(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives

148 files changed, 35235 insertions, 35235 deletions

diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index bff57b008..991c95147 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -97,7 +97,7 @@ struct AIListWindow : public Window {
 				int y = this->nested_array[AIL_WIDGET_LIST]->pos_y;
 				/* First AI in the list is hardcoded to random */
 				if (this->vscroll.pos == 0) {
-					DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, STR_AI_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_BLACK);
+					DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_BLACK);
 					y += this->line_height;
 				}
 				AIInfoList::const_iterator it = this->ai_info_list->begin();
@@ -119,14 +119,14 @@ struct AIListWindow : public Window {
 				if (selected_info != NULL) {
 					int y = r.top + WD_FRAMERECT_TOP;
 					SetDParamStr(0, selected_info->GetAuthor());
-					DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_AI_AUTHOR);
+					DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_AI_LIST_AUTHOR);
 					y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
 					SetDParam(0, selected_info->GetVersion());
-					DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_AI_VERSION);
+					DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_AI_LIST_VERSION);
 					y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
 					if (selected_info->GetURL() != NULL) {
 						SetDParamStr(0, selected_info->GetURL());
-						DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_AI_URL);
+						DrawString(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, STR_AI_LIST_URL);
 						y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
 					}
 					SetDParamStr(0, selected_info->GetDescription());
@@ -173,7 +173,7 @@ struct AIListWindow : public Window {
 
 			case AIL_WIDGET_CONTENT_DOWNLOAD:
 				if (!_network_available) {
-					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERROR_NOTAVAILABLE, 0, 0);
 				} else {
 #if defined(ENABLE_NETWORK)
 					ShowNetworkContentListWindow(NULL, CONTENT_TYPE_AI);
@@ -212,14 +212,14 @@ static const NWidgetPart _nested_ai_list_widgets[] = {
 		NWidget(WWT_CAPTION, COLOUR_MAUVE, AIL_WIDGET_CAPTION), SetMinimalSize(189, 14), SetDataTip(STR_AI_LIST_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_MATRIX, COLOUR_MAUVE, AIL_WIDGET_LIST), SetMinimalSize(188, 112), SetResize(1, 1), SetDataTip(0x501, STR_AI_AILIST_TIP),
+		NWidget(WWT_MATRIX, COLOUR_MAUVE, AIL_WIDGET_LIST), SetMinimalSize(188, 112), SetResize(1, 1), SetDataTip(0x501, STR_AI_LIST_TOOLTIP),
 		NWidget(WWT_SCROLLBAR, COLOUR_MAUVE, AIL_WIDGET_SCROLLBAR),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_MAUVE, AIL_WIDGET_INFO_BG), SetMinimalSize(200, 84), SetResize(1, 0),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIL_WIDGET_ACCEPT), SetMinimalSize(100, 12), SetResize(1, 0), SetDataTip(STR_AI_ACCEPT, STR_AI_ACCEPT_TIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIL_WIDGET_CANCEL), SetMinimalSize(100, 12), SetResize(1, 0), SetDataTip(STR_AI_CANCEL, STR_AI_CANCEL_TIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIL_WIDGET_ACCEPT), SetMinimalSize(100, 12), SetResize(1, 0), SetDataTip(STR_AI_LIST_ACCEPT, STR_AI_LIST_ACCEPT_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIL_WIDGET_CANCEL), SetMinimalSize(100, 12), SetResize(1, 0), SetDataTip(STR_AI_LIST_CANCEL, STR_AI_LIST_CANCEL_TOOLTIP),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIL_WIDGET_CONTENT_DOWNLOAD), SetMinimalSize(188, 12), SetResize(1, 0), SetDataTip(STR_INTRO_ONLINE_CONTENT, STR_INTRO_TOOLTIP_ONLINE_CONTENT),
@@ -361,13 +361,13 @@ struct AISettingsWindow : public Window {
 
 					if (_settings_newgame.difficulty.diff_level != 3) {
 						_settings_newgame.difficulty.diff_level = 3;
-						ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
+						ShowErrorMessage(INVALID_STRING_ID, STR_WARNING_DIFFICULTY_TO_CUSTOM, 0, 0);
 					}
 				} else if (!bool_item) {
 					/* Display a query box so users can enter a custom value. */
 					this->clicked_row = num;
 					SetDParam(0, this->ai_config->GetSetting(config_item.name));
-					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
+					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, 100, this, CS_NUMERAL, QSF_NONE);
 				}
 
 				this->SetDirty();
@@ -420,8 +420,8 @@ static const NWidgetPart _nested_ai_settings_widgets[] = {
 		NWidget(WWT_SCROLLBAR, COLOUR_MAUVE, AIS_WIDGET_SCROLLBAR),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIS_WIDGET_ACCEPT), SetMinimalSize(94, 12), SetResize(1, 0), SetDataTip(STR_AI_CLOSE, STR_NULL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIS_WIDGET_RESET), SetMinimalSize(94, 12), SetResize(1, 0), SetDataTip(STR_AI_RESET, STR_NULL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIS_WIDGET_ACCEPT), SetMinimalSize(94, 12), SetResize(1, 0), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, AIS_WIDGET_RESET), SetMinimalSize(94, 12), SetResize(1, 0), SetDataTip(STR_AI_SETTINGS_RESET, STR_NULL),
 		NWidget(WWT_RESIZEBOX, COLOUR_MAUVE, AIS_WIDGET_RESIZE),
 	EndContainer(),
 };
@@ -462,14 +462,14 @@ static const NWidgetPart _nested_ai_config_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_MAUVE, AIC_WIDGET_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 16),
 		NWidget(NWID_HORIZONTAL),
-			NWidget(WWT_MATRIX, COLOUR_MAUVE, AIC_WIDGET_LIST), SetMinimalSize(288, 112), SetDataTip(0x801, STR_AI_LIST_TIP),
+			NWidget(WWT_MATRIX, COLOUR_MAUVE, AIC_WIDGET_LIST), SetMinimalSize(288, 112), SetDataTip(0x801, STR_AI_CONFIG_LIST_TOOLTIP),
 			NWidget(WWT_SCROLLBAR, COLOUR_MAUVE, AIC_WIDGET_SCROLLBAR),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 9),
 		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(5, 0, 5),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CHANGE, STR_AI_CHANGE_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIGURE, STR_AI_CONFIGURE_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CLOSE, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CHANGE, STR_AI_CONFIG_CHANGE_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 9),
 	EndContainer(),
@@ -544,9 +544,9 @@ struct AIConfigWindow : public Window {
 						SetDParamStr(0, AIConfig::GetConfig((CompanyID)i)->GetInfo()->GetName());
 						text = STR_JUST_RAW_STRING;
 					} else if (i == 0) {
-						text = STR_AI_HUMAN_PLAYER;
+						text = STR_AI_CONFIG_HUMAN_PLAYER;
 					} else {
-						text = STR_AI_RANDOM_AI;
+						text = STR_AI_CONFIG_RANDOM_AI;
 					}
 					DrawString(r.left + 10, r.right - 10, y + WD_MATRIX_TOP, text,
 							(this->selected_slot == i) ? TC_WHITE : ((i > _settings_newgame.difficulty.max_no_competitors || i == 0) ? TC_SILVER : TC_ORANGE));
@@ -881,48 +881,48 @@ static const NWidgetPart _nested_ai_debug_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_VIEW),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(2, 0),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 1), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 1), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 2), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 2), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 3), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 3), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 4), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 4), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 5), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 5), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 6), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 6), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 7), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 7), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(2, 0), SetResize(1, 0),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(2, 0),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 8), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 8), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 9), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 9), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 10), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 10), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 11), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 11), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 12), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 12), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 13), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 13), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 14), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION),
+			NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_COMPANY_BUTTON_START + 14), SetMinimalSize(37, 13), SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(39, 0), SetResize(1, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 1), SetResize(1, 0),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_NAME_TEXT), SetMinimalSize(150, 20), SetResize(1, 0), SetDataTip(0x0, STR_AI_DEBUG_NAME_TIP),
+		NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_NAME_TEXT), SetMinimalSize(150, 20), SetResize(1, 0), SetDataTip(0x0, STR_AI_DEBUG_NAME_TOOLTIP),
 		EndContainer(),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, AID_WIDGET_RELOAD_TOGGLE), SetMinimalSize(149, 20), SetDataTip(STR_AI_DEBUG_RELOAD, STR_AI_DEBUG_RELOAD_TIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, AID_WIDGET_RELOAD_TOGGLE), SetMinimalSize(149, 20), SetDataTip(STR_AI_DEBUG_RELOAD, STR_AI_DEBUG_RELOAD_TOOLTIP),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PANEL, COLOUR_GREY, AID_WIDGET_LOG_PANEL), SetMinimalSize(287, 180), SetResize(1, 1),
@@ -948,6 +948,6 @@ void ShowAIDebugWindow(CompanyID show_company)
 		if (w == NULL) w = new AIDebugWindow(&_ai_debug_desc, 0);
 		if (show_company != INVALID_COMPANY) w->ChangeToAI(show_company);
 	} else {
-		ShowErrorMessage(INVALID_STRING_ID, STR_AI_DEBUG_SERVER_ONLY, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_AI_DEBUG_SERVER_ONLY, 0, 0);
 	}
 }
diff --git a/src/ai/ai_info_dummy.cpp b/src/ai/ai_info_dummy.cpp
index 2a6f29732..c70f030ce 100644
--- a/src/ai/ai_info_dummy.cpp
+++ b/src/ai/ai_info_dummy.cpp
@@ -54,7 +54,7 @@ void AI_CreateAIDummy(HSQUIRRELVM vm)
 	 * 1) We get the error message
 	 */
 	char error_message[1024];
-	GetString(error_message, STR_AI_NO_AI_FOUND, lastof(error_message));
+	GetString(error_message, STR_ERROR_AI_NO_AI_FOUND, lastof(error_message));
 
 	/* 2) We construct the AI's code. This is done by merging a header, body and footer */
 	char dummy_script[4096];
diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index 28d416925..c79ea0d34 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -262,7 +262,7 @@ void AIInstance::Died()
 
 	const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo();
 	if (info != NULL) {
-		ShowErrorMessage(INVALID_STRING_ID, STR_AI_PLEASE_REPORT_CRASH, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_AI_PLEASE_REPORT_CRASH, 0, 0);
 
 		if (info->GetURL() != NULL) {
 			AILog::Info("Please report the error to the following URL:");
diff --git a/src/ai/api/ai_bridge.hpp b/src/ai/api/ai_bridge.hpp
index bec17ca7a..7be500129 100644
--- a/src/ai/api/ai_bridge.hpp
+++ b/src/ai/api/ai_bridge.hpp
@@ -31,7 +31,7 @@ public:
 		ERR_BRIDGE_CANNOT_END_IN_WATER,      // [STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH]
 
 		/** The bride heads need to be on the same height */
-		ERR_BRIDGE_HEADS_NOT_ON_SAME_HEIGHT, // [STR_BRIDGEHEADS_NOT_SAME_HEIGHT]
+		ERR_BRIDGE_HEADS_NOT_ON_SAME_HEIGHT, // [STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT]
 	};
 
 	static const char *GetClassName() { return "AIBridge"; }
diff --git a/src/ai/api/ai_bridge.hpp.sq b/src/ai/api/ai_bridge.hpp.sq
index 593dc83ed..1026afbf2 100644
--- a/src/ai/api/ai_bridge.hpp.sq
+++ b/src/ai/api/ai_bridge.hpp.sq
@@ -28,7 +28,7 @@ void SQAIBridge_Register(Squirrel *engine) {
 
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_BUILD_BRIDGE_HERE,  AIBridge::ERR_BRIDGE_TYPE_UNAVAILABLE);
 	AIError::RegisterErrorMap(STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH, AIBridge::ERR_BRIDGE_CANNOT_END_IN_WATER);
-	AIError::RegisterErrorMap(STR_BRIDGEHEADS_NOT_SAME_HEIGHT,    AIBridge::ERR_BRIDGE_HEADS_NOT_ON_SAME_HEIGHT);
+	AIError::RegisterErrorMap(STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT,    AIBridge::ERR_BRIDGE_HEADS_NOT_ON_SAME_HEIGHT);
 
 	AIError::RegisterErrorMapString(AIBridge::ERR_BRIDGE_TYPE_UNAVAILABLE,         "ERR_BRIDGE_TYPE_UNAVAILABLE");
 	AIError::RegisterErrorMapString(AIBridge::ERR_BRIDGE_CANNOT_END_IN_WATER,      "ERR_BRIDGE_CANNOT_END_IN_WATER");
diff --git a/src/ai/api/ai_error.hpp b/src/ai/api/ai_error.hpp
index c845f3de7..f890b7cac 100644
--- a/src/ai/api/ai_error.hpp
+++ b/src/ai/api/ai_error.hpp
@@ -90,13 +90,13 @@ public:
 		ERR_ALREADY_BUILT,                            // [STR_ERROR_ALREADY_BUILT, STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST]
 
 		/** Area isn't clear, try to demolish the building on it */
-		ERR_AREA_NOT_CLEAR,                           // [STR_ERROR_BUILDING_MUST_BE_DEMOLISHED, STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST, STR_ERROR_MUST_DEMOLISH_RAILROAD, STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST, STR_ERROR_MUST_DEMOLISH_CARGO_TRAM_STATION_FIRST, STR_ERROR_MUST_DEMOLISH_TRUCK_STATION_FIRST, STR_ERROR_MUST_DEMOLISH_PASSENGER_TRAM_STATION_FIRST, STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST, STR_ERROR_BUOY_IN_THE_WAY, STR_ERROR_MUST_DEMOLISH_DOCK_FIRST, STR_OBJECT_IN_THE_WAY, STR_ERROR_COMPANY_HEADQUARTERS_IN, STR_ERROR_OBJECT_IN_THE_WAY, STR_ERROR_MUST_REMOVE_ROAD_FIRST, STR_ERROR_MUST_REMOVE_RAILROAD_TRACK, STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST, STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST, STR_ERROR_EXCAVATION_WOULD_DAMAGE]
+		ERR_AREA_NOT_CLEAR,                           // [STR_ERROR_BUILDING_MUST_BE_DEMOLISHED, STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST, STR_ERROR_MUST_DEMOLISH_RAILROAD, STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST, STR_ERROR_MUST_DEMOLISH_CARGO_TRAM_STATION_FIRST, STR_ERROR_MUST_DEMOLISH_TRUCK_STATION_FIRST, STR_ERROR_MUST_DEMOLISH_PASSENGER_TRAM_STATION_FIRST, STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST, STR_ERROR_BUOY_IN_THE_WAY, STR_ERROR_MUST_DEMOLISH_DOCK_FIRST, STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY, STR_ERROR_COMPANY_HEADQUARTERS_IN, STR_ERROR_OBJECT_IN_THE_WAY, STR_ERROR_MUST_REMOVE_ROAD_FIRST, STR_ERROR_MUST_REMOVE_RAILROAD_TRACK, STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST, STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST, STR_ERROR_EXCAVATION_WOULD_DAMAGE]
 
 		/** Area / property is owned by another company */
 		ERR_OWNED_BY_ANOTHER_COMPANY,                 // [STR_ERROR_AREA_IS_OWNED_BY_ANOTHER, STR_ERROR_OWNED_BY]
 
 		/** The name given is not unique for the object type */
-		ERR_NAME_IS_NOT_UNIQUE,                       // [STR_NAME_MUST_BE_UNIQUE]
+		ERR_NAME_IS_NOT_UNIQUE,                       // [STR_ERROR_NAME_MUST_BE_UNIQUE]
 
 		/** The building you want to build requires flat land */
 		ERR_FLAT_LAND_REQUIRED,                       // [STR_ERROR_FLAT_LAND_REQUIRED]
diff --git a/src/ai/api/ai_error.hpp.sq b/src/ai/api/ai_error.hpp.sq
index e5c91074e..399118fe8 100644
--- a/src/ai/api/ai_error.hpp.sq
+++ b/src/ai/api/ai_error.hpp.sq
@@ -69,7 +69,7 @@ void SQAIError_Register(Squirrel *engine) {
 	AIError::RegisterErrorMap(STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST,            AIError::ERR_AREA_NOT_CLEAR);
 	AIError::RegisterErrorMap(STR_ERROR_BUOY_IN_THE_WAY,                            AIError::ERR_AREA_NOT_CLEAR);
 	AIError::RegisterErrorMap(STR_ERROR_MUST_DEMOLISH_DOCK_FIRST,                   AIError::ERR_AREA_NOT_CLEAR);
-	AIError::RegisterErrorMap(STR_OBJECT_IN_THE_WAY,                                AIError::ERR_AREA_NOT_CLEAR);
+	AIError::RegisterErrorMap(STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY,                                AIError::ERR_AREA_NOT_CLEAR);
 	AIError::RegisterErrorMap(STR_ERROR_COMPANY_HEADQUARTERS_IN,                    AIError::ERR_AREA_NOT_CLEAR);
 	AIError::RegisterErrorMap(STR_ERROR_OBJECT_IN_THE_WAY,                          AIError::ERR_AREA_NOT_CLEAR);
 	AIError::RegisterErrorMap(STR_ERROR_MUST_REMOVE_ROAD_FIRST,                     AIError::ERR_AREA_NOT_CLEAR);
@@ -79,7 +79,7 @@ void SQAIError_Register(Squirrel *engine) {
 	AIError::RegisterErrorMap(STR_ERROR_EXCAVATION_WOULD_DAMAGE,                    AIError::ERR_AREA_NOT_CLEAR);
 	AIError::RegisterErrorMap(STR_ERROR_AREA_IS_OWNED_BY_ANOTHER,                   AIError::ERR_OWNED_BY_ANOTHER_COMPANY);
 	AIError::RegisterErrorMap(STR_ERROR_OWNED_BY,                                   AIError::ERR_OWNED_BY_ANOTHER_COMPANY);
-	AIError::RegisterErrorMap(STR_NAME_MUST_BE_UNIQUE,                              AIError::ERR_NAME_IS_NOT_UNIQUE);
+	AIError::RegisterErrorMap(STR_ERROR_NAME_MUST_BE_UNIQUE,                              AIError::ERR_NAME_IS_NOT_UNIQUE);
 	AIError::RegisterErrorMap(STR_ERROR_FLAT_LAND_REQUIRED,                         AIError::ERR_FLAT_LAND_REQUIRED);
 	AIError::RegisterErrorMap(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION,             AIError::ERR_LAND_SLOPED_WRONG);
 	AIError::RegisterErrorMap(STR_ERROR_TRAIN_IN_THE_WAY,                           AIError::ERR_VEHICLE_IN_THE_WAY);
diff --git a/src/ai/api/ai_rail.hpp b/src/ai/api/ai_rail.hpp
index e17a5d52c..1676b959f 100644
--- a/src/ai/api/ai_rail.hpp
+++ b/src/ai/api/ai_rail.hpp
@@ -24,13 +24,13 @@ public:
 		ERR_RAIL_BASE = AIError::ERR_CAT_RAIL << AIError::ERR_CAT_BIT_SIZE,
 
 		/** One-way roads cannot have crossings */
-		ERR_CROSSING_ON_ONEWAY_ROAD,       // [STR_ERR_CROSSING_ON_ONEWAY_ROAD]
+		ERR_CROSSING_ON_ONEWAY_ROAD,       // [STR_ERROR_CROSSING_ON_ONEWAY_ROAD]
 
 		/** Track not suitable for signals */
 		ERR_UNSUITABLE_TRACK,              // [STR_ERROR_NO_SUITABLE_RAILROAD_TRACK]
 
 		/** Non-uniform stations is diabled */
-		ERR_NONUNIFORM_STATIONS_DISABLED,  // [STR_NONUNIFORM_STATIONS_DISALLOWED]
+		ERR_NONUNIFORM_STATIONS_DISABLED,  // [STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED]
 	};
 
 	/**
diff --git a/src/ai/api/ai_rail.hpp.sq b/src/ai/api/ai_rail.hpp.sq
index 85d531d46..e4e19dcda 100644
--- a/src/ai/api/ai_rail.hpp.sq
+++ b/src/ai/api/ai_rail.hpp.sq
@@ -52,9 +52,9 @@ void SQAIRail_Register(Squirrel *engine) {
 	SQAIRail.DefSQConst(engine, AIRail::SIGNALTYPE_COMBO_TWOWAY,          "SIGNALTYPE_COMBO_TWOWAY");
 	SQAIRail.DefSQConst(engine, AIRail::SIGNALTYPE_NONE,                  "SIGNALTYPE_NONE");
 
-	AIError::RegisterErrorMap(STR_ERR_CROSSING_ON_ONEWAY_ROAD,      AIRail::ERR_CROSSING_ON_ONEWAY_ROAD);
+	AIError::RegisterErrorMap(STR_ERROR_CROSSING_ON_ONEWAY_ROAD,      AIRail::ERR_CROSSING_ON_ONEWAY_ROAD);
 	AIError::RegisterErrorMap(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK, AIRail::ERR_UNSUITABLE_TRACK);
-	AIError::RegisterErrorMap(STR_NONUNIFORM_STATIONS_DISALLOWED,   AIRail::ERR_NONUNIFORM_STATIONS_DISABLED);
+	AIError::RegisterErrorMap(STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED,   AIRail::ERR_NONUNIFORM_STATIONS_DISABLED);
 
 	AIError::RegisterErrorMapString(AIRail::ERR_CROSSING_ON_ONEWAY_ROAD,      "ERR_CROSSING_ON_ONEWAY_ROAD");
 	AIError::RegisterErrorMapString(AIRail::ERR_UNSUITABLE_TRACK,             "ERR_UNSUITABLE_TRACK");
diff --git a/src/ai/api/ai_road.hpp b/src/ai/api/ai_road.hpp
index e4aefec6d..a1ff43b39 100644
--- a/src/ai/api/ai_road.hpp
+++ b/src/ai/api/ai_road.hpp
@@ -24,13 +24,13 @@ public:
 		ERR_ROAD_BASE = AIError::ERR_CAT_ROAD << AIError::ERR_CAT_BIT_SIZE,
 
 		/** Road works are in progress */
-		ERR_ROAD_WORKS_IN_PROGRESS,                   // [STR_ROAD_WORKS_IN_PROGRESS]
+		ERR_ROAD_WORKS_IN_PROGRESS,                   // [STR_ERROR_ROAD_WORKS_IN_PROGRESS]
 
 		/** Drive through is in the wrong direction */
-		ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION,       // [STR_DRIVE_THROUGH_ERROR_DIRECTION]
+		ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION,       // [STR_ERROR_DRIVE_THROUGH_DIRECTION]
 
 		/** Drive through roads can't be build on town owned roads */
-		ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD,           // [STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD]
+		ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD,           // [STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD]
 
 
 		/** One way roads can't have junctions */
diff --git a/src/ai/api/ai_road.hpp.sq b/src/ai/api/ai_road.hpp.sq
index 050382337..5349d0891 100644
--- a/src/ai/api/ai_road.hpp.sq
+++ b/src/ai/api/ai_road.hpp.sq
@@ -36,9 +36,9 @@ void SQAIRoad_Register(Squirrel *engine) {
 	SQAIRoad.DefSQConst(engine, AIRoad::ROADVEHTYPE_BUS,                              "ROADVEHTYPE_BUS");
 	SQAIRoad.DefSQConst(engine, AIRoad::ROADVEHTYPE_TRUCK,                            "ROADVEHTYPE_TRUCK");
 
-	AIError::RegisterErrorMap(STR_ROAD_WORKS_IN_PROGRESS,                 AIRoad::ERR_ROAD_WORKS_IN_PROGRESS);
-	AIError::RegisterErrorMap(STR_DRIVE_THROUGH_ERROR_DIRECTION,          AIRoad::ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION);
-	AIError::RegisterErrorMap(STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD,       AIRoad::ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD);
+	AIError::RegisterErrorMap(STR_ERROR_ROAD_WORKS_IN_PROGRESS,                 AIRoad::ERR_ROAD_WORKS_IN_PROGRESS);
+	AIError::RegisterErrorMap(STR_ERROR_DRIVE_THROUGH_DIRECTION,          AIRoad::ERR_ROAD_DRIVE_THROUGH_WRONG_DIRECTION);
+	AIError::RegisterErrorMap(STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD,       AIRoad::ERR_ROAD_CANNOT_BUILD_ON_TOWN_ROAD);
 	AIError::RegisterErrorMap(STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION, AIRoad::ERR_ROAD_ONE_WAY_ROADS_CANNOT_HAVE_JUNCTIONS);
 
 	AIError::RegisterErrorMapString(AIRoad::ERR_ROAD_WORKS_IN_PROGRESS,                   "ERR_ROAD_WORKS_IN_PROGRESS");
diff --git a/src/ai/api/ai_tile.hpp b/src/ai/api/ai_tile.hpp
index 589792513..b35bcc270 100644
--- a/src/ai/api/ai_tile.hpp
+++ b/src/ai/api/ai_tile.hpp
@@ -31,7 +31,7 @@ public:
 		ERR_TILE_TOO_LOW,                      // [STR_ERROR_ALREADY_AT_SEA_LEVEL]
 
 		/** The area was already flat */
-		ERR_AREA_ALREADY_FLAT,                 // [STR_ALREADY_LEVELLED]
+		ERR_AREA_ALREADY_FLAT,                 // [STR_ERROR_ALREADY_LEVELLED]
 
 		/** There is a tunnel underneed */
 		ERR_EXCAVATION_WOULD_DAMAGE,           // [STR_ERROR_EXCAVATION_WOULD_DAMAGE]
diff --git a/src/ai/api/ai_tile.hpp.sq b/src/ai/api/ai_tile.hpp.sq
index fa825a93d..4c46df1bb 100644
--- a/src/ai/api/ai_tile.hpp.sq
+++ b/src/ai/api/ai_tile.hpp.sq
@@ -67,7 +67,7 @@ void SQAITile_Register(Squirrel *engine) {
 
 	AIError::RegisterErrorMap(STR_ERROR_ALREADY_AT_SEA_LEVEL,    AITile::ERR_TILE_TOO_HIGH);
 	AIError::RegisterErrorMap(STR_ERROR_ALREADY_AT_SEA_LEVEL,    AITile::ERR_TILE_TOO_LOW);
-	AIError::RegisterErrorMap(STR_ALREADY_LEVELLED,              AITile::ERR_AREA_ALREADY_FLAT);
+	AIError::RegisterErrorMap(STR_ERROR_ALREADY_LEVELLED,              AITile::ERR_AREA_ALREADY_FLAT);
 	AIError::RegisterErrorMap(STR_ERROR_EXCAVATION_WOULD_DAMAGE, AITile::ERR_EXCAVATION_WOULD_DAMAGE);
 
 	AIError::RegisterErrorMapString(AITile::ERR_TILE_TOO_HIGH,           "ERR_TILE_TOO_HIGH");
diff --git a/src/ai/api/ai_vehicle.hpp b/src/ai/api/ai_vehicle.hpp
index f2022ba49..53786adfb 100644
--- a/src/ai/api/ai_vehicle.hpp
+++ b/src/ai/api/ai_vehicle.hpp
@@ -28,13 +28,13 @@ public:
 		ERR_VEHICLE_TOO_MANY,                   // [STR_ERROR_TOO_MANY_VEHICLES_IN_GAME]
 
 		/** Vehicle is not available */
-		ERR_VEHICLE_NOT_AVAILABLE,              // [STR_AIRCRAFT_NOT_AVAILABLE, STR_ROAD_VEHICLE_NOT_AVAILABLE, STR_SHIP_NOT_AVAILABLE, STR_RAIL_VEHICLE_NOT_AVAILABLE]
+		ERR_VEHICLE_NOT_AVAILABLE,              // [STR_ERROR_AIRCRAFT_NOT_AVAILABLE, STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE, STR_ERROR_SHIP_NOT_AVAILABLE, STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE]
 
 		/** Vehicle can't be build due to game settigns */
 		ERR_VEHICLE_BUILD_DISABLED,             // [STR_ERROR_CAN_T_BUILD_TRAIN, STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE, STR_ERROR_CAN_T_BUILD_SHIP, STR_ERROR_CAN_T_BUILD_AIRCRAFT]
 
 		/** Vehicle can't be build in the selected depot */
-		ERR_VEHICLE_WRONG_DEPOT,                // [STR_DEPOT_WRONG_DEPOT_TYPE]
+		ERR_VEHICLE_WRONG_DEPOT,                // [STR_ERROR_DEPOT_WRONG_DEPOT_TYPE]
 
 		/** Vehicle can't return to the depot */
 		ERR_VEHICLE_CANNOT_SEND_TO_DEPOT,       // [STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT, STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT, STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT, STR_ERROR_CAN_T_SEND_AIRCRAFT_TO_HANGAR]
@@ -49,7 +49,7 @@ public:
 		ERR_VEHICLE_CANNOT_REFIT,               // [STR_ERROR_CAN_T_REFIT_TRAIN, STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE, STR_ERROR_CAN_T_REFIT_SHIP, STR_ERROR_CAN_T_REFIT_AIRCRAFT]
 
 		/** Vehicle is destroyed */
-		ERR_VEHICLE_IS_DESTROYED,               // [STR_CAN_T_REFIT_DESTROYED_VEHICLE, STR_CAN_T_SELL_DESTROYED_VEHICLE]
+		ERR_VEHICLE_IS_DESTROYED,               // [STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE, STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE]
 
 		/** Vehicle is not in a depot */
 		ERR_VEHICLE_NOT_IN_DEPOT,               // [STR_ERROR_AIRCRAFT_MUST_BE_STOPPED, STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT, STR_TRAIN_MUST_BE_STOPPED, STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT]
@@ -58,7 +58,7 @@ public:
 		ERR_VEHICLE_IN_FLIGHT,                  // [STR_ERROR_AIRCRAFT_IS_IN_FLIGHT]
 
 		/** Vehicle is without power */
-		ERR_VEHICLE_NO_POWER,                   // [STR_TRAIN_START_NO_CATENARY]
+		ERR_VEHICLE_NO_POWER,                   // [STR_ERROR_TRAIN_START_NO_CATENARY]
 
 	};
 
diff --git a/src/ai/api/ai_vehicle.hpp.sq b/src/ai/api/ai_vehicle.hpp.sq
index 2b802e07f..562f63e42 100644
--- a/src/ai/api/ai_vehicle.hpp.sq
+++ b/src/ai/api/ai_vehicle.hpp.sq
@@ -53,15 +53,15 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	SQAIVehicle.DefSQConst(engine, AIVehicle::VS_INVALID,                       "VS_INVALID");
 
 	AIError::RegisterErrorMap(STR_ERROR_TOO_MANY_VEHICLES_IN_GAME,                           AIVehicle::ERR_VEHICLE_TOO_MANY);
-	AIError::RegisterErrorMap(STR_AIRCRAFT_NOT_AVAILABLE,                                    AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_ROAD_VEHICLE_NOT_AVAILABLE,                                AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_SHIP_NOT_AVAILABLE,                                        AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
-	AIError::RegisterErrorMap(STR_RAIL_VEHICLE_NOT_AVAILABLE,                                AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_ERROR_AIRCRAFT_NOT_AVAILABLE,                                    AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE,                                AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_ERROR_SHIP_NOT_AVAILABLE,                                        AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
+	AIError::RegisterErrorMap(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE,                                AIVehicle::ERR_VEHICLE_NOT_AVAILABLE);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_BUILD_TRAIN,                                   AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_BUILD_ROAD_VEHICLE,                            AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_BUILD_SHIP,                                    AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_BUILD_AIRCRAFT,                                AIVehicle::ERR_VEHICLE_BUILD_DISABLED);
-	AIError::RegisterErrorMap(STR_DEPOT_WRONG_DEPOT_TYPE,                                    AIVehicle::ERR_VEHICLE_WRONG_DEPOT);
+	AIError::RegisterErrorMap(STR_ERROR_DEPOT_WRONG_DEPOT_TYPE,                                    AIVehicle::ERR_VEHICLE_WRONG_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_SEND_TRAIN_TO_DEPOT,                           AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_SEND_ROAD_VEHICLE_TO_DEPOT,                    AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_SEND_SHIP_TO_DEPOT,                            AIVehicle::ERR_VEHICLE_CANNOT_SEND_TO_DEPOT);
@@ -78,14 +78,14 @@ void SQAIVehicle_Register(Squirrel *engine) {
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REFIT_ROAD_VEHICLE,                            AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REFIT_SHIP,                                    AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
 	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REFIT_AIRCRAFT,                                AIVehicle::ERR_VEHICLE_CANNOT_REFIT);
-	AIError::RegisterErrorMap(STR_CAN_T_REFIT_DESTROYED_VEHICLE,                             AIVehicle::ERR_VEHICLE_IS_DESTROYED);
-	AIError::RegisterErrorMap(STR_CAN_T_SELL_DESTROYED_VEHICLE,                              AIVehicle::ERR_VEHICLE_IS_DESTROYED);
+	AIError::RegisterErrorMap(STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE,                             AIVehicle::ERR_VEHICLE_IS_DESTROYED);
+	AIError::RegisterErrorMap(STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE,                              AIVehicle::ERR_VEHICLE_IS_DESTROYED);
 	AIError::RegisterErrorMap(STR_ERROR_AIRCRAFT_MUST_BE_STOPPED,                            AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT,           AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_TRAIN_MUST_BE_STOPPED,                                     AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT,                       AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
 	AIError::RegisterErrorMap(STR_ERROR_AIRCRAFT_IS_IN_FLIGHT,                               AIVehicle::ERR_VEHICLE_IN_FLIGHT);
-	AIError::RegisterErrorMap(STR_TRAIN_START_NO_CATENARY,                                   AIVehicle::ERR_VEHICLE_NO_POWER);
+	AIError::RegisterErrorMap(STR_ERROR_TRAIN_START_NO_CATENARY,                                   AIVehicle::ERR_VEHICLE_NO_POWER);
 
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_MANY,             "ERR_VEHICLE_TOO_MANY");
 	AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_AVAILABLE,        "ERR_VEHICLE_NOT_AVAILABLE");
diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 01460abf0..f338d1631 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -250,7 +250,7 @@ uint16 AircraftDefaultCargoCapacity(CargoID cid, const AircraftVehicleInfo *avi)
  */
 CommandCost CmdBuildAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_company)) return_cmd_error(STR_AIRCRAFT_NOT_AVAILABLE);
+	if (!IsEngineBuildable(p1, VEH_AIRCRAFT, _current_company)) return_cmd_error(STR_ERROR_AIRCRAFT_NOT_AVAILABLE);
 
 	const AircraftVehicleInfo *avi = AircraftVehInfo(p1);
 	const Engine *e = Engine::Get(p1);
@@ -451,7 +451,7 @@ CommandCost CmdSellAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (!v->IsStoppedInDepot()) return_cmd_error(STR_ERROR_AIRCRAFT_MUST_BE_STOPPED);
 
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE);
 
 	CommandCost ret(EXPENSES_NEW_VEHICLES, -v->value);
 
@@ -522,7 +522,7 @@ CommandCost CmdRefitAircraft(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	Aircraft *v = Aircraft::GetIfValid(p1);
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (!v->IsStoppedInDepot()) return_cmd_error(STR_ERROR_AIRCRAFT_MUST_BE_STOPPED);
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE);
 
 	/* Check cargo */
 	CargoID new_cid = GB(p2, 0, 8);
diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp
index 038950f7a..90f886645 100644
--- a/src/aircraft_gui.cpp
+++ b/src/aircraft_gui.cpp
@@ -58,7 +58,7 @@ void DrawAircraftDetails(const Aircraft *v, int left, int right, int y)
 	}
 
 	SetDParam(0, feeder_share);
-	DrawString(left, right, y + 33 + y_offset, STR_FEEDER_CARGO_VALUE);
+	DrawString(left, right, y + 33 + y_offset, STR_VEHICLE_INFO_FEEDER_CARGO_VALUE);
 }
 
 
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 84dbe6a0f..0c9da8732 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -224,7 +224,7 @@ public:
 		if (_settings_game.economy.station_noise_level) {
 			/* show the noise of the selected airport */
 			SetDParam(0, airport->noise_level);
-			DrawString(panel_nwi->pos_x + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top, STR_STATION_NOISE);
+			DrawString(panel_nwi->pos_x + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, top, STR_STATION_BUILD_NOISE);
 			top += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
 		}
 
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index 0b78db723..ada739ae8 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -264,14 +264,14 @@ public:
 										!EngineHasReplacementForCompany(c, selected_id[0], selected_group));
 
 		/* now the actual drawing of the window itself takes place */
-		SetDParam(0, STR_VEHICLE_TRAIN + this->window_number);
+		SetDParam(0, STR_REPLACE_VEHICLE_TRAIN + this->window_number);
 
 		if (this->window_number == VEH_TRAIN) {
 			/* set on/off for renew_keep_length */
 			SetDParam(1, c->settings.renew_keep_length ? STR_CONFIG_SETTING_ON : STR_CONFIG_SETTING_OFF);
 
 			/* set wagon/engine button */
-			SetDParam(2, this->wagon_btnstate ? STR_ENGINES : STR_WAGONS);
+			SetDParam(2, this->wagon_btnstate ? STR_REPLACE_ENGINES : STR_REPLACE_WAGONS);
 
 			/* sets the colour of that art thing */
 			this->widget[RVW_WIDGET_TRAIN_FLUFF_LEFT].colour  = _company_colours[_local_company];
@@ -289,13 +289,13 @@ public:
 		/* sets up the string for the vehicle that is being replaced to */
 		if (selected_id[0] != INVALID_ENGINE) {
 			if (!EngineHasReplacementForCompany(c, selected_id[0], selected_group)) {
-				SetDParam(0, STR_NOT_REPLACING);
+				SetDParam(0, STR_REPLACE_NOT_REPLACING);
 			} else {
 				SetDParam(0, STR_ENGINE_NAME);
 				SetDParam(1, EngineReplacementForCompany(c, selected_id[0], selected_group));
 			}
 		} else {
-			SetDParam(0, STR_NOT_REPLACING_VEHICLE_SELECTED);
+			SetDParam(0, STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED);
 		}
 
 		DrawString(this->widget[RVW_WIDGET_INFO_TAB].left + 6, this->widget[RVW_WIDGET_INFO_TAB].right - 6, this->widget[RVW_WIDGET_INFO_TAB].top + 1, STR_BLACK_STRING);
@@ -440,7 +440,7 @@ public:
 static const Widget _replace_vehicle_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,                 STR_TOOLTIP_CLOSE_WINDOW},             // RVW_WIDGET_CLOSEBOX
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   443,     0,    13, STR_REPLACE_VEHICLES_WHITE,      STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // RVW_WIDGET_CAPTION
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   444,   455,     0,    13, STR_NULL,                        STR_STICKY_BUTTON},                    // RVW_WIDGET_STICKY
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   444,   455,     0,    13, STR_NULL,                        STR_TOOLTIP_STICKY},                    // RVW_WIDGET_STICKY
 
 {     WWT_MATRIX, RESIZE_BOTTOM,  COLOUR_GREY,     0,   215,    14,    13, 0x1,                             STR_REPLACE_HELP_LEFT_ARRAY},          // RVW_WIDGET_LEFT_MATRIX
 {  WWT_SCROLLBAR, RESIZE_BOTTOM,  COLOUR_GREY,   216,   227,    14,    13, STR_NULL,                        STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // RVW_WIDGET_LEFT_SCROLLBAR
@@ -452,7 +452,7 @@ static const Widget _replace_vehicle_widgets[] = {
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   138,   106,   117, STR_REPLACE_VEHICLES_START,      STR_REPLACE_HELP_START_BUTTON},        // RVW_WIDGET_START_REPLACE
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,   139,   305,   106,   117, 0x0,                             STR_REPLACE_HELP_REPLACE_INFO_TAB},    // RVW_WIDGET_INFO_TAB
 { WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   306,   443,   106,   117, STR_REPLACE_VEHICLES_STOP,       STR_REPLACE_HELP_STOP_BUTTON},         // RVW_WIDGET_STOP_REPLACE
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   444,   455,   106,   117, STR_NULL,                        STR_RESIZE_BUTTON},                    // RVW_WIDGET_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   444,   455,   106,   117, STR_NULL,                        STR_TOOLTIP_RESIZE},                    // RVW_WIDGET_RESIZE
 
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   138,   128,   139, STR_REPLACE_ENGINE_WAGON_SELECT, STR_REPLACE_ENGINE_WAGON_SELECT_HELP}, // RVW_WIDGET_TRAIN_ENGINEWAGON_TOGGLE
 {      WWT_PANEL,     RESIZE_TB,  COLOUR_GREY,   139,   153,   128,   139, 0x0,                             STR_NULL},                             // RVW_WIDGET_TRAIN_FLUFF_LEFT
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index c24917136..a0c5b8de9 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -190,7 +190,7 @@ public:
 					SetDParam(2, this->bridges->Get(i)->cost);
 					SetDParam(1, b->speed);
 					SetDParam(0, b->material);
-					text_dim = maxdim(text_dim, GetStringBoundingBox(STR_BUILD_BRIDGE_INFO));
+					text_dim = maxdim(text_dim, GetStringBoundingBox(STR_SELECT_BRIDGE_INFO));
 				}
 				sprite_dim.height++; // Sprite is rendered one pixel down in the matrix field.
 				text_dim.height++; // Allowing the bottom row pixels to be rendered on the edge of the matrix field.
@@ -221,7 +221,7 @@ public:
 					SetDParam(0, b->material);
 
 					DrawSprite(b->sprite, b->pal, r.left + WD_MATRIX_LEFT, y + this->resize.step_height - 1 - GetSpriteSize(b->sprite).height);
-					DrawStringMultiLine(r.left + this->bridgetext_offset, r.right, y + 2, y + this->resize.step_height, STR_BUILD_BRIDGE_INFO);
+					DrawStringMultiLine(r.left + this->bridgetext_offset, r.right, y + 2, y + this->resize.step_height, STR_SELECT_BRIDGE_INFO);
 					y += this->resize.step_height;
 				}
 				break;
@@ -317,11 +317,11 @@ static const NWidgetPart _nested_build_bridge_widgets[] = {
 		NWidget(NWID_VERTICAL),
 			/* Sort order + criteria buttons */
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_TEXTBTN, COLOUR_DARK_GREEN, BBSW_DROPDOWN_ORDER), SetFill(1, 0), SetDataTip(STR_SORT_BY, STR_SORT_ORDER_TIP),
-				NWidget(WWT_DROPDOWN, COLOUR_DARK_GREEN, BBSW_DROPDOWN_CRITERIA), SetFill(1, 0), SetDataTip(0x0, STR_SORT_CRITERIA_TIP),
+				NWidget(WWT_TEXTBTN, COLOUR_DARK_GREEN, BBSW_DROPDOWN_ORDER), SetFill(1, 0), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+				NWidget(WWT_DROPDOWN, COLOUR_DARK_GREEN, BBSW_DROPDOWN_CRITERIA), SetFill(1, 0), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIAP),
 			EndContainer(),
 			/* Matrix. */
-			NWidget(WWT_MATRIX, COLOUR_DARK_GREEN, BBSW_BRIDGE_LIST), SetFill(1, 0), SetResize(0, 22), SetDataTip(0x401, STR_BUILD_BRIDGE_SELECTION_TOOLTIP),
+			NWidget(WWT_MATRIX, COLOUR_DARK_GREEN, BBSW_BRIDGE_LIST), SetFill(1, 0), SetResize(0, 22), SetDataTip(0x401, STR_SELECT_BRIDGE_SELECTION_TOOLTIP),
 		EndContainer(),
 
 		/* scrollbar + resize button */
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 706a6e1dc..986d1a0e3 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -50,9 +50,9 @@ static const Widget _build_vehicle_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW },            // BUILD_VEHICLE_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   239,     0,    13, 0x0,             STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS },  // BUILD_VEHICLE_WIDGET_CAPTION
 	{      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,     0,   239,    14,    37, 0x0,             STR_NULL },                            // BUILD_VEHICLE_WIDGET_LIST_CONTROL
-	{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    80,    14,    25, STR_SORT_BY,     STR_SORT_ORDER_TIP},                   // BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING
-	{   WWT_DROPDOWN,  RESIZE_RIGHT,  COLOUR_GREY,    81,   239,    14,    25, 0x0,             STR_SORT_CRITERIA_TIP},                // BUILD_VEHICLE_WIDGET_SORT_DROPDOWN
-	{   WWT_DROPDOWN,  RESIZE_RIGHT,  COLOUR_GREY,    81,   239,    26,    37, 0x0,             STR_FILTER_CRITERIA_TIP},              // BUILD_VEHICLE_WIDGET_CARGO_FILTER_DROPDOWN
+	{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    80,    14,    25, STR_BUTTON_SORT_BY,     STR_TOOLTIP_SORT_ORDER},                   // BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING
+	{   WWT_DROPDOWN,  RESIZE_RIGHT,  COLOUR_GREY,    81,   239,    14,    25, 0x0,             STR_TOOLTIP_SORT_CRITERIAP},                // BUILD_VEHICLE_WIDGET_SORT_DROPDOWN
+	{   WWT_DROPDOWN,  RESIZE_RIGHT,  COLOUR_GREY,    81,   239,    26,    37, 0x0,             STR_TOOLTIP_FILTER_CRITERIA},              // BUILD_VEHICLE_WIDGET_CARGO_FILTER_DROPDOWN
 	{     WWT_MATRIX,     RESIZE_RB,  COLOUR_GREY,     0,   227,    38,    51, 0x101,           STR_NULL },                            // BUILD_VEHICLE_WIDGET_LIST
 	{  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   228,   239,    38,    51, 0x0,             STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST },// BUILD_VEHICLE_WIDGET_SCROLLBAR
 
@@ -60,7 +60,7 @@ static const Widget _build_vehicle_widgets[] = {
 
 	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   114,   174,   185, 0x0,             STR_NULL },                            // BUILD_VEHICLE_WIDGET_BUILD
 	{ WWT_PUSHTXTBTN,    RESIZE_RTB,  COLOUR_GREY,   115,   227,   174,   185, 0x0,             STR_NULL },                            // BUILD_VEHICLE_WIDGET_RENAME
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   228,   239,   174,   185, 0x0,             STR_RESIZE_BUTTON },                   // BUILD_VEHICLE_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   228,   239,   174,   185, 0x0,             STR_TOOLTIP_RESIZE },                   // BUILD_VEHICLE_WIDGET_RESIZE
 	{   WIDGETS_END},
 };
 
@@ -72,13 +72,13 @@ static const NWidgetPart _nested_build_vehicle_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_GREY, BUILD_VEHICLE_WIDGET_LIST_CONTROL),
 		/* Sort order + criteria button row. */
 		NWidget(NWID_HORIZONTAL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING), SetMinimalSize(81, 12), SetDataTip(STR_SORT_BY, STR_SORT_ORDER_TIP),
-			NWidget(WWT_DROPDOWN, COLOUR_GREY, BUILD_VEHICLE_WIDGET_SORT_DROPDOWN), SetMinimalSize(159, 12), SetResize(1, 0), SetDataTip(0x0, STR_SORT_CRITERIA_TIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, BUILD_VEHICLE_WIDGET_SORT_ASSENDING_DESCENDING), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+			NWidget(WWT_DROPDOWN, COLOUR_GREY, BUILD_VEHICLE_WIDGET_SORT_DROPDOWN), SetMinimalSize(159, 12), SetResize(1, 0), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIAP),
 		EndContainer(),
 		/* Filter criteria row. */
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetFill(1, 0),
-			NWidget(WWT_DROPDOWN, COLOUR_GREY, BUILD_VEHICLE_WIDGET_CARGO_FILTER_DROPDOWN), SetMinimalSize(159, 12), SetResize(1, 0), SetDataTip(0x0, STR_FILTER_CRITERIA_TIP),
+			NWidget(WWT_DROPDOWN, COLOUR_GREY, BUILD_VEHICLE_WIDGET_CARGO_FILTER_DROPDOWN), SetMinimalSize(159, 12), SetResize(1, 0), SetDataTip(0x0, STR_TOOLTIP_FILTER_CRITERIA),
 		EndContainer(),
 	EndContainer(),
 	/* Vehicle list. */
@@ -421,7 +421,7 @@ static int DrawCargoCapacityInfo(int left, int right, int y, EngineID engine, Ve
 
 		SetDParam(0, c);
 		SetDParam(1, cap[c]);
-		SetDParam(2, refittable ? STR_REFITTABLE : STR_EMPTY);
+		SetDParam(2, refittable ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY);
 		DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
 		y += FONT_HEIGHT_NORMAL;
 
@@ -545,7 +545,7 @@ static int DrawShipPurchaseInfo(int left, int right, int y, EngineID engine_numb
 	/* Cargo type + capacity */
 	SetDParam(0, e->GetDefaultCargoType());
 	SetDParam(1, e->GetDisplayDefaultCapacity());
-	SetDParam(2, refittable ? STR_REFITTABLE : STR_EMPTY);
+	SetDParam(2, refittable ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY);
 	DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
 	y += FONT_HEIGHT_NORMAL;
 
@@ -581,7 +581,7 @@ static int DrawAircraftPurchaseInfo(int left, int right, int y, EngineID engine_
 		 * callback, then the capacity shown is likely to be incorrect. */
 		SetDParam(0, cargo);
 		SetDParam(1, e->GetDisplayDefaultCapacity());
-		SetDParam(2, refittable ? STR_REFITTABLE : STR_EMPTY);
+		SetDParam(2, refittable ? STR_PURCHASE_INFO_REFITTABLE : STR_EMPTY);
 		DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
 	}
 	y += FONT_HEIGHT_NORMAL;
@@ -759,7 +759,7 @@ void DrawEngineList(VehicleType type, int x, int r, int y, const GUIEngineList *
 		DrawVehicleEngine(type, x, y + y_offset, engine, (count_location != 0 && num_engines == 0) ? PALETTE_CRASH : GetEnginePalette(engine, _local_company));
 		if (count_location != 0) {
 			SetDParam(0, num_engines);
-			DrawString(x, count_location, y + (GetVehicleListHeight(type) == 14 ? 3 : 8), STR_TINY_BLACK, TC_FROMSTRING, SA_RIGHT);
+			DrawString(x, count_location, y + (GetVehicleListHeight(type) == 14 ? 3 : 8), STR_TINY_BLACK_COMA, TC_FROMSTRING, SA_RIGHT);
 		}
 	}
 }
@@ -872,7 +872,7 @@ struct BuildVehicleWindow : Window {
 	/* Setup widget strings to fit the different types of vehicles */
 	void SetupWindowStrings(VehicleType type)
 	{
-		this->widget[BUILD_VEHICLE_WIDGET_CAPTION].data    = (this->listview_mode ? STR_AVAILABLE_TRAINS : STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION) + type;
+		this->widget[BUILD_VEHICLE_WIDGET_CAPTION].data    = (this->listview_mode ? STR_VEHICLE_LIST_AVAILABLE_TRAINS : STR_BUILD_VEHICLE_TRAIN_ALL_CAPTION) + type;
 		this->widget[BUILD_VEHICLE_WIDGET_LIST].tooltips   = STR_BUILD_VEHICLE_TRAIN_LIST_TOOLTIP + type;
 		this->widget[BUILD_VEHICLE_WIDGET_BUILD].data      = STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_BUTTON + type;
 		this->widget[BUILD_VEHICLE_WIDGET_BUILD].tooltips  = STR_BUILD_VEHICLE_TRAIN_BUILD_VEHICLE_TOOLTIP + type;
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index de7eaec97..5620c4571 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -128,8 +128,8 @@ static const CheatEntry _cheats_ui[] = {
 
 static const Widget _cheat_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,   STR_TOOLTIP_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   399,     0,    13, STR_CHEATS, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   399,    14,   169, 0x0,        STR_CHEATS_TIP},
+{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   399,     0,    13, STR_CHEATS,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   399,    14,   169, 0x0,               STR_CHEATS_TOOLTIP},
 {   WIDGETS_END},
 };
 
@@ -138,7 +138,7 @@ static const NWidgetPart _nested_cheat_widgets[] = {
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, 0),
 		NWidget(WWT_CAPTION, COLOUR_GREY, 1), SetDataTip(STR_CHEATS, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
-	NWidget(WWT_PANEL, COLOUR_GREY, 2), SetMinimalSize(400, 156), SetDataTip(0x0, STR_CHEATS_TIP), EndContainer(),
+	NWidget(WWT_PANEL, COLOUR_GREY, 2), SetMinimalSize(400, 156), SetDataTip(0x0, STR_CHEATS_TOOLTIP), EndContainer(),
 };
 
 struct CheatWindow : Window {
@@ -186,7 +186,7 @@ struct CheatWindow : Window {
 							break;
 
 						/* Set correct string for switch climate cheat */
-						case STR_CHEAT_SWITCH_CLIMATE: val += STR_TEMPERATE_LANDSCAPE;
+						case STR_CHEAT_SWITCH_CLIMATE: val += STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE;
 
 						/* Fallthrough */
 						default: SetDParam(0, val);
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp
index f018f4252..d644f09e1 100644
--- a/src/clear_cmd.cpp
+++ b/src/clear_cmd.cpp
@@ -310,18 +310,18 @@ static TrackStatus GetTileTrackStatus_Clear(TileIndex tile, TransportType mode,
 }
 
 static const StringID _clear_land_str[] = {
-	STR_CLEAR_LAND_DESCRIPTION_GRASS,
-	STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND,
-	STR_CLEAR_LAND_DESCRIPTION_ROCKS,
-	STR_CLEAR_LAND_DESCRIPTION_FIELDS,
-	STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND,
-	STR_CLEAR_LAND_DESCRIPTION_DESERT
+	STR_LAI_CLEAR_DESCRIPTION_GRASS,
+	STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND,
+	STR_LAI_CLEAR_DESCRIPTION_ROCKS,
+	STR_LAI_CLEAR_DESCRIPTION_FIELDS,
+	STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND,
+	STR_LAI_CLEAR_DESCRIPTION_DESERT
 };
 
 static void GetTileDesc_Clear(TileIndex tile, TileDesc *td)
 {
 	if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) {
-		td->str = STR_CLEAR_LAND_DESCRIPTION_BARE_LAND;
+		td->str = STR_LAI_CLEAR_DESCRIPTION_BARE_LAND;
 	} else {
 		td->str = _clear_land_str[GetClearGround(tile)];
 	}
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 47543389e..15c8eeb84 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -278,7 +278,7 @@ set_name:;
 			SetDParam(1, STR_NEWS_COMPANY_LAUNCH_DESCRIPTION);
 			SetDParamStr(2, cni->company_name);
 			SetDParam(3, t->index);
-			AddNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_NEW, NR_TILE, c->last_build_coordinate, NR_NONE, UINT32_MAX, cni);
+			AddNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_NEW, NR_TILE, c->last_build_coordinate, NR_NONE, UINT32_MAX, cni);
 		}
 		AI::BroadcastNewEvent(new AIEventCompanyNew(c->index), c->index);
 		return;
@@ -716,7 +716,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 			SetDParam(0, STR_NEWS_COMPANY_BANKRUPT_TITLE);
 			SetDParam(1, STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION);
 			SetDParamStr(2, cni->company_name);
-			AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_BANKRUPT, cni);
+			AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_BANKRUPT, cni);
 
 			/* Remove the company */
 			ChangeOwnershipOfCompanyItems(c->index, INVALID_OWNER);
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index f9aca2d1f..26c98a6ba 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -192,7 +192,7 @@ static void DrawCompanyEconomyStats(const Company *c, bool small, const Widget *
 
 		/* draw max loan aligned to loan below (y += 10) */
 		SetDParam(0, _economy.max_loan);
-		DrawString(widget[CFW_TOTAL_MAXLOAN].left, widget[CFW_TOTAL_MAXLOAN].right, y + 10, STR_MAX_LOAN);
+		DrawString(widget[CFW_TOTAL_MAXLOAN].left, widget[CFW_TOTAL_MAXLOAN].right, y + 10, STR_FINANCES_MAX_LOAN);
 	} else {
 		y = 15;
 	}
@@ -219,7 +219,7 @@ static const NWidgetPart _nested_company_finances_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, CFW_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, CFW_CAPTION), SetMinimalSize(369, 14), SetDataTip(STR_FINANCES_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, CFW_TOGGLE_SIZE), SetMinimalSize(14, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_TOGGLE_LARGE_SMALL_WINDOW),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, CFW_TOGGLE_SIZE), SetMinimalSize(14, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, CFW_STICKY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, CFW_EXPS_PANEL),
@@ -252,8 +252,8 @@ static const NWidgetPart _nested_company_finances_widgets[] = {
 static const Widget _company_finances_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},           // CFW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   380,     0,    13, STR_FINANCES_CAPTION,       STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // CFW_CAPTION
-{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   381,   394,     0,    13, SPR_LARGE_SMALL_WINDOW,     STR_TOGGLE_LARGE_SMALL_WINDOW},      // CFW_TOGGLE_SIZE
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   395,   406,     0,    13, 0x0,                        STR_STICKY_BUTTON},                  // CFW_STICKY
+{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   381,   394,     0,    13, SPR_LARGE_SMALL_WINDOW,     STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW},      // CFW_TOGGLE_SIZE
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   395,   406,     0,    13, 0x0,                        STR_TOOLTIP_STICKY},                  // CFW_STICKY
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   406,    14,    14, 0x0,                        STR_NULL},                           // CFW_EXPS_PANEL
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,   122,    14,    14, 0x0,                        STR_NULL},                           // CFW_EXPS_CATEGORY
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,   130,   215,    14,    14, 0x0,                        STR_NULL},                           // CFW_EXPS_PRICE1
@@ -272,7 +272,7 @@ static const NWidgetPart _nested_company_finances_small_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, CFW_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, CFW_CAPTION), SetMinimalSize(243, 14), SetDataTip(STR_FINANCES_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, CFW_TOGGLE_SIZE), SetMinimalSize(14, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_TOGGLE_LARGE_SMALL_WINDOW),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, CFW_TOGGLE_SIZE), SetMinimalSize(14, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, CFW_STICKY),
 	EndContainer(),
 	NWidget(WWT_EMPTY, COLOUR_GREY, CFW_EXPS_PANEL),
@@ -297,8 +297,8 @@ static const NWidgetPart _nested_company_finances_small_widgets[] = {
 static const Widget _company_finances_small_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},           // CFW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   253,     0,    13, STR_FINANCES_CAPTION,       STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // CFW_CAPTION
-{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   254,   267,     0,    13, SPR_LARGE_SMALL_WINDOW,     STR_TOGGLE_LARGE_SMALL_WINDOW},      // CFW_TOGGLE_SIZE
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   268,   279,     0,    13, 0x0,                        STR_STICKY_BUTTON},                  // CFW_STICKY
+{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   254,   267,     0,    13, SPR_LARGE_SMALL_WINDOW,     STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW},      // CFW_TOGGLE_SIZE
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   268,   279,     0,    13, 0x0,                        STR_TOOLTIP_STICKY},                  // CFW_STICKY
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                        STR_NULL},                           // CFW_EXPS_PANEL
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                        STR_NULL},                           // CFW_EXPS_CATEGORY
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                        STR_NULL},                           // CFW_EXPS_PRICE1
@@ -707,34 +707,34 @@ static const NWidgetPart _nested_select_company_livery_widgets [] = {
 		NWidget(WWT_CAPTION, COLOUR_GREY, SCLW_WIDGET_CAPTION), SetMinimalSize(389, 14), SetDataTip(STR_LIVERY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_GENERAL), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_COMPANY_GENERAL, STR_LIVERY_GENERAL_TIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_RAIL), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRAINLIST, STR_LIVERY_TRAIN_TIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_ROAD), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRUCKLIST, STR_LIVERY_ROAD_VEHICLE_TIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_SHIP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SHIPLIST, STR_LIVERY_SHIP_TIP),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_AIRCRAFT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_AIRPLANESLIST, STR_LIVERY_AIRCRAFT_TIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_GENERAL), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_COMPANY_GENERAL, STR_LIVERY_GENERAL_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_RAIL), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRAINLIST, STR_LIVERY_TRAIN_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_ROAD), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRUCKLIST, STR_LIVERY_ROAD_VEHICLE_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_SHIP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SHIPLIST, STR_LIVERY_SHIP_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCLW_WIDGET_CLASS_AIRCRAFT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_AIRPLANESLIST, STR_LIVERY_AIRCRAFT_TOOLTIP),
 		NWidget(WWT_PANEL, COLOUR_GREY, SCLW_WIDGET_SPACER_CLASS), SetMinimalSize(290, 22), EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PANEL, COLOUR_GREY, SCLW_WIDGET_SPACER_DROPDOWN), SetMinimalSize(150, 12), EndContainer(),
-		NWidget(WWT_DROPDOWN, COLOUR_GREY, SCLW_WIDGET_PRI_COL_DROPDOWN), SetMinimalSize(125, 12), SetDataTip(STR_BLACK_STRING, STR_LIVERY_PRIMARY_TIP),
-		NWidget(WWT_DROPDOWN, COLOUR_GREY, SCLW_WIDGET_SEC_COL_DROPDOWN), SetMinimalSize(125, 12), SetDataTip(STR_NETWORK_LAN_INTERNET_COMBO, STR_LIVERY_SECONDARY_TIP),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, SCLW_WIDGET_PRI_COL_DROPDOWN), SetMinimalSize(125, 12), SetDataTip(STR_BLACK_STRING, STR_LIVERY_PRIMARY_TOOLTIP),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, SCLW_WIDGET_SEC_COL_DROPDOWN), SetMinimalSize(125, 12), SetDataTip(STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO, STR_LIVERY_SECONDARY_TOOLTIP),
 	EndContainer(),
-	NWidget(WWT_MATRIX, COLOUR_GREY, SCLW_WIDGET_MATRIX), SetMinimalSize(400, 15), SetDataTip((1 << MAT_ROW_START) | (1 << MAT_COL_START), STR_LIVERY_PANEL_TIP),
+	NWidget(WWT_MATRIX, COLOUR_GREY, SCLW_WIDGET_MATRIX), SetMinimalSize(400, 15), SetDataTip((1 << MAT_ROW_START) | (1 << MAT_COL_START), STR_LIVERY_PANEL_TOOLTIP),
 };
 
 static const Widget _select_company_livery_widgets[] = {
 { WWT_CLOSEBOX, RESIZE_NONE,  COLOUR_GREY,   0,  10,   0,  13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW },
 {  WWT_CAPTION, RESIZE_NONE,  COLOUR_GREY,  11, 399,   0,  13, STR_LIVERY_CAPTION,         STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS },
-{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,   0,  21,  14,  35, SPR_IMG_COMPANY_GENERAL,    STR_LIVERY_GENERAL_TIP },
-{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  22,  43,  14,  35, SPR_IMG_TRAINLIST,          STR_LIVERY_TRAIN_TIP },
-{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  44,  65,  14,  35, SPR_IMG_TRUCKLIST,          STR_LIVERY_ROAD_VEHICLE_TIP },
-{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  66,  87,  14,  35, SPR_IMG_SHIPLIST,           STR_LIVERY_SHIP_TIP },
-{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  88, 109,  14,  35, SPR_IMG_AIRPLANESLIST,      STR_LIVERY_AIRCRAFT_TIP },
+{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,   0,  21,  14,  35, SPR_IMG_COMPANY_GENERAL,    STR_LIVERY_GENERAL_TOOLTIP },
+{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  22,  43,  14,  35, SPR_IMG_TRAINLIST,          STR_LIVERY_TRAIN_TOOLTIP },
+{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  44,  65,  14,  35, SPR_IMG_TRUCKLIST,          STR_LIVERY_ROAD_VEHICLE_TOOLTIP },
+{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  66,  87,  14,  35, SPR_IMG_SHIPLIST,           STR_LIVERY_SHIP_TOOLTIP },
+{   WWT_IMGBTN, RESIZE_NONE,  COLOUR_GREY,  88, 109,  14,  35, SPR_IMG_AIRPLANESLIST,      STR_LIVERY_AIRCRAFT_TOOLTIP },
 {    WWT_PANEL, RESIZE_NONE,  COLOUR_GREY, 110, 399,  14,  35, 0x0,                        STR_NULL },
 {    WWT_PANEL, RESIZE_NONE,  COLOUR_GREY,   0, 149,  36,  47, 0x0,                        STR_NULL },
-{ WWT_DROPDOWN, RESIZE_NONE,  COLOUR_GREY, 150, 274,  36,  47, STR_BLACK_STRING,           STR_LIVERY_PRIMARY_TIP },
-{ WWT_DROPDOWN, RESIZE_NONE,  COLOUR_GREY, 275, 399,  36,  47, STR_NETWORK_LAN_INTERNET_COMBO, STR_LIVERY_SECONDARY_TIP },
-{   WWT_MATRIX, RESIZE_NONE,  COLOUR_GREY,   0, 399,  48,  48 + 1 * 14, (1 << 8) | 1,      STR_LIVERY_PANEL_TIP },
+{ WWT_DROPDOWN, RESIZE_NONE,  COLOUR_GREY, 150, 274,  36,  47, STR_BLACK_STRING,           STR_LIVERY_PRIMARY_TOOLTIP },
+{ WWT_DROPDOWN, RESIZE_NONE,  COLOUR_GREY, 275, 399,  36,  47, STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO, STR_LIVERY_SECONDARY_TOOLTIP },
+{   WWT_MATRIX, RESIZE_NONE,  COLOUR_GREY,   0, 399,  48,  48 + 1 * 14, (1 << 8) | 1,      STR_LIVERY_PANEL_TOOLTIP },
 { WIDGETS_END },
 };
 
@@ -851,7 +851,7 @@ static const NWidgetPart _nested_select_company_manager_face_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, SCMFW_WIDGET_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, SCMFW_WIDGET_CAPTION), SetMinimalSize(164, 14), SetDataTip(STR_FACE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL), SetMinimalSize(15, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_FACE_ADVANCED_TIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL), SetMinimalSize(15, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_FACE_ADVANCED_TOOLTIP),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, SCMFW_WIDGET_SELECT_FACE),
 		NWidget(NWID_HORIZONTAL),
@@ -864,7 +864,7 @@ static const NWidgetPart _nested_select_company_manager_face_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(1, 0),
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 2),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON), SetMinimalSize(93, 12), SetDataTip(STR_FACE_ADVANCED, STR_FACE_ADVANCED_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON), SetMinimalSize(93, 12), SetDataTip(STR_FACE_ADVANCED, STR_FACE_ADVANCED_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 47),
 				NWidget(WWT_TEXTBTN, COLOUR_GREY, SCMFW_WIDGET_MALE), SetMinimalSize(93, 12), SetDataTip(STR_FACE_MALE_BUTTON, STR_FACE_MALE_TOOLTIP),
 				NWidget(WWT_TEXTBTN, COLOUR_GREY, SCMFW_WIDGET_FEMALE), SetMinimalSize(93, 12), SetDataTip(STR_FACE_FEMALE_BUTTON, STR_FACE_FEMALE_TOOLTIP),
@@ -874,8 +874,8 @@ static const NWidgetPart _nested_select_company_manager_face_widgets[] = {
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_CANCEL), SetMinimalSize(95, 12), SetDataTip(STR_QUERY_CANCEL, STR_FACE_CANCEL_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_ACCEPT), SetMinimalSize(95, 12), SetDataTip(STR_QUERY_OK, STR_FACE_OK_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_CANCEL), SetMinimalSize(95, 12), SetDataTip(STR_BUTTON_CANCEL, STR_FACE_CANCEL_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_ACCEPT), SetMinimalSize(95, 12), SetDataTip(STR_BUTTON_OK, STR_FACE_OK_TOOLTIP),
 	EndContainer(),
 };
 
@@ -883,14 +883,14 @@ static const NWidgetPart _nested_select_company_manager_face_widgets[] = {
 static const Widget _select_company_manager_face_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,          STR_TOOLTIP_CLOSE_WINDOW},           // SCMFW_WIDGET_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   174,     0,    13, STR_FACE_CAPTION,         STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // SCMFW_WIDGET_CAPTION
-{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   189,     0,    13, SPR_LARGE_SMALL_WINDOW,   STR_FACE_ADVANCED_TIP},              // SCMFW_WIDGET_TOGGLE_LARGE_SMALL
+{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   189,     0,    13, SPR_LARGE_SMALL_WINDOW,   STR_FACE_ADVANCED_TOOLTIP},              // SCMFW_WIDGET_TOGGLE_LARGE_SMALL
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   189,    14,   150, 0x0,                      STR_NULL},                           // SCMFW_WIDGET_SELECT_FACE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    94,   151,   162, STR_QUERY_CANCEL,         STR_FACE_CANCEL_TOOLTIP},            // SCMFW_WIDGET_CANCEL
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   189,   151,   162, STR_QUERY_OK,             STR_FACE_OK_TOOLTIP},                // SCMFW_WIDGET_ACCEPT
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    94,   151,   162, STR_BUTTON_CANCEL,        STR_FACE_CANCEL_TOOLTIP},            // SCMFW_WIDGET_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   189,   151,   162, STR_BUTTON_OK,            STR_FACE_OK_TOOLTIP},                // SCMFW_WIDGET_ACCEPT
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   187,    75,    86, STR_FACE_MALE_BUTTON,     STR_FACE_MALE_TOOLTIP},              // SCMFW_WIDGET_MALE
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   187,    87,    98, STR_FACE_FEMALE_BUTTON,   STR_FACE_FEMALE_TOOLTIP},            // SCMFW_WIDGET_FEMALE
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   137,   148, STR_FACE_NEW_FACE_BUTTON, STR_FACE_NEW_FACE_TOOLTIP},          // SCMFW_WIDGET_RANDOM_NEW_FACE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   187,    16,    27, STR_FACE_ADVANCED,        STR_FACE_ADVANCED_TIP},              // SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   187,    16,    27, STR_FACE_ADVANCED,        STR_FACE_ADVANCED_TOOLTIP},              // SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     2,    93,    16,   134, 0x0,                      STR_NULL},                           // SCMFW_WIDGET_FACE
 {   WIDGETS_END},
 };
@@ -899,24 +899,24 @@ static const NWidgetPart _nested_select_company_manager_face_adv_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, SCMFW_WIDGET_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, SCMFW_WIDGET_CAPTION), SetMinimalSize(194, 14), SetDataTip(STR_FACE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_IMGBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL), SetMinimalSize(15, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_FACE_SIMPLE_TIP),
+		NWidget(WWT_IMGBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL), SetMinimalSize(15, 14), SetDataTip(SPR_LARGE_SMALL_WINDOW, STR_FACE_SIMPLE_TOOLTIP),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, SCMFW_WIDGET_SELECT_FACE),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(2, 0),
 			NWidget(NWID_VERTICAL),
 				NWidget(WWT_EMPTY, COLOUR_GREY, SCMFM_WIDGET_FACE), SetMinimalSize(92, 119), SetPadding(2, 0, 2, 0),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_RANDOM_NEW_FACE), SetMinimalSize(92, 12), SetDataTip(STR_RANDOM, STR_FACE_NEW_FACE_TOOLTIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_RANDOM_NEW_FACE), SetMinimalSize(92, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_FACE_NEW_FACE_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 9),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_LOAD), SetMinimalSize(92, 12), SetDataTip(STR_FACE_LOAD, STR_FACE_LOAD_TIP),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_FACECODE), SetMinimalSize(92, 12), SetDataTip(STR_FACE_FACECODE, STR_FACE_FACECODE_TIP),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_SAVE), SetMinimalSize(92, 12), SetDataTip(STR_FACE_SAVE, STR_FACE_SAVE_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_LOAD), SetMinimalSize(92, 12), SetDataTip(STR_FACE_LOAD, STR_FACE_LOAD_TOOLTIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_FACECODE), SetMinimalSize(92, 12), SetDataTip(STR_FACE_FACECODE, STR_FACE_FACECODE_TOOLTIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_SAVE), SetMinimalSize(92, 12), SetDataTip(STR_FACE_SAVE, STR_FACE_SAVE_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 14),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(1, 0),
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 2),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON), SetMinimalSize(123, 12), SetDataTip(STR_FACE_SIMPLE, STR_FACE_SIMPLE_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON), SetMinimalSize(123, 12), SetDataTip(STR_FACE_SIMPLE, STR_FACE_SIMPLE_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(NWID_SPACER), SetMinimalSize(1, 0),
@@ -936,58 +936,58 @@ static const NWidgetPart _nested_select_company_manager_face_adv_widgets[] = {
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_EMPTY, COLOUR_GREY, SCMFW_WIDGET_LABELS), SetMinimalSize(75, 146), SetPadding(0, 4, 0, 1),
 					NWidget(NWID_VERTICAL),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_HAS_MOUSTACHE_EARRING), SetMinimalSize(43, 12), SetDataTip(STR_EMPTY, STR_FACE_MOUSTACHE_EARRING_TIP),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_HAS_GLASSES), SetMinimalSize(43, 12), SetDataTip(STR_EMPTY, STR_FACE_GLASSES_TIP),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_HAS_MOUSTACHE_EARRING), SetMinimalSize(43, 12), SetDataTip(STR_EMPTY, STR_FACE_MOUSTACHE_EARRING_TOOLTIP),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_HAS_GLASSES), SetMinimalSize(43, 12), SetDataTip(STR_EMPTY, STR_FACE_GLASSES_TOOLTIP),
 						NWidget(NWID_SPACER), SetMinimalSize(0, 2),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_HAIR_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_HAIR_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_HAIR), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_HAIR_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_HAIR_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_HAIR_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_HAIR_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_HAIR_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_HAIR), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_HAIR_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_HAIR_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_HAIR_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYEBROWS_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_EYEBROWS_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_EYEBROWS), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_EYEBROWS_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYEBROWS_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_EYEBROWS_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYEBROWS_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_EYEBROWS_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_EYEBROWS), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_EYEBROWS_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYEBROWS_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_EYEBROWS_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYECOLOUR_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_EYECOLOUR_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_EYECOLOUR), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_EYECOLOUR_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYECOLOUR_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_EYECOLOUR_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYECOLOUR_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_EYECOLOUR_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_EYECOLOUR), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_EYECOLOUR_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_EYECOLOUR_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_EYECOLOUR_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_GLASSES_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_GLASSES_TIP_2),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_GLASSES), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_GLASSES_TIP_2),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_GLASSES_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_GLASSES_TIP_2),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_GLASSES_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_GLASSES_TOOLTIP_2),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_GLASSES), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_GLASSES_TOOLTIP_2),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_GLASSES_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_GLASSES_TOOLTIP_2),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_NOSE_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_NOSE_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_NOSE), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_NOSE_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_NOSE_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_NOSE_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_NOSE_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_NOSE_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_NOSE), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_NOSE_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_NOSE_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_NOSE_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_LIPS_MOUSTACHE_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_LIPS_MOUSTACHE_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_LIPS_MOUSTACHE), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_LIPS_MOUSTACHE_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_LIPS_MOUSTACHE_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_LIPS_MOUSTACHE_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_LIPS_MOUSTACHE_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_LIPS_MOUSTACHE_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_LIPS_MOUSTACHE), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_LIPS_MOUSTACHE_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_LIPS_MOUSTACHE_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_LIPS_MOUSTACHE_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_CHIN_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_CHIN_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_CHIN), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_CHIN_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_CHIN_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_CHIN_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_CHIN_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_CHIN_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_CHIN), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_CHIN_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_CHIN_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_CHIN_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_JACKET_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_JACKET_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_JACKET), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_JACKET_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_JACKET_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_JACKET_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_JACKET_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_JACKET_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_JACKET), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_JACKET_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_JACKET_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_JACKET_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_COLLAR_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_COLLAR_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_COLLAR), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_COLLAR_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_COLLAR_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_COLLAR_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_COLLAR_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_COLLAR_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_COLLAR), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_COLLAR_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_COLLAR_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_COLLAR_TOOLTIP),
 						EndContainer(),
 						NWidget(NWID_HORIZONTAL),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_TIE_EARRING_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_TIE_EARRING_TIP),
-							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_TIE_EARRING), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_TIE_EARRING_TIP),
-							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_TIE_EARRING_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_TIE_EARRING_TIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_TIE_EARRING_L), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_FACE_TIE_EARRING_TOOLTIP),
+							NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_TIE_EARRING), SetMinimalSize(25, 12), SetDataTip(STR_EMPTY, STR_FACE_TIE_EARRING_TOOLTIP),
+							NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, SCMFW_WIDGET_TIE_EARRING_R), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_FACE_TIE_EARRING_TOOLTIP),
 						EndContainer(),
 					EndContainer(),
 				EndContainer(),
@@ -997,8 +997,8 @@ static const NWidgetPart _nested_select_company_manager_face_adv_widgets[] = {
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_CANCEL), SetMinimalSize(95, 12), SetDataTip(STR_QUERY_CANCEL, STR_FACE_CANCEL_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_ACCEPT), SetMinimalSize(125, 12), SetDataTip(STR_QUERY_OK, STR_FACE_OK_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_CANCEL), SetMinimalSize(95, 12), SetDataTip(STR_BUTTON_CANCEL, STR_FACE_CANCEL_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SCMFW_WIDGET_ACCEPT), SetMinimalSize(125, 12), SetDataTip(STR_BUTTON_OK, STR_FACE_OK_TOOLTIP),
 	EndContainer(),
 };
 
@@ -1006,52 +1006,52 @@ static const NWidgetPart _nested_select_company_manager_face_adv_widgets[] = {
 static const Widget _select_company_manager_face_adv_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,         STR_TOOLTIP_CLOSE_WINDOW},           // SCMFW_WIDGET_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   204,     0,    13, STR_FACE_CAPTION,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // SCMFW_WIDGET_CAPTION
-{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   205,   219,     0,    13, SPR_LARGE_SMALL_WINDOW,  STR_FACE_SIMPLE_TIP},                // SCMFW_WIDGET_TOGGLE_LARGE_SMALL
+{     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_GREY,   205,   219,     0,    13, SPR_LARGE_SMALL_WINDOW,  STR_FACE_SIMPLE_TOOLTIP},                // SCMFW_WIDGET_TOGGLE_LARGE_SMALL
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   219,    14,   207, 0x0,                     STR_NULL},                           // SCMFW_WIDGET_SELECT_FACE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    94,   208,   219, STR_QUERY_CANCEL,        STR_FACE_CANCEL_TOOLTIP},            // SCMFW_WIDGET_CANCEL
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   219,   208,   219, STR_QUERY_OK,            STR_FACE_OK_TOOLTIP},                // SCMFW_WIDGET_ACCEPT
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    94,   208,   219, STR_BUTTON_CANCEL,       STR_FACE_CANCEL_TOOLTIP},            // SCMFW_WIDGET_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   219,   208,   219, STR_BUTTON_OK,           STR_FACE_OK_TOOLTIP},                // SCMFW_WIDGET_ACCEPT
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    96,   156,    32,    43, STR_FACE_MALE_BUTTON,    STR_FACE_MALE_TOOLTIP},              // SCMFW_WIDGET_MALE
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   157,   217,    32,    43, STR_FACE_FEMALE_BUTTON,  STR_FACE_FEMALE_TOOLTIP},            // SCMFW_WIDGET_FEMALE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   137,   148, STR_RANDOM,              STR_FACE_NEW_FACE_TOOLTIP},          // SCMFW_WIDGET_RANDOM_NEW_FACE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   217,    16,    27, STR_FACE_SIMPLE,         STR_FACE_SIMPLE_TIP},                // SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   137,   148, STR_MAPGEN_RANDOM,       STR_FACE_NEW_FACE_TOOLTIP},          // SCMFW_WIDGET_RANDOM_NEW_FACE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,    95,   217,    16,    27, STR_FACE_SIMPLE,         STR_FACE_SIMPLE_TOOLTIP},                // SCMFW_WIDGET_TOGGLE_LARGE_SMALL_BUTTON
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     2,    93,    16,   134, 0x0,                     STR_NULL},                           // SCMFW_WIDGET_FACE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   158,   169, STR_FACE_LOAD,           STR_FACE_LOAD_TIP},                  // SCMFW_WIDGET_LOAD
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   170,   181, STR_FACE_FACECODE,       STR_FACE_FACECODE_TIP},              // SCMFW_WIDGET_FACECODE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   182,   193, STR_FACE_SAVE,           STR_FACE_SAVE_TIP},                  // SCMFW_WIDGET_SAVE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   158,   169, STR_FACE_LOAD,           STR_FACE_LOAD_TOOLTIP},                  // SCMFW_WIDGET_LOAD
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   170,   181, STR_FACE_FACECODE,       STR_FACE_FACECODE_TOOLTIP},              // SCMFW_WIDGET_FACECODE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     2,    93,   182,   193, STR_FACE_SAVE,           STR_FACE_SAVE_TOOLTIP},                  // SCMFW_WIDGET_SAVE
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    96,   156,    46,    57, STR_FACE_EUROPEAN,       STR_FACE_SELECT_EUROPEAN},           // SCMFW_WIDGET_ETHNICITY_EUR
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   157,   217,    46,    57, STR_FACE_AFRICAN,        STR_FACE_SELECT_AFRICAN},            // SCMFW_WIDGET_ETHNICITY_AFR
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   217,    60,    71, STR_EMPTY,               STR_FACE_MOUSTACHE_EARRING_TIP},     // SCMFW_WIDGET_HAS_MOUSTACHE_EARRING
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   217,    72,    83, STR_EMPTY,               STR_FACE_GLASSES_TIP},               // SCMFW_WIDGET_HAS_GLASSES
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   110,   121, SPR_ARROW_LEFT,          STR_FACE_EYECOLOUR_TIP},             // SCMFW_WIDGET_EYECOLOUR_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   110,   121, STR_EMPTY,               STR_FACE_EYECOLOUR_TIP},             // SCMFW_WIDGET_EYECOLOUR
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   110,   121, SPR_ARROW_RIGHT,         STR_FACE_EYECOLOUR_TIP},             // SCMFW_WIDGET_EYECOLOUR_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   158,   169, SPR_ARROW_LEFT,          STR_FACE_CHIN_TIP},                  // SCMFW_WIDGET_CHIN_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   158,   169, STR_EMPTY,               STR_FACE_CHIN_TIP},                  // SCMFW_WIDGET_CHIN
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   158,   169, SPR_ARROW_RIGHT,         STR_FACE_CHIN_TIP},                  // SCMFW_WIDGET_CHIN_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,    98,   109, SPR_ARROW_LEFT,          STR_FACE_EYEBROWS_TIP},              // SCMFW_WIDGET_EYEBROWS_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,    98,   109, STR_EMPTY,               STR_FACE_EYEBROWS_TIP},              // SCMFW_WIDGET_EYEBROWS
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,    98,   109, SPR_ARROW_RIGHT,         STR_FACE_EYEBROWS_TIP},              // SCMFW_WIDGET_EYEBROWS_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   146,   157, SPR_ARROW_LEFT,          STR_FACE_LIPS_MOUSTACHE_TIP},        // SCMFW_WIDGET_LIPS_MOUSTACHE_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   146,   157, STR_EMPTY,               STR_FACE_LIPS_MOUSTACHE_TIP},        // SCMFW_WIDGET_LIPS_MOUSTACHE
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   146,   157, SPR_ARROW_RIGHT,         STR_FACE_LIPS_MOUSTACHE_TIP},        // SCMFW_WIDGET_LIPS_MOUSTACHE_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   134,   145, SPR_ARROW_LEFT,          STR_FACE_NOSE_TIP},                  // SCMFW_WIDGET_NOSE_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   134,   145, STR_EMPTY,               STR_FACE_NOSE_TIP},                  // SCMFW_WIDGET_NOSE
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   134,   145, SPR_ARROW_RIGHT,         STR_FACE_NOSE_TIP},                  // SCMFW_WIDGET_NOSE_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,    86,    97, SPR_ARROW_LEFT,          STR_FACE_HAIR_TIP},                  // SCMFW_WIDGET_HAIR_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,    86,    97, STR_EMPTY,               STR_FACE_HAIR_TIP},                  // SCMFW_WIDGET_HAIR
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,    86,    97, SPR_ARROW_RIGHT,         STR_FACE_HAIR_TIP},                  // SCMFW_WIDGET_HAIR_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   170,   181, SPR_ARROW_LEFT,          STR_FACE_JACKET_TIP},                // SCMFW_WIDGET_JACKET_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   170,   181, STR_EMPTY,               STR_FACE_JACKET_TIP},                // SCMFW_WIDGET_JACKET
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   170,   181, SPR_ARROW_RIGHT,         STR_FACE_JACKET_TIP},                // SCMFW_WIDGET_JACKET_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   182,   193, SPR_ARROW_LEFT,          STR_FACE_COLLAR_TIP},                // SCMFW_WIDGET_COLLAR_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   182,   193, STR_EMPTY,               STR_FACE_COLLAR_TIP},                // SCMFW_WIDGET_COLLAR
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   182,   193, SPR_ARROW_RIGHT,         STR_FACE_COLLAR_TIP},                // SCMFW_WIDGET_COLLAR_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   194,   205, SPR_ARROW_LEFT,          STR_FACE_TIE_EARRING_TIP},           // SCMFW_WIDGET_TIE_EARRING_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   194,   205, STR_EMPTY,               STR_FACE_TIE_EARRING_TIP},           // SCMFW_WIDGET_TIE_EARRING
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   194,   205, SPR_ARROW_RIGHT,         STR_FACE_TIE_EARRING_TIP},           // SCMFW_WIDGET_TIE_EARRING_R
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   122,   133, SPR_ARROW_LEFT,          STR_FACE_GLASSES_TIP_2},             // SCMFW_WIDGET_GLASSES_L
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   122,   133, STR_EMPTY,               STR_FACE_GLASSES_TIP_2},             // SCMFW_WIDGET_GLASSES
-{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   122,   133, SPR_ARROW_RIGHT,         STR_FACE_GLASSES_TIP_2},             // SCMFW_WIDGET_GLASSES_R
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   217,    60,    71, STR_EMPTY,               STR_FACE_MOUSTACHE_EARRING_TOOLTIP},     // SCMFW_WIDGET_HAS_MOUSTACHE_EARRING
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   217,    72,    83, STR_EMPTY,               STR_FACE_GLASSES_TOOLTIP},               // SCMFW_WIDGET_HAS_GLASSES
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   110,   121, SPR_ARROW_LEFT,          STR_FACE_EYECOLOUR_TOOLTIP},             // SCMFW_WIDGET_EYECOLOUR_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   110,   121, STR_EMPTY,               STR_FACE_EYECOLOUR_TOOLTIP},             // SCMFW_WIDGET_EYECOLOUR
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   110,   121, SPR_ARROW_RIGHT,         STR_FACE_EYECOLOUR_TOOLTIP},             // SCMFW_WIDGET_EYECOLOUR_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   158,   169, SPR_ARROW_LEFT,          STR_FACE_CHIN_TOOLTIP},                  // SCMFW_WIDGET_CHIN_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   158,   169, STR_EMPTY,               STR_FACE_CHIN_TOOLTIP},                  // SCMFW_WIDGET_CHIN
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   158,   169, SPR_ARROW_RIGHT,         STR_FACE_CHIN_TOOLTIP},                  // SCMFW_WIDGET_CHIN_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,    98,   109, SPR_ARROW_LEFT,          STR_FACE_EYEBROWS_TOOLTIP},              // SCMFW_WIDGET_EYEBROWS_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,    98,   109, STR_EMPTY,               STR_FACE_EYEBROWS_TOOLTIP},              // SCMFW_WIDGET_EYEBROWS
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,    98,   109, SPR_ARROW_RIGHT,         STR_FACE_EYEBROWS_TOOLTIP},              // SCMFW_WIDGET_EYEBROWS_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   146,   157, SPR_ARROW_LEFT,          STR_FACE_LIPS_MOUSTACHE_TOOLTIP},        // SCMFW_WIDGET_LIPS_MOUSTACHE_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   146,   157, STR_EMPTY,               STR_FACE_LIPS_MOUSTACHE_TOOLTIP},        // SCMFW_WIDGET_LIPS_MOUSTACHE
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   146,   157, SPR_ARROW_RIGHT,         STR_FACE_LIPS_MOUSTACHE_TOOLTIP},        // SCMFW_WIDGET_LIPS_MOUSTACHE_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   134,   145, SPR_ARROW_LEFT,          STR_FACE_NOSE_TOOLTIP},                  // SCMFW_WIDGET_NOSE_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   134,   145, STR_EMPTY,               STR_FACE_NOSE_TOOLTIP},                  // SCMFW_WIDGET_NOSE
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   134,   145, SPR_ARROW_RIGHT,         STR_FACE_NOSE_TOOLTIP},                  // SCMFW_WIDGET_NOSE_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,    86,    97, SPR_ARROW_LEFT,          STR_FACE_HAIR_TOOLTIP},                  // SCMFW_WIDGET_HAIR_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,    86,    97, STR_EMPTY,               STR_FACE_HAIR_TOOLTIP},                  // SCMFW_WIDGET_HAIR
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,    86,    97, SPR_ARROW_RIGHT,         STR_FACE_HAIR_TOOLTIP},                  // SCMFW_WIDGET_HAIR_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   170,   181, SPR_ARROW_LEFT,          STR_FACE_JACKET_TOOLTIP},                // SCMFW_WIDGET_JACKET_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   170,   181, STR_EMPTY,               STR_FACE_JACKET_TOOLTIP},                // SCMFW_WIDGET_JACKET
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   170,   181, SPR_ARROW_RIGHT,         STR_FACE_JACKET_TOOLTIP},                // SCMFW_WIDGET_JACKET_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   182,   193, SPR_ARROW_LEFT,          STR_FACE_COLLAR_TOOLTIP},                // SCMFW_WIDGET_COLLAR_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   182,   193, STR_EMPTY,               STR_FACE_COLLAR_TOOLTIP},                // SCMFW_WIDGET_COLLAR
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   182,   193, SPR_ARROW_RIGHT,         STR_FACE_COLLAR_TOOLTIP},                // SCMFW_WIDGET_COLLAR_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   194,   205, SPR_ARROW_LEFT,          STR_FACE_TIE_EARRING_TOOLTIP},           // SCMFW_WIDGET_TIE_EARRING_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   194,   205, STR_EMPTY,               STR_FACE_TIE_EARRING_TOOLTIP},           // SCMFW_WIDGET_TIE_EARRING
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   194,   205, SPR_ARROW_RIGHT,         STR_FACE_TIE_EARRING_TOOLTIP},           // SCMFW_WIDGET_TIE_EARRING_R
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   175,   183,   122,   133, SPR_ARROW_LEFT,          STR_FACE_GLASSES_TOOLTIP_2},             // SCMFW_WIDGET_GLASSES_L
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   184,   208,   122,   133, STR_EMPTY,               STR_FACE_GLASSES_TOOLTIP_2},             // SCMFW_WIDGET_GLASSES
+{ WWT_PUSHIMGBTN,   RESIZE_NONE,  COLOUR_GREY,   209,   217,   122,   133, SPR_ARROW_RIGHT,         STR_FACE_GLASSES_TOOLTIP_2},             // SCMFW_WIDGET_GLASSES_R
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,    96,   170,    60,   205, 0x0,                     STR_NULL},                           // SCMFW_WIDGET_LABELS
 {   WIDGETS_END},
 };
@@ -1408,11 +1408,11 @@ static const Widget _company_widgets[] = {
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   180,   269,   158,   169, STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON, STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   270,   359,   158,   169, STR_COMPANY_VIEW_COMPANY_NAME_BUTTON,   STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP},
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,    18,    29, STR_COMPANY_VIEW_VIEW_HQ_BUTTON,        STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP},
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,    32,    43, STR_RELOCATE_HQ,                        STR_RELOCATE_COMPANY_HEADQUARTERS},
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,    32,    43, STR_COMPANY_VIEW_RELOCATE_HQ,                        STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   179,   158,   169, STR_COMPANY_VIEW_BUY_SHARE_BUTTON,      STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   180,   359,   158,   169, STR_COMPANY_VIEW_SELL_SHARE_BUTTON,     STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,   138,   149, STR_COMPANY_PASSWORD,                   STR_COMPANY_PASSWORD_TOOLTIP},
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,   138,   149, STR_COMPANY_JOIN,                       STR_COMPANY_JOIN_TIP},
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,   138,   149, STR_COMPANY_VIEW_PASSWORD,                   STR_COMPANY_VIEW_PASSWORD_TOOLTIP},
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   266,   355,   138,   149, STR_COMPANY_VIEW_JOIN,                       STR_COMPANY_VIEW_JOIN_TOOLTIP},
 {   WIDGETS_END},
 };
 
@@ -1432,7 +1432,7 @@ static const NWidgetPart _nested_company_widgets[] = {
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 			NWidget(WWT_TEXTBTN, COLOUR_GREY, CW_WIDGET_RELOCATE_HQ), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0),
-										SetDataTip(STR_RELOCATE_HQ, STR_RELOCATE_COMPANY_HEADQUARTERS),
+										SetDataTip(STR_COMPANY_VIEW_RELOCATE_HQ, STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 94),
 		/* Multi player buttons. */
@@ -1440,12 +1440,12 @@ static const NWidgetPart _nested_company_widgets[] = {
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_SPACER), SetFill(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_PASSWORD), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0),
-										SetDataTip(STR_COMPANY_PASSWORD, STR_COMPANY_PASSWORD_TOOLTIP),
+										SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_COMPANY_VIEW_PASSWORD_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_SPACER), SetFill(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, CW_WIDGET_COMPANY_JOIN), SetMinimalSize(90, 12), SetPadding(0, 4, 0, 0),
-										SetDataTip(STR_COMPANY_JOIN, STR_COMPANY_JOIN_TIP),
+										SetDataTip(STR_COMPANY_VIEW_JOIN, STR_COMPANY_VIEW_JOIN_TOOLTIP),
 			EndContainer(),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8),
@@ -1497,7 +1497,7 @@ static void DrawCompanyVehiclesAmount(CompanyID company, int right)
 		DrawString(x + 70, right, y, STR_COMPANY_VIEW_VEHICLES_NONE);
 	} else {
 		static const StringID strings[] = {
-			STR_TRAINS, STR_ROAD_VEHICLES, STR_SHIPS, STR_AIRCRAFT
+			STR_COMPANY_VIEW_TRAINS, STR_COMPANY_VIEW_ROAD_VEHICLES, STR_COMPANY_VIEW_SHIPS, STR_COMPANY_VIEW_AIRCRAFT
 		};
 		assert_compile(lengthof(amounts) == lengthof(strings));
 
@@ -1642,13 +1642,13 @@ struct CompanyWindow : Window
 			case CW_WIDGET_PRESIDENT_NAME:
 				this->query_widget = CW_WIDGET_PRESIDENT_NAME;
 				SetDParam(0, this->window_number);
-				ShowQueryString(STR_PRESIDENT_NAME, STR_QUERY_PRESIDENT_S_NAME_CAPTION, MAX_LENGTH_PRESIDENT_NAME_BYTES, MAX_LENGTH_PRESIDENT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
+				ShowQueryString(STR_PRESIDENT_NAME, STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION, MAX_LENGTH_PRESIDENT_NAME_BYTES, MAX_LENGTH_PRESIDENT_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
 				break;
 
 			case CW_WIDGET_COMPANY_NAME:
 				this->query_widget = CW_WIDGET_COMPANY_NAME;
 				SetDParam(0, this->window_number);
-				ShowQueryString(STR_COMPANY_NAME, STR_QUERY_COMPANY_NAME_CAPTION, MAX_LENGTH_COMPANY_NAME_BYTES, MAX_LENGTH_COMPANY_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
+				ShowQueryString(STR_COMPANY_NAME, STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION, MAX_LENGTH_COMPANY_NAME_BYTES, MAX_LENGTH_COMPANY_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
 				break;
 
 			case CW_WIDGET_BUILD_VIEW_HQ: {
@@ -1812,8 +1812,8 @@ static const Widget _buy_company_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,     0,    10,     0,    13, STR_BLACK_CROSS,                         STR_TOOLTIP_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,    11,   333,     0,    13, STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,     0,   333,    14,   136, 0x0,                                     STR_NULL},
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,   148,   207,   117,   128, STR_NO,                                  STR_NULL},
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,   218,   277,   117,   128, STR_YES,                                 STR_NULL},
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,   148,   207,   117,   128, STR_QUIT_NO,                                  STR_NULL},
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_LIGHT_BLUE,   218,   277,   117,   128, STR_QUIT_YES,                                 STR_NULL},
 {   WIDGETS_END},
 };
 
@@ -1826,9 +1826,9 @@ static const NWidgetPart _nested_buy_company_widgets[] = {
 		NWidget(NWID_SPACER), SetMinimalSize(334, 103), SetFill(1, 0),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(148, 0), SetFill(1, 0),
-			NWidget(WWT_TEXTBTN, COLOUR_LIGHT_BLUE, BCW_NO), SetMinimalSize(60, 12), SetDataTip(STR_NO, STR_NULL),
+			NWidget(WWT_TEXTBTN, COLOUR_LIGHT_BLUE, BCW_NO), SetMinimalSize(60, 12), SetDataTip(STR_QUIT_NO, STR_NULL),
 			NWidget(NWID_SPACER), SetMinimalSize(10, 0), SetFill(1, 0),
-			NWidget(WWT_TEXTBTN, COLOUR_LIGHT_BLUE, BCW_YES), SetMinimalSize(60, 12), SetDataTip(STR_YES, STR_NULL),
+			NWidget(WWT_TEXTBTN, COLOUR_LIGHT_BLUE, BCW_YES), SetMinimalSize(60, 12), SetDataTip(STR_QUIT_YES, STR_NULL),
 			NWidget(NWID_SPACER), SetMinimalSize(56, 0), SetFill(1, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8), SetFill(1, 0),
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index 457bcdc84..82e12e2e3 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -72,11 +72,11 @@ enum DepotWindowWidgets {
 static const Widget _depot_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,     STR_TOOLTIP_CLOSE_WINDOW},           // DEPOT_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,    23,     0,    13, 0x0,                 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // DEPOT_WIDGET_CAPTION
-	{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,    24,    35,     0,    13, 0x0,                 STR_STICKY_BUTTON},                  // DEPOT_WIDGET_STICKY
+	{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,    24,    35,     0,    13, 0x0,                 STR_TOOLTIP_STICKY},                  // DEPOT_WIDGET_STICKY
 
 	/* Widgets are set up run-time */
 	{     WWT_IMGBTN,    RESIZE_LRB,  COLOUR_GREY,     1,    23,    14,   -32, 0x0,                 STR_NULL},                         // DEPOT_WIDGET_SELL
-	{     WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_GREY,     1,    23,   -55,   -32, SPR_SELL_CHAIN_TRAIN,STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP}, // DEPOT_WIDGET_SELL_CHAIN, trains only
+	{     WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_GREY,     1,    23,   -55,   -32, SPR_SELL_CHAIN_TRAIN,STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP}, // DEPOT_WIDGET_SELL_CHAIN, trains only
 	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,  COLOUR_GREY,     1,    23,   -31,    -9, 0x0,                 STR_NULL},                         // DEPOT_WIDGET_SELL_ALL
 	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,  COLOUR_GREY,     1,    23,    -8,    14, 0x0,                 STR_NULL},                         // DEPOT_WIDGET_AUTOREPLACE
 
@@ -93,7 +93,7 @@ static const Widget _depot_widgets[] = {
 	{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   -11,     0,    15,    26, 0x0,                 STR_NULL},                         // DEPOT_WIDGET_VEHICLE_LIST
 	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,  COLOUR_GREY,     1,    11,    15,    26, SPR_FLAG_VEH_STOPPED,STR_NULL},                         // DEPOT_WIDGET_STOP_ALL
 	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,  COLOUR_GREY,    12,    23,    15,    26, SPR_FLAG_VEH_RUNNING,STR_NULL},                         // DEPOT_WIDGET_START_ALL
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,    24,    35,    15,    26, 0x0,                 STR_RESIZE_BUTTON},                // DEPOT_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,    24,    35,    15,    26, 0x0,                 STR_TOOLTIP_RESIZE},                // DEPOT_WIDGET_RESIZE
 	{   WIDGETS_END},
 };
 
@@ -275,7 +275,7 @@ struct DepotWindow : Window {
 
 				/* Number of wagons relative to a standard length wagon (rounded up) */
 				SetDParam(0, (u->tcache.cached_total_length + 7) / 8);
-				DrawString(this->widget[DEPOT_WIDGET_MATRIX].left, this->widget[DEPOT_WIDGET_MATRIX].right - 1, y + 4, STR_TINY_BLACK, TC_FROMSTRING, SA_RIGHT); // Draw the counter
+				DrawString(this->widget[DEPOT_WIDGET_MATRIX].left, this->widget[DEPOT_WIDGET_MATRIX].right - 1, y + 4, STR_TINY_BLACK_COMA, TC_FROMSTRING, SA_RIGHT); // Draw the counter
 				break;
 			}
 
@@ -585,19 +585,19 @@ struct DepotWindow : Window {
 	void SetupStringsForDepotWindow(VehicleType type)
 	{
 		this->widget[DEPOT_WIDGET_CAPTION].data          = STR_DEPOT_TRAIN_CAPTION + type;
-		this->widget[DEPOT_WIDGET_STOP_ALL].tooltips     = STR_MASS_STOP_DEPOT_TRAIN_TIP + type;
-		this->widget[DEPOT_WIDGET_START_ALL].tooltips    = STR_MASS_START_DEPOT_TRAIN_TIP + type;
+		this->widget[DEPOT_WIDGET_STOP_ALL].tooltips     = STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP + type;
+		this->widget[DEPOT_WIDGET_START_ALL].tooltips    = STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP + type;
 		this->widget[DEPOT_WIDGET_SELL].tooltips         = STR_DEPOT_TRAIN_SELL_TOOLTIP + type;
-		this->widget[DEPOT_WIDGET_SELL_ALL].tooltips     = STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP + type;
+		this->widget[DEPOT_WIDGET_SELL_ALL].tooltips     = STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP + type;
 
 		this->widget[DEPOT_WIDGET_BUILD].data            = STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON + type;
 		this->widget[DEPOT_WIDGET_BUILD].tooltips        = STR_DEPOT_TRAIN_NEW_VEHICLES_TOOLTIP + type;
-		this->widget[DEPOT_WIDGET_CLONE].data            = STR_CLONE_TRAIN + type;
-		this->widget[DEPOT_WIDGET_CLONE].tooltips        = STR_CLONE_TRAIN_DEPOT_INFO + type;
+		this->widget[DEPOT_WIDGET_CLONE].data            = STR_DEPOT_CLONE_TRAIN + type;
+		this->widget[DEPOT_WIDGET_CLONE].tooltips        = STR_DEPOT_CLONE_TRAIN_DEPOT_INFO + type;
 
 		this->widget[DEPOT_WIDGET_LOCATION].tooltips     = STR_DEPOT_TRAIN_LOCATION_TOOLTIP + type;
-		this->widget[DEPOT_WIDGET_VEHICLE_LIST].tooltips = STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP + type;
-		this->widget[DEPOT_WIDGET_AUTOREPLACE].tooltips  = STR_DEPOT_AUTOREPLACE_TRAIN_TIP + type;
+		this->widget[DEPOT_WIDGET_VEHICLE_LIST].tooltips = STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP + type;
+		this->widget[DEPOT_WIDGET_AUTOREPLACE].tooltips  = STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP + type;
 
 		switch (type) {
 			default: NOT_REACHED();
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 994034ab5..bb7f92607 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -70,7 +70,7 @@ static void PlaceDocks_BuildCanal(TileIndex tile)
 
 static void PlaceDocks_BuildLock(TileIndex tile)
 {
-	DoCommandP(tile, 0, 0, CMD_BUILD_LOCK | CMD_MSG(STR_CANT_BUILD_LOCKS), CcBuildDocks);
+	DoCommandP(tile, 0, 0, CMD_BUILD_LOCK | CMD_MSG(STR_ERROR_CAN_T_BUILD_LOCKS), CcBuildDocks);
 }
 
 static void PlaceDocks_BuildRiver(TileIndex tile)
@@ -220,16 +220,16 @@ struct BuildDocksToolbarWindow : Window {
 				case DDSP_BUILD_BRIDGE:
 					if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
 					extern void CcBuildBridge(bool success, TileIndex tile, uint32 p1, uint32 p2);
-					DoCommandP(end_tile, start_tile, TRANSPORT_WATER << 15, CMD_BUILD_BRIDGE | CMD_MSG(STR_CAN_T_BUILD_AQUEDUCT_HERE), CcBuildBridge);
+					DoCommandP(end_tile, start_tile, TRANSPORT_WATER << 15, CMD_BUILD_BRIDGE | CMD_MSG(STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE), CcBuildBridge);
 
 				case DDSP_DEMOLISH_AREA:
 					GUIPlaceProcDragXY(select_proc, start_tile, end_tile);
 					break;
 				case DDSP_CREATE_WATER:
-					DoCommandP(end_tile, start_tile, (_game_mode == GM_EDITOR ? _ctrl_pressed : 0), CMD_BUILD_CANAL | CMD_MSG(STR_CANT_BUILD_CANALS), CcBuildCanal);
+					DoCommandP(end_tile, start_tile, (_game_mode == GM_EDITOR ? _ctrl_pressed : 0), CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_BUILD_CANALS), CcBuildCanal);
 					break;
 				case DDSP_CREATE_RIVER:
-					DoCommandP(end_tile, start_tile, 2, CMD_BUILD_CANAL | CMD_MSG(STR_CANT_PLACE_RIVERS), CcBuildCanal);
+					DoCommandP(end_tile, start_tile, 2, CMD_BUILD_CANAL | CMD_MSG(STR_ERROR_CAN_T_PLACE_RIVERS), CcBuildCanal);
 					break;
 
 				default: break;
@@ -305,11 +305,11 @@ static const NWidgetPart _nested_build_docks_scen_toolbar_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN, DTW_STICKY),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_CANAL), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BUILD_CANAL, STR_CREATE_LAKE),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_CANAL), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BUILD_CANAL, STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_LOCK), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BUILD_LOCK, STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP),
 		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, DTW_SEPERATOR), SetMinimalSize(5, 22), SetFill(0, 1), EndContainer(),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_DEMOLISH), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_RIVER), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BUILD_RIVER, STR_CREATE_RIVER),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_RIVER), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BUILD_RIVER, STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, DTW_BUILD_AQUEDUCT), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_AQUEDUCT, STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP),
 	EndContainer(),
 };
diff --git a/src/economy.cpp b/src/economy.cpp
index 39c030ebd..e6084e654 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -491,7 +491,7 @@ static void CompanyCheckBankrupt(Company *c)
 			SetDParam(0, STR_NEWS_COMPANY_IN_TROUBLE_TITLE);
 			SetDParam(1, STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION);
 			SetDParamStr(2, cni->company_name);
-			AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_TROUBLE, cni);
+			AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_TROUBLE, cni);
 			AI::BroadcastNewEvent(new AIEventCompanyInTrouble(c->index));
 			break;
 		case 3: {
@@ -501,7 +501,7 @@ static void CompanyCheckBankrupt(Company *c)
 				SetDParam(0, STR_NEWS_COMPANY_IN_TROUBLE_TITLE);
 				SetDParam(1, STR_NEWS_COMPANY_IN_TROUBLE_DESCRIPTION);
 				SetDParamStr(2, cni->company_name);
-				AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_TROUBLE, cni);
+				AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_TROUBLE, cni);
 				break;
 			}
 
@@ -536,7 +536,7 @@ static void CompanyCheckBankrupt(Company *c)
 			SetDParam(0, STR_NEWS_COMPANY_BANKRUPT_TITLE);
 			SetDParam(1, STR_NEWS_COMPANY_BANKRUPT_DESCRIPTION);
 			SetDParamStr(2, cni->company_name);
-			AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_BANKRUPT, cni);
+			AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_BANKRUPT, cni);
 
 			/* Remove the company */
 			ChangeNetworkOwner(c->index, COMPANY_SPECTATOR);
@@ -1532,7 +1532,7 @@ static void DoAcquireCompany(Company *c)
 	SetDParamStr(2, cni->company_name);
 	SetDParamStr(3, cni->other_company_name);
 	SetDParam(4, c->bankrupt_value);
-	AddCompanyNewsItem(STR_NEWS_MESSAGE, NS_COMPANY_MERGER, cni);
+	AddCompanyNewsItem(STR_MESSAGE_NEWS_FORMAT, NS_COMPANY_MERGER, cni);
 	AI::BroadcastNewEvent(new AIEventCompanyMerger(ci, _current_company));
 
 	/* original code does this a little bit differently */
@@ -1584,7 +1584,7 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1,
 	if (c == NULL || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
 
 	/* Protect new companies from hostile takeovers */
-	if (_cur_year - c->inaugurated_year < 6) return_cmd_error(STR_PROTECTED);
+	if (_cur_year - c->inaugurated_year < 6) return_cmd_error(STR_ERROR_PROTECTED);
 
 	/* Those lines are here for network-protection (clients can be slow) */
 	if (GetAmountOwnedBy(c, COMPANY_SPECTATOR) == 0) return cost;
diff --git a/src/engine.cpp b/src/engine.cpp
index 85c17f3f2..58879c204 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -747,7 +747,7 @@ CommandCost CmdRenameEngine(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_ENGINE_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniqueEngineName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniqueEngineName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 7b9953908..cfda12234 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -45,8 +45,8 @@ static const Widget _engine_preview_widgets[] = {
 {   WWT_CLOSEBOX,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,    0,   10,    0,   13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},           // EPW_CLOSE
 {    WWT_CAPTION,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,   11,  299,    0,   13, STR_ENGINE_PREVIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // EPW_CAPTION
 {      WWT_PANEL,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,    0,  299,   14,  191, 0x0,                        STR_NULL},                           // EPW_BACKGROUND
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,   85,  144,  172,  183, STR_NO,                     STR_NULL},                           // EPW_NO
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,  155,  214,  172,  183, STR_YES,                    STR_NULL},                           // EPW_YES
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,   85,  144,  172,  183, STR_QUIT_NO,                     STR_NULL},                           // EPW_NO
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_LIGHT_BLUE,  155,  214,  172,  183, STR_QUIT_YES,                    STR_NULL},                           // EPW_YES
 {   WIDGETS_END},
 };
 
@@ -58,8 +58,8 @@ static const NWidgetPart _nested_engine_preview_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, EPW_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 158),
 		NWidget(NWID_HORIZONTAL), SetPIP(85, 10, 85),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, EPW_NO), SetMinimalSize(60, 12), SetDataTip(STR_NO, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, EPW_YES), SetMinimalSize(60, 12), SetDataTip(STR_YES, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, EPW_NO), SetMinimalSize(60, 12), SetDataTip(STR_QUIT_NO, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, EPW_YES), SetMinimalSize(60, 12), SetDataTip(STR_QUIT_YES, STR_NULL),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 	EndContainer(),
@@ -165,7 +165,7 @@ static void DrawTrainEngineInfo(EngineID engine, int left, int right, int top, i
 	} else {
 		SetDParam(5, CT_INVALID);
 	}
-	DrawStringMultiLine(left, right, top, bottom, STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER, TC_FROMSTRING, SA_CENTER);
+	DrawStringMultiLine(left, right, top, bottom, STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER, TC_FROMSTRING, SA_CENTER);
 }
 
 static void DrawAircraftEngineInfo(EngineID engine, int left, int right, int top, int bottom)
@@ -182,7 +182,7 @@ static void DrawAircraftEngineInfo(EngineID engine, int left, int right, int top
 		SetDParam(5, e->u.air.mail_capacity);
 		SetDParam(6, e->GetRunningCost());
 
-		DrawStringMultiLine(left, right, top, bottom, STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
+		DrawStringMultiLine(left, right, top, bottom, STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
 	} else {
 		SetDParam(0, e->GetCost());
 		SetDParam(1, e->GetDisplayMaxSpeed());
@@ -190,7 +190,7 @@ static void DrawAircraftEngineInfo(EngineID engine, int left, int right, int top
 		SetDParam(3, e->GetDisplayDefaultCapacity());
 		SetDParam(4, e->GetRunningCost());
 
-		DrawStringMultiLine(left, right, top, bottom, STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
+		DrawStringMultiLine(left, right, top, bottom, STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
 	}
 }
 
@@ -209,7 +209,7 @@ static void DrawRoadVehEngineInfo(EngineID engine, int left, int right, int top,
 	}
 	SetDParam(4, e->GetRunningCost());
 
-	DrawStringMultiLine(left, right, top, bottom, STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
+	DrawStringMultiLine(left, right, top, bottom, STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
 }
 
 static void DrawShipEngineInfo(EngineID engine, int left, int right, int top, int bottom)
@@ -221,7 +221,7 @@ static void DrawShipEngineInfo(EngineID engine, int left, int right, int top, in
 	SetDParam(2, e->GetDefaultCargoType());
 	SetDParam(3, e->GetDisplayDefaultCapacity());
 	SetDParam(4, e->GetRunningCost());
-	DrawStringMultiLine(left, right, top, bottom, STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
+	DrawStringMultiLine(left, right, top, bottom, STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST, TC_FROMSTRING, SA_CENTER);
 }
 
 void DrawNewsNewVehicleAvail(Window *w, const NewsItem *ni)
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 8503938fe..9f9939d62 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -115,7 +115,7 @@ enum GenerateLandscapeWindowWidgets {
 
 static const Widget _generate_landscape_widgets[] = {
 {  WWT_CLOSEBOX,  RESIZE_NONE, COLOUR_BROWN,    0,  10,   0,  13, STR_BLACK_CROSS,              STR_TOOLTIP_CLOSE_WINDOW},                 // GLAND_CLOSEBOX
-{    WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN,   11, 337,   0,  13, STR_WORLD_GENERATION_CAPTION, STR_NULL},                                 // GLAND_TITLEBAR
+{    WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN,   11, 337,   0,  13, STR_MAPGEN_WORLD_GENERATION_CAPTION, STR_NULL},                                 // GLAND_TITLEBAR
 {      WWT_PANEL, RESIZE_NONE, COLOUR_BROWN,    0, 337,  14, 313, 0x0,                          STR_NULL},                                 // GLAND_BACKGROUND
 
 /* Landscape selection */
@@ -125,78 +125,78 @@ static const Widget _generate_landscape_widgets[] = {
 {   WWT_IMGBTN_2, RESIZE_NONE, COLOUR_ORANGE, 250, 326,  24,  78, SPR_SELECT_TOYLAND,           STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE},      // GLAND_TOYLAND
 
 /* Mapsize X */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110,  91, 101, STR_MAPSIZE,                  STR_NULL},                               // GLAND_MAPSIZE_X_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110,  91, 101, STR_MAPGEN_MAPSIZE,                  STR_NULL},                               // GLAND_MAPSIZE_X_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 161,  90, 101, STR_NUM_1,                    STR_NULL},                               // GLAND_MAPSIZE_X_PULLDOWN
 /* Mapsize Y */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 168, 176,  91, 101, STR_BY,                       STR_NULL},                               // GLAND_MAPSIZE_Y_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 168, 176,  91, 101, STR_MAPGEN_BY,                       STR_NULL},                               // GLAND_MAPSIZE_Y_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 180, 227,  90, 101, STR_NUM_2,                    STR_NULL},                               // GLAND_MAPSIZE_Y_PULLDOWN
 
 /*  Number of towns */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 113, 123, STR_NUMBER_OF_TOWNS,          STR_NULL},                               // GLAND_TOWN_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 113, 123, STR_MAPGEN_NUMBER_OF_TOWNS,          STR_NULL},                               // GLAND_TOWN_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 175, 112, 123, 0x0,                          STR_NULL},                               // GLAND_TOWN_PULLDOWN
 
 /* Number of industries */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 131, 141, STR_NUMBER_OF_INDUSTRIES,     STR_NULL},                               // GLAND_INDUSTRY_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 131, 141, STR_MAPGEN_NUMBER_OF_INDUSTRIES,     STR_NULL},                               // GLAND_INDUSTRY_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 175, 130, 141, 0x0,                          STR_NULL},                               // GLAND_INDUSTRY_PULLDOWN
 
 /* Edit box for seed */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 153, 163, STR_RANDOM_SEED,              STR_NULL},                               // GLAND_RANDOM_TEXT
-{    WWT_EDITBOX, RESIZE_NONE, COLOUR_WHITE,  114, 207, 152, 163, STR_RANDOM_SEED_OSKTITLE,     STR_RANDOM_SEED_HELP},                   // GLAND_RANDOM_EDITBOX
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 326, 152, 163, STR_RANDOM,                   STR_RANDOM_HELP},                        // GLAND_RANDOM_BUTTON
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 153, 163, STR_MAPGEN_RANDOM_SEED,              STR_NULL},                               // GLAND_RANDOM_TEXT
+{    WWT_EDITBOX, RESIZE_NONE, COLOUR_WHITE,  114, 207, 152, 163, STR_MAPGEN_RANDOM_SEED_OSKTITLE,     STR_MAPGEN_RANDOM_SEED_HELP},                   // GLAND_RANDOM_EDITBOX
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 326, 152, 163, STR_MAPGEN_RANDOM,                   STR_MAPGEN_RANDOM_HELP},                        // GLAND_RANDOM_BUTTON
 
 /* Generate button */
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN, 243, 326, 228, 257, STR_GENERATE,                 STR_NULL},                                // GLAND_GENERATE_BUTTON
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN, 243, 326, 228, 257, STR_MAPGEN_GENERATE,                 STR_NULL},                                // GLAND_GENERATE_BUTTON
 
 /* Start date */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 212, 113, 123, STR_DATE,                     STR_NULL},                               // GLAND_START_DATE_TEXT1
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 212, 113, 123, STR_MAPGEN_DATE,                     STR_NULL},                               // GLAND_START_DATE_TEXT1
 {     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 227, 112, 123, SPR_ARROW_DOWN,               STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD}, // GLAND_START_DATE_DOWN
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 228, 314, 112, 123, STR_GENERATE_DATE,            STR_NULL},                               // GLAND_START_DATE_TEXT
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 228, 314, 112, 123, STR_BLACK_DATE_LONG,            STR_NULL},                               // GLAND_START_DATE_TEXT
 {     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 112, 123, SPR_ARROW_UP,                 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD},  // GLAND_START_DATE_UP
 
 /* Snow line */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 278, 131, 141, STR_SNOW_LINE_HEIGHT,         STR_NULL},                               // GLAND_SNOW_LEVEL_TEXT1
-{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 282, 293, 130, 141, SPR_ARROW_DOWN,               STR_SNOW_LINE_DOWN},                     // GLAND_SNOW_LEVEL_DOWN
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 278, 131, 141, STR_MAPGEN_SNOW_LINE_HEIGHT,         STR_NULL},                               // GLAND_SNOW_LEVEL_TEXT1
+{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 282, 293, 130, 141, SPR_ARROW_DOWN,               STR_MAPGEN_SNOW_LINE_DOWN},                     // GLAND_SNOW_LEVEL_DOWN
 {    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 294, 314, 130, 141, STR_NUM_3,                    STR_NULL},                               // GLAND_SNOW_LEVEL_TEXT
-{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 130, 141, SPR_ARROW_UP,                 STR_SNOW_LINE_UP},                       // GLAND_SNOW_LEVEL_UP
+{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 130, 141, SPR_ARROW_UP,                 STR_MAPGEN_SNOW_LINE_UP},                       // GLAND_SNOW_LEVEL_UP
 
 /* Tree placer */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 193, 203, STR_TREE_PLACER,              STR_NULL},                               // GLAND_TREE_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 193, 203, STR_MAPGEN_TREE_PLACER,              STR_NULL},                               // GLAND_TREE_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 192, 203, 0x0,                          STR_NULL},                               // GLAND_TREE_PULLDOWN
 
 /* Landscape generator */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 175, 185, STR_LAND_GENERATOR,           STR_NULL},                               // GLAND_LANDSCAPE_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 175, 185, STR_MAPGEN_LAND_GENERATOR,           STR_NULL},                               // GLAND_LANDSCAPE_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 174, 185, 0x0,                          STR_NULL},                               // GLAND_LANDSCAPE_PULLDOWN
 
 /* Terrain type */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 211, 221, STR_TERRAIN_TYPE,             STR_NULL},                               // GLAND_TERRAIN_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 211, 221, STR_MAPGEN_TERRAIN_TYPE,             STR_NULL},                               // GLAND_TERRAIN_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 210, 221, 0x0,                          STR_NULL},                               // GLAND_TERRAIN_PULLDOWN
 
 /* Water quantity */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 229, 239, STR_QUANTITY_OF_SEA_LAKES,    STR_NULL},                               // GLAND_WATER_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 229, 239, STR_MAPGEN_QUANTITY_OF_SEA_LAKES,    STR_NULL},                               // GLAND_WATER_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 228, 239, 0x0,                          STR_NULL},                               // GLAND_WATER_PULLDOWN
 
 /* Map smoothness */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 247, 257, STR_SMOOTHNESS,               STR_NULL},                               // GLAND_SMOOTHNESS_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 247, 257, STR_MAPGEN_SMOOTHNESS,               STR_NULL},                               // GLAND_SMOOTHNESS_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 246, 257, 0x0,                          STR_NULL},                               // GLAND_SMOOTHNESS_PULLDOWN
 
 /* Water borders */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 265, 275, STR_BORDER_TYPE,              STR_NULL},                               // GLAND_BORDER_TYPES
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 264, 275, STR_BORDER_RANDOMIZE,         STR_NULL},                               // GLAND_BORDERS_RANDOM
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12,  95, 282, 292, STR_NORTHWEST,                STR_NULL},                               // GLAND_WATER_NW_TEXT
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 250, 326, 282, 292, STR_NORTHEAST,                STR_NULL},                               // GLAND_WATER_NE_TEXT
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 250, 326, 294, 304, STR_SOUTHEAST,                STR_NULL},                               // GLAND_WATER_SE_TEXT
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12,  95, 294, 304, STR_SOUTHWEST,                STR_NULL},                               // GLAND_WATER_SW_TEXT
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 100, 172, 280, 291, 0x0,                          STR_NORTHWEST},                          // GLAND_WATER_NW
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 173, 245, 280, 291, 0x0,                          STR_NORTHEAST},                          // GLAND_WATER_NE
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 173, 245, 292, 303, 0x0,                          STR_SOUTHEAST},                          // GLAND_WATER_SE
-{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 100, 172, 292, 303, 0x0,                          STR_SOUTHWEST},                          // GLAND_WATER_SW
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 265, 275, STR_MAPGEN_BORDER_TYPE,              STR_NULL},                               // GLAND_BORDER_TYPES
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 264, 275, STR_MAPGEN_BORDER_RANDOMIZE,         STR_NULL},                               // GLAND_BORDERS_RANDOM
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12,  95, 282, 292, STR_MAPGEN_NORTHWEST,                STR_NULL},                               // GLAND_WATER_NW_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 250, 326, 282, 292, STR_MAPGEN_NORTHEAST,                STR_NULL},                               // GLAND_WATER_NE_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 250, 326, 294, 304, STR_MAPGEN_SOUTHEAST,                STR_NULL},                               // GLAND_WATER_SE_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12,  95, 294, 304, STR_MAPGEN_SOUTHWEST,                STR_NULL},                               // GLAND_WATER_SW_TEXT
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 100, 172, 280, 291, 0x0,                          STR_MAPGEN_NORTHWEST},                          // GLAND_WATER_NW
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 173, 245, 280, 291, 0x0,                          STR_MAPGEN_NORTHEAST},                          // GLAND_WATER_NE
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 173, 245, 292, 303, 0x0,                          STR_MAPGEN_SOUTHEAST},                          // GLAND_WATER_SE
+{ WWT_PUSHTXTBTN, RESIZE_NONE, COLOUR_ORANGE, 100, 172, 292, 303, 0x0,                          STR_MAPGEN_SOUTHWEST},                          // GLAND_WATER_SW
 {   WIDGETS_END},
 };
 
 static const NWidgetPart _nested_generate_landscape_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN, GLAND_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_BROWN, GLAND_TITLEBAR), SetDataTip(STR_WORLD_GENERATION_CAPTION, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, GLAND_TITLEBAR), SetDataTip(STR_MAPGEN_WORLD_GENERATION_CAPTION, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, GLAND_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 10),
@@ -213,25 +213,25 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 			/* Left column with labels. */
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPSIZE, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 11),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_NUMBER_OF_TOWNS, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_NUMBER_OF_INDUSTRIES, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 11),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_RANDOM_SEED, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_RANDOM_SEED, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 11),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_LANDSCAPE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_LAND_GENERATOR, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_LANDSCAPE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_LAND_GENERATOR, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_TREE_PLACER, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_TREE_PLACER, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TERRAIN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_TERRAIN_TYPE, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TERRAIN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_TERRAIN_TYPE, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_QUANTITY_OF_SEA_LAKES, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_QUANTITY_OF_SEA_LAKES, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SMOOTHNESS_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_SMOOTHNESS, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SMOOTHNESS_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_SMOOTHNESS, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_BORDER_TYPES), SetMinimalSize(99, 11), SetDataTip(STR_BORDER_TYPE, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_BORDER_TYPES), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_BORDER_TYPE, STR_NULL),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 			/* Widgets at the right of the labels. */
@@ -240,7 +240,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_NUM_1, STR_NULL),
 					NWidget(NWID_SPACER), SetMinimalSize(6, 0),
-					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_BY, STR_NULL), SetPadding(1, 0, 0, 0),
+					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_NUM_2, STR_NULL),
 					NWidget(NWID_SPACER), SetFill(1, 0),
@@ -251,10 +251,10 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(0x0, STR_NULL),
 					NWidget(NWID_SPACER), SetMinimalSize(6, 0),
 					/* Starting date. */
-					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetMinimalSize(31, 11), SetDataTip(STR_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
+					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetMinimalSize(31, 11), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
-					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_GENERATE_DATE, STR_NULL),
+					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
@@ -265,19 +265,19 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 					NWidget(NWID_SPACER), SetMinimalSize(6, 0),
 					/* Snow line. */
 					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT1), SetMinimalSize(97, 11),
-														SetDataTip(STR_SNOW_LINE_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
+														SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
-					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SNOW_LINE_DOWN),
+					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_NUM_3, STR_NULL),
-					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SNOW_LINE_UP),
+					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10), SetFill(1, 0),
 				NWidget(NWID_HORIZONTAL),
 					/* Edit box for seed. */
-					NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_RANDOM_SEED_OSKTITLE, STR_RANDOM_SEED_HELP),
+					NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP),
 					NWidget(NWID_SPACER), SetMinimalSize(8, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_RANDOM, STR_RANDOM_HELP),
+					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
 				NWidget(NWID_HORIZONTAL),
@@ -294,11 +294,11 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 						NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 						NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_SMOOTHNESS_PULLDOWN), SetMinimalSize(118, 12),
 						NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_BORDERS_RANDOM), SetMinimalSize(118, 12), SetDataTip(STR_BORDER_RANDOMIZE, STR_NULL),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_BORDERS_RANDOM), SetMinimalSize(118, 12), SetDataTip(STR_MAPGEN_BORDER_RANDOMIZE, STR_NULL),
 					EndContainer(),
 					NWidget(NWID_VERTICAL),
 						NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84,30),
-														SetDataTip(STR_GENERATE, STR_NULL), SetPadding(64, 0, 0, 11),
+														SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetPadding(64, 0, 0, 11),
 						NWidget(NWID_SPACER), SetFill(0, 1),
 					EndContainer(),
 					NWidget(NWID_SPACER), SetFill(1, 0),
@@ -310,22 +310,22 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 		/* Map borders buttons for each edge. */
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NW_TEXT), SetMinimalSize(84, 11), SetDataTip(STR_NORTHWEST, STR_NULL), SetPadding(2, 0, 0, 12),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SW_TEXT), SetMinimalSize(84, 11), SetDataTip(STR_SOUTHWEST, STR_NULL), SetPadding(1, 0, 0, 12),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NW_TEXT), SetMinimalSize(84, 11), SetDataTip(STR_MAPGEN_NORTHWEST, STR_NULL), SetPadding(2, 0, 0, 12),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SW_TEXT), SetMinimalSize(84, 11), SetDataTip(STR_MAPGEN_SOUTHWEST, STR_NULL), SetPadding(1, 0, 0, 12),
 			EndContainer(),
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_HORIZONTAL),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NW), SetMinimalSize(73, 12), SetDataTip(0x0, STR_NORTHWEST), SetPadding(0, 0, 0, 4),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NE), SetMinimalSize(73, 12), SetDataTip(0x0, STR_NORTHEAST),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NW), SetMinimalSize(73, 12), SetDataTip(0x0, STR_MAPGEN_NORTHWEST), SetPadding(0, 0, 0, 4),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_NE), SetMinimalSize(73, 12), SetDataTip(0x0, STR_MAPGEN_NORTHEAST),
 				EndContainer(),
 				NWidget(NWID_HORIZONTAL),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SW), SetMinimalSize(73, 12), SetDataTip(0x0, STR_SOUTHWEST), SetPadding(0, 0, 0, 4),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SE), SetMinimalSize(73, 12), SetDataTip(0x0, STR_SOUTHEAST),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SW), SetMinimalSize(73, 12), SetDataTip(0x0, STR_MAPGEN_SOUTHWEST), SetPadding(0, 0, 0, 4),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_ORANGE, GLAND_WATER_SE), SetMinimalSize(73, 12), SetDataTip(0x0, STR_MAPGEN_SOUTHEAST),
 				EndContainer(),
 			EndContainer(),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_NORTHEAST, STR_NULL), SetPadding(2, 0, 0, 4),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_SOUTHEAST, STR_NULL), SetPadding(1, 0, 0, 4),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_NE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_MAPGEN_NORTHEAST, STR_NULL), SetPadding(2, 0, 0, 4),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_WATER_SE_TEXT), SetMinimalSize(77, 11), SetDataTip(STR_MAPGEN_SOUTHEAST, STR_NULL), SetPadding(1, 0, 0, 4),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
@@ -335,7 +335,7 @@ static const NWidgetPart _nested_generate_landscape_widgets[] = {
 
 static const Widget _heightmap_load_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE, COLOUR_BROWN,    0,  10,   0,  13, STR_BLACK_CROSS,              STR_TOOLTIP_CLOSE_WINDOW},                 // GLAND_CLOSEBOX
-{    WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN,   11, 337,   0,  13, STR_WORLD_GENERATION_CAPTION, STR_NULL},                                 // GLAND_TITLEBAR
+{    WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN,   11, 337,   0,  13, STR_MAPGEN_WORLD_GENERATION_CAPTION, STR_NULL},                                 // GLAND_TITLEBAR
 {      WWT_PANEL, RESIZE_NONE, COLOUR_BROWN,    0, 337,  14, 235, 0x0,                          STR_NULL},                                 // GLAND_BACKGROUND
 
 /* Landscape selection */
@@ -345,46 +345,46 @@ static const Widget _heightmap_load_widgets[] = {
 {   WWT_IMGBTN_2, RESIZE_NONE, COLOUR_ORANGE, 250, 326,  24,  78, SPR_SELECT_TOYLAND,           STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE},      // GLAND_TOYLAND
 
 /* Mapsize X */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 113, 123, STR_MAPSIZE,                  STR_NULL},                              // GLAND_MAPSIZE_X_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 113, 123, STR_MAPGEN_MAPSIZE,                  STR_NULL},                              // GLAND_MAPSIZE_X_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 161, 112, 123, STR_NUM_1,                    STR_NULL},                              // GLAND_MAPSIZE_X_PULLDOWN
 /* Mapsize Y */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 168, 176, 113, 123, STR_BY,                       STR_NULL},                              // GLAND_MAPSIZE_Y_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 168, 176, 113, 123, STR_MAPGEN_BY,                       STR_NULL},                              // GLAND_MAPSIZE_Y_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 180, 227, 112, 123, STR_NUM_2,                    STR_NULL},                              // GLAND_MAPSIZE_Y_PULLDOWN
 
 /* Number of towns */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 135, 145, STR_NUMBER_OF_TOWNS,          STR_NULL},                              // GLAND_TOWN_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 135, 145, STR_MAPGEN_NUMBER_OF_TOWNS,          STR_NULL},                              // GLAND_TOWN_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 175, 134, 145, 0x0,                          STR_NULL},                              // GLAND_TOWN_PULLDOWN
 
 /* Number of industries */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 153, 163, STR_NUMBER_OF_INDUSTRIES,     STR_NULL},                              // GLAND_INDUSTRY_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 153, 163, STR_MAPGEN_NUMBER_OF_INDUSTRIES,     STR_NULL},                              // GLAND_INDUSTRY_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 175, 152, 163, 0x0,                          STR_NULL},                              // GLAND_INDUSTRY_PULLDOWN
 
 /* Edit box for seed */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 175, 185, STR_RANDOM_SEED,              STR_NULL},                              // GLAND_RANDOM_TEXT
-{    WWT_EDITBOX, RESIZE_NONE, COLOUR_WHITE,  114, 207, 174, 185, STR_RANDOM_SEED_OSKTITLE,     STR_RANDOM_SEED_HELP},                  // GLAND_RANDOM_EDITBOX
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 326, 174, 185, STR_RANDOM,                   STR_RANDOM_HELP},                       // GLAND_RANDOM_BUTTON
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 175, 185, STR_MAPGEN_RANDOM_SEED,              STR_NULL},                              // GLAND_RANDOM_TEXT
+{    WWT_EDITBOX, RESIZE_NONE, COLOUR_WHITE,  114, 207, 174, 185, STR_MAPGEN_RANDOM_SEED_OSKTITLE,     STR_MAPGEN_RANDOM_SEED_HELP},                  // GLAND_RANDOM_EDITBOX
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 326, 174, 185, STR_MAPGEN_RANDOM,                   STR_MAPGEN_RANDOM_HELP},                       // GLAND_RANDOM_BUTTON
 
 /* Generate button */
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN,  243, 326, 196, 225, STR_GENERATE,                 STR_NULL},                              // GLAND_GENERATE_BUTTON
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN,  243, 326, 196, 225, STR_MAPGEN_GENERATE,                 STR_NULL},                              // GLAND_GENERATE_BUTTON
 
 /* Starting date */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 212, 135, 145, STR_DATE,                     STR_NULL},                              // GLAND_START_DATE_TEXT1
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 212, 135, 145, STR_MAPGEN_DATE,                     STR_NULL},                              // GLAND_START_DATE_TEXT1
 {     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 227, 134, 145, SPR_ARROW_DOWN,               STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD}, // GLAND_START_DATE_DOWN
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 228, 314, 134, 145, STR_GENERATE_DATE,            STR_NULL},                              // GLAND_START_DATE_TEXT
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 228, 314, 134, 145, STR_BLACK_DATE_LONG,            STR_NULL},                              // GLAND_START_DATE_TEXT
 {     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 134, 145, SPR_ARROW_UP,                 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD},  // GLAND_START_DATE_UP
 
 /* Snow line */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 278, 153, 163, STR_SNOW_LINE_HEIGHT,         STR_NULL},                              // GLAND_SNOW_LEVEL_TEXT1
-{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 282, 293, 152, 163, SPR_ARROW_DOWN,               STR_SNOW_LINE_DOWN},                    // GLAND_SNOW_LEVEL_DOWN
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 182, 278, 153, 163, STR_MAPGEN_SNOW_LINE_HEIGHT,         STR_NULL},                              // GLAND_SNOW_LEVEL_TEXT1
+{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 282, 293, 152, 163, SPR_ARROW_DOWN,               STR_MAPGEN_SNOW_LINE_DOWN},                    // GLAND_SNOW_LEVEL_DOWN
 {    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 294, 314, 152, 163, STR_NUM_3,                    STR_NULL},                              // GLAND_SNOW_LEVEL_TEXT
-{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 152, 163, SPR_ARROW_UP,                 STR_SNOW_LINE_UP},                      // GLAND_SNOW_LEVEL_UP
+{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 152, 163, SPR_ARROW_UP,                 STR_MAPGEN_SNOW_LINE_UP},                      // GLAND_SNOW_LEVEL_UP
 
 /* Tree placer */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 197, 207, STR_TREE_PLACER,              STR_NULL},                              // GLAND_TREE_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 197, 207, STR_MAPGEN_TREE_PLACER,              STR_NULL},                              // GLAND_TREE_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 196, 207, STR_BLACK_ARROW_DOWN,         STR_NULL},                              // GLAND_TREE_PULLDOWN
 
 /* Heightmap rotation */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 215, 225, STR_HEIGHTMAP_ROTATION,       STR_NULL},                              // GLAND_HEIGHTMAP_ROTATION_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE,  12, 110, 215, 225, STR_MAPGEN_HEIGHTMAP_ROTATION,       STR_NULL},                              // GLAND_HEIGHTMAP_ROTATION_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 114, 231, 214, 225, STR_BLACK_ARROW_DOWN,         STR_NULL},                              // GLAND_HEIGHTMAP_ROTATION_PULLDOWN
 
 {   WIDGETS_END},
@@ -394,7 +394,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 	/* Window header. */
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN, GLAND_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_BROWN, GLAND_TITLEBAR), SetDataTip(STR_WORLD_GENERATION_CAPTION, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, GLAND_TITLEBAR), SetDataTip(STR_MAPGEN_WORLD_GENERATION_CAPTION, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, GLAND_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 10),
@@ -411,17 +411,17 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 			/* Labels at the left side. */
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPSIZE, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_X_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 11),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_NUMBER_OF_TOWNS, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TOWN_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_TOWNS, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_NUMBER_OF_INDUSTRIES, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_INDUSTRY_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_NUMBER_OF_INDUSTRIES, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 11),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_RANDOM_SEED, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_RANDOM_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_RANDOM_SEED, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 11),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_TREE_PLACER, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_TREE_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_TREE_PLACER, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 7),
-				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_HEIGHTMAP_ROTATION, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_TEXT), SetMinimalSize(99, 11), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 				NWidget(NWID_SPACER), SetFill(0, 1),
 			EndContainer(),
@@ -432,7 +432,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_NUM_1, STR_NULL),
 					NWidget(NWID_SPACER), SetMinimalSize(6, 0),
-					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_BY, STR_NULL), SetPadding(1, 0, 0, 0),
+					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12), SetDataTip(STR_NUM_2, STR_NULL),
 					NWidget(NWID_SPACER), SetFill(1, 0),
@@ -443,10 +443,10 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetMinimalSize(62, 12), SetDataTip(0x0, STR_NULL),
 					NWidget(NWID_SPACER), SetMinimalSize(6, 0),
 					/* Starting date. */
-					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetMinimalSize(31, 11), SetDataTip(STR_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
+					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_START_DATE_TEXT1), SetMinimalSize(31, 11), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
-					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_GENERATE_DATE, STR_NULL),
+					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
@@ -457,19 +457,19 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					NWidget(NWID_SPACER), SetMinimalSize(6, 0),
 					/* Snow line. */
 					NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT1), SetMinimalSize(97, 11),
-														SetDataTip(STR_SNOW_LINE_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
+														SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetMinimalSize(3, 0),
-					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SNOW_LINE_DOWN),
+					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_NUM_3, STR_NULL),
-					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SNOW_LINE_UP),
+					NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
 				NWidget(NWID_HORIZONTAL),
 					/* Edit box for seed. */
-					NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_RANDOM_SEED_OSKTITLE, STR_RANDOM_SEED_HELP),
+					NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetMinimalSize(94, 12), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP),
 					NWidget(NWID_SPACER), SetMinimalSize(8, 0),
-					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_RANDOM, STR_RANDOM_HELP),
+					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetMinimalSize(111, 12), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
@@ -483,7 +483,7 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
 					EndContainer(),
 					NWidget(NWID_SPACER), SetMinimalSize(11, 0),
 					/* Generate button. */
-					NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84, 30), SetDataTip(STR_GENERATE, STR_NULL),
+					NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetMinimalSize(84, 30), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetFill(0, 1),
@@ -607,18 +607,18 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 			this->widget[GLAND_TERRAIN_PULLDOWN].data    = _elevations[_settings_newgame.difficulty.terrain_type];
 			this->widget[GLAND_WATER_PULLDOWN].data      = _sea_lakes[_settings_newgame.difficulty.quantity_sea_lakes];
 			this->widget[GLAND_SMOOTHNESS_PULLDOWN].data = _smoothness[_settings_newgame.game_creation.tgen_smoothness];
-			this->widget[GLAND_BORDERS_RANDOM].data      = (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? STR_BORDER_RANDOMIZE : STR_BORDER_MANUAL;
+			this->widget[GLAND_BORDERS_RANDOM].data      = (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) ? STR_MAPGEN_BORDER_RANDOMIZE : STR_MAPGEN_BORDER_MANUAL;
 
 			if (_settings_newgame.game_creation.water_borders == BORDERS_RANDOM) {
-				this->widget[GLAND_WATER_NE].data = STR_BORDER_RANDOM;
-				this->widget[GLAND_WATER_NW].data = STR_BORDER_RANDOM;
-				this->widget[GLAND_WATER_SE].data = STR_BORDER_RANDOM;
-				this->widget[GLAND_WATER_SW].data = STR_BORDER_RANDOM;
+				this->widget[GLAND_WATER_NE].data = STR_MAPGEN_BORDER_RANDOM;
+				this->widget[GLAND_WATER_NW].data = STR_MAPGEN_BORDER_RANDOM;
+				this->widget[GLAND_WATER_SE].data = STR_MAPGEN_BORDER_RANDOM;
+				this->widget[GLAND_WATER_SW].data = STR_MAPGEN_BORDER_RANDOM;
 			} else {
-				this->widget[GLAND_WATER_NE].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_NE) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
-				this->widget[GLAND_WATER_NW].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_NW) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
-				this->widget[GLAND_WATER_SE].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_SE) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
-				this->widget[GLAND_WATER_SW].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_SW) ? STR_BORDER_WATER : STR_BORDER_FREEFORM;
+				this->widget[GLAND_WATER_NE].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_NE) ? STR_MAPGEN_BORDER_WATER : STR_MAPGEN_BORDER_FREEFORM;
+				this->widget[GLAND_WATER_NW].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_NW) ? STR_MAPGEN_BORDER_WATER : STR_MAPGEN_BORDER_FREEFORM;
+				this->widget[GLAND_WATER_SE].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_SE) ? STR_MAPGEN_BORDER_WATER : STR_MAPGEN_BORDER_FREEFORM;
+				this->widget[GLAND_WATER_SW].data = HasBit(_settings_newgame.game_creation.water_borders, BORDER_SW) ? STR_MAPGEN_BORDER_WATER : STR_MAPGEN_BORDER_FREEFORM;
 			}
 		} else {
 			this->widget[GLAND_TREE_PULLDOWN].data               = _tree_placer[_settings_newgame.game_creation.tree_placer];
@@ -643,9 +643,9 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 				SetDParam(0, this->x);
 				SetDParam(1, this->y);
 			}
-			int right = DrawString(0, 326, 91, STR_HEIGHTMAP_SIZE, TC_FROMSTRING, SA_RIGHT);
+			int right = DrawString(0, 326, 91, STR_MAPGEN_HEIGHTMAP_SIZE, TC_FROMSTRING, SA_RIGHT);
 
-			DrawString( 12, 114, 91, STR_HEIGHTMAP_NAME);
+			DrawString( 12, 114, 91, STR_MAPGEN_HEIGHTMAP_NAME);
 			DrawString(114, right - 5, 91, this->name, TC_ORANGE);
 		}
 	}
@@ -695,8 +695,8 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 						this->y * 2 < (1U << _settings_newgame.game_creation.map_y) ||
 						this->y / 2 > (1U << _settings_newgame.game_creation.map_y))) {
 					ShowQuery(
-						STR_HEIGHTMAP_SCALE_WARNING_CAPTION,
-						STR_HEIGHTMAP_SCALE_WARNING_MESSAGE,
+						STR_WARNING_HEIGHTMAP_SCALE_CAPTION,
+						STR_WARNING_HEIGHTMAP_SCALE_MESSAGE,
 						this,
 						LandscapeGenerationCallback);
 				} else {
@@ -719,7 +719,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 			case GLAND_START_DATE_TEXT: // Year text
 				this->widget_id = GLAND_START_DATE_TEXT;
 				SetDParam(0, _settings_newgame.game_creation.starting_year);
-				ShowQueryString(STR_JUST_INT, STR_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_MAPGEN_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
 				break;
 
 			case GLAND_SNOW_LEVEL_DOWN:
@@ -737,7 +737,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 			case GLAND_SNOW_LEVEL_TEXT: // Snow line text
 				this->widget_id = GLAND_SNOW_LEVEL_TEXT;
 				SetDParam(0, _settings_newgame.game_creation.snow_line_height);
-				ShowQueryString(STR_JUST_INT, STR_SNOW_LINE_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_MAPGEN_SNOW_LINE_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
 				break;
 
 			case GLAND_TREE_PULLDOWN: // Tree placer
@@ -818,7 +818,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
 				if ((uint)index == CUSTOM_TOWN_NUMBER_DIFFICULTY) {
 					this->widget_id = widget;
 					SetDParam(0, _settings_newgame.game_creation.custom_town_number);
-					ShowQueryString(STR_JUST_INT, STR_NUMBER_OF_TOWNS, 5, 50, this, CS_NUMERAL, QSF_NONE);
+					ShowQueryString(STR_JUST_INT, STR_MAPGEN_NUMBER_OF_TOWNS, 5, 50, this, CS_NUMERAL, QSF_NONE);
 				};
 				IConsoleSetSetting("difficulty.number_towns", index);
 				break;
@@ -1043,7 +1043,7 @@ struct CreateScenarioWindow : public Window
 			case CSCEN_START_DATE_TEXT: // Year text
 				this->widget_id = CSCEN_START_DATE_TEXT;
 				SetDParam(0, _settings_newgame.game_creation.starting_year);
-				ShowQueryString(STR_JUST_INT, STR_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_MAPGEN_START_DATE_QUERY_CAPT, 8, 100, this, CS_NUMERAL, QSF_NONE);
 				break;
 
 			case CSCEN_FLAT_LAND_HEIGHT_DOWN:
@@ -1061,7 +1061,7 @@ struct CreateScenarioWindow : public Window
 			case CSCEN_FLAT_LAND_HEIGHT_TEXT: // Height level text
 				this->widget_id = CSCEN_FLAT_LAND_HEIGHT_TEXT;
 				SetDParam(0, _settings_newgame.game_creation.se_flat_world_height);
-				ShowQueryString(STR_JUST_INT, STR_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT, 3, 100, this, CS_NUMERAL, QSF_NONE);
 				break;
 		}
 	}
@@ -1099,7 +1099,7 @@ struct CreateScenarioWindow : public Window
 
 static const Widget _create_scenario_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE, COLOUR_BROWN,    0,  10,   0,  13, STR_BLACK_CROSS,         STR_TOOLTIP_CLOSE_WINDOW},                 // CSCEN_CLOSEBOX
-{    WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN,   11, 337,   0,  13, STR_SE_CAPTION,          STR_NULL},                                 // CSCEN_CAPTION
+{    WWT_CAPTION, RESIZE_NONE, COLOUR_BROWN,   11, 337,   0,  13, STR_SE_MAPGEN_CAPTION,          STR_NULL},                                 // CSCEN_CAPTION
 {      WWT_PANEL, RESIZE_NONE, COLOUR_BROWN,    0, 337,  14, 169, 0x0,                     STR_NULL},                                 // CSCEN_BACKGROUND
 
 /* Landscape selection */
@@ -1109,34 +1109,34 @@ static const Widget _create_scenario_widgets[] = {
 {   WWT_IMGBTN_2, RESIZE_NONE, COLOUR_ORANGE, 250, 326,  24,  78, SPR_SELECT_TOYLAND,      STR_INTRO_TOOLTIP_TOYLAND_LANDSCAPE},      // CSCEN_TOYLAND
 
 /* Generation type */
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN,   12, 115,  95, 124, STR_SE_FLAT_WORLD,       STR_SE_FLAT_WORLD_TIP},                    // CSCEN_EMPTY_WORLD
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN,   12, 115, 131, 160, STR_SE_RANDOM_LAND,      STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND},// CSCEN_RANDOM_WORLD
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN,   12, 115,  95, 124, STR_SE_MAPGEN_FLAT_WORLD,       STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP},                    // CSCEN_EMPTY_WORLD
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREEN,   12, 115, 131, 160, STR_SE_MAPGEN_RANDOM_LAND,      STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND},// CSCEN_RANDOM_WORLD
 
 /* Mapsize X */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 135, 212,  96, 106, STR_MAPSIZE,             STR_NULL},                               // CSCEN_MAPSIZE_X_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 135, 212,  96, 106, STR_MAPGEN_MAPSIZE,             STR_NULL},                               // CSCEN_MAPSIZE_X_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 216, 263,  95, 106, STR_NUM_1,               STR_NULL},                               // CSCEN_MAPSIZE_X_PULLDOWN
 /* Mapsize Y */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 268, 276,  96, 106, STR_BY,                  STR_NULL},                               // CSCEN_MAPSIZE_Y_TEXT
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 268, 276,  96, 106, STR_MAPGEN_BY,                  STR_NULL},                               // CSCEN_MAPSIZE_Y_TEXT
 {   WWT_DROPDOWN, RESIZE_NONE, COLOUR_ORANGE, 279, 326,  95, 106, STR_NUM_2,               STR_NULL},                               // CSCEN_MAPSIZE_Y_PULLDOWN
 
 /* Start date */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 135, 212, 114, 124, STR_DATE,                STR_NULL},                               // CSCEN_START_DATE_LABEL
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 135, 212, 114, 124, STR_MAPGEN_DATE,                STR_NULL},                               // CSCEN_START_DATE_LABEL
 {     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 216, 227, 113, 124, SPR_ARROW_DOWN,          STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD}, // CSCEN_START_DATE_DOWN
-{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 228, 314, 113, 124, STR_GENERATE_DATE,       STR_NULL},                               // CSCEN_START_DATE_TEXT
+{    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 228, 314, 113, 124, STR_BLACK_DATE_LONG,       STR_NULL},                               // CSCEN_START_DATE_TEXT
 {     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 113, 124, SPR_ARROW_UP,            STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD},  // CSCEN_START_DATE_UP
 
 /* Flat map height */
-{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 135, 278, 132, 142, STR_FLAT_WORLD_HEIGHT,   STR_NULL},                               // CSCEN_FLAT_LAND_HEIGHT_LABEL
-{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 282, 293, 131, 142, SPR_ARROW_DOWN,          STR_FLAT_WORLD_HEIGHT_DOWN},             // CSCEN_FLAT_LAND_HEIGHT_DOWN
+{       WWT_TEXT, RESIZE_NONE, COLOUR_ORANGE, 135, 278, 132, 142, STR_SE_MAPGEN_FLAT_WORLD_HEIGHT,   STR_NULL},                               // CSCEN_FLAT_LAND_HEIGHT_LABEL
+{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 282, 293, 131, 142, SPR_ARROW_DOWN,          STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN},             // CSCEN_FLAT_LAND_HEIGHT_DOWN
 {    WWT_TEXTBTN, RESIZE_NONE, COLOUR_ORANGE, 294, 314, 131, 142, STR_NUM_3,               STR_NULL},                               // CSCEN_FLAT_LAND_HEIGHT_TEXT
-{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 131, 142, SPR_ARROW_UP,            STR_FLAT_WORLD_HEIGHT_UP},               // CSCEN_FLAT_LAND_HEIGHT_UP
+{     WWT_IMGBTN, RESIZE_NONE, COLOUR_ORANGE, 315, 326, 131, 142, SPR_ARROW_UP,            STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP},               // CSCEN_FLAT_LAND_HEIGHT_UP
 {   WIDGETS_END},
 };
 
 static const NWidgetPart _nested_create_scenario_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN, CSCEN_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_BROWN, CSCEN_CAPTION), SetDataTip(STR_SE_CAPTION, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, CSCEN_CAPTION), SetDataTip(STR_SE_MAPGEN_CAPTION, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, CSCEN_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 10),
@@ -1150,40 +1150,40 @@ static const NWidgetPart _nested_create_scenario_widgets[] = {
 		NWidget(NWID_HORIZONTAL), SetPIP(12, 19, 11),
 			/* Green generation type buttons: 'Flat land' and 'Random land'. */
 			NWidget(NWID_VERTICAL), SetPIP(16, 6, 9),
-				NWidget(WWT_TEXTBTN, COLOUR_GREEN, CSCEN_EMPTY_WORLD), SetMinimalSize(104, 30), SetDataTip(STR_SE_FLAT_WORLD, STR_SE_FLAT_WORLD_TIP),
-				NWidget(WWT_TEXTBTN, COLOUR_GREEN, CSCEN_RANDOM_WORLD), SetMinimalSize(104, 30), SetDataTip(STR_SE_RANDOM_LAND, STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND),
+				NWidget(WWT_TEXTBTN, COLOUR_GREEN, CSCEN_EMPTY_WORLD), SetMinimalSize(104, 30), SetDataTip(STR_SE_MAPGEN_FLAT_WORLD, STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP),
+				NWidget(WWT_TEXTBTN, COLOUR_GREEN, CSCEN_RANDOM_WORLD), SetMinimalSize(104, 30), SetDataTip(STR_SE_MAPGEN_RANDOM_LAND, STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND),
 			EndContainer(),
 			/* Labels + setting drop-downs */
 			NWidget(NWID_VERTICAL), SetPIP(16, 6, 0),
 				/* Map size. */
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_MAPSIZE_X_TEXT), SetMinimalSize(78, 11),
-												SetDataTip(STR_MAPSIZE, STR_NULL), SetPadding(1, 0, 0, 0),
+												SetDataTip(STR_MAPGEN_MAPSIZE, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, CSCEN_MAPSIZE_X_PULLDOWN), SetMinimalSize(48, 12),
 												SetDataTip(STR_NUM_1, STR_NULL), SetPadding(0, 4, 0, 0),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_MAPSIZE_Y_TEXT), SetMinimalSize(9, 11),
-												SetDataTip(STR_BY, STR_NULL), SetPadding(1, 2, 0, 0),
+												SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 2, 0, 0),
 					NWidget(WWT_DROPDOWN, COLOUR_ORANGE, CSCEN_MAPSIZE_Y_PULLDOWN), SetMinimalSize(48, 12),
 												SetDataTip(STR_NUM_2, STR_NULL),
 				EndContainer(),
 				/* Date. */
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_START_DATE_LABEL), SetMinimalSize(78, 11),
-												SetDataTip(STR_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
+												SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetFill(1, 0),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_START_DATE_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD),
-					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CSCEN_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_GENERATE_DATE, STR_NULL),
+					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CSCEN_START_DATE_TEXT), SetMinimalSize(87, 12), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL),
 					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_START_DATE_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD),
 				EndContainer(),
 				/* Flat map height. */
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_TEXT, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_LABEL), SetMinimalSize(144, 11),
-												SetDataTip(STR_FLAT_WORLD_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
+												SetDataTip(STR_SE_MAPGEN_FLAT_WORLD_HEIGHT, STR_NULL), SetPadding(1, 0, 0, 0),
 					NWidget(NWID_SPACER), SetFill(1, 0),
-					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_FLAT_WORLD_HEIGHT_DOWN),
+					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_DOWN), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_DOWN, STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN),
 					NWidget(WWT_TEXTBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_TEXT), SetMinimalSize(21, 12), SetDataTip(STR_NUM_3, STR_NULL),
-					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_FLAT_WORLD_HEIGHT_UP),
+					NWidget(WWT_IMGBTN, COLOUR_ORANGE, CSCEN_FLAT_LAND_HEIGHT_UP), SetMinimalSize(12, 12), SetDataTip(SPR_ARROW_UP, STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetFill(1, 1),
 			EndContainer(),
@@ -1285,7 +1285,7 @@ struct GenerateProgressWindow : public Window {
 		DrawFrameRect(19, 20, (this->width - 18), 37, COLOUR_GREY, FR_BORDERONLY);
 		DrawFrameRect(20, 21, (int)((this->width - 40) * _tp.percent / 100) + 20, 36, COLOUR_MAUVE, FR_NONE);
 		SetDParam(0, _tp.percent);
-		DrawString(this->widget[GPWW_BACKGROUND].left, this->widget[GPWW_BACKGROUND].right, 25, STR_PROGRESS, TC_FROMSTRING, SA_CENTER);
+		DrawString(this->widget[GPWW_BACKGROUND].left, this->widget[GPWW_BACKGROUND].right, 25, STR_GENERATION_PROGRESS, TC_FROMSTRING, SA_CENTER);
 
 		/* Tell which class we are generating */
 		DrawString(this->widget[GPWW_BACKGROUND].left, this->widget[GPWW_BACKGROUND].right, 46, _tp.cls, TC_FROMSTRING, SA_CENTER);
@@ -1293,7 +1293,7 @@ struct GenerateProgressWindow : public Window {
 		/* And say where we are in that class */
 		SetDParam(0, _tp.current);
 		SetDParam(1, _tp.total);
-		DrawString(this->widget[GPWW_BACKGROUND].left, this->widget[GPWW_BACKGROUND].right, 58, STR_GENERATION_PROGRESS, TC_FROMSTRING, SA_CENTER);
+		DrawString(this->widget[GPWW_BACKGROUND].left, this->widget[GPWW_BACKGROUND].right, 58, STR_GENERATION_PROGRESS_NUM, TC_FROMSTRING, SA_CENTER);
 
 		this->SetDirty();
 	}
@@ -1304,7 +1304,7 @@ struct GenerateProgressWindow : public Window {
  */
 void PrepareGenerateWorldProgress()
 {
-	_tp.cls   = STR_WORLD_GENERATION;
+	_tp.cls   = STR_GENERATION_WORLD_GENERATION;
 	_tp.current = 0;
 	_tp.total   = 0;
 	_tp.percent = 0;
@@ -1324,16 +1324,16 @@ static void _SetGeneratingWorldProgress(gwp_class cls, uint progress, uint total
 {
 	static const int percent_table[GWP_CLASS_COUNT + 1] = {0, 5, 15, 20, 40, 60, 65, 80, 85, 99, 100 };
 	static const StringID class_table[GWP_CLASS_COUNT]  = {
-		STR_WORLD_GENERATION,
+		STR_GENERATION_WORLD_GENERATION,
 		STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION,
-		STR_CLEARING_TILES,
+		STR_GENERATION_CLEARING_TILES,
 		STR_SCENEDIT_TOOLBAR_TOWN_GENERATION,
 		STR_SCENEDIT_TOOLBAR_INDUSTRY_GENERATION,
-		STR_UNMOVABLE_GENERATION,
-		STR_TREE_GENERATION,
-		STR_SETTINGUP_GAME,
-		STR_PREPARING_TILELOOP,
-		STR_PREPARING_GAME
+		STR_GENERATION_UNMOVABLE_GENERATION,
+		STR_GENERATION_TREE_GENERATION,
+		STR_GENERATION_SETTINGUP_GAME,
+		STR_GENERATION_PREPARING_TILELOOP,
+		STR_GENERATION_PREPARING_GAME
 	};
 
 	assert(cls < GWP_CLASS_COUNT);
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index 77c86c1e6..6df83105a 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -109,7 +109,7 @@ static NWidgetBase *MakeNWidgetCompanyLines(int *biggest_index)
 		NWidgetBackground *panel = new NWidgetBackground(WWT_PANEL, COLOUR_GREY, widnum);
 		panel->SetMinimalSize(246, 12);
 		panel->SetFill(false, false);
-		panel->SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION);
+		panel->SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP);
 		vert->Add(panel);
 	}
 	*biggest_index = GLW_LAST_COMPANY;
@@ -484,7 +484,7 @@ public:
 
 struct OperatingProfitGraphWindow : BaseGraphWindow {
 	OperatingProfitGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, window_number, 2, 18, 136, true, STR_CURRCOMPACT)
+			BaseGraphWindow(desc, window_number, 2, 18, 136, true, STR_JUST_CURRCOMPACT)
 	{
 		this->FindWindowPlacementAndResize(desc);
 	}
@@ -532,7 +532,7 @@ void ShowOperatingProfitGraph()
 
 struct IncomeGraphWindow : BaseGraphWindow {
 	IncomeGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, window_number, 2, 18, 104, false, STR_CURRCOMPACT)
+			BaseGraphWindow(desc, window_number, 2, 18, 104, false, STR_JUST_CURRCOMPACT)
 	{
 		this->FindWindowPlacementAndResize(desc);
 	}
@@ -655,7 +655,7 @@ static const Widget _performance_history_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,                               STR_TOOLTIP_CLOSE_WINDOW},              // PHW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   475,     0,    13, STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},    // PHW_CAPTION
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   526,   575,     0,    13, STR_GRAPH_KEY_BUTTON,                          STR_GRAPH_KEY_TOOLTIP},                 // PHW_KEY
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   476,   525,     0,    13, STR_PERFORMANCE_DETAIL_KEY,                    STR_SHOW_DETAILED_PERFORMANCE_RATINGS}, // PHW_DETAILED_PERFORMANCE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   476,   525,     0,    13, STR_PERFORMANCE_DETAIL_KEY,                    STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP}, // PHW_DETAILED_PERFORMANCE
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   575,    14,   237, 0x0,                                           STR_NULL},                              // PHW_BACKGROUND
 {   WIDGETS_END},
 };
@@ -664,7 +664,7 @@ static const NWidgetPart _nested_performance_history_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, PHW_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, PHW_CAPTION), SetDataTip(STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, PHW_DETAILED_PERFORMANCE), SetMinimalSize(50, 14), SetDataTip(STR_PERFORMANCE_DETAIL_KEY, STR_SHOW_DETAILED_PERFORMANCE_RATINGS),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, PHW_DETAILED_PERFORMANCE), SetMinimalSize(50, 14), SetDataTip(STR_PERFORMANCE_DETAIL_KEY, STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, PHW_KEY), SetMinimalSize(50, 14), SetDataTip(STR_GRAPH_KEY_BUTTON, STR_GRAPH_KEY_TOOLTIP),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, PHW_BACKGROUND), SetMinimalSize(576, 224), EndContainer(),
@@ -688,7 +688,7 @@ void ShowPerformanceHistoryGraph()
 
 struct CompanyValueGraphWindow : BaseGraphWindow {
 	CompanyValueGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, window_number, 2, 18, 200, false, STR_CURRCOMPACT)
+			BaseGraphWindow(desc, window_number, 2, 18, 200, false, STR_JUST_CURRCOMPACT)
 	{
 		this->FindWindowPlacementAndResize(desc);
 	}
@@ -742,7 +742,7 @@ enum CargoPaymentRatesWidgets {
 
 struct PaymentRatesGraphWindow : BaseGraphWindow {
 	PaymentRatesGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-			BaseGraphWindow(desc, window_number, 2, 24, 200, false, STR_CURRCOMPACT)
+			BaseGraphWindow(desc, window_number, 2, 24, 200, false, STR_JUST_CURRCOMPACT)
 	{
 		uint num_active = 0;
 		const CargoSpec *cs;
@@ -1000,7 +1000,7 @@ enum CompanyLeagueWidgets {
 static const Widget _company_league_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE,  COLOUR_GREY,   0,  10,  0,  13, STR_BLACK_CROSS,                  STR_TOOLTIP_CLOSE_WINDOW},
 {    WWT_CAPTION, RESIZE_NONE,  COLOUR_GREY,  11, 387,  0,  13, STR_COMPANY_LEAGUE_TABLE_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX, RESIZE_NONE,  COLOUR_GREY, 388, 399,  0,  13, STR_NULL,                         STR_STICKY_BUTTON},
+{  WWT_STICKYBOX, RESIZE_NONE,  COLOUR_GREY, 388, 399,  0,  13, STR_NULL,                         STR_TOOLTIP_STICKY},
 {      WWT_PANEL, RESIZE_NONE,  COLOUR_GREY,   0, 399, 14, 166, 0x0,                              STR_NULL},
 {   WIDGETS_END},
 };
@@ -1238,16 +1238,16 @@ CompanyID PerformanceRatingDetailWindow::company = INVALID_COMPANY;
 static NWidgetBase *MakePerformanceDetailPanels(int *biggest_index)
 {
 	const StringID performance_tips[] = {
-		STR_PERFORMANCE_DETAIL_VEHICLES_TIP,
-		STR_PERFORMANCE_DETAIL_STATIONS_TIP,
-		STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP,
-		STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP,
-		STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP,
-		STR_PERFORMANCE_DETAIL_DELIVERED_TIP,
-		STR_PERFORMANCE_DETAIL_CARGO_TIP,
-		STR_PERFORMANCE_DETAIL_MONEY_TIP,
-		STR_PERFORMANCE_DETAIL_LOAN_TIP,
-		STR_PERFORMANCE_DETAIL_TOTAL_TIP,
+		STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP,
+		STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP,
 	};
 
 	assert(lengthof(performance_tips) == SCORE_END - SCORE_BEGIN);
@@ -1293,7 +1293,7 @@ static NWidgetBase *MakeCompanyButtonRows(int *biggest_index)
 		NWidgetBackground *panel = new NWidgetBackground(WWT_PANEL, COLOUR_GREY, widnum);
 		panel->SetMinimalSize(37, 13);
 		panel->SetFill(false, false);
-		panel->SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION);
+		panel->SetDataTip(0x0, STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP);
 		hor->Add(panel);
 		hor_length++;
 	}
@@ -1315,32 +1315,32 @@ static const Widget _performance_rating_detail_widgets[] = {
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   298,     0,    13, STR_PERFORMANCE_DETAIL, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},  // PRW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    14,    40, 0x0,                    STR_NULL},                            // PRW_BACKGROUND
 
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    41,    60, 0x0,                    STR_PERFORMANCE_DETAIL_VEHICLES_TIP}, // PRW_SCORE_FIRST
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    61,    80, 0x0,                    STR_PERFORMANCE_DETAIL_STATIONS_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    81,   100, 0x0,                    STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   101,   120, 0x0,                    STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   121,   140, 0x0,                    STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   141,   160, 0x0,                    STR_PERFORMANCE_DETAIL_DELIVERED_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   161,   180, 0x0,                    STR_PERFORMANCE_DETAIL_CARGO_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   181,   200, 0x0,                    STR_PERFORMANCE_DETAIL_MONEY_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   201,   220, 0x0,                    STR_PERFORMANCE_DETAIL_LOAN_TIP},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   221,   240, 0x0,                    STR_PERFORMANCE_DETAIL_TOTAL_TIP},    // PRW_SCORE_LAST
-
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     2,    38,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},     // PRW_COMPANY_FIRST
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    39,    75,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    76,   112,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   113,   149,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   150,   186,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   187,   223,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   224,   260,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   261,   297,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     2,    38,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    39,    75,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    76,   112,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   113,   149,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   150,   186,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   187,   223,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   224,   260,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION},     // PRW_COMPANY_LAST
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    41,    60, 0x0,                    STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP}, // PRW_SCORE_FIRST
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    61,    80, 0x0,                    STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,    81,   100, 0x0,                    STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   101,   120, 0x0,                    STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   121,   140, 0x0,                    STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   141,   160, 0x0,                    STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   161,   180, 0x0,                    STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   181,   200, 0x0,                    STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   201,   220, 0x0,                    STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   298,   221,   240, 0x0,                    STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP},    // PRW_SCORE_LAST
+
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     2,    38,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},     // PRW_COMPANY_FIRST
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    39,    75,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    76,   112,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   113,   149,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   150,   186,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   187,   223,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   224,   260,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   261,   297,    14,    26, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     2,    38,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    39,    75,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    76,   112,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   113,   149,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   150,   186,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   187,   223,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   224,   260,    27,    39, 0x0,                    STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP},     // PRW_COMPANY_LAST
 {   WIDGETS_END},
 };
 
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp
index 7ef41258b..1baac2876 100644
--- a/src/group_cmd.cpp
+++ b/src/group_cmd.cpp
@@ -165,7 +165,7 @@ CommandCost CmdRenameGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_GROUP_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniqueGroupName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniqueGroupName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index e4548c128..9ac433d69 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -72,9 +72,9 @@ static void ShowGroupActionDropdown(Window *w, GroupID gid)
 {
 	DropDownList *list = new DropDownList();
 
-	list->push_back(new DropDownListStringItem(STR_REPLACE_VEHICLES,    GALF_REPLACE, false));
-	list->push_back(new DropDownListStringItem(STR_SEND_FOR_SERVICING,  GALF_SERVICE, false));
-	list->push_back(new DropDownListStringItem(STR_SEND_TRAIN_TO_DEPOT, GALF_DEPOT,   false));
+	list->push_back(new DropDownListStringItem(STR_VEHICLE_LIST_REPLACE_VEHICLES,    GALF_REPLACE, false));
+	list->push_back(new DropDownListStringItem(STR_VEHICLE_LIST_SEND_FOR_SERVICING,  GALF_SERVICE, false));
+	list->push_back(new DropDownListStringItem(STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT, GALF_DEPOT,   false));
 
 	if (Group::IsValidID(gid)) {
 		list->push_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE,  GALF_ADD_SHARED, false));
@@ -88,30 +88,30 @@ static void ShowGroupActionDropdown(Window *w, GroupID gid)
 static const Widget _group_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,      STR_TOOLTIP_CLOSE_WINDOW},          // GRP_WIDGET_CLOSEBOX
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   447,     0,    13, 0x0,                  STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},// GRP_WIDGET_CAPTION
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   448,   459,     0,    13, 0x0,                  STR_STICKY_BUTTON},                 // GRP_WIDGET_STICKY
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   200,   280,    14,    25, STR_SORT_BY,          STR_SORT_ORDER_TIP},                // GRP_WIDGET_SORT_BY_ORDER
-{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_GREY,   281,   447,    14,    25, 0x0,                  STR_SORT_CRITERIA_TIP},             // GRP_WIDGET_SORT_BY_DROPDOWN
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   448,   459,     0,    13, 0x0,                  STR_TOOLTIP_STICKY},                 // GRP_WIDGET_STICKY
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,   200,   280,    14,    25, STR_BUTTON_SORT_BY,   STR_TOOLTIP_SORT_ORDER},                // GRP_WIDGET_SORT_BY_ORDER
+{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_GREY,   281,   447,    14,    25, 0x0,                  STR_TOOLTIP_SORT_CRITERIAP},             // GRP_WIDGET_SORT_BY_DROPDOWN
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,   448,   459,    14,    25, 0x0,                  STR_NULL},                          // GRP_WIDGET_EMPTY_TOP_RIGHT
 {     WWT_MATRIX,     RESIZE_RB,  COLOUR_GREY,   200,   447,    26,   181, 0x701,                STR_NULL},                          // GRP_WIDGET_LIST_VEHICLE
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   448,   459,    26,   181, 0x0,                  STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // GRP_WIDGET_LIST_VEHICLE_SCROLLBAR
 {      WWT_PANEL,     RESIZE_TB,  COLOUR_GREY,   188,   199,   169,   193, 0x0,                  STR_NULL},                          // GRP_WIDGET_EMPTY2
-{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,   200,   305,   182,   193, 0x0,                  STR_AVAILABLE_ENGINES_TIP},         // GRP_WIDGET_AVAILABLE_VEHICLES
-{   WWT_DROPDOWN,     RESIZE_TB,  COLOUR_GREY,   306,   423,   182,   193, STR_MANAGE_LIST,      STR_MANAGE_LIST_TIP},               // GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   424,   435,   182,   193, SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP},            // GRP_WIDGET_STOP_ALL
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   436,   447,   182,   193, SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP},           // GRP_WIDGET_START_ALL
+{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,   200,   305,   182,   193, 0x0,                  STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP},         // GRP_WIDGET_AVAILABLE_VEHICLES
+{   WWT_DROPDOWN,     RESIZE_TB,  COLOUR_GREY,   306,   423,   182,   193, STR_VEHICLE_LIST_MANAGE_LIST,      STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP},               // GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   424,   435,   182,   193, SPR_FLAG_VEH_STOPPED, STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP},            // GRP_WIDGET_STOP_ALL
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   436,   447,   182,   193, SPR_FLAG_VEH_RUNNING, STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP},           // GRP_WIDGET_START_ALL
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,   448,   447,   182,   193, 0x0,                  STR_NULL},                          // GRP_WIDGET_EMPTY_BOTTOM_RIGHT
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   448,   459,   182,   193, 0x0,                  STR_RESIZE_BUTTON},                 // GRP_WIDGET_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   448,   459,   182,   193, 0x0,                  STR_TOOLTIP_RESIZE},                 // GRP_WIDGET_RESIZE
 
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   199,    14,    25, 0x0,                  STR_NULL},                          // GRP_WIDGET_EMPTY_TOP_LEFT
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   199,    26,    38, 0x0,                  STR_NULL},                          // GRP_WIDGET_ALL_VEHICLES
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   199,    39,    51, 0x0,                  STR_NULL},                          // GRP_WIDGET_DEFAULT_VEHICLES
-{     WWT_MATRIX, RESIZE_BOTTOM,  COLOUR_GREY,     0,   187,    52,   168, 0x701,                STR_GROUPS_CLICK_ON_GROUP_FOR_TIP}, // GRP_WIDGET_LIST_GROUP
+{     WWT_MATRIX, RESIZE_BOTTOM,  COLOUR_GREY,     0,   187,    52,   168, 0x701,                STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP}, // GRP_WIDGET_LIST_GROUP
 { WWT_SCROLL2BAR, RESIZE_BOTTOM,  COLOUR_GREY,   188,   199,    52,   168, 0x0,                  STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // GRP_WIDGET_LIST_GROUP_SCROLLBAR
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,     0,    23,   169,   193, 0x0,                  STR_GROUP_CREATE_TIP},              // GRP_WIDGET_CREATE_GROUP
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,    24,    47,   169,   193, 0x0,                  STR_GROUP_DELETE_TIP},              // GRP_WIDGET_DELETE_GROUP
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,    48,    71,   169,   193, 0x0,                  STR_GROUP_RENAME_TIP},              // GRP_WIDGET_RENAME_GROUP
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,     0,    23,   169,   193, 0x0,                  STR_GROUP_CREATE_TOOLTIP},              // GRP_WIDGET_CREATE_GROUP
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,    24,    47,   169,   193, 0x0,                  STR_GROUP_DELETE_TOOLTIP},              // GRP_WIDGET_DELETE_GROUP
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,    48,    71,   169,   193, 0x0,                  STR_GROUP_RENAME_TOOLTIP},              // GRP_WIDGET_RENAME_GROUP
 {      WWT_PANEL,     RESIZE_TB,  COLOUR_GREY,    72,   163,   169,   193, 0x0,                  STR_NULL},                          // GRP_WIDGET_EMPTY1
-{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   164,   187,   169,   193, 0x0,                  STR_GROUP_REPLACE_PROTECTION_TIP},  // GRP_WIDGET_REPLACE_PROTECTION
+{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   164,   187,   169,   193, 0x0,                  STR_GROUP_REPLACE_PROTECTION_TOOLTIP},  // GRP_WIDGET_REPLACE_PROTECTION
 {   WIDGETS_END},
 };
 
@@ -130,23 +130,23 @@ static const NWidgetPart _nested_group_widgets[] = {
 			NWidget(WWT_PANEL, COLOUR_GREY, GRP_WIDGET_ALL_VEHICLES), SetMinimalSize(200, 13), EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY, GRP_WIDGET_DEFAULT_VEHICLES), SetMinimalSize(200, 13), EndContainer(),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_MATRIX, COLOUR_GREY, GRP_WIDGET_LIST_GROUP), SetMinimalSize(188, 117), SetDataTip(0x701, STR_GROUPS_CLICK_ON_GROUP_FOR_TIP), SetResize(0, 1),
+				NWidget(WWT_MATRIX, COLOUR_GREY, GRP_WIDGET_LIST_GROUP), SetMinimalSize(188, 117), SetDataTip(0x701, STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP), SetResize(0, 1),
 				NWidget(WWT_SCROLL2BAR, COLOUR_GREY, GRP_WIDGET_LIST_GROUP_SCROLLBAR), SetMinimalSize(12, 117),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_CREATE_GROUP), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_CREATE_TIP),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_DELETE_GROUP), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_DELETE_TIP),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_RENAME_GROUP), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_RENAME_TIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_CREATE_GROUP), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_CREATE_TOOLTIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_DELETE_GROUP), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_DELETE_TOOLTIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_RENAME_GROUP), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_RENAME_TOOLTIP),
 				NWidget(WWT_PANEL, COLOUR_GREY, GRP_WIDGET_EMPTY1), SetMinimalSize(92, 25), SetFill(1, 0), EndContainer(),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_REPLACE_PROTECTION), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_REPLACE_PROTECTION_TIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_REPLACE_PROTECTION), SetMinimalSize(24, 25), SetDataTip(0x0, STR_GROUP_REPLACE_PROTECTION_TOOLTIP),
 				NWidget(WWT_PANEL, COLOUR_GREY, GRP_WIDGET_EMPTY2), SetMinimalSize(12, 25), EndContainer(),
 			EndContainer(),
 		EndContainer(),
 		/* right part */
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, GRP_WIDGET_SORT_BY_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_SORT_BY, STR_SORT_ORDER_TIP),
-				NWidget(WWT_DROPDOWN, COLOUR_GREY, GRP_WIDGET_SORT_BY_DROPDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_SORT_CRITERIA_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, GRP_WIDGET_SORT_BY_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+				NWidget(WWT_DROPDOWN, COLOUR_GREY, GRP_WIDGET_SORT_BY_DROPDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIAP),
 				NWidget(WWT_PANEL, COLOUR_GREY, GRP_WIDGET_EMPTY_TOP_RIGHT), SetMinimalSize(12, 12), SetResize(1, 0), EndContainer(),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
@@ -154,10 +154,10 @@ static const NWidgetPart _nested_group_widgets[] = {
 				NWidget(WWT_SCROLLBAR, COLOUR_GREY, GRP_WIDGET_LIST_VEHICLE_SCROLLBAR), SetMinimalSize(12, 156),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, GRP_WIDGET_AVAILABLE_VEHICLES), SetMinimalSize(106, 12), SetDataTip(0x0, STR_AVAILABLE_ENGINES_TIP),
-				NWidget(WWT_DROPDOWN, COLOUR_GREY, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN), SetMinimalSize(118, 12), SetDataTip(STR_MANAGE_LIST, STR_MANAGE_LIST_TIP),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_STOP_ALL), SetMinimalSize(12, 12), SetDataTip(SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_START_ALL), SetMinimalSize(12, 12), SetDataTip(SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, GRP_WIDGET_AVAILABLE_VEHICLES), SetMinimalSize(106, 12), SetDataTip(0x0, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP),
+				NWidget(WWT_DROPDOWN, COLOUR_GREY, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN), SetMinimalSize(118, 12), SetDataTip(STR_VEHICLE_LIST_MANAGE_LIST, STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_STOP_ALL), SetMinimalSize(12, 12), SetDataTip(SPR_FLAG_VEH_STOPPED, STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, GRP_WIDGET_START_ALL), SetMinimalSize(12, 12), SetDataTip(SPR_FLAG_VEH_RUNNING, STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP),
 				NWidget(WWT_PANEL, COLOUR_GREY, GRP_WIDGET_EMPTY_BOTTOM_RIGHT), SetMinimalSize(0, 12), SetResize(1, 0), EndContainer(),
 				NWidget(WWT_RESIZEBOX, COLOUR_GREY, GRP_WIDGET_RESIZE), SetMinimalSize(12, 12),
 			EndContainer(),
@@ -263,7 +263,7 @@ public:
 		this->vehicle_sel = INVALID_VEHICLE;
 
 		this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips   = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type;
-		this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS + this->vehicle_type;
+		this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type;
 
 		switch (this->vehicle_type) {
 			case VEH_TRAIN:
@@ -417,7 +417,7 @@ public:
 
 			/* draw the number of vehicles of the group */
 			SetDParam(0, g->num_vehicle);
-			DrawString(this->widget[GRP_WIDGET_LIST_GROUP].left, this->widget[GRP_WIDGET_LIST_GROUP].right, y1 + 1, STR_GROUP_TINY_NUM, (this->group_sel == g->index) ? TC_WHITE : TC_BLACK, SA_RIGHT);
+			DrawString(this->widget[GRP_WIDGET_LIST_GROUP].left, this->widget[GRP_WIDGET_LIST_GROUP].right, y1 + 1, STR_TINY_COMMA, (this->group_sel == g->index) ? TC_WHITE : TC_BLACK, SA_RIGHT);
 		}
 
 		this->DrawSortButtonState(GRP_WIDGET_SORT_BY_ORDER, this->vehicles.IsDescSortOrder() ? SBS_DOWN : SBS_UP);
@@ -489,14 +489,14 @@ public:
 			}
 
 			case GRP_WIDGET_CREATE_GROUP: // Create a new group
-				DoCommandP(0, this->vehicle_type, 0, CMD_CREATE_GROUP | CMD_MSG(STR_GROUP_CAN_T_CREATE));
+				DoCommandP(0, this->vehicle_type, 0, CMD_CREATE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_CREATE));
 				break;
 
 			case GRP_WIDGET_DELETE_GROUP: { // Delete the selected group
 				GroupID group = this->group_sel;
 				this->group_sel = ALL_GROUP;
 
-				DoCommandP(0, group, 0, CMD_DELETE_GROUP | CMD_MSG(STR_GROUP_CAN_T_DELETE));
+				DoCommandP(0, group, 0, CMD_DELETE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_DELETE));
 				break;
 			}
 
@@ -543,7 +543,7 @@ public:
 		switch (widget) {
 			case GRP_WIDGET_ALL_VEHICLES: // All vehicles
 			case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles
-				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
+				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE));
 
 				this->vehicle_sel = INVALID_VEHICLE;
 
@@ -565,7 +565,7 @@ public:
 
 				if (id_g >= this->groups.Length()) return;
 
-				DoCommandP(0, this->groups[id_g]->index, vindex, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
+				DoCommandP(0, this->groups[id_g]->index, vindex, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_VEHICLE));
 
 				break;
 			}
@@ -601,7 +601,7 @@ public:
 	{
 		if (str == NULL) return;
 
-		DoCommandP(0, this->group_sel, 0, CMD_RENAME_GROUP | CMD_MSG(STR_GROUP_CAN_T_RENAME), NULL, str);
+		DoCommandP(0, this->group_sel, 0, CMD_RENAME_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_RENAME), NULL, str);
 	}
 
 	virtual void OnResize(Point delta)
@@ -639,12 +639,12 @@ public:
 					case GALF_ADD_SHARED: // Add shared Vehicles
 						assert(Group::IsValidID(this->group_sel));
 
-						DoCommandP(0, this->group_sel, this->vehicle_type, CMD_ADD_SHARED_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_SHARED_VEHICLE));
+						DoCommandP(0, this->group_sel, this->vehicle_type, CMD_ADD_SHARED_VEHICLE_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE));
 						break;
 					case GALF_REMOVE_ALL: // Remove all Vehicles from the selected group
 						assert(Group::IsValidID(this->group_sel));
 
-						DoCommandP(0, this->group_sel, this->vehicle_type, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
+						DoCommandP(0, this->group_sel, this->vehicle_type, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
 						break;
 					default: NOT_REACHED();
 				}
diff --git a/src/heightmap.cpp b/src/heightmap.cpp
index 04207cd2e..202905e8a 100644
--- a/src/heightmap.cpp
+++ b/src/heightmap.cpp
@@ -101,20 +101,20 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map)
 
 	fp = FioFOpenFile(filename, "rb");
 	if (fp == NULL) {
-		ShowErrorMessage(STR_PNGMAP_ERR_FILE_NOT_FOUND, STR_PNGMAP_ERROR, 0, 0);
+		ShowErrorMessage(STR_ERROR_PNGMAP_FILE_NOT_FOUND, STR_ERROR_PNGMAP, 0, 0);
 		return false;
 	}
 
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 	if (png_ptr == NULL) {
-		ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_PNGMAP_ERROR, 0, 0);
+		ShowErrorMessage(STR_ERROR_PNGMAP_MISC, STR_ERROR_PNGMAP, 0, 0);
 		fclose(fp);
 		return false;
 	}
 
 	info_ptr = png_create_info_struct(png_ptr);
 	if (info_ptr == NULL || setjmp(png_jmpbuf(png_ptr))) {
-		ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_PNGMAP_ERROR, 0, 0);
+		ShowErrorMessage(STR_ERROR_PNGMAP_MISC, STR_ERROR_PNGMAP, 0, 0);
 		fclose(fp);
 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 		return false;
@@ -130,7 +130,7 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map)
 	/* Maps of wrong colour-depth are not used.
 	 * (this should have been taken care of by stripping alpha and 16-bit samples on load) */
 	if ((info_ptr->channels != 1) && (info_ptr->channels != 3) && (info_ptr->bit_depth != 8)) {
-		ShowErrorMessage(STR_PNGMAP_ERR_IMAGE_TYPE, STR_PNGMAP_ERROR, 0, 0);
+		ShowErrorMessage(STR_ERROR_PNGMAP_IMAGE_TYPE, STR_ERROR_PNGMAP, 0, 0);
 		fclose(fp);
 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 		return false;
@@ -224,14 +224,14 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
 
 	f = FioFOpenFile(filename, "rb");
 	if (f == NULL) {
-		ShowErrorMessage(STR_PNGMAP_ERR_FILE_NOT_FOUND, STR_BMPMAP_ERROR, 0, 0);
+		ShowErrorMessage(STR_ERROR_PNGMAP_FILE_NOT_FOUND, STR_ERROR_BMPMAP, 0, 0);
 		return false;
 	}
 
 	BmpInitializeBuffer(&buffer, f);
 
 	if (!BmpReadHeader(&buffer, &info, &data)) {
-		ShowErrorMessage(STR_BMPMAP_ERR_IMAGE_TYPE, STR_BMPMAP_ERROR, 0, 0);
+		ShowErrorMessage(STR_ERROR_BMPMAP_IMAGE_TYPE, STR_ERROR_BMPMAP, 0, 0);
 		fclose(f);
 		BmpDestroyData(&data);
 		return false;
@@ -239,7 +239,7 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
 
 	if (map != NULL) {
 		if (!BmpReadBitmap(&buffer, &info, &data)) {
-			ShowErrorMessage(STR_BMPMAP_ERR_IMAGE_TYPE, STR_BMPMAP_ERROR, 0, 0);
+			ShowErrorMessage(STR_ERROR_BMPMAP_IMAGE_TYPE, STR_ERROR_BMPMAP, 0, 0);
 			fclose(f);
 			BmpDestroyData(&data);
 			return false;
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp
index c9adb7734..1fd566ef9 100644
--- a/src/industry_cmd.cpp
+++ b/src/industry_cmd.cpp
@@ -428,7 +428,7 @@ static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
 	td->str = is->name;
 	if (!IsIndustryCompleted(tile)) {
 		SetDParamX(td->dparam, 0, td->str);
-		td->str = STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION;
+		td->str = STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION;
 	}
 
 	if (is->grf_prop.grffile != NULL) {
@@ -453,7 +453,7 @@ static CommandCost ClearTile_Industry(TileIndex tile, DoCommandFlag flags)
 				((indspec->behaviour & INDUSTRYBEH_BUILT_ONWATER) ||
 				HasBit(GetIndustryTileSpec(GetIndustryGfx(tile))->slopes_refused, 5)))) {
 		SetDParam(0, indspec->name);
-		return_cmd_error(flags & DC_AUTO ? STR_OBJECT_IN_THE_WAY : INVALID_STRING_ID);
+		return_cmd_error(flags & DC_AUTO ? STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY : INVALID_STRING_ID);
 	}
 
 	if (flags & DC_EXEC) {
@@ -1457,7 +1457,7 @@ static bool CheckIfFarEnoughFromIndustry(TileIndex tile, int type)
 				_game_mode != GM_EDITOR || // editor must not be stopped
 				!_settings_game.economy.same_industry_close ||
 				!_settings_game.economy.multiple_industry_per_town)) {
-			_error_message = STR_INDUSTRY_TOO_CLOSE;
+			_error_message = STR_ERROR_INDUSTRY_TOO_CLOSE;
 			return false;
 		}
 
@@ -1466,7 +1466,7 @@ static bool CheckIfFarEnoughFromIndustry(TileIndex tile, int type)
 				i->type == indspec->conflicting[1] ||
 				i->type == indspec->conflicting[2]) &&
 				in_low_distance) {
-			_error_message = STR_INDUSTRY_TOO_CLOSE;
+			_error_message = STR_ERROR_INDUSTRY_TOO_CLOSE;
 			return false;
 		}
 	}
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 65b2ec593..23492a765 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -76,11 +76,11 @@ enum DynamicPlaceIndustriesWidgets {
 static const Widget _build_industry_widgets[] = {
 {   WWT_CLOSEBOX,    RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    10,     0,    13, STR_BLACK_CROSS,           STR_TOOLTIP_CLOSE_WINDOW},             // DPIW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_DARK_GREEN,    11,   169,     0,    13, STR_FUND_INDUSTRY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // DPIW_CAPTION
-{     WWT_MATRIX,      RESIZE_RB,  COLOUR_DARK_GREEN,     0,   157,    14,   118, 0x801,                     STR_INDUSTRY_SELECTION_HINT},          // DPIW_MATRIX_WIDGET
+{     WWT_MATRIX,      RESIZE_RB,  COLOUR_DARK_GREEN,     0,   157,    14,   118, 0x801,                     STR_FUND_INDUSTRY_SELECTION_TOOLTIP},          // DPIW_MATRIX_WIDGET
 {  WWT_SCROLLBAR,     RESIZE_LRB,  COLOUR_DARK_GREEN,   158,   169,    14,   118, 0x0,                       STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // DPIW_SCROLLBAR
 {      WWT_PANEL,     RESIZE_RTB,  COLOUR_DARK_GREEN,     0,   169,   119,   199, 0x0,                       STR_NULL},                             // DPIW_INFOPANEL
-{    WWT_TEXTBTN,     RESIZE_RTB,  COLOUR_DARK_GREEN,     0,   157,   200,   211, STR_FUND_NEW_INDUSTRY,     STR_NULL},                             // DPIW_FUND_WIDGET
-{  WWT_RESIZEBOX,    RESIZE_LRTB,  COLOUR_DARK_GREEN,   158,   169,   200,   211, 0x0,                       STR_RESIZE_BUTTON},                    // DPIW_RESIZE_WIDGET
+{    WWT_TEXTBTN,     RESIZE_RTB,  COLOUR_DARK_GREEN,     0,   157,   200,   211, STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY,     STR_NULL},                             // DPIW_FUND_WIDGET
+{  WWT_RESIZEBOX,    RESIZE_LRTB,  COLOUR_DARK_GREEN,   158,   169,   200,   211, 0x0,                       STR_TOOLTIP_RESIZE},                    // DPIW_RESIZE_WIDGET
 {   WIDGETS_END},
 };
 
@@ -90,13 +90,13 @@ static const NWidgetPart _nested_build_industry_widgets[] = {
 		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, DPIW_CAPTION), SetMinimalSize(159, 14), SetDataTip(STR_FUND_INDUSTRY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetResize(1, 0),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_MATRIX, COLOUR_DARK_GREEN, DPIW_MATRIX_WIDGET), SetMinimalSize(158, 105), SetDataTip(0x801, STR_INDUSTRY_SELECTION_HINT), SetResize(1, 1),
+		NWidget(WWT_MATRIX, COLOUR_DARK_GREEN, DPIW_MATRIX_WIDGET), SetMinimalSize(158, 105), SetDataTip(0x801, STR_FUND_INDUSTRY_SELECTION_TOOLTIP), SetResize(1, 1),
 		NWidget(WWT_SCROLLBAR, COLOUR_DARK_GREEN, DPIW_SCROLLBAR), SetResize(0, 1),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_DARK_GREEN, DPIW_INFOPANEL), SetMinimalSize(170, 81), SetResize(1, 0),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_TEXTBTN, COLOUR_DARK_GREEN, DPIW_FUND_WIDGET), SetMinimalSize(158, 12), SetResize(1, 0), SetDataTip(STR_FUND_NEW_INDUSTRY, STR_NULL),
+		NWidget(WWT_TEXTBTN, COLOUR_DARK_GREEN, DPIW_FUND_WIDGET), SetMinimalSize(158, 12), SetResize(1, 0), SetDataTip(STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY, STR_NULL),
 		NWidget(WWT_RESIZEBOX, COLOUR_DARK_GREEN, DPIW_RESIZE_WIDGET),
 	EndContainer(),
 };
@@ -213,9 +213,9 @@ public:
 		if (_game_mode == GM_EDITOR) {
 			/* We've chosen many random industries but no industries have been specified */
 			if (indsp == NULL) this->enabled[this->selected_index] = _settings_game.difficulty.number_industries != 0;
-			this->widget[DPIW_FUND_WIDGET].data = STR_BUILD_NEW_INDUSTRY;
+			this->widget[DPIW_FUND_WIDGET].data = STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY;
 		} else {
-			this->widget[DPIW_FUND_WIDGET].data = (_settings_game.construction.raw_industry_construction == 2 && indsp->IsRawIndustry()) ? STR_PROSPECT_NEW_INDUSTRY : STR_FUND_NEW_INDUSTRY;
+			this->widget[DPIW_FUND_WIDGET].data = (_settings_game.construction.raw_industry_construction == 2 && indsp->IsRawIndustry()) ? STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY : STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY;
 		}
 		this->SetWidgetDisabledState(DPIW_FUND_WIDGET, !this->enabled[this->selected_index]);
 
@@ -231,7 +231,7 @@ public:
 			bool selected = this->selected_index == i + this->vscroll.pos;
 
 			if (this->index[i + this->vscroll.pos] == INVALID_INDUSTRYTYPE) {
-				DrawString(20, right, y + offset, STR_MANY_RANDOM_INDUSTRIES, selected ? TC_WHITE : TC_ORANGE);
+				DrawString(20, right, y + offset, STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES, selected ? TC_WHITE : TC_ORANGE);
 				continue;
 			}
 			const IndustrySpec *indsp = GetIndustrySpec(this->index[i + this->vscroll.pos]);
@@ -243,13 +243,13 @@ public:
 		}
 
 		if (this->selected_type == INVALID_INDUSTRYTYPE) {
-			DrawStringMultiLine(x_str, x_str + max_width, y_str, wi->bottom, STR_RANDOM_INDUSTRIES_TIP);
+			DrawStringMultiLine(x_str, x_str + max_width, y_str, wi->bottom, STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP);
 			return;
 		}
 
 		if (_game_mode != GM_EDITOR) {
 			SetDParam(0, indsp->GetConstructionCost());
-			DrawString(x_str, right, y_str, STR_INDUSTRY_BUILD_COST);
+			DrawString(x_str, right, y_str, STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST);
 			y_str += 11;
 		}
 
@@ -335,7 +335,7 @@ public:
 					this->HandleButtonClick(DPIW_FUND_WIDGET);
 
 					if (Town::GetNumItems() == 0) {
-						ShowErrorMessage(STR_ERROR_MUST_BUILD_TOWN_FIRST, STR_CAN_T_GENERATE_INDUSTRIES, 0, 0);
+						ShowErrorMessage(STR_ERROR_MUST_BUILD_TOWN_FIRST, STR_ERROR_CAN_T_GENERATE_INDUSTRIES, 0, 0);
 					} else {
 						extern void GenerateIndustries();
 						_generating_world = true;
@@ -682,13 +682,13 @@ static void UpdateIndustryProduction(Industry *i)
 static const Widget _industry_view_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_CREAM,     0,    10,     0,    13, STR_BLACK_CROSS,           STR_TOOLTIP_CLOSE_WINDOW},           // IVW_CLOSEBOX
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_CREAM,    11,   247,     0,    13, STR_INDUSTRY_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // IVW_CAPTION
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_CREAM,   248,   259,     0,    13, 0x0,                       STR_STICKY_BUTTON},                  // IVW_STICKY
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_CREAM,   248,   259,     0,    13, 0x0,                       STR_TOOLTIP_STICKY},                  // IVW_STICKY
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_CREAM,     0,   259,    14,   105, 0x0,                       STR_NULL},                           // IVW_BACKGROUND
 {      WWT_INSET,     RESIZE_RB,  COLOUR_CREAM,     2,   257,    16,   103, 0x0,                       STR_NULL},                           // IVW_VIEWPORT
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_CREAM,     0,   259,   106,   107, 0x0,                       STR_NULL},                           // IVW_INFO
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_CREAM,     0,   129,   108,   119, STR_BUTTON_LOCATION,       STR_INDUSTRY_VIEW_LOCATION_TOOLTIP}, // IVW_GOTO
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_CREAM,   130,   247,   108,   119, 0x0,                       STR_NULL},                           // IVW_SPACER
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_CREAM,   248,   259,   108,   119, 0x0,                       STR_RESIZE_BUTTON},                  // IVW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_CREAM,   248,   259,   108,   119, 0x0,                       STR_TOOLTIP_RESIZE},                  // IVW_RESIZE
 {   WIDGETS_END},
 };
 
@@ -740,34 +740,34 @@ enum IndustryDirectoryWidgets {
 /** Widget definition of the industy directory gui */
 static const Widget _industry_directory_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_BROWN,     0,    10,     0,    13, STR_BLACK_CROSS,         STR_TOOLTIP_CLOSE_WINDOW},             // IDW_CLOSEBOX
-{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_BROWN,    11,   415,     0,    13, STR_INDUSTRYDIR_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // IDW_CAPTION
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   416,   427,     0,    13, 0x0,                     STR_STICKY_BUTTON},                    // IDW_STICKY
+{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_BROWN,    11,   415,     0,    13, STR_INDUSTRY_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // IDW_CAPTION
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   416,   427,     0,    13, 0x0,                     STR_TOOLTIP_STICKY},                    // IDW_STICKY
 
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_BROWN,     0,    80,    14,    25, STR_SORT_BY,             STR_SORT_ORDER_TIP},                   // IDW_DROPDOWN_ORDER
-{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_BROWN,    81,   243,    14,    25, 0x0,                     STR_SORT_CRITERIA_TIP},                // IDW_DROPDOWN_CRITERIA
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_BROWN,     0,    80,    14,    25, STR_BUTTON_SORT_BY,             STR_TOOLTIP_SORT_ORDER},                   // IDW_DROPDOWN_ORDER
+{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_BROWN,    81,   243,    14,    25, 0x0,                     STR_TOOLTIP_SORT_CRITERIAP},                // IDW_DROPDOWN_CRITERIA
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_BROWN,   244,   415,    14,    25, 0x0,                     STR_NULL},                             // IDW_SPACER
 
-{      WWT_PANEL,     RESIZE_RB,  COLOUR_BROWN,     0,   415,    26,   189, 0x0,                     STR_INDUSTRYDIR_LIST_CAPTION},         // IDW_INDUSTRY_LIST
+{      WWT_PANEL,     RESIZE_RB,  COLOUR_BROWN,     0,   415,    26,   189, 0x0,                     STR_INDUSTRY_DIRECTORY_LIST_CAPTION},         // IDW_INDUSTRY_LIST
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_BROWN,   416,   427,    14,   177, 0x0,                     STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // IDW_SCROLLBAR
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_BROWN,   416,   427,   178,   189, 0x0,                     STR_RESIZE_BUTTON},                    // IDW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_BROWN,   416,   427,   178,   189, 0x0,                     STR_TOOLTIP_RESIZE},                    // IDW_RESIZE
 {   WIDGETS_END},
 };
 
 static const NWidgetPart _nested_industry_directory_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN, IDW_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_BROWN, IDW_CAPTION), SetMinimalSize(405, 14), SetDataTip(STR_INDUSTRYDIR_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetResize(1, 0),
+		NWidget(WWT_CAPTION, COLOUR_BROWN, IDW_CAPTION), SetMinimalSize(405, 14), SetDataTip(STR_INDUSTRY_DIRECTORY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), SetResize(1, 0),
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN, IDW_STICKY),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_TEXTBTN, COLOUR_BROWN, IDW_DROPDOWN_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_SORT_BY, STR_SORT_ORDER_TIP),
-				NWidget(WWT_DROPDOWN, COLOUR_BROWN, IDW_DROPDOWN_CRITERIA), SetMinimalSize(163, 12), SetDataTip(0x0, STR_SORT_CRITERIA_TIP),
+				NWidget(WWT_TEXTBTN, COLOUR_BROWN, IDW_DROPDOWN_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+				NWidget(WWT_DROPDOWN, COLOUR_BROWN, IDW_DROPDOWN_CRITERIA), SetMinimalSize(163, 12), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIAP),
 				NWidget(WWT_PANEL , COLOUR_BROWN, IDW_SPACER), SetResize(1, 0),
 				EndContainer(),
 			EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_BROWN, IDW_INDUSTRY_LIST), SetMinimalSize(416, 164), SetDataTip(0x0, STR_INDUSTRYDIR_LIST_CAPTION), SetResize(1, 1),
+			NWidget(WWT_PANEL, COLOUR_BROWN, IDW_INDUSTRY_LIST), SetMinimalSize(416, 164), SetDataTip(0x0, STR_INDUSTRY_DIRECTORY_LIST_CAPTION), SetResize(1, 1),
 			EndContainer(),
 		EndContainer(),
 		NWidget(NWID_VERTICAL),
@@ -964,8 +964,8 @@ public:
 			}
 
 			/* Drawing the right string */
-			StringID str = STR_INDUSTRYDIR_ITEM_NOPROD;
-			if (p != 1) str = (p == 5) ? STR_INDUSTRYDIR_ITEM : STR_INDUSTRYDIR_ITEM_TWO;
+			StringID str = STR_INDUSTRY_DIRECTORY_ITEM_NOPROD;
+			if (p != 1) str = (p == 5) ? STR_INDUSTRY_DIRECTORY_ITEM : STR_INDUSTRY_DIRECTORY_ITEM_TWO;
 			DrawString(4, this->widget[IDW_INDUSTRY_LIST].right, y, str);
 
 			y += 10;
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index cf0f0bb13..ffcc83f97 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -118,7 +118,7 @@ struct SelectGameWindow : public Window {
 
 			case SGI_PLAY_NETWORK:
 				if (!_network_available) {
-					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERROR_NOTAVAILABLE, 0, 0);
 				} else {
 					ShowNetworkGameWindow();
 				}
@@ -137,7 +137,7 @@ struct SelectGameWindow : public Window {
 			case SGI_GRF_SETTINGS:    ShowNewGRFSettings(true, true, false, &_grfconfig_newgame); break;
 			case SGI_CONTENT_DOWNLOAD:
 				if (!_network_available) {
-					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERROR_NOTAVAILABLE, 0, 0);
 				} else {
 					ShowNetworkContentListWindow();
 				}
@@ -287,7 +287,7 @@ void AskExitGame()
 #endif
 	ShowQuery(
 		STR_QUIT_CAPTION,
-		STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD,
+		STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD,
 		NULL,
 		AskExitGameCallback
 	);
@@ -303,7 +303,7 @@ void AskExitToGameMenu()
 {
 	ShowQuery(
 		STR_ABANDON_GAME_CAPTION,
-		(_game_mode != GM_EDITOR) ? STR_ABANDON_GAME_QUERY : STR_QUIT_SCENARIO_QUERY,
+		(_game_mode != GM_EDITOR) ? STR_ABANDON_GAME_QUERY : STR_ABANDOM_SCENARIO_QUERY,
 		NULL,
 		AskExitToGameMenuCallback
 	);
diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt
index f7931d34c..ae5030150 100644
--- a/src/lang/afrikaans.txt
+++ b/src/lang/afrikaans.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kaart -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spel Opsies
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Boodskap
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Boodskap van {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Versigtig!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Versigtig!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Kan dit nie doen nie....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kan nie hierdie area skoon maak nie....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Oorspronklike kopiereg {COPYRIGHT} 1995 Chris Sawyer, Alle regte voorbehou
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Die OpenTTD span
 
 STR_QUIT_CAPTION                                                :{WHITE}Verlaat
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nee
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Is u seker u wil OpenTTD verlaat en terug keer na {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nee
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Is u seker u wil OpenTTD verlaat en terug keer na {STRING}?
 
 STR_JUST_NOTHING                                                :Niks
 STR_COLOUR_DARK_BLUE                                            :Donker Blou
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Woestyn
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sneeu
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Boodskap
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Gewone
-STR_QUERY_CANCEL                                                :{BLACK}Kanselleer
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Hernoem
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Gewone
+STR_BUTTON_CANCEL                                               :{BLACK}Kanselleer
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Hernoem
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Vrag
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Inligting
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapasiteite
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Totaale Vrag
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totaale vrag kapasitiet van die trein:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Totaale vrag kapasitiet van die trein:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nuwe Spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Laai Spel
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Veelspeler
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Draaiboek Redakteur
 
-STR_MAPSIZE                                                     :{BLACK}Kaart groote:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kaart groote:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spel Opsies
 
 STR_COMPANY_SOMEONE                                             :iemand{SKIP}{SKIP}
@@ -309,10 +309,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Verlaat spel
 STR_FILE_MENU_EXIT                                              :Gaan uit
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Is jy seker jy wil die speletjie verlaat?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Verlaat Spel
-STR_SORT_ORDER_TIP                                              :{BLACK}Selekteer sorteer orde (afklimende/klimende)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selekteer sorteer maatstaf
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selekteer filtrering kriteria
-STR_SORT_BY                                                     :{BLACK}Sorteer by
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selekteer sorteer orde (afklimende/klimende)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selekteer sorteer maatstaf
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selekteer filtrering kriteria
+STR_BUTTON_SORT_BY                                              :{BLACK}Sorteer by
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populasie
@@ -344,24 +344,24 @@ STR_SORT_BY_RUNNING_COST                                        :Loopkoste
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Krag/Loopkoste
 STR_SORT_BY_CARGO_CAPACITY                                      :Vrag Kapasiteit
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Geen vrag van enige tipe is op wag
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Kies alle fakulteite
-STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vrag tipes (geen wag vrag ingesluit)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Toon 'n lys van beskikbaare enjin tipes vir die voertiug tipe.
-STR_MANAGE_LIST                                                 :{BLACK}Bestuur lys
-STR_MANAGE_LIST_TIP                                             :{BLACK}Stuur instruksies na alle voertuie in die lys
-STR_REPLACE_VEHICLES                                            :Vervang voertuie
-STR_SEND_FOR_SERVICING                                          :Stuur vir Diens
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Beskikbaar Treine
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Beskikbaar Voertuie
-STR_AVAILABLE_SHIPS                                             :{BLACK}Beskikbaar Skepe
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Beskikbaar Vliegtuie
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Stuur na Depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur na Depot
-STR_SEND_SHIP_TO_DEPOT                                          :Stuur na Depot
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur na Hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Geen vrag van enige tipe is op wag
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Kies alle fakulteite
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Kies alle vrag tipes (geen wag vrag ingesluit)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Toon 'n lys van beskikbaare enjin tipes vir die voertiug tipe.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Bestuur lys
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Stuur instruksies na alle voertuie in die lys
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vervang voertuie
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Stuur vir Diens
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Beskikbaar Treine
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Beskikbaar Voertuie
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Beskikbaar Skepe
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Beskikbaar Vliegtuie
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Stuur na Depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Stuur na Depot
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Stuur na Depot
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Stuur na Hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -391,12 +391,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opsies
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan nie diens interval verander nie...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Maak venster toe
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Venster titel - sleep om venster te beweeg
-STR_STICKY_BUTTON                                               :{BLACK}Merk die venster as ontoemaakbaar met die"Sluit Alle Vensters" sleutel
-STR_RESIZE_BUTTON                                               :{BLACK}Kliek en sleep om venster te vergroot
+STR_TOOLTIP_STICKY                                              :{BLACK}Merk die venster as ontoemaakbaar met die"Sluit Alle Vensters" sleutel
+STR_TOOLTIP_RESIZE                                              :{BLACK}Kliek en sleep om venster te vergroot
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kliek hier om na die huidige spaar/laai lêer te spring
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Vernietig geboue ens. op 'n vierkant van land
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Verlaag 'n hoek van land
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Verhoog 'n hoek van land
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Verlaag 'n hoek van land
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Verhoog 'n hoek van land
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rol staaf - rol die lys op/af
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rol baan - rol die lys op/af
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Toon land hoogtelyne op landkaart
@@ -409,14 +409,14 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Tokkel d
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Wins die jaar: {CURRENCY} (verlede jaar: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} ja{P ar re} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ja{P ar re} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ja{P ar re} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ja{P ar re} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Trein
-STR_VEHICLE_ROAD_VEHICLE                                        :Pad voertuig
-STR_VEHICLE_SHIP                                                :Skip
-STR_VEHICLE_AIRCRAFT                                            :Vliegtuig
+STR_REPLACE_VEHICLE_TRAIN                                       :Trein
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Pad voertuig
+STR_REPLACE_VEHICLE_SHIP                                        :Skip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Vliegtuig
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} raak oud.
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} raak baie oud.
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} raak baie oud en benodig dringende vervanging.
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Spoorweg
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Plaaslike raad: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Geen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Naam
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1ste
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kliek op
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kliek op musiek lied om te verwyder van huidige program (Slegs Gewoonte1 of Gewoonte2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Tokkel musiek lys skommel aan/af
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Vertoon liedjie keuse venster
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Kliek op diens om uitsig op die nywerheid/stad te senter
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Kliek op diens om uitsig op die nywerheid/stad te senter
 STR_INTRO_DIFFICULTY                                            :{BLACK}Moeilikheid ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Laaste boodskap/nuus verslag
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Verminde
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Genereer lukraake land
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Herstel landskap
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Herstel Landskap
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Verwyder alle speler-besit eiendom van die kaart af
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Verwyder alle speler-besit eiendom van die kaart af
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Is jy seker u wil alle speler-besit eiendom verwyder?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landskap generasie
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Dorp generasie
@@ -606,8 +606,8 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...te na
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...te naby aan 'n ander dorp
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...ligging ongeskik
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...te veel dorpe
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan nie enige stede bou nie
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...daar is nie meer spasie oor op die kaart nie
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan nie enige stede bou nie
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...daar is nie meer spasie oor op die kaart nie
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}vermeerder grootte van dorp
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Brei uit
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Lukraak Dorp
@@ -623,13 +623,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Plaas ro
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Plaas ligtoring
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Plaas sender
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Bepaal woestyn gebied.{}Druk en hou in CTRL om te verwyder
-STR_CREATE_LAKE                                                 :{BLACK}Bepaal water area.{}Maak 'n kanaal, tensy CTRL is ingehou teen seevlak, dan sal dit vloed vul die omgewings
-STR_CREATE_RIVER                                                :{BLACK}Plaas riviere
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Bepaal water area.{}Maak 'n kanaal, tensy CTRL is ingehou teen seevlak, dan sal dit vloed vul die omgewings
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Plaas riviere
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Vee uit
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Vee hierdie dorp heeltemal uit
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Stoor draaiboek
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Laai draaiboek
-STR_MENU_LOAD_HEIGHTMAP                                         :Laai Hoogtekaart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Laai Hoogtekaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Verlaat redigeerder
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Verlaat
@@ -639,7 +639,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Stoor Dr
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Speel Draaiboek
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Speel Hoogtekaart
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}begin 'n nuwe speletjie, gebruikend 'n hoogtekaart as 'n landskap
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Is jy seker jy wil die draaiboek verlaat?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Is jy seker jy wil die draaiboek verlaat?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kan slegs in dorpe met te minste 1200 mense gebou word
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Beweeg die begin datum 1 jaar terug
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Beweeg die begin datum 1 jaar voorentoe
@@ -651,12 +651,12 @@ STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Kies dorp groote
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Dorp groote:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Straat uitleg van dorp:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Kies straat uitleg ingebruik vir dorp
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Oorspronklik
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Beter strate
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Straat uitleg van dorp:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Kies straat uitleg ingebruik vir dorp
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Oorspronklik
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Beter strate
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Toon laaste boodskap of nuus verslag
 STR_NEWS_MESSAGES_OFF                                           :Af
 STR_NEWS_MESSAGES_SUMMARY                                       :Opsomming
@@ -754,10 +754,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ST
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Skermskoot suksesvol gestoor as '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Skermskoot het misluk!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Koop land vir gebruk in die toekoms
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Koop land vir gebruk in die toekoms
 STR_STATUSBAR_AUTOSAVE                                          :{RED}OUTOSTOOR
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SPAAR  SPELETJIE  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Spaar nog in vorder, {}wag asb tot dit klaar is!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Spaar nog in vorder, {}wag asb tot dit klaar is!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Kies 'Ezy Straat styl musiek' program
 
 ############ start of townname region
@@ -820,7 +820,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Kies die
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Volskerm
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kies die blokkie om OpenTTD in volleskerm te speel
-STR_FULLSCREEN_FAILED                                           :{WHITE}Volskerm metode gedop
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Volskerm metode gedop
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skerm resolusie
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Kies die skerm resolusie om te gebruik
@@ -833,12 +833,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kies die
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} verlore / korrupte ler{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Addisioneel informasie oor die basis grapfieke stel
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Outostoor het misluk
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Outostoor het misluk
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Op pad na {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Op pad na {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Geen opdrae
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Geen opdrae, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Op pad na {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Op pad na {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Geen opdrae
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Geen opdrae, {VELOCITY}
 
 STR_PASSENGERS                                                  :passasiers
 STR_BAGS                                                        :sakke
@@ -849,9 +849,9 @@ STR_CRATES                                                      :hokke
 STR_RES_OTHER                                                   :ander
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan nie opdraglys deel nie...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan nie opdrag lys kopie nie...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Einde van Gedeel Opdrae - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kan nie opdraglys deel nie...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kan nie opdrag lys kopie nie...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Einde van Gedeel Opdrae - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} kan nie 'n roete vind om aan te gaan nie.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} is verlore.
@@ -1103,15 +1103,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-groot
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :gestrem
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Verander stel waarde
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Verander stel waarde
 
-STR_TEMPERATE_LANDSCAPE                                         :Magtig landskap
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-artiese landskap
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropiese landskap
-STR_TOYLAND_LANDSCAPE                                           :Speelgoedland landskap
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Magtig landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub-artiese landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub-tropiese landskap
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Speelgoedland landskap
 
 STR_CHEATS                                                      :{WHITE}Kullery
-STR_CHEATS_TIP                                                  :{BLACK}Tikblokkies wys ann as jy die bedreig vroeë gebruik het
+STR_CHEATS_TOOLTIP                                              :{BLACK}Tikblokkies wys ann as jy die bedreig vroeë gebruik het
 STR_CHEATS_WARNING                                              :{BLACK}Waarskuwing! U staan op die punt om jou mededinger te verrai. Hou in gedagte dat so 'n skande sal vir ewigheid onthou word.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Vermeerder geld by {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Speel as maatskappy: {ORANGE}{COMMA}
@@ -1123,176 +1123,176 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Skakel
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Verander datum: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ontsper modifisering van produksie waardes: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Op pad na {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Op pad na {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Op pad na {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Op pad na {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Gaan oor {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Gaan deurgaande oor {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Gaan oor {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Gaan deurgaande oor {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Wegpunt {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Wegpunt {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Wegpunt
+STR_FORMAT_WAYPOINT_NAME                                        :Wegpunt {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Wegpunt {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Wegpunt
 
-STR_WAYPOINT                                                    :{WHITE}Wegpunt
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Kies wegpunt tipe
+STR_WAYPOINT_CAPTION                                            :{WHITE}Wegpunt
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Kies wegpunt tipe
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Redigeer wegpunt naam
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan nie wegpunt naam verander nie...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan nie wegpunt naam verander nie...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Verdoel spoor na wegpunt
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kanie nie trein wegpunt hier bou nie...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan nie trein wegpunt van hier werwyder nie...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kanie nie trein wegpunt hier bou nie...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan nie trein wegpunt van hier werwyder nie...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Bou spoorweg spoor met die Outospoor metode
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...daar is geen dorp in die draaiboek
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...daar is geen dorp in die draaiboek
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Baie lukraak dorpe
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Maak die kaart vol met wildweg geplaased dorpe
-STR_MANY_RANDOM_INDUSTRIES                                      :Baie luraak nywehede
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Maak die kaart vol met wildweg geplaased nywerhede
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kan nie nywerhede opwek nie...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Baie lukraak dorpe
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Maak die kaart vol met wildweg geplaased dorpe
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Baie luraak nywehede
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Maak die kaart vol met wildweg geplaased nywerhede
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan nie nywerhede opwek nie...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Oppe die landargitekteur werktuigbaan om land te verhoog/verlaag, boome beplant, ens.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landargitekteur
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Vlakte daal
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Vlakte daal
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Boome van lukraak tipe
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plaas boome van lukraak tipe
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plaas boome van lukraak tipe
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kan nie kanaale hier bou nie...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kan nie kanaale hier bou nie...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Bou kanaale.
-STR_LANDINFO_CANAL                                              :Kanaal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanaal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan nie sluite hier bou nie...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kan nie sluite hier bou nie...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Bou sluite
-STR_LANDINFO_LOCK                                               :Sluit
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sluit
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Can nie riviere hier plaas nie...
-STR_LANDINFO_RIVER                                              :Rivier
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Can nie riviere hier plaas nie...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rivier
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...baken is in gebruik!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...baken is in gebruik!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koördineer: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koördineer: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan nie deel van stasie verwyder nie...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan nie spoor tipe hier verdoel nie...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan nie deel van stasie verwyder nie...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan nie spoor tipe hier verdoel nie...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Verdoel/Opgradeer die spoor tipe
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Sleep trein enjin hier om hele trein te verkoop
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Sleep trein enjin hier om hele trein te verkoop
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Sleep & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bou 'n stasie gebruikend sleep & drop
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Kies 'n stasie klas om te vertoon
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Kies die stasie tipe om te bou
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Kies 'n stasie klas om te vertoon
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Kies die stasie tipe om te bou
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Vinnig vooruit die spel
 STR_MESSAGE_HISTORY                                             :{WHITE}Boodskap Geskidenis
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}'n Lys van al die onlangs nuus boodskappe
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Sper alle
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Ontsper alle
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}'n Lys van al die onlangs nuus boodskappe
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Sper alle
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Ontsper alle
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Nywerhede
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% uitgevoer)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% uitgevoer)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nywerheid name - kliek op naam om uitsig op die nywerheid te plaas
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Nywerhede
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% uitgevoer)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% uitgevoer)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nywerheid name - kliek op naam om uitsig op die nywerheid te plaas
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...te naby aan 'n ander nywerheid
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...te naby aan 'n ander nywerheid
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Verander produksie
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multispeler
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Speler naam:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Die is die naam waarmee ander spelers sal jou aanwys
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Tik in jou naam
-STR_NETWORK_CONNECTION                                          :{BLACK}Verbinding:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Kies teen internet spel of 'n Plaaslike Area Netwerk (LAN) spel
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Begin verskaffer
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Begin u eie verskaffer
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Naam
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Naam van die speletjie
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Taal, bediender verwerking, ens.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Kliek 'n speletjie van die lys om dit te selekteer
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Die bedienaar wat jy laaste aan deelgeneem het
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Die bedienaar wat jy laaste op gespeel het
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Versoek verskaffer
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Versoek netwerk vir 'n verskaffer
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Byvoeg Bediender
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Voeg 'n verskaffer tot die lys wat sal altyd wees gemerk vir loopende speletjies.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Invoeg die adres van die gasheer
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliente
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliente oplyn / Kliente maks{}Maatskappye oplyn / Maatskappye maks
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Landkaart grote
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Landkaart grote van die speeletjie{}Kliek om volgens area te sorteer
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Huidigge datum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}jare
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Hoeveelheid jaar{}wat die speeletjie hardloop
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMASIE
-STR_NETWORK_CLIENTS                                             :{SILVER}Kliente:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Taal:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Blokkiestel:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaart groote:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verskaffer hersiening:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Verskaffer adres:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Begin datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Huidige datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Wagwoord beskerm!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}VERSKAFFER AFLYN
-STR_NETWORK_SERVER_FULL                                         :{SILVER}VERSKAFFER VOL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}HERSIENING ONGELYK
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MISPAS
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Verbind spel
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Begin nuwe multispeler speletjie
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spel naam:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Die spel naam sal vertoon word na ander spelers in die multispeler keuse
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Tik 'n naam in vir die netwerk speeletjie
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Stel wagwoord
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Beskerm jou spel met 'n wagwoord as jy wil dit nie publieke toepassing laat wees nie
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Kies 'n kaart
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Watter kaart wil jy speel?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (adverteer)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} Klient{P "" e}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maks kliente:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Kies die maksimum nommer van kliente. Alle gleufe hoef nie om vol te wees nie
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Maatskap{P py pye}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks maatskappye:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Beperk die verskaffer na 'n sekere bedrag van maatskappye
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} aanskouer{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks aanskouers:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Beperk die verskaffer na 'n sekere bedrag van aanskouers
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Taal gepraat:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Ander spelers sal weet watter taal op die verskaffer gepraat is
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Begin Speletjie
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Begin 'n nuwe netwerk spel van 'n lukraak kaart of draaiboek
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Laai Speletjie
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Hervat 'n vroeër gespaar multispeler speletjie (wees seker om te konnekteer as die korrekte speler)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multispeler
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Tik in jou naam
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Verbinding:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Kies teen internet spel of 'n Plaaslike Area Netwerk (LAN) spel
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Begin verskaffer
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Begin u eie verskaffer
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Naam
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Naam van die speletjie
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Taal, bediender verwerking, ens.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Kliek 'n speletjie van die lys om dit te selekteer
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Die bedienaar wat jy laaste aan deelgeneem het
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Die bedienaar wat jy laaste op gespeel het
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Versoek verskaffer
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Versoek netwerk vir 'n verskaffer
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Byvoeg Bediender
+STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Voeg 'n verskaffer tot die lys wat sal altyd wees gemerk vir loopende speletjies.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Invoeg die adres van die gasheer
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Kliente
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Kliente oplyn / Kliente maks{}Maatskappye oplyn / Maatskappye maks
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Landkaart grote
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Landkaart grote van die speeletjie{}Kliek om volgens area te sorteer
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Huidigge datum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}jare
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Hoeveelheid jaar{}wat die speeletjie hardloop
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPEL INFORMASIE
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Kliente:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Taal:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Blokkiestel:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kaart groote:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Verskaffer hersiening:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Verskaffer adres:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Begin datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Huidige datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Wagwoord beskerm!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}VERSKAFFER AFLYN
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}VERSKAFFER VOL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}HERSIENING ONGELYK
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF MISPAS
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Verbind spel
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Begin nuwe multispeler speletjie
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spel naam:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Die spel naam sal vertoon word na ander spelers in die multispeler keuse
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Tik 'n naam in vir die netwerk speeletjie
+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_SELECT_MAP                             :{BLACK}Kies 'n kaart
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Watter kaart wil jy speel?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (adverteer)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} Klient{P "" e}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maks kliente:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Kies die maksimum nommer van kliente. Alle gleufe hoef nie om vol te wees nie
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Maatskap{P py pye}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maks maatskappye:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Beperk die verskaffer na 'n sekere bedrag van maatskappye
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} aanskouer{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maks aanskouers:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Beperk die verskaffer na 'n sekere bedrag van aanskouers
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Taal gepraat:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Ander spelers sal weet watter taal op die verskaffer gepraat is
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Begin Speletjie
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Begin 'n nuwe netwerk spel van 'n lukraak kaart of draaiboek
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Laai Speletjie
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Hervat 'n vroeër gespaar multispeler speletjie (wees seker om te konnekteer as die korrekte speler)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Enige
@@ -1328,33 +1328,33 @@ STR_NETWORK_LANG_AFRIKAANS                                      :Afrikaans
 STR_NETWORK_LANG_GREEK                                          :Grieks
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multispeler spel tuiste
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Multispeler spel tuiste
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Voorberei om te verbind:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}'n Lys van alle ondernemings tans in hierdie speletjie. U kan een van beide sluit aan een of begin 'n nuwe een indien daar is 'n vry maatskappy gleuf
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nuwe Maatskappy
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Skep 'n nuwe maatskappy
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Aanskou speletjie
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Bekyk die spel as 'n aanskouer
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Verbind maatskappy
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Hulp om die maatskappy te bestuur
-STR_NETWORK_REFRESH                                             :{BLACK}Vervris verskaffer
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Vervris die verskaffer inligting
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Voorberei om te verbind:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}'n Lys van alle ondernemings tans in hierdie speletjie. U kan een van beide sluit aan een of begin 'n nuwe een indien daar is 'n vry maatskappy gleuf
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nuwe Maatskappy
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Skep 'n nuwe maatskappy
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Aanskou speletjie
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Bekyk die spel as 'n aanskouer
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Verbind maatskappy
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hulp om die maatskappy te bestuur
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Vervris verskaffer
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Vervris die verskaffer inligting
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}MAATSKAPPY INFORMASIE
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}MAATSKAPPY INFORMASIE
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Maatskappy naam:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inwyding:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Maatskappy waarde:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Hudige balans:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Verlede jaar se inkome:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestasie:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Maatskappy naam:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inwyding:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Maatskappy waarde:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Hudige balans:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Verlede jaar se inkome:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Prestasie:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Voertuie:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasies:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spelers:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Voertuie:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stasies:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spelers:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Besig om the konnek...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Besig om the konnek...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Konnek...
@@ -1370,61 +1370,61 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Haal maa
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Klient{P "" e} voor jou
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} afgelaai dusver
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Loskoppel
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Loskoppel
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sleutel die bedrag geld in wat u wil gee
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Verskaffer is beskerm. Invoeg wagwoord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Maatskappy is beskerm. Invoeg wagwoord
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klient Lys
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klient Lys
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuwe Maatskapy
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Geen netwerk ontwerp gevind of voldoen sonder ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kan nie enige netwerk speletjies vind nie
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Die verskaffer het nie die versoek geantwoord nie
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kan nie konnekteer te danke aan newgrf mispas nie
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netwerk-Spel sinchroniseering gedop
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Netwerk-Spel verbinding verloor
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kan nie spaarspel laai nie
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Verskaffer kan nie aangesit word nie
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Kan nie verbinding kry nie
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Verbinding #{NUM} het betyds uitgeloop
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} A protokol-fout was gemaak en die verbinding was verlore
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Die hersiening van die klient is nie gelyk aan die verskaffer se hersiening nie
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Verkeerde wagwoord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Die verskaffer is vol
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Jy is van die verskaffer verban
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Jy is van die spel geskop
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Bedrieg is nie toegelaat op hierdie verskaffer
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Geen netwerk ontwerp gevind of voldoen sonder ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Kan nie enige netwerk speletjies vind nie
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Die verskaffer het nie die versoek geantwoord nie
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Kan nie konnekteer te danke aan newgrf mispas nie
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Netwerk-Spel sinchroniseering gedop
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Netwerk-Spel verbinding verloor
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Kan nie spaarspel laai nie
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Verskaffer kan nie aangesit word nie
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Kan nie verbinding kry nie
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Verbinding #{NUM} het betyds uitgeloop
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} A protokol-fout was gemaak en die verbinding was verlore
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Die hersiening van die klient is nie gelyk aan die verskaffer se hersiening nie
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Verkeerde wagwoord
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Die verskaffer is vol
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Jy is van die verskaffer verban
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Jy is van die spel geskop
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Bedrieg is nie toegelaat op hierdie verskaffer
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :algemeen fout
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync fout
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kan nie kaart laai nie
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :verbinding verloor
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokol fout
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF mispas
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nie gemagtig nie
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :vreemde pakket aanvaar
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :verkeerde hersiening
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :naam reeds in gebruik
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :verkeerde wagwoord
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :verkeerde maatskapy-id in DoenBevel
-STR_NETWORK_ERR_CLIENT_KICKED                                   :geskop by verskaffer
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :het probeer om 'n bedreig te gebruik
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :verskaffer vol
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemeen fout
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desync fout
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :kan nie kaart laai nie
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :verbinding verloor
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokol fout
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF mispas
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nie gemagtig nie
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :vreemde pakket aanvaar
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :verkeerde hersiening
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :naam reeds in gebruik
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :verkeerde wagwoord
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :verkeerde maatskapy-id in DoenBevel
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :geskop by verskaffer
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :het probeer om 'n bedreig te gebruik
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :verskaffer vol
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS                  :Speletjie gepoos (not enough players)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS                :Speletjie ongepoos (genoeg spelers)
 STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Speletjie gepoos (konnekteer kliënt)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} het by die spel aangesluit
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} het by besigheid  #{2:NUM} aangesluit
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} het aangesluit by die spektators
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} het die spel verlaat ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} het sy/haar naam verander na {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} het jou besigheid {2:CURRENCY} gegee
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Jy het {1:STRING} {2:CURRENCY} gegee
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} het by die spel aangesluit
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} het by besigheid  #{2:NUM} aangesluit
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} het aangesluit by die spektators
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} het die spel verlaat ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} het sy/haar naam verander na {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} het jou besigheid {2:CURRENCY} gegee
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Jy het {1:STRING} {2:CURRENCY} gegee
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Span] :
 STR_NETWORK_CHAT_COMPANY                                        :[Span] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Span] Na {STRING}: {WHITE}{STRING}
@@ -1434,8 +1434,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privaat] Na {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Tik woord in vir netwerk kominikasie
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Die verskaffer het die sessie toegemaak
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Die verskaffer is besig om te weerbegin...{}Wag asb...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Die verskaffer het die sessie toegemaak
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Die verskaffer is besig om te weerbegin...{}Wag asb...
 
 STR_NETWORK_SERVER                                              :Verskaffer
 STR_NETWORK_CLIENT                                              :Klient
@@ -1449,19 +1449,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Praat met maats
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privaate boodskap
 
 
-STR_NETWORK_SEND                                                :{BLACK}Stuur
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Stuur
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kan nie landskap van PNG laai nie...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...lêer nie gevind nie.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan nie prent tipe verdoel. 8 of 24-bit PNG prent vereis.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...iets het verkeerd gegaan. Jammer. (moontlik korrup lêer)
+STR_ERROR_PNGMAP                                                :{WHITE}Kan nie landskap van PNG laai nie...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...lêer nie gevind nie.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...kan nie prent tipe verdoel. 8 of 24-bit PNG prent vereis.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...iets het verkeerd gegaan. Jammer. (moontlik korrup lêer)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kan nie landskap van BMP laai nie...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan nie beeld tipe verdoel nie.
+STR_ERROR_BMPMAP                                                :{WHITE}Kan nie landskap van BMP laai nie...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...kan nie beeld tipe verdoel nie.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Koste: {CURRENCY}
@@ -1475,13 +1475,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Beraamde
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}kan nie land hier verhoog nie...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kan nie land hier verlaag nie...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan nie grond hier gelyk maak nie...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rotse
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Ongelyke land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Kaal land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gras
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Velde
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Sneeu-bedekte land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Woestyn
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rotse
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Ongelyke land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Kaal land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Velde
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Sneeu-bedekte land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Woestyn
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Land loop in verkeerde rigting
@@ -1489,11 +1489,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Onmoontl
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Uitgrawings sal tonnel beskadig
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... reeds op seevlak
 STR_ERROR_TOO_HIGH                                              :{WHITE}... te hoog
-STR_ALREADY_LEVELLED                                            :{WHITE}... klaar gelyk
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... klaar gelyk
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Geen geskikte spoor
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...alreeds gebou
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Moet eers spoor verwyder
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Pad is een rigting of geblok
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Pad is een rigting of geblok
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Spoorweg Kostruksie
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrifiseerde Spoorweg Konstruksie
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Enkelspoor Konstruksie
@@ -1517,40 +1517,40 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Bou spoo
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bou spoorweg brug
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bou spoorweg tonnel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Tokkel bou/verwyder vir spoore en seinligte
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brug seleksie - kliek op jou verkose brug om dit te bou
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brug seleksie - kliek op jou verkose brug om dit te bou
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Kies spoorweg skuur orientasie
-STR_RAILROAD_TRACK                                              :Spoorweg
-STR_RAILROAD_TRAIN_DEPOT                                        :Spoorweg trein skuur
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Spoorweg
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Spoorweg trein skuur
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...gebied is besit deur 'n ander maatskappy
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Spoorweg spoor met gewone seine
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Spoorweg spoor met gewone seine
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Spoorweg spoor met uitgang-seine
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Spoorweg spoor met kombo-seine
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Treinspoor met rigting aanwysers
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Treinspoor met een-rigting aanwysers
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Spoorweg spoor met gewone en pre-seine
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Spoorweg spoor met geowne en uitgang-seine
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Spoorweg spoor met gewone en kombo-seine
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Trainspoor met blok en rigting aanwysers
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Trainspoor met blok en een-rigting aanwysers
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Spoorweg spoor met pre- en uitgang-seine
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Spoorweg spoor met pre- en kombo-seine
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Spoorweg spoor met pre- en pad seiene
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Spoorweg spoor met pre- en een-rigting seiene
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Spoorweg spoor met uitgang- en kombo-seine
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Spoorweg spoor met afklim- en pad seiene
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Treinspoor met afklim- en een-rigting aanwysers
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Trainspoor met kombineer- en rigting aanwysers
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Trainspoor met kombineer- en een-rigting aanwysers
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Trainspoor met rigting- en een-rigting aanwysers
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Moet eers spoorweg stasie verwyder
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Sluit by stasie aan
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Spoorweg spoor met gewone seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Spoorweg spoor met gewone seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Spoorweg spoor met uitgang-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Spoorweg spoor met kombo-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Treinspoor met rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Treinspoor met een-rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Spoorweg spoor met gewone en pre-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Spoorweg spoor met geowne en uitgang-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Spoorweg spoor met gewone en kombo-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Trainspoor met blok en rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Trainspoor met blok en een-rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Spoorweg spoor met pre- en uitgang-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Spoorweg spoor met pre- en kombo-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Spoorweg spoor met pre- en pad seiene
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Spoorweg spoor met pre- en een-rigting seiene
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Spoorweg spoor met uitgang- en kombo-seine
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Spoorweg spoor met afklim- en pad seiene
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Treinspoor met afklim- en een-rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Trainspoor met kombineer- en rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Trainspoor met kombineer- en een-rigting aanwysers
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Trainspoor met rigting- en een-rigting aanwysers
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Moet eers spoorweg stasie verwyder
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Sluit by stasie aan
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Moet pad eers verwyder word
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Pad werke in verloop
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Pad werke in verloop
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Pad Konstruksie
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Tremweg Konstruksie
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selekteer Pad Brug
@@ -1586,14 +1586,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Bou trem
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktifeer/Deaktifeer ee-rigting paaie
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Tokkel bou/verwyder vir pad bou
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Tokkel bou/verwyder vir tremweg konstruksie
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Kies pad voertuig depot orientasie
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Kies trem voertuig depot orientasie
-STR_ROAD_DESCRIPTION_ROAD                                       :Pad
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Pad met straatligte
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Boom-belynde pad
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Pad voertuig depot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Pad/spoor vlak kruising
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tremweg
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Kies pad voertuig depot orientasie
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Kies trem voertuig depot orientasie
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Pad
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Pad met straatligte
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Boom-belynde pad
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Pad voertuig depot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Pad/spoor vlak kruising
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tremweg
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan nie bus stasie verwyder nie...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan nie vragmotor stasie verwyder stasie...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan nie passasier stasie verwyder nie...
@@ -1601,12 +1601,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kan nie
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Dorpe
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Gebou moet eers afgebreek word
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (City)
@@ -1619,7 +1619,7 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Senter s
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Verander dorp naam
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passasiers verlede maand: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Pos verlede maand: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} gelewer laas maand
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} gelewer laas maand
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Hoog kantoor blok
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kantoor blok
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Klein blok van woonstelle
@@ -1691,7 +1691,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Verkeer warboel in {TOWN}!{}{}Pad heropbou program befonds deur {STRING} bring 6 maande van ellende na motoriste!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (onder konstruksie)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (onder konstruksie)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igloo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tepees
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teepot-Huis
@@ -1704,17 +1704,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Plaas teken
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Boome
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...boom reeds daar
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan nie boom hier beplant nie...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...te veel tekens
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan nie teken hier plaas nie...
-STR_SIGN_DEFAULT                                                :Teken
+STR_DEFAULT_SIGN_NAME                                           :Teken
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Redigeer teken teks
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan nie teken naam verander nie...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan nie teken verwyder nie
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Kies boom tipe om te beplant
-STR_TREE_NAME_TREES                                             :Boome
-STR_TREE_NAME_RAINFOREST                                        :Reenwoud
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktus Plante
+STR_LAI_TREE_NAME_TREES                                         :Boome
+STR_LAI_TREE_NAME_RAINFOREST                                    :Reenwoud
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktus Plante
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Spoor Stasie Keuse
@@ -1734,7 +1734,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Moet eer
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Te naby aan 'n ander lughawe
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Moet eers lughawe afbreek
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Hernoem stasie/laai area
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Hernoem stasie/laai area
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Stasie kan nie hernoem word nie...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Graderings
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aanvaar
@@ -1752,10 +1752,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Treffend
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Toon alle treine wat hierdie stasie op hul skedule het
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Toon alle pad voertuie wat hierdie stasie op hul skedule het
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Toon alle vliegtuie wat hierdie stasie op hul skedule het
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Toon alle skepe wat hierdie stasie op hul skedule het
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Toon alle treine wat hierdie stasie op hul skedule het
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Toon alle pad voertuie wat hierdie stasie op hul skedule het
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Toon alle vliegtuie wat hierdie stasie op hul skedule het
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Toon alle skepe wat hierdie stasie op hul skedule het
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} aanvaar nie meer {STRING} nie
@@ -1788,47 +1788,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Verander
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Toon lys van aanvaarde vrag
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stasie naame - Kliek naam om skerm op stasie te senter
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Kies groote/tipe van lughawe
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Spoorweg stasie
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Vliegtuig hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lughawe
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Vragmotor laai area
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bus stasie
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Skip werf
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Spoorweg stasie
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Vliegtuig hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lughawe
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Vragmotor laai area
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bus stasie
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Skip werf
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Verlig dekking area van die voorgestelde bouterrein
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Moenie die dekking area van die voorgestelde bouterrein verlig nie
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Dekking area verlig
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Werf
-STR_STATION_DESCRIPTION_BUOY                                    :Baken
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Baken
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...baken in die pad
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...Stasie te ver van mekaar af
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ongelyk stasies is versper
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hou in CTRL om meer as een item te selekteer
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...ongelyk stasies is versper
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hou in CTRL om meer as een item te selekteer
 
 STR_UNDEFINED                                                   :(undefined string)
-STR_STAT_CLASS_DFLT                                             :Verstek stasie
-STR_STAT_CLASS_WAYP                                             :Wegpunte
+STR_STATION_CLASS_DFLT                                          :Verstek stasie
+STR_STATION_CLASS_WAYP                                          :Wegpunte
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Skip Depot Orientasie
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...moet op water gebou word
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Skip depot kan nie hier gebou word nie...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Kies skip depot orientasie
-STR_WATER_DESCRIPTION_WATER                                     :Water
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kus of oewer
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Skip depot
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akwamaryn
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Water
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kus of oewer
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Skip depot
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akwamaryn
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Kan nie op water bou nie
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Moet eers kanaale afbreek
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Moet eers kanaale afbreek
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spaar Speletjie
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Laai Speletjie
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Spaar
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Uitvee
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spektator, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Spektator, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} vry
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan nie skyf lees nie
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Speletjie Spaar Misluk{}{STRING}
@@ -1844,12 +1844,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lys van
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Huidige naam vir spaar-speletjie
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Vee uit die huidige verkieste spaar-speletjie
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Spaar die huidige speletjie, met die verkieste naame
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Opwek lukraak nuwe speletjie
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Laai Hoogtekaart
-STR_SAVE_OSKTITLE                                               :{BLACK}Tik 'n naam in vir die stoor-speeletjie
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Opwek lukraak nuwe speletjie
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Laai Hoogtekaart
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Tik 'n naam in vir die stoor-speeletjie
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} in die pad
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} in die pad
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kool Myn
 STR_INDUSTRY_NAME_POWER_STATION                                 :Krag Stasie
@@ -1907,7 +1907,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Senter skerm op nywerheid
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Nuwe {STRING} onder opbou naby {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nuwe {STRING} word naby {TOWN} beplant!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Koste: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Koste: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Nywerheid tipe kan nie hier gebou word nie...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...woud kan net bo sneeu-lyn beplant word
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} aankondig dreigend sluiting!
@@ -1925,16 +1925,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Ander tonnel in die pad
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tonnel so op die einde van die kaart eindig
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tonnel so op die einde van die kaart eindig
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Kan nie daal vir ander einde van tonnel te uitgrawe nie
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Moet eers tonnel afbreek
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Moet eers brug afbreek
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kan nie in die selfde plek begin en eindig nie
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Brug hoofde is nie op die selfde vlak nie
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Brug is te laag vie die daal
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan nie in die selfde plek begin en eindig nie
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Brug hoofde is nie op die selfde vlak nie
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Brug is te laag vie die daal
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Begin en einde moet in lyn wees
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Plek ongeskik vir tonnel ingang
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensie, Staal
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Balk, Staal
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Vrydraer, Staal
@@ -1945,30 +1945,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   : Buis, Staal
 STR_BRIDGE_TUBULAR_SILICON                                      :Buis, Silicon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Brug kan nie daar gebou word nie...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tonnel kan nie daar gebou word nie...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Spoorweg tonnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Pad tonnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Staal stuspensie spoor brug
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Staal balk spoor brug
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Staal vrydraer spoor brug
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Versterk beton suspensie spoor brug
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Houterig spoor brug
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Beton spoor brug
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Staal suspensie pad brug
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Staal balk pad brug
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Staal vrydraer pad brug
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Versterk beton suspensie pad brug
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Houterig pad brug
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Beton pad brug
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Buis spoor brug
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Buis pad brug
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Spoorweg tonnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Pad tonnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Staal stuspensie spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Staal balk spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Staal vrydraer spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Versterk beton suspensie spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Houterig spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Beton spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Staal suspensie pad brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Staal balk pad brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Staal vrydraer pad brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Versterk beton suspensie pad brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Houterig pad brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Beton pad brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Buis spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Buis pad brug
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Voorwerp in die pad
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Sender
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Vuurtoring
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Maatskappy Hoofkwartier
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Sender
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Vuurtoring
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Maatskappy Hoofkwartier
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...maatskappy hoofkwartier in die weg
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Maatskappy-besitte land
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Maatskappy-besitte land
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Die land area kan nie aangekoop word nie...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...jy besit dit alreeds!
 
@@ -2014,7 +2014,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stasie
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Moeite Vlak
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Bewaar
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Bewaar
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Maklik
@@ -2086,8 +2086,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kleur Ske
 STR_LIVERY_CAPTION                                              :{WHITE}Nuwe Kleur Skema
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Maatskappy Naam
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Bestuurder Naam
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Maatskappy Naam
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Bestuurder se Naam
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Maatskappy Naam
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Bestuurder se Naam
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Maatskappy naam kan nie verander word nie...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Bestuurder se naam kan nie verander word nie...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finansies {BLACK}{COMPANYNUM}
@@ -2111,11 +2111,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totaal:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Inkome Grafiek
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Bediening Profyt Grafiek
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bank Balans
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lening
-STR_MAX_LOAN                                                    :{WHITE}Maks Lening:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maks Lening:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Leen {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Terugbetaal {SKIP}{SKIP}{CURRENCY}
@@ -2124,7 +2124,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan nie
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...geen lening om terug te betaal
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} vereis
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan nie lening terugbetaal nie...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan nie geld wat van die bank geleen is weggee nie...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan nie geld wat van die bank geleen is weggee nie...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Kies nuwe gesig vir bestuurder
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Verander die maatskappy voertuig lewery
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Verander bestuurder se naam
@@ -2134,10 +2134,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Terugbet
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Bestuurder)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Bevestig: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Voertuie
-STR_TRAINS                                                      :{WHITE}{COMMA} trein{P "" e}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} pad voertui{P g e}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} vliegtuig
-STR_SHIPS                                                       :{WHITE}{COMMA} sk{P ip epe}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} trein{P "" e}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} pad voertui{P g e}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} vliegtuig
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} sk{P ip epe}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Geen
 STR_FACE_CAPTION                                                :{WHITE}Gesig Keuse
 STR_FACE_MALE_BUTTON                                            :{BLACK}Manlik
@@ -2151,7 +2151,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Opwek lu
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Sleutel
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Wys sleutel na grafieke
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Sleutel vir maatskappy grafieke
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Kliek hier om maatskappy se intrede op grafiek aan/af te skakel
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Kliek hier om maatskappy se intrede op grafiek aan/af te skakel
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Eenheide van vrag afgelewer
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Maatskappy prestasie graderings (maksimum gradering=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Maatskappy waarde
@@ -2185,23 +2185,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Tycoon
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bou HK
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bou maatskappy hoofkwartiers / wys maatskappy hoofkwartiers
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Herbou maatskappy hoofkwartiers elders vir 1% koste van maatskappy waarde
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Herbou maatskappy hoofkwartiers elders vir 1% koste van maatskappy waarde
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Maatskappy hoofkwartiers kan nie hier gebou word nie...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Wys HK
-STR_RELOCATE_HQ                                                 :{BLACK}Beweeg HQ
-STR_COMPANY_JOIN                                                :{BLACK}Bind
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Bind en speel as maatskapy
-STR_COMPANY_PASSWORD                                            :{BLACK}Wagwoord
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Wagwoord-beskerm jou maatskappy om onmagtig gebruikers te belet van verbinding
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Stel maatskappy wagwoord
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Beweeg HQ
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Bind
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Bind en speel as maatskapy
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Wagwoord
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Wagwoord-beskerm jou maatskappy om onmagtig gebruikers te belet van verbinding
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Stel maatskappy wagwoord
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Moenie die ingesleutelde wagwoord bewaar nie
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gee die maatskappy die nuwe wagwoord
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Maatskappy wagwoord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Voorbepaalde maatskappy wagwoord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Gebruik die maatskapy wagwoord as die standaard vir nuwe maatskappye
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Voorbepaalde maatskappy wagwoord
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Gebruik die maatskapy wagwoord as die standaard vir nuwe maatskappye
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Wêreld Resessie!{}{}Finasiële kenners vrees die ergste terwyl ekonomie val!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Insinking Oor!{}{}Oplewing in sake gee vertroue na nywerhede as ekonomie versterk!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Tokkel groot/klein venster groote
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Tokkel groot/klein venster groote
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Maatskappy waarde: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Koop 25% aandeel in maatskappy
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Verkoop 25% aandeel in maatskappy
@@ -2211,7 +2211,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan nie
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan nie 25% aandeel in die maatskappy verkoop nie...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% besit by {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} is deur {STRING} oorgevat!
-STR_PROTECTED                                                   :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
+STR_ERROR_PROTECTED                                             :{WHITE}Die maatskappy is nie oud genoeg om aandeele te handel nie...
 
 STR_LIVERY_DEFAULT                                              :Standaard Lewery
 STR_LIVERY_STEAM                                                :Stoom Enjin
@@ -2237,14 +2237,14 @@ STR_LIVERY_LARGE_PLANE                                          :Groot Vliegtuig
 STR_LIVERY_PASSENGER_TRAM                                       :Passasier Trem
 STR_LIVERY_FREIGHT_TRAM                                         :Vrag Trem
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Toon generaal kleur skemas
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Wys trein kleur skemas
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Toon pad voertuig kleur skemas
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Toon skip kleur skemas
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Toon vliegtuig kleurskemas
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Kies die premere kleur vir die verkieste skema
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Kies die sekondere kleur vir die verkieste skema
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Kies 'n kleur skema te verander, of veelvoud skemas met CTRL+kliek. Kliek op die boks te skakel gebruik van skema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Toon generaal kleur skemas
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Wys trein kleur skemas
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Toon pad voertuig kleur skemas
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Toon skip kleur skemas
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Toon vliegtuig kleurskemas
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Kies die premere kleur vir die verkieste skema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Kies die sekondere kleur vir die verkieste skema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Kies 'n kleur skema te verander, of veelvoud skemas met CTRL+kliek. Kliek op die boks te skakel gebruik van skema
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Stoom)
@@ -2551,9 +2551,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Geen aflaay en
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Verander die stop gedrag van die geselekteerde bevel
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Verander die op-laai gedrag van die geselekteerde bevel
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}verander die aflaai gedrag ven die geselekteerde bevel
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Sit 'n bevorderde bevel in
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Sit 'n bevorderde bevel in
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Gaan na naaste diensstasie
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Gaan na naaste vliegtuigloods
 STR_ORDER_NEAREST_DEPOT                                         :die naaste
@@ -2563,9 +2563,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Diens geen-stop
 STR_ORDER_TRAIN_DEPOT                                           :Trein Diensstasie
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Pad Voertuig Diensstasie
 STR_ORDER_SHIP_DEPOT                                            :Sleep Diensstasie
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Beweeg altyd
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Diens indien nodig
@@ -2589,10 +2589,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :is meer as
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :is meer as of gelyk aan
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is waar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is fals
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Spring oor na bevel {COMMA}
-STR_CONDITIONAL_NUM                                             :Spring oor na bevel {COMMA} wanneer {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Spring oor na bevel {COMMA} wanneer {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Spring oor na bevel {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Spring oor na bevel {COMMA} wanneer {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Spring oor na bevel {COMMA} wanneer {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Geen reis
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Reis (Nie gerooster nie)
@@ -2615,17 +2615,17 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Treine k
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sprong
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Uit vee
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Gaan Na
-STR_REFIT                                                       :{BLACK}Herpas
-STR_REFIT_TIP                                                   :{BLACK}Kies watter vrag tipe te herpas na in die opdraag. CTRL-kliek om herpas instruksie te verwyder
-STR_REFIT_ORDER                                                 :(Herpas na {STRING})
-STR_STOP_ORDER                                                  :(Stop)
-STR_TIMETABLE_VIEW                                              :{BLACK}Rooster
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Skakel na die rooster uitsig
-STR_ORDER_VIEW                                                  :{BLACK}Bevele
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Verander na die bevel lys
+STR_ORDER_REFIT                                                 :{BLACK}Herpas
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Kies watter vrag tipe te herpas na in die opdraag. CTRL-kliek om herpas instruksie te verwyder
+STR_ORDER_REFIT_ORDER                                           :(Herpas na {STRING})
+STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Rooster
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Skakel na die rooster uitsig
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Bevele
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Verander na die bevel lys
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Opdrae)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Einde van Opdrae - -
-STR_SERVICE                                                     :{BLACK}Diens
+STR_ORDER_SERVICE                                               :{BLACK}Diens
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebou: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2645,7 +2645,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}voertuig
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}'n voertuig wat heirdie opdrag deel kan nie na daadie stasie toe gaan
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan nie voertuig beweeg nie...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Die agterste motor sal altyd die voorste motor volg
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan nie roete na plaaslike depot vind nie
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Diens tussentyd: {LTBLUE}{COMMA}dae{BLACK}   Laaste diens: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Diens tussentyd: {LTBLUE}{COMMA}%{BLACK}   Laaste diens: {LTBLUE}{DATE_LONG}
@@ -2665,8 +2665,8 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rooster
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander die bedrag van tyd die verlig opdrag moes vat
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Vee uit die totaal van tyd vir die gespesiveerde opdrag
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Herstel die laat teller, so dat die  voertuig op tyd is
-STR_SERVICE_HINT                                                :{BLACK}Sprong die opdraag tensy 'n diens nodig is
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kos: {CURRENCY} Gewig: {WEIGHT_S}{}Spoed: {VELOCITY}  Krag: {POWER}{}Loopkoste: {CURRENCY}/jr{}Kapasitiet: {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sprong die opdraag tensy 'n diens nodig is
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kos: {CURRENCY} Gewig: {WEIGHT_S}{}Spoed: {VELOCITY}  Krag: {POWER}{}Loopkoste: {CURRENCY}/jr{}Kapasitiet: {CARGO}
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Gestop
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan nie trein forseer om sein te vermy op gevaar...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Botsing!
@@ -2674,27 +2674,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Botsing!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Trein Botsing!{}{COMMA} sterf in vuurbol na botsing
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan nie rigting van trein omkeer nie...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan nie voertuie van veel deele draai nie
-STR_CLEAR_TIME                                                  :{BLACK}Reinig Tyd
-STR_RESET_LATENESS                                              :{BLACK}Herstel Laat Teller
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Verander wegpunt name
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Reinig Tyd
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Herstel Laat Teller
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Verander wegpunt name
 
-STR_TRAIN_STOPPING                                              :{RED}Ophou
-STR_TRAIN_STOPPING_VEL                                          :{RED}Ophou, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Onbestaaanbaar spoor tipes
-STR_TRAIN_NO_POWER                                              :{RED}Geen Krag
-STR_TRAIN_START_NO_CATENARY                                     :Die spoor kort n kettinglyn, dus kan die trien nie aanskakel nie
-STR_TRAIN_STUCK                                                 :{ORANGE}Wag vir beskikbare pad
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Ophou
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Ophou, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Onbestaaanbaar spoor tipes
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Geen Krag
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Die spoor kort n kettinglyn, dus kan die trien nie aanskakel nie
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Wag vir beskikbare pad
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nuwe {STRING} nou beskikbaar!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nuwe {STRING} nou beskikbaar!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kan nie vernietige voertuig verkoop nie...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kan nie vernietigte voertuig aanpas nie...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kan nie vernietige voertuig verkoop nie...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kan nie vernietigte voertuig aanpas nie...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kan nie rooster voertuig nie...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Voertuie kan slegs by stasies wag.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Die voertuig stop nie by die stasie nie.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan nie rooster voertuig nie...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Voertuie kan slegs by stasies wag.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Die voertuig stop nie by die stasie nie.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Verander Tyd
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Die voertuig loop tans op tyd
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Die voertuig loop tans {STRING} laat
@@ -2708,7 +2708,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Vul die
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...moet gestop binne 'n pad voertuig depot wees
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan nie plaaslike depot vind nie
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forseer voertuig om te draai om
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapasiteit: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapasiteit: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} voertuig{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2734,11 +2734,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plaas baken wat kan as 'n wegpunt gebruik word
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan nie baken hier plaas nie...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bou akwamaryn
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan nie akwamaryn hier bou nie...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan nie akwamaryn hier bou nie...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Herstel)
 STR_REFIT_TITLE                                                 :{GOLD}Kies vrag tipe vir skip te ontvoer:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nuwe kapasiteit: {GOLD}{CARGO}{}{BLACK}Herstelkoste: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(herstelbaar)
+STR_PURCHASE_INFO_REFITTABLE                                    :(herstelbaar)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lughawe
@@ -2751,7 +2751,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bou lugh
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Burgers herdenk . . .{}Eerste vliegtuig arriveer by {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Vliegtuig Botsing!{}{COMMA} stef in die vuurbol by {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Vliegtuig Ongeluk!{}Vliegtuig het geen petrol nie, {COMMA} sterf in 'n bal van vuur!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rooster)
 
@@ -2764,13 +2764,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Kool myn bedaaring los spoor van vernietiging naby {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Oorstroom!{}Te minste {COMMA} vermis, aangeneem dood na beduidende oorstroom!
 
-STR_BRIBE_FAILED                                                :{WHITE}Jou omkooping onderneeming is deur
-STR_BRIBE_FAILED_2                                              :{WHITE}'n streek navorser uitgevind
-STR_BUILD_DATE                                                  :{BLACK}Gebou: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Jou omkooping onderneeming is deur
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}'n streek navorser uitgevind
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Gebou: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stasie klas: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stasie tiepe: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NuweGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stasie klas: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stasie tiepe: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NuweGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Aanwysend prestasie gradering
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Aanwyse
@@ -2790,28 +2790,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Geld:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Lening:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totaal:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Nommer van voertuie; dit sluit pad voertuie, treine, skepe en vliegtuie in
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Aantal van stasie parte. Elke deel van 'n stasie (b.v. trein stasie, bushalte, lughawe) is getel, selfs indien hulle is konnekteer as een stasie
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Die profyt van die voertuig met die laagste inkome (van alle voertuie ouer as 2 jaare)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Bedrag van kontant gemaak in die maand met die laagste profyt in die laaste 12 kwartiers
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Bedrag van kontant gemaak in die maand met die hoogste profyt in die laaste 12 kwartiers
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Eenheide van vrag afgelewer in die laaste vier kwartiers
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Nommer van vrag tipes afgelewer in die verlede kwartier
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Bedrag van geld die maatskappy het in die bank
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Die bedrag van geld dat die maatskappy het gevat op lening
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Totaale punte uit van moontlike punte
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Nommer van voertuie; dit sluit pad voertuie, treine, skepe en vliegtuie in
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Aantal van stasie parte. Elke deel van 'n stasie (b.v. trein stasie, bushalte, lughawe) is getel, selfs indien hulle is konnekteer as een stasie
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Die profyt van die voertuig met die laagste inkome (van alle voertuie ouer as 2 jaare)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Bedrag van kontant gemaak in die maand met die laagste profyt in die laaste 12 kwartiers
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Bedrag van kontant gemaak in die maand met die hoogste profyt in die laaste 12 kwartiers
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Eenheide van vrag afgelewer in die laaste vier kwartiers
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Nommer van vrag tipes afgelewer in die verlede kwartier
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Bedrag van geld die maatskappy het in die bank
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Die bedrag van geld dat die maatskappy het gevat op lening
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Totaale punte uit van moontlike punte
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Stellings
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Wys NewGRF stellings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF stellings
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Wend aan veranderings
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Tokkel pallet
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Tokkel die pallet van die geselekteurde NewGRF.{}Doen dit wanneer die grafika van hierdie NewGRF pink lyk in die speletjie.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Stel parameters
-STR_NEWGRF_FILENAME                                             :{BLACK}Lêer naam: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Pallet: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Wend aan veranderings
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Tokkel pallet
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Tokkel die pallet van die geselekteurde NewGRF.{}Doen dit wanneer die grafika van hierdie NewGRF pink lyk in die speletjie.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stel parameters
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Lêer naam: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Pallet: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Jy is besig om veranderings op 'n tans gebruikte speletjie te doen. Dit kan OpenTTD beskadig. {}Is jy heeltemal seker ?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2832,34 +2832,34 @@ STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Onbekende Aksie
 STR_NEWGRF_ERROR_INVALID_ID                                     :Pooging om onvoldoende ID te gebruik.
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} het 'n korrupte "sprite". Alle korrupte "sprites" sal gewys word as 'n rooi vraag teken (?).
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Laai die gekose voorafstel
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Stoor voorafstel
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Stoor die huidige lys as 'n voorafstel
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Sleutel 'n naam vir die voorafstel in
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Vee voorafstel uit
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Vee die huidige gekose voorafstel uit
-STR_NEWGRF_ADD                                                  :{BLACK}Voeg
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Voeg 'n NewGRF na die lys
-STR_NEWGRF_REMOVE                                               :{BLACK}Verwyder
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Verwyder die gekose NewGRF lêer van die lys
-STR_NEWGRF_MOVEUP                                               :{BLACK}Beweeg Op
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Beweeg die gekose NewGRF op in die lys
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Beweeg Af
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Beweeg die gekose NewGRF af in die lys
-STR_NEWGRF_FILE_TIP                                             :{BLACK}'n Lys van die NewGRF lêers wat installer. Kliek 'n lêer om sy parameter te verander.
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameters: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Invoer NewGRF parameters
-STR_NEWGRF_NO_INFO                                              :{BLACK}Geen informasie beskikbaar
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Laai die gekose voorafstel
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Stoor voorafstel
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Stoor die huidige lys as 'n voorafstel
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Sleutel 'n naam vir die voorafstel in
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Vee voorafstel uit
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Vee die huidige gekose voorafstel uit
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Voeg
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Voeg 'n NewGRF na die lys
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Verwyder
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Verwyder die gekose NewGRF lêer van die lys
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Beweeg Op
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Beweeg die gekose NewGRF op in die lys
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Beweeg Af
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Beweeg die gekose NewGRF af in die lys
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}'n Lys van die NewGRF lêers wat installer. Kliek 'n lêer om sy parameter te verander.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameters: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Invoer NewGRF parameters
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Geen informasie beskikbaar
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Beskikbaar NewGRF lêers
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Voeg na seleksie
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Voeg die verkiesde NewGRF lêer na u configurasie
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Herskandeer lêers
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Bywerk die lys van beskikbaar NewGRF lêers
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Voeg die verkiesde NewGRF lêer na u configurasie
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Herskandeer lêers
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Bywerk die lys van beskikbaar NewGRF lêers
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan nie lêer voeg: duplikaat GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Gelyke lêer nie gevind nie
-STR_NEWGRF_DISABLED                                             :{RED}Gestrem
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Gelyke lêer nie gevind nie
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Gestrem
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Gelyke lêer nie gevind nie (versoenbaar GRF gelaai)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Versoenbaar GRF(s) gelaai vir vermis lêers
@@ -2869,7 +2869,7 @@ STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}Dit vera
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Trein '{VEHICLE}' wat aan '{COMPANY}' behoort het 'n onaanvaarbare lengte. Dit is heel waarskeinlik veroorsaak deur probleme met NewGRFs. Speeletjie mag uit  sinkrone gaan of  hang.
 
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Speeletjie was gesoor in 'n weergawe sonder trem toelaating. Alle tremme was verwyder.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Speeletjie was gesoor in 'n weergawe sonder trem toelaating. Alle tremme was verwyder.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Gewoonte koers
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wissel koers: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2880,16 +2880,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Verwiss
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Verwissel na Euro: {ORANGE}nooit
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Voorskou: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}verander gebruiklike koers parameter
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Verlaag die hoeveelheid van jou koers vir een Pond (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Verhoog die hoeveelheid van jou koers vir een Pond (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Stel die wissel koers vir jou koers vir een Pond (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Stel die skeier vir jou koers
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Stel die voorvoegsel teks vir jou koers
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Stel die agtervoegsel teks vir jou koers
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Skakel na Euro vroeër
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Skakel na Euro later
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Stel die jaar om na Euro toe te skakel
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pond (£) in jou koers
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Verlaag die hoeveelheid van jou koers vir een Pond (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Verhoog die hoeveelheid van jou koers vir een Pond (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Stel die wissel koers vir jou koers vir een Pond (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Stel die skeier vir jou koers
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Stel die voorvoegsel teks vir jou koers
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Stel die agtervoegsel teks vir jou koers
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Skakel na Euro vroeër
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Skakel na Euro later
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Stel die jaar om na Euro toe te skakel
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pond (£) in jou koers
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2908,8 +2908,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skeep{P "" e}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Vliegtuie
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gedeel opdrae van {COMMA} Voertui{P g e}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Toon alle voertuie wat die rooster deel
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Gedeel opdrae van {COMMA} Voertui{P g e}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Toon alle voertuie wat die rooster deel
 
 STR_NEWS_AIRCRAFT_IS_WAITING                                    :{WHITE}{VEHICLE} wag in die vliegtuig hangar
 
@@ -3013,39 +3013,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Herpas p
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Herstel vrag skip om 'n ander vrag tipe te ontvoer
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Hestel vliegtuig om 'n ander vrag tipe te ontvoer
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op pad na {TOWN} Trein Depot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op pad na {TOWN} Trein Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Op pad na {TOWN} Pad Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Op pad na {TOWN} Skip Depot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Op pad na {TOWN} Skip Depot, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op pad na {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Diens by {TOWN} Trein Depot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Diens by {TOWN} Trein Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Diens by {TOWN} Pad Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Diens by {TOWN} Pad Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Diens by {TOWN} Skip Depot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Diens by {TOWN} Skip Depot, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Diens by {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Diens by {STATION} Hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Kloon Trein
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloon Voertuig
-STR_CLONE_SHIP                                                  :{BLACK}Kloon Skip
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloon Vliegtuig
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dit sa 'n kopie van die trein bou insluitend alle trokke. Control-kliek sal die opdrae deel
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dit sal 'n kopie van die pad voertuig bou. Control-kliek sal die opdrae deel
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dit sal 'n kopie van die skip bou. Control-kliek sal die opdrae deel
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dit sal 'n kopie van die vliegtuig bou. Control-kliek sal die opdrae deel
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dit sal 'n kopie van 'n trein bou insluitend alle trokke. Kliek die knoppie en dan op 'n trein binne of buite die depot. Control-kliek sal die opdrae deel
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dit sal 'n kopie van 'n pad voertuig bou. Kliek die knoppie en dan op 'n pad voertuig binne of buite die depot. Control-kliek sal die opdrae deel
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dit sal 'n kopie van 'n skip bou. Kliek die knoppie en dan op 'n skip binne of buite die depot. Control-kliek sal die opdrae deel
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dit sal 'n kopie van 'n vliegtuig bou. Kliek die knoppie en dan op 'n vliegtuig binne of buite die hangar. Control-kliek sal die opdrae deel
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Op pad na {TOWN} Trein Depot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Op pad na {TOWN} Trein Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Op pad na {TOWN} Pad Depot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Op pad na {TOWN} Pad Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Op pad na {TOWN} Skip Depot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Op pad na {TOWN} Skip Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Op pad na {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Op pad na {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Diens by {TOWN} Trein Depot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Diens by {TOWN} Trein Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Diens by {TOWN} Pad Depot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Diens by {TOWN} Pad Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Diens by {TOWN} Skip Depot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Diens by {TOWN} Skip Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Diens by {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Diens by {STATION} Hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kloon Trein
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloon Voertuig
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloon Skip
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloon Vliegtuig
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Dit sa 'n kopie van die trein bou insluitend alle trokke. Control-kliek sal die opdrae deel
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Dit sal 'n kopie van die pad voertuig bou. Control-kliek sal die opdrae deel
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Dit sal 'n kopie van die skip bou. Control-kliek sal die opdrae deel
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Dit sal 'n kopie van die vliegtuig bou. Control-kliek sal die opdrae deel
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Dit sal 'n kopie van 'n trein bou insluitend alle trokke. Kliek die knoppie en dan op 'n trein binne of buite die depot. Control-kliek sal die opdrae deel
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Dit sal 'n kopie van 'n pad voertuig bou. Kliek die knoppie en dan op 'n pad voertuig binne of buite die depot. Control-kliek sal die opdrae deel
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Dit sal 'n kopie van 'n skip bou. Kliek die knoppie en dan op 'n skip binne of buite die depot. Control-kliek sal die opdrae deel
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Dit sal 'n kopie van 'n vliegtuig bou. Kliek die knoppie en dan op 'n vliegtuig binne of buite die hangar. Control-kliek sal die opdrae deel
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nuwe Spoor Voertuie
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nuwe Elektries Spoor Voertuie
@@ -3115,28 +3115,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Senter s
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}U staan op die punt om al die voertuie in die depot te verkoop. Is jy seker?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Verkeerde depot tipe
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Verkeerde depot tipe
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Verkoop allep treine in die depot
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Verkoop alle pad voertuie in die depot
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Verkoop alle skepe in die depot
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Verkoop alle vliegtuie in die hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Verkoop allep treine in die depot
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Verkoop alle pad voertuie in die depot
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Verkoop alle skepe in die depot
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Verkoop alle vliegtuie in die hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Kry 'n lys van alle treine met die huidige depot in sy opdrae
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Kry 'n lys van alle pad voertuie met die huidige depot in sy opdrae
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Kry 'n lys van alle skepe met die huidige depot in sy opdrae
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Kry 'n lys van alle vliegtuie wat enige hangar by die lughawe in sy opdrae het
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Kry 'n lys van alle treine met die huidige depot in sy opdrae
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Kry 'n lys van alle pad voertuie met die huidige depot in sy opdrae
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Kry 'n lys van alle skepe met die huidige depot in sy opdrae
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Kry 'n lys van alle vliegtuie wat enige hangar by die lughawe in sy opdrae het
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Outovervang alle treine in die depot
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Outovervang alle pad voertuie in die depot
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Outovervang alle skepe in die depot
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Outovervang alle vlietuie in die hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Outovervang alle treine in die depot
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Outovervang alle pad voertuie in die depot
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Outovervang alle skepe in die depot
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Outovervang alle vlietuie in die hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vervang {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Begin Voertuie Vervang
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop Voertuie Vervang
-STR_NOT_REPLACING                                               :{BLACK}Word nie vervang nie
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Geen voertuig gekies
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Word nie vervang nie
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Geen voertuig gekies
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Kies die enjin tipe te vervang
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Kies die nuwe enjin tipe wat jy wil gebriuk in plaas van die linker gekose enjin tipe
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Druk om die vervaardiging van die linker gekose enjin tipe te stop
@@ -3148,26 +3148,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Maak aut
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Vervang: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skakel tussen enjin en wa vervang vensters
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Voertuig is nie beskikbaar nie
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Voertuig is nie beskikbaar nie
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skip is nie beskikbaar
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Vliegtuig is nie beskikbaar nie
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Voertuig is nie beskikbaar nie
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Voertuig is nie beskikbaar nie
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Skip is nie beskikbaar
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Vliegtuig is nie beskikbaar nie
 
-STR_ENGINES                                                     :Enjine
-STR_WAGONS                                                      :Waens
+STR_REPLACE_ENGINES                                             :Enjine
+STR_REPLACE_WAGONS                                              :Waens
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Kliek om alle treine in die depot te stop
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Kliek om alle pad voertuie in die depot te stop
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Kliek om alle skepe in die depot te stop
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Kliek om alle vlietuie in die hangar te stop
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Kliek om alle treine in die depot te stop
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Kliek om alle pad voertuie in die depot te stop
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Kliek om alle skepe in die depot te stop
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Kliek om alle vlietuie in die hangar te stop
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Kliek om alle treine in die depot te aanskakel
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Kliek om alle pad voertuie in die depot te aanskakel
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Kliek om alle skepe in die depot te aanskakel
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Kliek om alle vliegtuie in die hangar te aanskakel
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Kliek om alle treine in die depot te aanskakel
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Kliek om alle pad voertuie in die depot te aanskakel
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Kliek om alle skepe in die depot te aanskakel
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Kliek om alle vliegtuie in die hangar te aanskakel
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Kliek om alle voertuie in die lys te stop
-STR_MASS_START_LIST_TIP                                         :{BLACK}Kliek om aller voertuie in die lys te aanskakel
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Kliek om alle voertuie in die lys te stop
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Kliek om aller voertuie in die lys te aanskakel
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Teken Lys - {COMMA} Teken{P "" s}
@@ -3175,14 +3175,14 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Teken Ly
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Spoort voertuie
-STR_ELRAIL_VEHICLES                                             :Elektrifiseerde Spoor Voertuie
-STR_MONORAIL_VEHICLES                                           :Eenspoor Voertuie
-STR_MAGLEV_VEHICLES                                             :Maglev Voertuie
+STR_REPLACE_RAIL_VEHICLES                                       :Spoort voertuie
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrifiseerde Spoor Voertuie
+STR_REPLACE_MONORAIL_VEHICLES                                   :Eenspoor Voertuie
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev Voertuie
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kos: {GOLD}{CURRENCY}{BLACK} Gewig: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Spoed: {GOLD}{VELOCITY}{BLACK}   Krag: {GOLD}{POWER}
@@ -3208,69 +3208,69 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Opwek
-STR_RANDOM                                                      :{BLACK}Lukraake
-STR_RANDOM_HELP                                                 :{BLACK}Verander die lukraak saad gebruik vir Terrein Generasie
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Wêreld generasie
-STR_RANDOM_SEED                                                 :{BLACK}Lukraak Saad:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Kliek om 'n lukraak saad in te voeg
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Sleutel 'n lukraak saad in
-STR_LAND_GENERATOR                                              :{BLACK}Daal genereerder:
-STR_TREE_PLACER                                                 :{BLACK}Boom algoritme:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Hoogtekaart rotasie:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrein tipe:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Seevlak:
-STR_SMOOTHNESS                                                  :{BLACK}Gladheid:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Sneeu lyn hoogte:
-STR_DATE                                                        :{BLACK}Date:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Hoev. van dorpe
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Hoev. van nywerhede
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Beweeg die sneeu lyn een op
-STR_SNOW_LINE_DOWN                                              :{BLACK}Beweeg die sneeu lyn een af
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Verander sneeu lyn hoogte
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Verander begin jaar
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skaal waaskuwing
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Om die kaart te veel te verstel is nie aanbeveel. Gaan voort met die generasie?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Hoogtekaart name:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Groote: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Opwek
+STR_MAPGEN_RANDOM                                               :{BLACK}Lukraake
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Verander die lukraak saad gebruik vir Terrein Generasie
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Wêreld generasie
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Lukraak Saad:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Kliek om 'n lukraak saad in te voeg
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Sleutel 'n lukraak saad in
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Daal genereerder:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Boom algoritme:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Hoogtekaart rotasie:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrein tipe:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Seevlak:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Gladheid:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Sneeu lyn hoogte:
+STR_MAPGEN_DATE                                                 :{BLACK}Date:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Hoev. van dorpe
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Hoev. van nywerhede
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Beweeg die sneeu lyn een op
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Beweeg die sneeu lyn een af
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Verander sneeu lyn hoogte
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Verander begin jaar
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skaal waaskuwing
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Om die kaart te veel te verstel is nie aanbeveel. Gaan voort met die generasie?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Hoogtekaart name:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Groote: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Genereer wêreld...
 STR_GENERATION_ABORT                                            :{BLACK}Verlaat
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Verlaat Wêreld Generasie
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Wil jy rerig die generasie verlaat?
-STR_PROGRESS                                                    :{WHITE}{NUM}% klaar
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Wêreld generasie
-STR_TREE_GENERATION                                             :{BLACK}Boom generasie
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Onbeweegbaar generasie
-STR_CLEARING_TILES                                              :{BLACK}Ru en rotserig area ontwikkeling
-STR_SETTINGUP_GAME                                              :{BLACK}Stel speletjie op
-STR_PREPARING_TILELOOP                                          :{BLACK}Hardloop teël-herhaling
-STR_PREPARING_GAME                                              :{BLACK}Voorbereiding speletjie
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Hierdie aksie verander die moeite vlak to gebruiklike
-STR_SE_FLAT_WORLD                                               :{WHITE}Platte daal
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Opwek 'n plat daal
-STR_SE_RANDOM_LAND                                              :{WHITE}Lukraak daal
-STR_SE_NEW_WORLD                                                :{BLACK}Skep nuwe draaiboek
-STR_SE_CAPTION                                                  :{WHITE}Draaiboek tipe
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Beweeg die hoogte van platte daal een af
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Beweeg die hoogte van platte daal bo een
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Verander die hoogte van platte daal
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Hoogte van platte daal:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% klaar
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Wêreld generasie
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Boom generasie
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Onbeweegbaar generasie
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Ru en rotserig area ontwikkeling
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Stel speletjie op
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Hardloop teël-herhaling
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Voorbereiding speletjie
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Hierdie aksie verander die moeite vlak to gebruiklike
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Platte daal
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Opwek 'n plat daal
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Lukraak daal
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Skep nuwe draaiboek
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Draaiboek tipe
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Beweeg die hoogte van platte daal een af
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Beweeg die hoogte van platte daal bo een
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Verander die hoogte van platte daal
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Hoogte van platte daal:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Senter die kleinkaart op die huidige posisie
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kaart kante:
-STR_NORTHWEST                                                   :{BLACK}Noordwes
-STR_NORTHEAST                                                   :{BLACK}Noordoos
-STR_SOUTHEAST                                                   :{BLACK}Suidoos
-STR_SOUTHWEST                                                   :{BLACK}Suidwes
-STR_BORDER_FREEFORM                                             :{BLACK}Vryeform
-STR_BORDER_WATER                                                :{BLACK}Water
-STR_BORDER_RANDOM                                               :{BLACK}Lukraak
-STR_BORDER_RANDOMIZE                                            :{BLACK}Lukraak
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kaart kante:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Noordwes
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Noordoos
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Suidoos
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Suidwes
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Vryeform
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Water
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Lukraak
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Lukraak
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Klein
@@ -3295,20 +3295,20 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengte: {NUM}{}Hoogte verskil: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Hoogte verskil: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}oordra Krediete: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...hierdie is 'n dorp besit pad
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...pad teenoor in die verkeerde rigting
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Deursigtigheid Opsies
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Tokkel deursigtigheid vir stasie tekens
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Tokkel deursigtigheid vir boome
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Tokkel deursigtigheid vir huise
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Tokkel deursigtigheid vir nywerhede
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Tokkel deursigtigheid vir boubaardes soos stasies, depots, weypunte en catenary
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Tokkel deursigtigheid vir brue
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Tokkel deursigtigheid vir strukture soos vuurtorings en senders, miskien in toekoms vir ooglekkers
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Tokkel deursigtigheid vir laai aanwysers
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Stel voorwerpe onsigbaar inplaas van deursigtig
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}oordra Krediete: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...hierdie is 'n dorp besit pad
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...pad teenoor in die verkeerde rigting
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Deursigtigheid Opsies
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Tokkel deursigtigheid vir stasie tekens
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Tokkel deursigtigheid vir boome
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Tokkel deursigtigheid vir huise
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Tokkel deursigtigheid vir nywerhede
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Tokkel deursigtigheid vir boubaardes soos stasies, depots, weypunte en catenary
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Tokkel deursigtigheid vir brue
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Tokkel deursigtigheid vir strukture soos vuurtorings en senders, miskien in toekoms vir ooglekkers
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Tokkel deursigtigheid vir laai aanwysers
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Stel voorwerpe onsigbaar inplaas van deursigtig
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3318,7 +3318,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alle triene
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alle pad voertuie
 STR_GROUP_ALL_SHIPS                                             :Alle skepe
@@ -3327,24 +3327,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ongegroepeerde
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ongegroepeerde pad voertuie
 STR_GROUP_DEFAULT_SHIPS                                         :Ongegroepeerde skepe
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ongegroepeerde vliegtuig
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Voeg gedeel voertuie
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Verwyder alle voertuie
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Hernoem groep
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kan nie groep skep nie...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kan nie groep uitvee nie...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kan nie groep hernoem nie...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kan nie alle voertuie van groep verwyder nie...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kan nie voeg die voertuig tot hierdie groep nie...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kan nie gedeel voertuie na groep byvoeg...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kan nie groep skep nie...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kan nie groep uitvee nie...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kan nie groep hernoem nie...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kan nie alle voertuie van groep verwyder nie...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kan nie voeg die voertuig tot hierdie groep nie...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kan nie gedeel voertuie na groep byvoeg...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Groepe - Kliek op 'n groep om te lys alle voertuie van hierdie groep
-STR_GROUP_CREATE_TIP                                            :{BLACK}kliek om groep te skep
-STR_GROUP_DELETE_TIP                                            :{BLACK}Vee uit die gekose groep
-STR_GROUP_RENAME_TIP                                            :{BLACK}Hernoem die gekose groep
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliek om te beskerm hierdie groep van wêreldwyd outovervang
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groepe - Kliek op 'n groep om te lys alle voertuie van hierdie groep
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}kliek om groep te skep
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Vee uit die gekose groep
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Hernoem die gekose groep
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Kliek om te beskerm hierdie groep van wêreldwyd outovervang
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3405,35 +3405,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Naam moet unike wees
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Naam moet unike wees
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Gaan na volgende teken
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Gaan na vorige teken
-STR_SIGN_OSKTITLE                                               :{BLACK}Tik 'n naam vir die teken in
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Gaan na volgende teken
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Gaan na vorige teken
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Tik 'n naam vir die teken in
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fonds
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospek
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bou
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Kies die paslike nywerheid van hierdie lys
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fonds
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospek
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bou
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Kies die paslike nywerheid van hierdie lys
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Voorlopend
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Voorloopend gesig keuse.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Voorloopend gesig keuse.
 STR_FACE_SIMPLE                                                 :{BLACK}Eenvoudig
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Eenvoudig gesig keuse.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Eenvoudig gesig keuse.
 STR_FACE_LOAD                                                   :{BLACK}Laai
-STR_FACE_LOAD_TIP                                               :{BLACK}Laai gunsteling gesig
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Laai gunsteling gesig
 STR_FACE_LOAD_DONE                                              :{WHITE}Jou gunsteling gesig is van die OpenTTD stellings lêer gelaai.
 STR_FACE_FACECODE                                               :{BLACK}Speler gesig no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Toon en/of stel speler gesig nommer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Toon en/of stel speler gesig nommer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Toon en/of stel speler gesig nommer
 STR_FACE_FACECODE_SET                                           :{WHITE}Nuwe gesig nommer kode is gestel.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kon nie speler gesig nommer stel - moet numeries wees tussen 0 en 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Spaar
-STR_FACE_SAVE_TIP                                               :{BLACK}Spaar gunsteling gesig
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Spaar gunsteling gesig
 STR_FACE_SAVE_DONE                                              :{WHITE}Die gesig sal as u gunsteling gesig in die OpenTTD stellings lêer gespaar word.
 STR_FACE_EUROPEAN                                               :{BLACK}Europiese
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Kies europiese gesige
@@ -3441,40 +3441,40 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikaan
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Kies  afrikaanse gesige
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nee
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Ontsper snor of oorbel
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Ontsper snor of oorbel
 STR_FACE_HAIR                                                   :Hare:
-STR_FACE_HAIR_TIP                                               :{BLACK}Verander hare
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Verander hare
 STR_FACE_EYEBROWS                                               :Winkbroue:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Verander winkbroue
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Verander winkbroue
 STR_FACE_EYECOLOUR                                              :Oog kleur:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Verander oogkleur
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Verander oogkleur
 STR_FACE_GLASSES                                                :Brille:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Ontsper brille
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Verander brille
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Ontsper brille
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Verander brille
 STR_FACE_NOSE                                                   :Neus:
-STR_FACE_NOSE_TIP                                               :{BLACK}Verander neus
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Verander neus
 STR_FACE_LIPS                                                   :Lippe:
 STR_FACE_MOUSTACHE                                              :Snor:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Verander lippe of snor
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Verander lippe of snor
 STR_FACE_CHIN                                                   :Ken:
-STR_FACE_CHIN_TIP                                               :{BLACK}Verander ken
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Verander ken
 STR_FACE_JACKET                                                 :Jas:
-STR_FACE_JACKET_TIP                                             :{BLACK}Verander jas
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Verander jas
 STR_FACE_COLLAR                                                 :Kraag:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Verander kraag
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Verander kraag
 STR_FACE_TIE                                                    :Das:
 STR_FACE_EARRING                                                :Oorbel:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Verander das of oorbel
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Verander das of oorbel
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Sein seleksie
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan nie seine hier verander nie...
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Een-rigting pad sein (elektries){}'n Pad sein laat meer as een trein in 'n sein block op die selfde tyd, as die trein 'n pad kan vind na 'n veiligge stop punt. Een-rigting seine kan nie  van die agterkant verby gevat word nie.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Sein verander{}Wanneer geselekteer is, 'n kliek askei op die sein sal die sein verander na die geselekteerde sein tiepe en waarde, CTRL-kliek sal die bestaande waarde tokkel.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Sein sleep digtheid
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Verminder sein sleep digtheid
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Verhoog sein sleep digtheid
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Sein seleksie
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan nie seine hier verander nie...
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Een-rigting pad sein (elektries){}'n Pad sein laat meer as een trein in 'n sein block op die selfde tyd, as die trein 'n pad kan vind na 'n veiligge stop punt. Een-rigting seine kan nie  van die agterkant verby gevat word nie.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Sein verander{}Wanneer geselekteer is, 'n kliek askei op die sein sal die sein verander na die geselekteerde sein tiepe en waarde, CTRL-kliek sal die bestaande waarde tokkel.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Sein sleep digtheid
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Verminder sein sleep digtheid
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Verhoog sein sleep digtheid
 ########
 
 ############ on screen keyboard
@@ -3486,42 +3486,42 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI Stellings
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Wys AI stellings
 STR_AI_DEBUG                                                    :{WHITE}AI ontfout
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Naam van die AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Naam van die AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Herlaai AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Maak die AI dood, herlaai die skrif en herlaai die AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Die AI ontfout venster is net beskikbaar vir die dienaar
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Maak die AI dood, herlaai die skrif en herlaai die AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Die AI ontfout venster is net beskikbaar vir die dienaar
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Konfigurasie
-STR_AI_CHANGE                                                   :{BLACK}Kies AI
-STR_AI_CONFIGURE                                                :{BLACK}Konfigureer
-STR_AI_CHANGE_TIP                                               :{BLACK}Laai nog 'n AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfigureer die parameters van AI
-STR_AI_LIST_TIP                                                 :{BLACK}Alle AIs wat in die volgende spel  gelaai gaan word
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Kies AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigureer
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Laai nog 'n AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigureer die parameters van AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alle AIs wat in die volgende spel  gelaai gaan word
 STR_AI_LIST_CAPTION                                             :{WHITE}Beskikbare AIs
-STR_AI_AILIST_TIP                                               :{BLACK}Kliek om 'n AI te kies
-STR_AI_ACCEPT                                                   :{BLACK}Aanvaar
-STR_AI_ACCEPT_TIP                                               :{BLACK}Kies beligte AI
-STR_AI_CANCEL                                                   :{BLACK}Kanseleer
-STR_AI_CANCEL_TIP                                               :{BLACK}Moenie AI verander nie
-STR_AI_CLOSE                                                    :{BLACK}Maak toe
-STR_AI_HUMAN_PLAYER                                             :Mens Speler
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Kliek om 'n AI te kies
+STR_AI_LIST_ACCEPT                                              :{BLACK}Aanvaar
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Kies beligte AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Kanseleer
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Moenie AI verander nie
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Maak toe
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Mens Speler
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parameters
-STR_AI_AUTHOR                                                   :{BLACK}Skrywer: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Daar was n fout met een van die AIs. Rapporteer assblief aan die skrywer met n skermskoot van die AI ontfout venster.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Skrywer: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Daar was n fout met een van die AIs. Rapporteer assblief aan die skrywer met n skermskoot van die AI ontfout venster.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Geraaas limit in dorp: {ORANGE}{COMMA}{BLACK}  Maks: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Geraas gegenereer: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Geraaas limit in dorp: {ORANGE}{COMMA}{BLACK}  Maks: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Geraas gegenereer: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipe
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Naam
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Naam van die inhoud
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Naam van die inhoud
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Selekteer alles
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Merk al die inhoud wat afgelaai moet word
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Merk alle inhoud wat nie afgelaai moet word nie
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Begin om die geselekteerde inligting af te laai
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Merk al die inhoud wat afgelaai moet word
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Merk alle inhoud wat nie afgelaai moet word nie
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Begin om die geselekteerde inligting af te laai
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Jy het nie dit geselekteer om af te laai nie
 STR_CONTENT_DETAIL_SUBTITLE_SELECTED                            :{SILVER}Jy het dit geselekeer om af te laai
 STR_CONTENT_DETAIL_SUBTITLE_ALREADY_HERE                        :{SILVER}Jy het hierdie reeds
@@ -3533,6 +3533,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kon nie
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Kyk Na Aanlyn Inhoud
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Kyk vir nuwe of bygewerkde inhoud om af te laai
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Vind vermisde inhoud aanlyn
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Kyk of die vermisde inhoud aanlyn kan gevind word
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Vind vermisde inhoud aanlyn
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Kyk of die vermisde inhoud aanlyn kan gevind word
 ########
diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt
index a72ee6427..dc89d0a9a 100644
--- a/src/lang/arabic_egypt.txt
+++ b/src/lang/arabic_egypt.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}الخر
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}خيارات
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}رسالة
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}رسالة من {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}تحذير!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}تحذير!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}لا يمكن تن�يذة....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}لا يمكن ازالتة ....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}الحقوق الأصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق مح�وظة
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}النس
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}النسخة الم�توحة {COPYRIGHT}2002-2009 �ريق النسخة الم�توحة
 
 STR_QUIT_CAPTION                                                :{WHITE}انهاء
-STR_YES                                                         :{BLACK}نعم
-STR_NO                                                          :{BLACK}لا
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}هل تود اغلاق النسخة الم�توحة و العودة لـ {STRING}?
+STR_QUIT_YES                                                    :{BLACK}نعم
+STR_QUIT_NO                                                     :{BLACK}لا
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}هل تود اغلاق النسخة الم�توحة و العودة لـ {STRING}?
 
 STR_JUST_NOTHING                                                :�ارغ
 STR_COLOUR_DARK_BLUE                                            :ازرق غامق
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}صحراء
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}ثلج
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}رسالة
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}ا�تراضي
-STR_QUERY_CANCEL                                                :{BLACK}الغاء
-STR_QUERY_OK                                                    :{BLACK}موا�ق
-STR_QUERY_RENAME                                                :{BLACK}اعادة تسمية
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}ا�تراضي
+STR_BUTTON_CANCEL                                               :{BLACK}الغاء
+STR_BUTTON_OK                                                   :{BLACK}موا�ق
+STR_BUTTON_RENAME                                               :{BLACK}اعادة تسمية
 
 STR_OSNAME_WINDOWS                                              :ويندوز
 STR_OSNAME_DOS                                                  :دوس
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}بضاع
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}معلومات
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK} السعة
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}مجموع الحمولة
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}الحمولة القصوى لهذا القطار:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}الحمولة القصوى لهذا القطار:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}لعبة جديدة
 STR_INTRO_LOAD_GAME                                             :{BLACK} تحميل
 STR_INTRO_MULTIPLAYER                                           :{BLACK}لعب جماعي
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}محرر الخريطة
 
-STR_MAPSIZE                                                     :{BLACK}حجم الخريطة
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}حجم الخريطة
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}خيارات اللعبة
 
 STR_COMPANY_SOMEONE                                             :شخص ما {SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :اغلاق ال
 STR_FILE_MENU_EXIT                                              :خروج
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}هل انت متأكد انك تود ترك هذة اللعبة و اغلاقها؟
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}ترك اللعبة
-STR_SORT_ORDER_TIP                                              :{BLACK} اختر طريقة الترتيب - تنازلي / تصاعدي
-STR_SORT_CRITERIA_TIP                                           :{BLACK} اختر نوع الترتيب
-STR_FILTER_CRITERIA_TIP                                         :{BLACK} اختر معايير ال�لترة
-STR_SORT_BY                                                     :{BLACK} رتب بـ
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK} اختر طريقة الترتيب - تنازلي / تصاعدي
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK} اختر نوع الترتيب
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK} اختر معايير ال�لترة
+STR_BUTTON_SORT_BY                                              :{BLACK} رتب بـ
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}عدد السكان
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :تكل�ة ال
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :القوة/تكل�ة التشغيل
 STR_SORT_BY_CARGO_CAPACITY                                      :سعة الشحن
 
-STR_NO_WAITING_CARGO                                            :{BLACK}لا يوجد اي شحنة منتظرة
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}اختر جميع المرا�ق
-STR_SELECT_ALL_TYPES                                            :{BLACK}اختر كل انواع الشحن (حتى غير المنتظرة(
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}عرض جميع المحركات لهذا النوع من العربات
-STR_MANAGE_LIST                                                 :{BLACK}ادارة الوحدات
-STR_MANAGE_LIST_TIP                                             :{BLACK}ارسل تعليمات لكل الوحدات المتاحة
-STR_REPLACE_VEHICLES                                            :استبدال بجديد
-STR_SEND_FOR_SERVICING                                          :توجة للصيانة
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}القطارات المتاحة
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}العربات المتاحة
-STR_AVAILABLE_SHIPS                                             :{BLACK}الس�ن المتاحة
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}الطائرات المتاحة
-
-STR_SEND_TRAIN_TO_DEPOT                                         :توجة الى الورشة
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :توجة الى الورشة
-STR_SEND_SHIP_TO_DEPOT                                          :توجة الى حوض الصيانة
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :توجة الى حظيرة الصيانة
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}لا يوجد اي شحنة منتظرة
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}اختر جميع المرا�ق
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}اختر كل انواع الشحن (حتى غير المنتظرة(
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}عرض جميع المحركات لهذا النوع من العربات
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}ادارة الوحدات
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}ارسل تعليمات لكل الوحدات المتاحة
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :استبدال بجديد
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :توجة للصيانة
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}القطارات المتاحة
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}العربات المتاحة
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}الس�ن المتاحة
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}الطائرات المتاحة
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :توجة الى الورشة
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :توجة الى الورشة
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :توجة الى حوض الصيانة
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :توجة الى حظيرة الصيانة
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}خيار
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}لا يمكن تغيير �ترات الصيانة
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}اغلاق الاطار
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}عنوان الاطار- اسحب لتحريك الاطار
-STR_STICKY_BUTTON                                               :{BLACK}خصص هذا الاطار بان يبقى م�توح عند اغلاق كا�ة الاطارات
-STR_RESIZE_BUTTON                                               :{BLACK}اضغط واسحب لتعديل حجم الاطار
+STR_TOOLTIP_STICKY                                              :{BLACK}خصص هذا الاطار بان يبقى م�توح عند اغلاق كا�ة الاطارات
+STR_TOOLTIP_RESIZE                                              :{BLACK}اضغط واسحب لتعديل حجم الاطار
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}اضغط هنا لتوجة الى دليل الح�ظ/ال�تح القياسي
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}هدم المباني و غيرها
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}خ�ض ركن الارض
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}ر�ع ركن الارض
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}خ�ض ركن الارض
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}ر�ع ركن الارض
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}شريط العرض- �وق /تحت
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}عمود التحريك - يمين/يسار
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}عرض التضاريس على الخريطة
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}عرض/Ø
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK} دخل السنة الحالية : {CURRENCY}  (  السنة السابقة  :  {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA}سنة ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA}سنة ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA}سنة ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA}سنة ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :قطار
-STR_VEHICLE_ROAD_VEHICLE                                        :مركبات
-STR_VEHICLE_SHIP                                                :س�ن
-STR_VEHICLE_AIRCRAFT                                            :طائرات
+STR_REPLACE_VEHICLE_TRAIN                                       :قطار
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :مركبات
+STR_REPLACE_VEHICLE_SHIP                                        :س�ن
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :طائرات
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} اصبحت قديمة
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} اصبحت قديمة جدا
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} قديمة جدا وتحتاج الى استبدال �وري
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}معلومات ارض
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK} تكل�ة الازالة :  {LTBLUE} غير متاح
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}تكل�ة الازالة :  {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK} الدخل عند للتجديد:  {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK} الدخل عند للتجديد:  {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :غير متاح
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}المالك: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}مالك الطريق: {LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}مالك
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}السلطة المحلية: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :�ارغ
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}اسم
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}اضغط
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}اضغط على المسار لازالته من القائمة
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}تشغيل / ايقا� العشوائي
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}اظهار اطار اختيار الموسيقى
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}اضغط على الخدمة لتوسيط الخريطة على المصنع/المدينة
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}اضغط على الخدمة لتوسيط الخريطة على المصنع/المدينة
 STR_INTRO_DIFFICULTY                                            :{BLACK} مستوى الصعوبة ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :الرسالة الأخيرة/التقرير الجديد
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}انقا
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}انشاء مسطحات عشوائية
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}اعادة المسطحات الأرضية الى وضعها السابق
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}اعادة المسطحات الأرضية الى وضعها السابق
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}ازالة ممتلكات اللاعبين من الخريطة
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}ازالة ممتلكات اللاعبين من الخريطة
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}هل انت متأكد من ازالة ممتلكات اللاعبين من الخريطة
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}بناء المسطحات الأرضية
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}بناء المدن
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...قرÙ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...قريبة جدا من مدينة أخرى
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... الموقع غير مناسب
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... المدن كثيرة جدا
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}لا يمكن انشاء اي مدينة
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}.... لا يوجد �راغ �ي الخريطة
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}لا يمكن انشاء اي مدينة
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}.... لا يوجد �راغ �ي الخريطة
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}زيادة حجم المدينة
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}توسيع المدينة
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}لن تبني البلدية طرق جديدة. بامكانك تمكين البلدية من بناء الطرق الجديدة عن طريق الاعدادات المتقدمة --> الاقتصاد --> المدن
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}لن تبني البلدية طرق جديدة. بامكانك تمكين البلدية من بناء الطرق الجديدة عن طريق الاعدادات المتقدمة --> الاقتصاد --> المدن
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}مدينة عشوائية
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}بناء مدينة �ي مكان عشوائي
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}لايمكن انشاء {STRING} هنا...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}اضا�
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}وضع منارة ضوئية
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}وضع هوائي لاسلكي
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}عر� منطقة صحراوية. {}اضغط بشكل متواصل م�تاح كنترول لأزالتها
-STR_CREATE_LAKE                                                 :{BLACK}عر� منطقة البحر.{} انشأ قناة, يجب الضغط المتواصل على م�تاح كنترول عند مستوى البحر والا طمرت المياة الاجزاء المجاورة
-STR_CREATE_RIVER                                                :{BLACK}انشاء انهار
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}عر� منطقة البحر.{} انشأ قناة, يجب الضغط المتواصل على م�تاح كنترول عند مستوى البحر والا طمرت المياة الاجزاء المجاورة
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}انشاء انهار
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}حذ�
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}حذ� المدينة كليا
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :ح�ظ الخريطة
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :�تح خريطة
-STR_MENU_LOAD_HEIGHTMAP                                         :�تح خريطة مرت�عات
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :�تح خريطة مرت�عات
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :خروج من المحرر
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :انهاء
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Ø­Ù�ظ Ø
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}لعب خريطة
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}العب خريطة المرت�عات
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}ابدأ لعبة جديدة بواسطة خريطة المرت�عات
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}هل تريد الخروج من انشاء الخريطة
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}هل تريد الخروج من انشاء الخريطة
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...يمكن بنائة �ي مدن يزيد سكانها عن 1200 نسمة
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}العودة بتاريخ البدأ سنة واحدة
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}تقديم تاريخ البدأ سنة واحدة لالأمام
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...يجØ
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}صغير
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}وسط
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}كبير
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK} عشوائي
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK} عشوائي
 STR_FOUND_TOWN_CITY                                             :{BLACK}مدينة
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK} المدن الكبيرة تنمو اسرع من المدن العادية. {} كلما كانت اكبر عند انشائها, بالاعتماد على الاعدادات.
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}اختر حجم المدينة
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}حجم المدينة:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW} تصميم طرق المدينة
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK} اختر تصميم الطرق لهذه المدينة
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK} اصلي
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK} طرق ا�ضل
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK} نمط 2 * 2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK} نمط 3 * 3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK} عشوائي
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW} تصميم طرق المدينة
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK} اختر تصميم الطرق لهذه المدينة
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK} اصلي
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK} طرق ا�ضل
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK} نمط 2 * 2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK} نمط 3 * 3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK} عشوائي
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}اظهر اخر رسالة / تقرير
 STR_NEWS_MESSAGES_OFF                                           :اغلاق
 STR_NEWS_MESSAGES_SUMMARY                                       :ملخص
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  Ù…
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}صورة من الشاشة ح�ظت بنجاح باسم:  '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}لم يتم ح�ظ الصورة
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}شاء ارض للأستخدام المستقبلي
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}شاء ارض للأستخدام المستقبلي
 STR_STATUSBAR_AUTOSAVE                                          :{RED}ح�ظ تلقائي
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  يتم ح�ظ اللعبة  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}الح�ظ مازال جاريا الآن{}الرجاء الأنتظار حتر ينتهي
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}الح�ظ مازال جاريا الآن{}الرجاء الأنتظار حتر ينتهي
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}اختر'Ezy Street style music'برنامج
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}اختر
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}شاشة كاملة
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}اختر هذا المربع للعب OpenTTD على لشاشة الكاملة
-STR_FULLSCREEN_FAILED                                           :{WHITE}�شل تشغيل نمط الشاشة الكاملة
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}�شل تشغيل نمط الشاشة الكاملة
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}دقة الشاشة
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}اختر دقة الشاشة
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK} اختØ
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} مل� م�قود او غير صالح
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK} معلومات اضا�ية عن القاعدة الرسومية
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}�شل الح�ظ التلقائي
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}�شل الح�ظ التلقائي
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}تتوجة الى {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}تتوجة الى {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}لايوجد اوامر وجهات
-STR_NO_ORDERS_VEL                                               :{LTBLUE}لا يوجد اوامر وجهات , {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}تتوجة الى {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}تتوجة الى {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}لايوجد اوامر وجهات
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}لا يوجد اوامر وجهات , {VELOCITY}
 
 STR_PASSENGERS                                                  :ركاب
 STR_BAGS                                                        :صناديق
@@ -857,9 +857,9 @@ STR_CRATES                                                      :صناديق
 STR_RES_OTHER                                                   :اخرى
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}لا يمكن مشاركة قائمة الأوامر
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}لا يمكن نسخ قائمة الأوامر
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - نهاية الأوامر المشتركة - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}لا يمكن مشاركة قائمة الأوامر
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}لا يمكن نسخ قائمة الأوامر
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - نهاية الأوامر المشتركة - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} لا يستطيع ايجاد طريق للمواصلة
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} تائه
@@ -1128,15 +1128,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}طول
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :غير م�عل
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}عدل قيمة التغيير
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}عدل قيمة التغيير
 
-STR_TEMPERATE_LANDSCAPE                                         :مناطق معتدلة
-STR_SUB_ARCTIC_LANDSCAPE                                        :مناطق ثلجية
-STR_SUB_TROPICAL_LANDSCAPE                                      :مناطق مدارية
-STR_TOYLAND_LANDSCAPE                                           :ألعاب
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :مناطق معتدلة
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :مناطق ثلجية
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :مناطق مدارية
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :ألعاب
 
 STR_CHEATS                                                      :{WHITE}اسرار
-STR_CHEATS_TIP                                                  :{BLACK}علامة صح اذا استخدمت  هذا السر من  قبل
+STR_CHEATS_TOOLTIP                                              :{BLACK}علامة صح اذا استخدمت  هذا السر من  قبل
 STR_CHEATS_WARNING                                              :{BLACK}تحذير! انت على وشك ان تخون منا�سيك. هذا الخيانة ستبقى عار عليك الى الأبد.
 STR_CHEAT_MONEY                                                 :{LTBLUE}زيادة السيولة بـ {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}العب كشركة{ORANGE}{COMMA}
@@ -1148,179 +1148,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}بدل
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}عدل التاريخ {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}ت�عيل تغيير قيمة الانتاج: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}متوجه ل{WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}متوجه ل {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}متوجه ل{WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}متوجه ل {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :أذهب من خلال{WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :توجة بشكل بدون توق� خلال {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :أذهب من خلال{WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :توجة بشكل بدون توق� خلال {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :نقطة عبور {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} نقطة عبور #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} عوامة
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} عوامة #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :نقطة عبور
+STR_FORMAT_WAYPOINT_NAME                                        :نقطة عبور {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} نقطة عبور #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} عوامة
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} عوامة #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :نقطة عبور
 
-STR_WAYPOINT                                                    :{WHITE} نقطة عبور
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK} اختر نوع نقطة العبور
+STR_WAYPOINT_CAPTION                                            :{WHITE} نقطة عبور
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK} اختر نوع نقطة العبور
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}عدل اسم نقطة العبور
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}لا يمكن تعديل نقطة العبور
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}لا يمكن تعديل نقطة العبور
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}غير السكة الى نقطة عبور
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}لا  يمكن بناء نقطة عبور هنا ...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}لا يمكن ازالة نقطة العبور من هنا ...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}لا  يمكن بناء نقطة عبور هنا ...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}لا يمكن ازالة نقطة العبور من هنا ...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}بناء سكة القطار باستخدام البناء التلقائي
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... لا يوجد مدن �ي هذه الخريطة
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}مولد الخريطة توق� ... {} ... لا يوجد مواقع مناسبة للمدن
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... لا يوجد مدن �ي هذه الخريطة
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}مولد الخريطة توق� ... {} ... لا يوجد مواقع مناسبة للمدن
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}العديد من المدن العشوائية
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}غطي الخريطة عشوائيا بمدن
-STR_MANY_RANDOM_INDUSTRIES                                      :الكثير من المصانع
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}غطي الخريطة عشوائيا بالمصانع
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}لا يمكن انشاء مصانع ...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}العديد من المدن العشوائية
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}غطي الخريطة عشوائيا بمدن
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :الكثير من المصانع
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}غطي الخريطة عشوائيا بالمصانع
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}لا يمكن انشاء مصانع ...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}ا�تح مدير تحرير التضاريس لر�ع / خ�ض الارض, زراعة الاشجار, الخ.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}التضاريس
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}مستوى الارض
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}مستوى الارض
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}شجر عشوائي
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}ضع شجر عشوائي
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}ضع شجر عشوائي
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}لا يمكن بناء قناة مياة هنا ...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}لا يمكن بناء قناة مياة هنا ...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}بناء قناة
-STR_LANDINFO_CANAL                                              :قناة
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :قناة
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}لا يمكن بناء حاجز هنا
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}لا يمكن بناء حاجز هنا
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK} بناء ق�ل
-STR_LANDINFO_LOCK                                               :ق�ل
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :ق�ل
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}لا يمكن وضع نهر هنا ...
-STR_LANDINFO_RIVER                                              :نهر
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}لا يمكن وضع نهر هنا ...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :نهر
 
-STR_BUOY_IS_IN_USE                                              :{WHITE} ... العوامة مستخدمة
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE} ... العوامة مستخدمة
 
-STR_LANDINFO_COORDS                                             :{BLACK}الأحداثيات: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}الأحداثيات: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}لا يمكن حذ� جزء من المحطة ...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}لا يمكن تحويل سكة القطار هنا ...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}لا يمكن حذ� جزء من المحطة ...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}لا يمكن تحويل سكة القطار هنا ...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}حول / طور سكة القطار
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}أسحب محرك القطار إلى هنا لبيع القطار كاملا
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}أسحب محرك القطار إلى هنا لبيع القطار كاملا
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}أسحب وأ�لت
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}بناء محطة بطريقة السحب والإ�لات
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK} اختر �ئة المحطات لعرضها
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}أختر نوع المحطة لبنائها
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK} اختر �ئة المحطات لعرضها
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}أختر نوع المحطة لبنائها
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}سرع اللعبه
 STR_MESSAGE_HISTORY                                             :{WHITE}الرسائل السابقة
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}قائمة بآخر الاخبار
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}تعطيل الكل
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}ت�عيل الكل
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}قائمة بآخر الاخبار
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}تعطيل الكل
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}ت�عيل الكل
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}صناعات
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW}({COMMA}% صدرت)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW}({COMMA}%/{COMMA}% صدرت)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}اسماء المصانع - اضغط على اسم لتوسيط الشاشة علية
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}صناعات
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW}({COMMA}% صدرت)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW}({COMMA}%/{COMMA}% صدرت)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}اسماء المصانع - اضغط على اسم لتوسيط الشاشة علية
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}قريب جدا من مصنع آخر
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}قريب جدا من مصنع آخر
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}تغيير الانتاج
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}تعدد اللاعبين
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}أسم اللاعب
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}هذا الآسم الذي ستعر� به �ي اللعبة
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}أدخل أسمك
-STR_NETWORK_CONNECTION                                          :{BLACK}اتصال
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}أختر بين لعبة على الإنترنت أو الشبكة المحلية (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}أبدأ الخادم
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}أبدأ خادمك الخاص
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}الأسم
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}أسم اللعبة
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}اللغة ، نسخة الخادم ، إلخ
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}أضغط على لعبة من القائمة لإختيارها
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}الخادم الذي أنضممت إليه آخر مره:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}اضغط للعب الخادم الذي لعبت به آخر مرة.
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}أبحث عن خادم
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}أبحث �ي الشبكة عن خادم
-STR_NETWORK_ADD_SERVER                                          :{BLACK}اض� خادم - سير�ر
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}اض� خادم (سير�ر) و الذي سو� ي�حص اذا كان هناك لعبة قيد التشغيل حاليا
-STR_NETWORK_ENTER_IP                                            :{BLACK}أدخل عنوان المضي�
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}عميل
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}عملاء متصلين  / أقصى عدد للعملاء{}شركات متصلة  / أقصى عدد للشركات
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}حجم الخريطة
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}حجم خريطة اللعبة{}أضغط لترتيب بالحجم
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}التاريخ
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}التاريخ الحالي
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}سنين
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}عدد السنوات{}اللعبة قائمة
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}معلومات اللعبة
-STR_NETWORK_CLIENTS                                             :{SILVER}عملاء:{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}اللغة:{WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}مجموعة المربعات:{WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}حجم الخريطة: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}نسخة الخادم:{WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}عنوان الخادم:{WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}تاريخ البداية:{WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}التاريخ الحالي:{WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}كلمت السر محمية!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}الخادم غير موجود
-STR_NETWORK_SERVER_FULL                                         :{SILVER}الخادم ممتلئ
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}النسخة غير متطابقة
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER} عدم توا�ق NewGFR
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}أنضم للعبة
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}أبدا لعبة متعددة اللاعبين جديدة
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}أسم اللعبة:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}أسم اللعبة سيظهر للآخرين �ي قائمة تعدد اللاعبين
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}أدخل أسم اللعبة للشبكة
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}ضع كلمة سر
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}احم لعبتك برقم سري حتى لا تصبح لعبتك م�توحة للجميع
-STR_NETWORK_SELECT_MAP                                          :{BLACK}اختر خريطة:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}�ي أي خريطة تود ان تلعب؟
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :شبكة محلية
-STR_NETWORK_INTERNET                                            :انترنت
-STR_NETWORK_LAN_INTERNET                                        :شبكة محلية / انترنت
-STR_NETWORK_INTERNET_ADVERTISE                                  :انترنت (دعاية)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM}عميل
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}اقصى عدد عملاء:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}أختر أقصى عدد للعملاء
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}شركة
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}أقصى عدد شركات:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}حدد العدد الاقصى للشركات �ي هذا الخادم
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}مشاهد
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}أقصى عدد مشاهدين:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}حدد عدد المشاهدين لهذا الخادم
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}اللغة المتحدثة:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}اللاعبين الآخرين سيعر�ون اللغة المتحدثة
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}أبدأ اللعبة
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}ابدأ لعبة شبكة جديدة من خريطة عشوائية او سيناريو.
-STR_NETWORK_LOAD_GAME                                           :{BLACK}حمل اللعبة
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}استعادة لعبة متعددة اللاعبين سابقة (تأكد من الربط باللاعب الصحيح).
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}تعدد اللاعبين
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}أسم اللاعب
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}هذا الآسم الذي ستعر� به �ي اللعبة
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}أدخل أسمك
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}اتصال
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}أختر بين لعبة على الإنترنت أو الشبكة المحلية (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}أبدأ الخادم
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}أبدأ خادمك الخاص
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}الأسم
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}أسم اللعبة
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}اللغة ، نسخة الخادم ، إلخ
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}أضغط على لعبة من القائمة لإختيارها
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}الخادم الذي أنضممت إليه آخر مره:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}أدخل عنوان المضي�
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}عميل
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}عملاء متصلين  / أقصى عدد للعملاء{}شركات متصلة  / أقصى عدد للشركات
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}حجم الخريطة
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}حجم خريطة اللعبة{}أضغط لترتيب بالحجم
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}التاريخ
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}التاريخ الحالي
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}سنين
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}عدد السنوات{}اللعبة قائمة
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}معلومات اللعبة
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}عملاء:{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}اللغة:{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}مجموعة المربعات:{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}حجم الخريطة: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}نسخة الخادم:{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}عنوان الخادم:{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}تاريخ البداية:{WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}التاريخ الحالي:{WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}كلمت السر محمية!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}الخادم غير موجود
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}الخادم ممتلئ
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}النسخة غير متطابقة
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER} عدم توا�ق NewGFR
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}أنضم للعبة
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}أبدا لعبة متعددة اللاعبين جديدة
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}أسم اللعبة:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}أسم اللعبة سيظهر للآخرين �ي قائمة تعدد اللاعبين
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}أدخل أسم اللعبة للشبكة
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}ضع كلمة سر
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}احم لعبتك برقم سري حتى لا تصبح لعبتك م�توحة للجميع
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}اختر خريطة:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}�ي أي خريطة تود ان تلعب؟
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :شبكة محلية
+STR_NETWORK_SERVER_LIST_INTERNET                                :انترنت
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :شبكة محلية / انترنت
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :انترنت (دعاية)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM}عميل
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}اقصى عدد عملاء:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}أختر أقصى عدد للعملاء
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}شركة
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}أقصى عدد شركات:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}حدد العدد الاقصى للشركات �ي هذا الخادم
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}مشاهد
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}أقصى عدد مشاهدين:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}حدد عدد المشاهدين لهذا الخادم
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}اللغة المتحدثة:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}اللاعبين الآخرين سيعر�ون اللغة المتحدثة
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}أبدأ اللعبة
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}ابدأ لعبة شبكة جديدة من خريطة عشوائية او سيناريو.
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}حمل اللعبة
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}استعادة لعبة متعددة اللاعبين سابقة (تأكد من الربط باللاعب الصحيح).
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :أي
@@ -1361,33 +1361,33 @@ STR_NETWORK_LANG_GREEK                                          :اليونانÙ
 STR_NETWORK_LANG_LATVIAN                                        :اللات�ية
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}ردهة تعدد اللاعبين
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}ردهة تعدد اللاعبين
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}التحضير لالانضمام الى:{ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}قائمة بالشركات الموجودة باللعبة ، يمكنك الإنضمام لشركة أو تأسيس واحدة
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}شركة جديدة
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}أنشئ شركة جديدة
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}شاهد اللعبة
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}شاهد اللعبة كامشاهد
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}أنضم لشركة
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}ساعد �ي إدارة الشركة
-STR_NETWORK_REFRESH                                             :{BLACK}حدث الخادم
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}حدث معلومات الخادم
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}التحضير لالانضمام الى:{ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}قائمة بالشركات الموجودة باللعبة ، يمكنك الإنضمام لشركة أو تأسيس واحدة
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}شركة جديدة
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}أنشئ شركة جديدة
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}شاهد اللعبة
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}شاهد اللعبة كامشاهد
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}أنضم لشركة
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}ساعد �ي إدارة الشركة
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}حدث الخادم
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}حدث معلومات الخادم
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}معلومات الشركة
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}معلومات الشركة
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}أسم الشركة:{WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}ا�تتاح:{WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}قيمة الشركة:{WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}الرصيد الحالي:{WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}دخل السنة الماضية:{WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}الأداء:{WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}أسم الشركة:{WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}ا�تتاح:{WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}قيمة الشركة:{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}الرصيد الحالي:{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}دخل السنة الماضية:{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}الأداء:{WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}مركبة:{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}محطات:{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}لاعبين:{WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}مركبة:{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}محطات:{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}لاعبين:{WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}إتصال...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}إتصال...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) إتصال..
@@ -1403,49 +1403,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}جلب Ù
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM}انتظار اللاعبين السابقين
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} حمل حتى الان
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}�صل
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}�صل
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE} ادخل قدر المال الذي تود اعطائه
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}الخادم محمي، أدخل الرقم السر
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}الشركة محمية ، أدخل الرقم السري
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}قائمة العملاء
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}قائمة العملاء
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE} شاهد
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE} شركة جديدة
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} لايوجد أجهزة شبكة او الشبكة معطلة
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} لايوجد ألعاب شبكة
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} الخادم لم يجب على الطلب
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} لم يتم الربط بسبب عدم توا�ق NewGFR
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}�شل تحديث البيانات
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} انقطع الاتصال بلعبة الشبكة
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} لايمكن تحميل اللعبة المخزنة
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} لايمكن بدء الخادم
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} لايمكن الإتصال
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} الاتصال رقم # {NUM}انهى الوقت المتاح للربط
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} حدث خطأ �ي البروتوكول و انقطع الاتصال
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}نسخة اللاعب غير مطابقة لنسخة الخادم
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} رقم سري خاطئ
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} الخادم ممتلئ
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} أنت ممنوع من هذا الخادم
-STR_NETWORK_ERR_KICKED                                          :{WHITE} لقد طردت من اللعبة
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} الغش ليس مسموحا به �ي هذه اللعبة
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} لايوجد أجهزة شبكة او الشبكة معطلة
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} لايوجد ألعاب شبكة
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} الخادم لم يجب على الطلب
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} لم يتم الربط بسبب عدم توا�ق NewGFR
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}�شل تحديث البيانات
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} انقطع الاتصال بلعبة الشبكة
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} لايمكن تحميل اللعبة المخزنة
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} لايمكن بدء الخادم
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} لايمكن الإتصال
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} الاتصال رقم # {NUM}انهى الوقت المتاح للربط
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} حدث خطأ �ي البروتوكول و انقطع الاتصال
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}نسخة اللاعب غير مطابقة لنسخة الخادم
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} رقم سري خاطئ
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} الخادم ممتلئ
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} أنت ممنوع من هذا الخادم
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} لقد طردت من اللعبة
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} الغش ليس مسموحا به �ي هذه اللعبة
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :خطاء عام
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :خطأ �ي DESYNC
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :لايمكن تحميل الخريطة
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :�قد الإتصال
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :خطاء �ي البروتكول
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :عدم توا�ق �ي NewGFR
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :غير مصرح
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :استلمت معلومات غريبة
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :اصدار خاطئ
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :الأسم مستخدم
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :رقم سري خاطئ
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :اسم الشركة خاطئ �ي الشبكة
-STR_NETWORK_ERR_CLIENT_KICKED                                   :طردت من الخادم
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :كان يحاول استخدام سر للغش
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :خادم ممتلئ
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :خطاء عام
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :خطأ �ي DESYNC
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :لايمكن تحميل الخريطة
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :�قد الإتصال
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :خطاء �ي البروتكول
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :عدم توا�ق �ي NewGFR
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :غير مصرح
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :استلمت معلومات غريبة
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :اصدار خاطئ
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :الأسم مستخدم
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :رقم سري خاطئ
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :اسم الشركة خاطئ �ي الشبكة
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :طردت من الخادم
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :كان يحاول استخدام سر للغش
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :خادم ممتلئ
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1455,15 +1455,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :اللعب مت
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :الاستمرار باللعب - تم ربط اللاعب
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :الاستمرار باللعب - �شل ربط اللاعب
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :يغادر
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} قد انضم للعبة
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} انضم الى الشركة رقم : {2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} انضم الى المشاهدين
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} قد بدأ شركة جديدة: (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} قد غادر اللعبة : - {2:STRING}-
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} قد غير اسمه / اسمها الى {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} اعطى شركتك : {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :***  انت اعطيت : {1:STRING}  {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :يغادر
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} قد انضم للعبة
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} انضم الى الشركة رقم : {2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} انضم الى المشاهدين
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} قد بدأ شركة جديدة: (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} قد غادر اللعبة : - {2:STRING}-
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} قد غير اسمه / اسمها الى {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} اعطى شركتك : {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :***  انت اعطيت : {1:STRING}  {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[�ريق]
 STR_NETWORK_CHAT_COMPANY                                        :[�ريق]{STRING} : {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[�ريق] الى {STRING} : {WHITE}{STRING}
@@ -1473,8 +1473,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[خاص] الى
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[الكل]:
 STR_NETWORK_CHAT_ALL                                            :[الكل] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}ادخل نص للمحادثة
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE}اق�ل الخادم الجلسة
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} يتم بدأ الخادم من جديد ... {} الرجاء الأنتظار
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}اق�ل الخادم الجلسة
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} يتم بدأ الخادم من جديد ... {} الرجاء الأنتظار
 
 STR_NETWORK_SERVER                                              :خادم
 STR_NETWORK_CLIENT                                              :عميل
@@ -1488,19 +1488,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :تحدث لشر
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :رسالة خاصة
 
 
-STR_NETWORK_SEND                                                :{BLACK}ارسل
+STR_NETWORK_CHAT_SEND                                           :{BLACK}ارسل
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}لا يمكن تحميل الخريطة من PNG ...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... المل� غير موجود.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}... لا يمكن تحويل صيغة المل�.مطلوب مل� PNG . 8 او 24 - بت
-STR_PNGMAP_ERR_MISC                                             :{WHITE}حدث خطأ ما ... للاس� ! (قد يكون مل� تال�).
+STR_ERROR_PNGMAP                                                :{WHITE}لا يمكن تحميل الخريطة من PNG ...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... المل� غير موجود.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... لا يمكن تحويل صيغة المل�.مطلوب مل� PNG . 8 او 24 - بت
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}حدث خطأ ما ... للاس� ! (قد يكون مل� تال�).
 
-STR_BMPMAP_ERROR                                                :{WHITE}لا يمكن تحميل الخريطة من BMP ...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}لايمكن تحويل نوع الصورة...
+STR_ERROR_BMPMAP                                                :{WHITE}لا يمكن تحميل الخريطة من BMP ...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}لايمكن تحويل نوع الصورة...
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}تكل�ة: {CURRENCY}
@@ -1514,13 +1514,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}الدخ
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}لا يمكن ر�ع الأرض هنا
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}لا يمكن خ�ض الأرض هنا
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}لا يمكن تسوية الأرض هنا ...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :صخور
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :ارض جبلية
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :ارض جرداء
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :عشب
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :حقول
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :ارض  ثلجية
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :صحراء
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :صخور
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :ارض جبلية
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :ارض جرداء
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :عشب
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :حقول
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :ارض  ثلجية
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :صحراء
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}الأرض مائلة �ي الأتجاة الغير مناسب
@@ -1528,11 +1528,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}تركي
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}الح�ر سو� يضر بالقناة
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... تم الوصول لمستوى البحر
 STR_ERROR_TOO_HIGH                                              :{WHITE}عالي جدا...
-STR_ALREADY_LEVELLED                                            :{WHITE}مسطحة ...
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}مسطحة ...
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}....مسار السكة الحديدية غير مناسب
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...تم بنائة
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}يجب ازالة السكة اولا
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}طريق بإتجاه واحد أو مغلق
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}طريق بإتجاه واحد أو مغلق
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}بناء السكك الحديدية
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}بناء سكة القطار الكهربائية
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}بناء السكة الاحادية
@@ -1556,44 +1556,44 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}بناء
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}بناء جسر قطارات
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}بناء ن�ق قطار
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}تناوب بناء/ازالة سكك واشارات القطارات
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}بناء الجسور - اختر الجسر الم�ضل لديك لبنائة
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}بناء الجسور - اختر الجسر الم�ضل لديك لبنائة
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}اختر اتجاة ورشة صيانة القطارات
-STR_RAILROAD_TRACK                                              :سكة القطار
-STR_RAILROAD_TRAIN_DEPOT                                        :ورشة صيانة القطار
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :سكة القطار
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :ورشة صيانة القطار
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...المنطقة مملوكة لشركة منا�سة
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :سكة قطار مع اشارة ق�ل
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :سكة قطار مع مرتبطة باشارة سابقة
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :سكة قطار مع اشارة خروج
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :سكة قطار مع اشارة مزدوجة
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :سكة قطار مع اشارة طريق
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :سكة قطار مع اشارة اتجاة واحد
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :سكة قطار مع اشارة اغلاق و اشارة سابقة
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :سكة قطار مع اشارة ق�ل و خروج
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :سكة قطار مع اشارة ق�ل و اشارة مزدوجة
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :سكة قطار مع اشارة ق�ل و اشارة طريق
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :سكة قطار مع اشارة ق�ل و اتجاة واحد
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :سكة قطار مع اشارة خروج و اشارة مسبقة
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :سكة قطار مع اشارةمزدوجة و اشارة مسبقة
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :سكة قطار مع اشارة طريق و اشارة مسبقة
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :سكة قطار مع اشارة اتجاة واحد و اشارة مسبقة
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :سكة قطار مع اشارة مزدوجة و اشارة خروج
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :سكة قطار مع اشارة خروج و اتجاة
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :سكة قطار مع اشارة خروج و اتجاة واحد
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :سكة قطار مع اشارة مزدوجة و اشارة مسار
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :سكة قطار مع اشارة مزدوجة و اشارة طريق واحد
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :سكة قطار مع اشارة مسار و اتجاة موحد
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}يجب ازالة محطة القطار اولا
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE} يجب ازالة سكة الحديد اولا
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW} بناء محطة م�صلة
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW} ابني نقطة عبور مستقلة
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK} اربط المحطات
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK} اربط نقطة العبور
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :سكة قطار مع اشارة ق�ل
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :سكة قطار مع مرتبطة باشارة سابقة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :سكة قطار مع اشارة خروج
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :سكة قطار مع اشارة مزدوجة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :سكة قطار مع اشارة طريق
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :سكة قطار مع اشارة اتجاة واحد
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :سكة قطار مع اشارة اغلاق و اشارة سابقة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :سكة قطار مع اشارة ق�ل و خروج
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :سكة قطار مع اشارة ق�ل و اشارة مزدوجة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :سكة قطار مع اشارة ق�ل و اشارة طريق
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :سكة قطار مع اشارة ق�ل و اتجاة واحد
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :سكة قطار مع اشارة خروج و اشارة مسبقة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :سكة قطار مع اشارةمزدوجة و اشارة مسبقة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :سكة قطار مع اشارة طريق و اشارة مسبقة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :سكة قطار مع اشارة اتجاة واحد و اشارة مسبقة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :سكة قطار مع اشارة مزدوجة و اشارة خروج
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :سكة قطار مع اشارة خروج و اتجاة
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :سكة قطار مع اشارة خروج و اتجاة واحد
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :سكة قطار مع اشارة مزدوجة و اشارة مسار
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :سكة قطار مع اشارة مزدوجة و اشارة طريق واحد
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :سكة قطار مع اشارة مسار و اتجاة موحد
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}يجب ازالة محطة القطار اولا
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE} يجب ازالة سكة الحديد اولا
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW} بناء محطة م�صلة
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW} ابني نقطة عبور مستقلة
+STR_JOIN_STATION_CAPTION                                        :{BLACK} اربط المحطات
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK} اربط نقطة العبور
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}يجب ازالة الطريق اولا
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}اعمال الطرق قيد التن�يذ
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}اعمال الطرق قيد التن�يذ
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}بناء الطرق
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}بناء ترام
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}اختر الجسر المناسب
@@ -1629,14 +1629,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}بناء
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}�عل / عطل الطرق موحدة الاتجاة
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}تناوب بناء/ ازالة الطرق
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}بدل بناء / ازالة طرق الترام
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}اختر اتجاة ورشة صيانة العربات
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}اختر اتجاة مستودع الترام
-STR_ROAD_DESCRIPTION_ROAD                                       :طريق
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :طريق مضاء
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :طريق مرصو� بالشجر
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :ورشة صيانة العربات
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :تقاطع طريق مع سكة قطار
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :الترام
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}اختر اتجاة ورشة صيانة العربات
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}اختر اتجاة مستودع الترام
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :طريق
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :طريق مضاء
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :طريق مرصو� بالشجر
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :ورشة صيانة العربات
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :تقاطع طريق مع سكة قطار
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :الترام
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}لا يمكن حذ� محطة الركاب ...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}لا يمكن ازالة محطة البضائع من هنا ...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}لا يمكن ازالة محطة الترام للركاب
@@ -1644,12 +1644,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}لا ÙŠÙ
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}مدن/ بلدات
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ){COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ){COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}يجب هدم المبنى اولا
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} - مدينة -
@@ -1662,9 +1662,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}وسط Ø
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}تغيير اسم المدينة
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}الركاب الشهر الماضي: {ORANGE}{COMMA}{BLACK}  الأقصى: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}طرود البريد الشهر الماضي: {ORANGE}{COMMA}{BLACK}  الأقصى: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK} نمو المدينة يتطلب بضائع
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} مطلوب
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} اوصل الشهر الماضي
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK} نمو المدينة يتطلب بضائع
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} مطلوب
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} اوصل الشهر الماضي
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :مبنى مكاتب عالي
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :مبنى مكاتب
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :مبنى شقق صغيرة
@@ -1701,7 +1701,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}شركة {STRING}  �ازت بالعرض{}{} نقل {STRING} من {STATION} الى {STATION} سو� يعطي 3 اضعا� الدخل للسنة القادمة
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK} شركة {STRING}  �ازت بالعرض !{}{} نقل {STRING} من {STATION} الى {STATION} سو� يعطي اربعة اضعا� الدخل للسنة القادمة
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN}البلدية تر�ض بناء مطار آخر �ي هذه المدينة
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE} بلدية {TOWN}{} تر�ض السماح بمطار هنا بسبب تتعلق بالضوضاء العالية منه .
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE} بلدية {TOWN}{} تر�ض السماح بمطار هنا بسبب تتعلق بالضوضاء العالية منه .
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :اكواخ
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :منازل
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :شقق
@@ -1737,7 +1737,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK} �وضى طرق عارمة �ي مدينة {TOWN}!{}{}اعادة ترميم الطرق مولت من قبل شركة {STRING}{} تجلي ستة أشهر من الشقاء لعربات الطريق.
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ) {COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (تحت الانشاء)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (تحت الانشاء)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :مبنى قباني
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :خيم
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :مبنى ابريق الشاي
@@ -1750,17 +1750,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :وضع علام
 STR_PLANT_TREE_CAPTION                                          :{WHITE} اشجار
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... الاشجار موجودة هنا مسبقا
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}... لا يمكن زراعة اشجار هنا
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... العلامات كثيرة جدا
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE} لايمكن وضع علامة هنا...
-STR_SIGN_DEFAULT                                                :علامة
+STR_DEFAULT_SIGN_NAME                                           :علامة
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}عدل نص العلامة
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}لا يمكن تعديل اسم العلامة ...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}لا يمكن حذ� العلامة ...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK} اختر نوع الشجر لزراعتة
-STR_TREE_NAME_TREES                                             :اشجار
-STR_TREE_NAME_RAINFOREST                                        :غابات ماطرة
-STR_TREE_NAME_CACTUS_PLANTS                                     :اشجار الصبار
+STR_LAI_TREE_NAME_TREES                                         :اشجار
+STR_LAI_TREE_NAME_RAINFOREST                                    :غابات ماطرة
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :اشجار الصبار
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE} اختر محطة القطار
@@ -1782,7 +1782,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}يجب Ø
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}قريب جدا من مطار آخر
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}يجب هدم المطار اولا
 
-STR_QUERY_RENAME_STATION_CAPTION                                :اعادة تسمية المحطة
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :اعادة تسمية المحطة
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}لا يمكن اعادة التسمية
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}معدل النقل
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}يستقبل
@@ -1800,10 +1800,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :خارق
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK} عرض جميع العربات المرتبطة بهذه المحطة
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}عرض جميع الس�ن المرتبطة بهذا المر�ئ
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK} عرض جميع العربات المرتبطة بهذه المحطة
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK} عرض جميع القطارات المرتبطة بهذه المحطة
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}عرض جميع الس�ن المرتبطة بهذا المر�ئ
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING} :{YELLOW}{STRING} ) {COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} لم تعد تقبل {STRING}
@@ -1839,47 +1839,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}غير Ø
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}عرض لائحة بالبضائع المقبولة
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}اسم المحطة - اضغط على اسم المحطة لتوسيطها �ي الشاشة
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}اختر حجم / نوع المطار
-STR_STATION_SIGN                                                :{STATION}  {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :محطة قطارات
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :حظيرة طائرات
-STR_STATION_DESCRIPTION_AIRPORT                                 :مطار
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :محطة تحميل عربات
-STR_STATION_DESCRIPTION_BUS_STATION                             :محطة باصات
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :مر�ء س�ن
+STR_VIEWPORT_STATION                                            :{STATION}  {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :محطة قطارات
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :حظيرة طائرات
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :مطار
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :محطة تحميل عربات
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :محطة باصات
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :مر�ء س�ن
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}وضح منطقة التغطيةللموقع المقترح
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}لا توضح منطقة التغطية للموقح المقترح
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}وضح منطقة التغطية
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}مر�ء
-STR_STATION_DESCRIPTION_BUOY                                    :عوامة
+STR_LAI_STATION_DESCRIPTION_BUOY                                :عوامة
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... عوامة �ي المسار
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... المحطة واسعة جدا
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}منع المحطات الغير منتظمة ...
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}اضغط بشكل متواصل على م�تاح كنترول لاختيار اكثر من وحدة
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}منع المحطات الغير منتظمة ...
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}اضغط بشكل متواصل على م�تاح كنترول لاختيار اكثر من وحدة
 
 STR_UNDEFINED                                                   :وصلة غير معر�ة
-STR_STAT_CLASS_DFLT                                             :المحطة القياسية
-STR_STAT_CLASS_WAYP                                             :نقطة عبور
+STR_STATION_CLASS_DFLT                                          :المحطة القياسية
+STR_STATION_CLASS_WAYP                                          :نقطة عبور
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}اتجاة حوض الصيانة
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}يجب ان يبنى �ي الماء
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}لا يمكن بناء حوض صيانة هنا ...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK} اختر اتجاة حوض الصيانة
-STR_WATER_DESCRIPTION_WATER                                     :مياة
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :ساحل او ض�ة نهر
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :حوض صيانة للس�ن
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :قناة مائية
+STR_LAI_WATER_DESCRIPTION_WATER                                 :مياة
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :ساحل او ض�ة نهر
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :حوض صيانة للس�ن
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :قناة مائية
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE} ... لا يمكن بنائة على الماء
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}يجب هدم القتاة اولا
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}يجب هدم القتاة اولا
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}ح�ظ اللعبة
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}�تح
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}ح�ظ
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}حذ�
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :المشاهدين, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :المشاهدين, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} متاح
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}لا يمكن قرائة القرص
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}�شل ح�ظ اللعبة{}{STRING}
@@ -1895,12 +1895,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}قائم
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}الاسم المختار حاليا لح�ظ اللعبة
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}حذ� اللعبة المح�وظة حاليا
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}اح�ظ اللعبة الحالية، بواسطة الاسم المختار
-STR_NETWORK_SERVER_RANDOM_GAME                                  :ولد لعبة جديدة عشوائيا
-STR_LOAD_HEIGHTMAP                                              :{WHITE}حمل خريطة مرت�عات
-STR_SAVE_OSKTITLE                                               :{BLACK}ادخل اسم الح�ظ للعبة
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :ولد لعبة جديدة عشوائيا
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}حمل خريطة مرت�عات
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}ادخل اسم الح�ظ للعبة
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} على الطريق
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} على الطريق
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :منجم �حم
 STR_INDUSTRY_NAME_POWER_STATION                                 :محطة طاقة
@@ -1958,7 +1958,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}وسط الشاشة على المصنع
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}{STRING} جديد تحت الانشاء قرب {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK} {STRING} جديدة يتم تجهيزها قرب  {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}التكل�ة: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}التكل�ة: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}لا بمكن بناء المصنع هنا ...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... يمكن زراعة الغابة �وق خط الثلج �قط
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING}يعلن الاغلاق ال�وري
@@ -1976,16 +1976,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}ن�ق آخر �ي مسار هذا الن�ق
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE} الان�اق تنتهي خارج حدود الخريطة
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE} الان�اق تنتهي خارج حدود الخريطة
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}لا يمكن تعديل الأرض �ي نهاية الن�ق
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}يجب هدم الن�ق اولا
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}يجب هدم الجسر اولا
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}لا يمكن ان يبدء وينتهي �ي ن�س المكان
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE} نهايات الجسر ليست على استقامة واحدة
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}الجسر منخ�ض جدا للوادي
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}لا يمكن ان يبدء وينتهي �ي ن�س المكان
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE} نهايات الجسر ليست على استقامة واحدة
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}الجسر منخ�ض جدا للوادي
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}البداية و النهاية يجب ان تكون على استقامة واحدة
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}الموقع غير صالح لمدخل الن�ق
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :تعليق, حديدي
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :العارضة, حديدية
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :الحامل, حديدي
@@ -1996,30 +1996,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :انبوبي, Ø
 STR_BRIDGE_TUBULAR_SILICON                                      :أنبوبي،سيلكون
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}لا يمكن بناء جسر هنا ...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}لا يمكن بناء ن�ق هنا ...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :ن�ق سكة القطار
-STR_TUNNEL_DESCRIPTION_ROAD                                     :ن�ق طريق عربات
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :جسر قطارات بتعليق حديدي
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :جسر قطارات بعوارض حديدية
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :جسر قطار بحوامل حديدية
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :جسر قطار بتعليق اسمنتي من الغابات الماطرة
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :جسر قطار خشبي
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :جسر قطار اسمنتي
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :جسر عربات بتعليق حديدي
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :جسر عربات بعوارض حديدية
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :جسر عربات بحوامل حديدية
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :جسر عربات بتعليق اسمنتي من الغابات الماطرة
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :جسر عربات خشبي
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :جسر عربات اسمنتي
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :جسر قطار انبوبي
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :جسر عربات انبوبي
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :ن�ق سكة القطار
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :ن�ق طريق عربات
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :جسر قطارات بتعليق حديدي
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :جسر قطارات بعوارض حديدية
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :جسر قطار بحوامل حديدية
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :جسر قطار بتعليق اسمنتي من الغابات الماطرة
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :جسر قطار خشبي
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :جسر قطار اسمنتي
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :جسر عربات بتعليق حديدي
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :جسر عربات بعوارض حديدية
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :جسر عربات بحوامل حديدية
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :جسر عربات بتعليق اسمنتي من الغابات الماطرة
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :جسر عربات خشبي
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :جسر عربات اسمنتي
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :جسر قطار انبوبي
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :جسر عربات انبوبي
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}عائق �ي الطريق
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :برج ارسال
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :منارة ضوئية
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :مبنى الشركة الرئيسي
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :برج ارسال
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :منارة ضوئية
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :مبنى الشركة الرئيسي
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}مبنى شركة على الطريق
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :ارض مملوكة لشركة
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :ارض مملوكة لشركة
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}لا يمكن شراء هذة القطعة ...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}هذه القطعة ملك لك من قبل ...
 
@@ -2067,7 +2067,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING}محطØ
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}مستوى الصعوبة
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}ح�ظ
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}ح�ظ
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}سهل
@@ -2140,8 +2140,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}اللوÙ
 STR_LIVERY_CAPTION                                              :{WHITE}الوان جديدة
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}اسم الشركة
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}اسم صاحب الشركة
-STR_QUERY_COMPANY_NAME_CAPTION                                  :اسم الشركة
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :اسم صاحب الشركة
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :اسم الشركة
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :اسم صاحب الشركة
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}لا يمكن تغيير اسم الشركة
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}لا يمكن تغيير اسم صاحب الشركة
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} {BLACK} {COMPANYNUM}  سجل المحاسبة
@@ -2165,11 +2165,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}المجموع
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}الرسم البياني للدخل
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}الرسم البياني لتشغيل
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}السيولة المتاحة
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}القرض
-STR_MAX_LOAN                                                    :{WHITE}اقصى حد للقرض: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}اقصى حد للقرض: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}اقتراض{SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}تسديد{SKIP}{SKIP}{CURRENCY}
@@ -2178,7 +2178,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}بلغت
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... لا يوجد دين للسداد
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} مطلوب
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}لا يمكن تسديد الدين
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}لا يمكن التخلي عن النقود المعطاة من البنك على سبيل الاعارة ...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}لا يمكن التخلي عن النقود المعطاة من البنك على سبيل الاعارة ...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}اختر وجة جديد للمدير
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}غير الوان مركبات الشركة
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}غير اسم المدير
@@ -2188,10 +2188,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}اعاد
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD} (المدير)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}ي�تتح: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}العربات:
-STR_TRAINS                                                      :{WHITE}{COMMA} قطار
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA}عربة
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} طائرة
-STR_SHIPS                                                       :{WHITE}{COMMA} س�ينة
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} قطار
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA}عربة
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} طائرة
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} س�ينة
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}بدون
 STR_FACE_CAPTION                                                :{WHITE}اختيار الوجة
 STR_FACE_MALE_BUTTON                                            :{BLACK}رجل
@@ -2204,9 +2204,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}اختر
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}اختر وجة عشوائي
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}م�تاح
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}اظهار م�تاح الرسم البياني
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}عرض كامل ت�اصيل الأداء
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}عرض كامل ت�اصيل الأداء
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}م�تاح الشركات �ي الرسم البياني
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}اضغط لعرض/اخ�اء الشركة �ي الرسم
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}اضغط لعرض/اخ�اء الشركة �ي الرسم
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}عدد الوحدات المنقولة
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}تقييم الأداء العام للشركة ---- اقصى اداء = 1000
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}قيمة الشركة
@@ -2240,23 +2240,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :ملك
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :امبراطور
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}بناء مقر الشركة الرئيسي
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}بناء / عرض مبنى الشركة الرئيسي
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}اعادة بناء مقر الشركة بمكان آخر و بتكل�ة 1% من قيمة الشركة.
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}اعادة بناء مقر الشركة بمكان آخر و بتكل�ة 1% من قيمة الشركة.
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}لا يمكن بناء مبنى الشركة الئيسي ...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}عرض مبنى الشركة الئيسي
-STR_RELOCATE_HQ                                                 :{BLACK}اعادة بناء مقر الشركة
-STR_COMPANY_JOIN                                                :{BLACK} انضم
-STR_COMPANY_JOIN_TIP                                            :{BLACK} انضم و العب بهذه الشركة
-STR_COMPANY_PASSWORD                                            :{BLACK}كلمة المرور
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}احم شركتك بكلمة مرور خاصة لمنع الوصول الغير مسموح من اللاعبين الآخرين.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}ادخل كلمة المرور
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}اعادة بناء مقر الشركة
+STR_COMPANY_VIEW_JOIN                                           :{BLACK} انضم
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK} انضم و العب بهذه الشركة
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}كلمة المرور
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}احم شركتك بكلمة مرور خاصة لمنع الوصول الغير مسموح من اللاعبين الآخرين.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}ادخل كلمة المرور
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}لا تح�ظ كلمة المرور المدخلة
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}اعط الشركة كلمة المرور الجديدة
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}كلمة مرور الشركة
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}كلمة مرور الشركة القياسية
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}استخدم هذه الكلمة كقياسية لكل الشركات الجديدة
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}كلمة مرور الشركة القياسية
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}استخدم هذه الكلمة كقياسية لكل الشركات الجديدة
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}ركود اقتصادي!{}{}خبراء الأقتصاد خائ�ون من ركود اقتصادي وشيك
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}الركود انتهى!{}{}العودة للصعود �ي الاقتصاد اعطى الثقة �ي قوة الاقتصاد
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}تبديل حجم الاطار كبير / صغير
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}تبديل حجم الاطار كبير / صغير
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}قيمة الشركة: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}اشتري 25% من اسهم الشركة
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}بيع 25% من اسهم الشركة
@@ -2266,7 +2266,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}لا ÙŠÙ
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}لا يمكن بيع 25% من اسهم الشركة ...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE} ( {COMMA}% مملوكة بواسطة {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING}تم الاستحواذ عليها بواسطة {STRING}!
-STR_PROTECTED                                                   :{WHITE}هذه الشركة ليست عريقة بقدر كا�ي لمشاركة الأسهم ...
+STR_ERROR_PROTECTED                                             :{WHITE}هذه الشركة ليست عريقة بقدر كا�ي لمشاركة الأسهم ...
 
 STR_LIVERY_DEFAULT                                              :الزي القياسي
 STR_LIVERY_STEAM                                                :محرك بخاري
@@ -2292,14 +2292,14 @@ STR_LIVERY_LARGE_PLANE                                          :طائرة  ÙƒØ
 STR_LIVERY_PASSENGER_TRAM                                       :ترام ركاب
 STR_LIVERY_FREIGHT_TRAM                                         :عربة ترام للشحن
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}اظهر اللون العام
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}اظهر لون القطائرات
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}اظهر لون العربات النمطي
-STR_LIVERY_SHIP_TIP                                             :{BLACK}اظهر لون الس�ن
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}اظهر ألوان الطائرات
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}اختر اللون الأساسي
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}اختر اللون الثانوي
-STR_LIVERY_PANEL_TIP                                            :{BLACK}اختر اللون, أو م�تاح كنترول لاكثر من لون. اضغط على الصندوق ل�تح/ ق�ل الالوان.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}اظهر اللون العام
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}اظهر لون القطائرات
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}اظهر لون العربات النمطي
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}اظهر لون الس�ن
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}اظهر ألوان الطائرات
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}اختر اللون الأساسي
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}اختر اللون الثانوي
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}اختر اللون, أو م�تاح كنترول لاكثر من لون. اضغط على الصندوق ل�تح/ ق�ل الالوان.
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :كربي باول -بخاري
@@ -2607,9 +2607,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(  عدم انØ
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}غير سلوك التوق� لالأمر المختار
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}غير سلوك امر التحميل المختار
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}غير سلوك التنزيل للامر المختار
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}ادخل امر متقدم
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}ادخل امر متقدم
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :اذهب الى اقرب مستودع صيانة
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :اذهب الى اقرب حظيرة صيانة
 STR_ORDER_NEAREST_DEPOT                                         :الأقرب
@@ -2619,9 +2619,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :الصيانة
 STR_ORDER_TRAIN_DEPOT                                           :مستودع قطار
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :مستودع العربات
 STR_ORDER_SHIP_DEPOT                                            :حوض صيانة الس�ن
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} حظيرة
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} حظيرة
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :الذهاب دائما
 STR_ORDER_DROP_SERVICE_DEPOT                                    :الصيانة عند الحاجة
@@ -2646,10 +2646,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :اكثر من
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :اكثر او مساو لـ
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :صحيح
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :خاطئ
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :اق�ز الى الأمر {COMMA}
-STR_CONDITIONAL_NUM                                             :اق�ز للامر{COMMA} عندما {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :اق�ز للامر {COMMA} عندما {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :اق�ز الى الأمر {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :اق�ز للامر{COMMA} عندما {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :اق�ز للامر {COMMA} عندما {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}لا رحيل
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}مسا�ر (ليس هناك جدولة)
@@ -2672,18 +2672,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}يمكن
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}تجاوز
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}حذ�
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}اذهب الى
-STR_REFIT                                                       :{BLACK}اعادة تهيئة
-STR_REFIT_TIP                                                   :{BLACK}اختر نوع البضائع المنقولة لتهيئة العربات �ي هذا الامر. اضغط كنترول لازالة تعليمات التهيئة.
-STR_REFIT_ORDER                                                 :هيئة الى {STRING}
-STR_REFIT_STOP_ORDER                                            :هيئت الى {STRING} و توق�
-STR_STOP_ORDER                                                  :توق�
-STR_TIMETABLE_VIEW                                              :{BLACK}جدولة الاوامر
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}غير الى نا�ذة جدولة الاوامر
-STR_ORDER_VIEW                                                  :{BLACK}الأوامر
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}حول الى عرض الاوامر
+STR_ORDER_REFIT                                                 :{BLACK}اعادة تهيئة
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}اختر نوع البضائع المنقولة لتهيئة العربات �ي هذا الامر. اضغط كنترول لازالة تعليمات التهيئة.
+STR_ORDER_REFIT_ORDER                                           :هيئة الى {STRING}
+STR_ORDER_REFIT_STOP_ORDER                                      :هيئت الى {STRING} و توق�
+STR_ORDER_STOP_ORDER                                            :توق�
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}جدولة الاوامر
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}غير الى نا�ذة جدولة الاوامر
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}الأوامر
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}حول الى عرض الاوامر
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (اوامر)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - نهاية الاوامر - -
-STR_SERVICE                                                     :{BLACK} صيانة
+STR_ORDER_SERVICE                                               :{BLACK} صيانة
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}بني: {LTBLUE}{NUM}{BLACK} تكل�ة: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} تكل�ة: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2703,7 +2703,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE} العØ
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE} العربة المشتركة لا تستطيع الوصول للمحطة
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}لا يمكن تحريك العربة ...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}المحرك الخل�ي دائما سيتبع الامامي
-STR_CARGO_N_A                                                   :غير متاح {SKIP}
+STR_QUANTITY_N_A                                                :غير متاح {SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}لا يمكن ايجاد طريق للورشة
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}�ترات الصيانة: {LTBLUE}{COMMA} يوم {BLACK} اخر صيانة: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}�ترات الصيانة: {LTBLUE}{COMMA}% {BLACK}    الصيانة الأخيرة: {LTBLUE}{DATE_LONG}
@@ -2723,10 +2723,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}جدول
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}غير مقدار الزمن الذي يستغرقة الامر
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}مسح مقدار الوقت للامر
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}عدل وقت التاخير للعداد حتى تصل المركبة �ي الوقت المحدد
-STR_SERVICE_HINT                                                :{BLACK}تجاوز هذا الامر الا اذا لم تكن الصيانة مطلوبة
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK} التكل�ة: {CURRENCY} الوزن: {WEIGHT_S} {} السرعة: {VELOCITY}  الطاقة: {POWER}{} كل�ة التشغيل: {CURRENCY} / سنة {} السعة: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK} التكل�ة {CURRENCY} السرعة القصوى {VELOCITY}{}Capacity السعة {CARGO} {CARGO}{} كل�ة التشغيل {CURRENCY} / سنة
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK} التكل�ة {CURRENCY} السرعة القصوى {VELOCITY}{} السعة {CARGO}{} كل�ة التشغيل {CURRENCY} / سنة
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}تجاوز هذا الامر الا اذا لم تكن الصيانة مطلوبة
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK} التكل�ة: {CURRENCY} الوزن: {WEIGHT_S} {} السرعة: {VELOCITY}  الطاقة: {POWER}{} كل�ة التشغيل: {CURRENCY} / سنة {} السعة: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK} التكل�ة {CURRENCY} السرعة القصوى {VELOCITY}{}Capacity السعة {CARGO} {CARGO}{} كل�ة التشغيل {CURRENCY} / سنة
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK} التكل�ة {CURRENCY} السرعة القصوى {VELOCITY}{} السعة {CARGO}{} كل�ة التشغيل {CURRENCY} / سنة
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK} العمر {LTBLUE}{STRING}{BLACK} تكل�ة التشغيل {LTBLUE}{CURRENCY} / سنة
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK} السرعة القصوى {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK} الوزن {LTBLUE}{WEIGHT_S}  {BLACK} الطاقة  {LTBLUE}{POWER}{BLACK}  السرعى القصوى  {LTBLUE}{VELOCITY}
@@ -2746,28 +2746,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}لا يمكن عكس اتجاة القطار...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE} لا يمكن تغيير اتجاة العربة ...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}لا يمكن انعطا� العربات المكونة من اكثر من وحدة.
-STR_CLEAR_TIME                                                  :{BLACK}مسح الوقت
-STR_RESET_LATENESS                                              :{BLACK}اعد ضبط العداد التأخير
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}غير اسم نقطة العبور
-STR_CHANGE_BUOY_NAME                                            :{BLACK} غير اسم العومة
-
-STR_TRAIN_STOPPING                                              :{RED}يتوق�
-STR_TRAIN_STOPPING_VEL                                          :{RED}يتوق� , {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :نوع سكة حديد متعارض
-STR_TRAIN_NO_POWER                                              :{RED}لا توجد طاقة
-STR_TRAIN_START_NO_CATENARY                                     :هذة السكة ت�تقد السلسال لذا لا يستطيع القطار ان يتحرك
-STR_TRAIN_STUCK                                                 :{ORANGE}ينتظر لمسار متاح
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}مسح الوقت
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}اعد ضبط العداد التأخير
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}غير اسم نقطة العبور
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK} غير اسم العومة
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}يتوق�
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}يتوق� , {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :نوع سكة حديد متعارض
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}لا توجد طاقة
+STR_ERROR_TRAIN_START_NO_CATENARY                               :هذة السكة ت�تقد السلسال لذا لا يستطيع القطار ان يتحرك
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}ينتظر لمسار متاح
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}جديد {STRING}الآن متاحة !
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}جديد {STRING} الآن متاح ! - {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE} لا يمكن بيع العربة المحطمة ...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}لا يمكن اعادة العربة المحطمة ...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE} لا يمكن بيع العربة المحطمة ...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}لا يمكن اعادة العربة المحطمة ...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}لا يمكن جدولة العربة ...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}يمكن للعربات الانتظار �ي المحطات �قط.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}هذه العربة لا تتوق� �ي هذه المحطة.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}لا يمكن جدولة العربة ...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}يمكن للعربات الانتظار �ي المحطات �قط.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}هذه العربة لا تتوق� �ي هذه المحطة.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}غير الوقت
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}هذه العربة تعمل حسب الجدولة �ي الوقت المحدد
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}هذه العربة {STRING} متاخرة حاليا عن الجدولة
@@ -2781,7 +2781,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}املأ
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE} ... يجب ان يوق� داخل ورشة الصيانة.
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}لم يتم العثور على ورشة قريبة من العربة
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}اجبر العربة لدوان للخل�
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}السعة: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}السعة: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM}العربات {STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2808,11 +2808,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}وضع عوامة - يمكن استخدامها نقطة عبور
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}لا يمكن وضع عوامة هنا
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}بناء قناة مائية
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}لا يمكن بناء قناة مياة هنا ...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}لا يمكن بناء قناة مياة هنا ...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} )تغيير(
 STR_REFIT_TITLE                                                 :{GOLD}اختر نوع الحمولة ...
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}السعة الجديدة: {GOLD}{CARGO}{}{BLACK}تكل�ة التغيير: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :)قابل لتغيير(
+STR_PURCHASE_INFO_REFITTABLE                                    :)قابل لتغيير(
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}مطارات
@@ -2825,7 +2825,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}بناء
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}الأهالي يحت�لون . . . {}بوصول أول طائرة الى {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}تحطم طائرة !{}{COMMA}ماتوا �ي الحريق بمطار {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}تحطم طائرة ! {}انتهى الوقود من الطائرة, {COMMA}تو�ي اثر الحادث !
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} جدولة الاوامر
 
@@ -2838,13 +2838,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}الخمود �ي منجم ال�حم يتسبب �ي سلسلة ان�جارات قرب {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}�يضانات !{}على الأقل {COMMA} م�قودين او �ي عداد الأموات بعد �يضانات عارمة !
 
-STR_BRIBE_FAILED                                                :{WHITE}محاولتك لرشوة السلطات المحلية �شلت
-STR_BRIBE_FAILED_2                                              :{WHITE}أكتش�ت من مقبل اللمحققين المحلين
-STR_BUILD_DATE                                                  :{BLACK}بني: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}محاولتك لرشوة السلطات المحلية �شلت
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}أكتش�ت من مقبل اللمحققين المحلين
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}بني: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK} �ئة المحطة: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}نوع المحطة: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK} �ئة المحطة: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}نوع المحطة: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}التقييم الم�صل
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}ت�اصيل
@@ -2864,28 +2864,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}السي
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}الدين:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}المجموع:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}عدد العربات, وتشمل عربات الطريق,و القطارات,و الس�ن و الطائرات.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}كل انواع المحطات (محطة قطار, موق� باص, مطار, الخ) حتى لو كانت مرتبطة ببعضها كمحطة واحدة
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK} دخل المركبات ذات الدخل الادنى (لكل العربات اكثر من سنتين �ي الخدمة).
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}ادنى دخل تم تحقيقة �ي شهر واحد من الشهور الاثنى عشر الماضية
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}اعلى مكاسب تم تحقيقها �ي شهر واحد من الاثنى عشر شهرا الماضية
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}الوحدات التي نقلت الاثنى عشر شهرا الماضية
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}عدد انواع الشحن الي تم نقلها �ي الربع الأخير
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}السيولة المالية المتو�رة للشركة �ي البنك.
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}مقدار الدين الذي اخذته هذه الشركة
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}مجموع النقاط من المجموع الكلي الممكن
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}عدد العربات, وتشمل عربات الطريق,و القطارات,و الس�ن و الطائرات.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}كل انواع المحطات (محطة قطار, موق� باص, مطار, الخ) حتى لو كانت مرتبطة ببعضها كمحطة واحدة
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK} دخل المركبات ذات الدخل الادنى (لكل العربات اكثر من سنتين �ي الخدمة).
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}ادنى دخل تم تحقيقة �ي شهر واحد من الشهور الاثنى عشر الماضية
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}اعلى مكاسب تم تحقيقها �ي شهر واحد من الاثنى عشر شهرا الماضية
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}الوحدات التي نقلت الاثنى عشر شهرا الماضية
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}عدد انواع الشحن الي تم نقلها �ي الربع الأخير
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}السيولة المالية المتو�رة للشركة �ي البنك.
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}مقدار الدين الذي اخذته هذه الشركة
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}مجموع النقاط من المجموع الكلي الممكن
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK} اعدادات NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK} عرض اعدادات newGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE} اعدادات NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}ن�ذ التغييرات
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}�تح/اغلاق اللوحة
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}�تح / اغلاق لوحة NewGRF المختارة.{} ا�عل هذا عندما تكون الرسومات الجديدة وردية اللون.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}اضبط الاعدادات
-STR_NEWGRF_FILENAME                                             :{BLACK}ام المل�: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK} صحي�ة : {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRFمعر� : {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}  : مجموع ام دي 5 {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}ن�ذ التغييرات
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}�تح/اغلاق اللوحة
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}�تح / اغلاق لوحة NewGRF المختارة.{} ا�عل هذا عندما تكون الرسومات الجديدة وردية اللون.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}اضبط الاعدادات
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}ام المل�: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK} صحي�ة : {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRFمعر� : {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}  : مجموع ام دي 5 {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}ان على وشك ان تحدث تغييرات �ي لعبة شغالة؛ قد يتسبب �ي توق� OpenTTD.{} هل انت متأكد تماما من هذا؟
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2908,34 +2908,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :محاولة ا
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} يحتوي على خصائص غير صالحة. جميع الخصائص الغير صالحة سو� يشار لها بعلامة است�هام حمراء.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :يحتوي على اوامر متعددة - 8 مدخلات
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}�تح مجموعة الاعدادات المسجلة
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}ح�ظ مجموعة الاعدادات
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}ح�ظ القائمة الحالية كمجموعة  اعدادات
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}ادخل اسم للمجموعة المسجلة
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}حذ�مجموعة  الاعدادات المسجلة
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}حذ� مجموعة الاعدادات الحالية
-STR_NEWGRF_ADD                                                  :{BLACK} اض�
-STR_NEWGRF_ADD_TIP                                              :{BLACK}اضا�ة مل�ات NewGFR الى القائمة
-STR_NEWGRF_REMOVE                                               :{BLACK}ازالة
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}ازالة مل� NewGRF من القائمة
-STR_NEWGRF_MOVEUP                                               :{BLACK}تحريك للأعلى
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}حرك المل� المختار الى الأعلى
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}تحريك للأس�ل
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}حرك المل� المختار الى الاس�ل �ي القائمة
-STR_NEWGRF_FILE_TIP                                             :{BLACK}قائمة مل�ات NewGRF المركبة. اضغط على المل� لتغييرة.
-STR_NEWGRF_PARAMETER                                            :{BLACK}الاعدادات: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}ادخل اعدادات NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}لا يوجد معلومات متاحة
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}�تح مجموعة الاعدادات المسجلة
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}ح�ظ مجموعة الاعدادات
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}ح�ظ القائمة الحالية كمجموعة  اعدادات
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}ادخل اسم للمجموعة المسجلة
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}حذ�مجموعة  الاعدادات المسجلة
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}حذ� مجموعة الاعدادات الحالية
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK} اض�
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}اضا�ة مل�ات NewGFR الى القائمة
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}ازالة
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}ازالة مل� NewGRF من القائمة
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}تحريك للأعلى
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}حرك المل� المختار الى الأعلى
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}تحريك للأس�ل
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}حرك المل� المختار الى الاس�ل �ي القائمة
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}قائمة مل�ات NewGRF المركبة. اضغط على المل� لتغييرة.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}الاعدادات: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}ادخل اعدادات NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}لا يوجد معلومات متاحة
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}مل�ات NewGFR المتاحة
 STR_NEWGRF_ADD_FILE                                             :{BLACK}اض� الى الخيارات
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}اض� مل� NewGFR المختار الى اعداداتك الخاصة
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}اعادة كش� للمل�ات
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}تحديث قائمة NewGRF المتاحة
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}اض� مل� NewGFR المختار الى اعداداتك الخاصة
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}اعادة كش� للمل�ات
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}تحديث قائمة NewGRF المتاحة
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}لا يمكن اضا�ة المل�: نسخة سابقة منه مضا�ة
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}لم يتم العثور على المل� المقترن
-STR_NEWGRF_DISABLED                                             :{RED}معطل
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}لم يتم العثور على المل� المقترن
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}معطل
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}المل� المطابق غير موجود (مل� متوا�ق من NewGRFحمل)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}تم تحميل مل� GFR مطابق بدلا من الم�قود
@@ -2951,7 +2951,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE} الرØ
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE} التكل�ة \ السعة ل '{1:ENGINE}'  تختل� ما بين قائمة الشراء و مابعد البناء. قد يتسبب هذا �ي �شل التبديل الذاتي.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' تسبب بدورة غير منتهية �ي نداء الانتاج
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}اللعبة ح�ظت بنسخة لا تدعم الترام. كل ما يتعلق بالترام حذ�.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}اللعبة ح�ظت بنسخة لا تدعم الترام. كل ما يتعلق بالترام حذ�.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}عمله مخصصه
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}معامل التبديل: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2962,16 +2962,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}حول
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}حول إلى يورو : {ORANGE}أبدا
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}عرض: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}غير الخيارات الاختيارة
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK} £ قلل قيمة عملتك لكل جنية استرليني
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK} £ زد قيمة عملتك لكل جنية استرليني
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK} حدد قيمة الصر� لعملتك مقابل الجنية الاسترليني (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK} حدد ال�اصل لعملتك
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK} حدد الرمز الاستهلالي لعملتك
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK} حدد الرمز اللاحق لعملتك
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK} بدل الى اليورو مبكرا
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK} بدل الى اليورو متاخرا
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK} حدد السنة لتبديل العملة لليورو
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK} 10000 جنية استرليني �ي عملتك
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK} £ قلل قيمة عملتك لكل جنية استرليني
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK} £ زد قيمة عملتك لكل جنية استرليني
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK} حدد قيمة الصر� لعملتك مقابل الجنية الاسترليني (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK} حدد ال�اصل لعملتك
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK} حدد الرمز الاستهلالي لعملتك
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK} حدد الرمز اللاحق لعملتك
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK} بدل الى اليورو مبكرا
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK} بدل الى اليورو متاخرا
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK} حدد السنة لتبديل العملة لليورو
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK} 10000 جنية استرليني �ي عملتك
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2990,8 +2990,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} س�ينة
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} طائرة
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE} مشاركة الاوامر لـ {COMMA} عربة
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK} عرض جميع العربات التي تشترك �ي هذا الجدول
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE} مشاركة الاوامر لـ {COMMA} عربة
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK} عرض جميع العربات التي تشترك �ي هذا الجدول
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ينتظر �ي المستودع
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} تنتظر �ي المستودع
@@ -3098,39 +3098,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK} هيئ
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}تغيير نوع الحمولة للس�ينة
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}غير نوع الحمولة الى نوع آخر
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}متوجه لورشة قطارات {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}متوجه لورشة {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}متوجه لحوض س�ن{TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}تتجة الى حوض {TOWN}للس�ن, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}متوجه لحظيرة {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}تتوجة الى حظيرة {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}صيانة �ي ورشة قطار {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE} صيانة �ي ورشة {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}صيانة �ي ورشة {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE} صيانة �ي ورشة {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}صيانة �ي حوض س�ن  {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}صيانة �ي حوض{TOWN}للس�ن, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}صيانه �ي حظيرة  {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}الصيانة �ي حظيرة {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}نسخ قطار
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}نسخ عربة
-STR_CLONE_SHIP                                                  :{BLACK}انسخ الس�ينة
-STR_CLONE_AIRCRAFT                                              :{BLACK}نسخ الطائرة
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}هذا سو� يشتري نسخة عن قطار بكل عرباته. م�تاح التحكم + الضغط سو� يشارك الاوامر.
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}هذا سو� يشتري عربة مطابقة للمختارة. م�تاح التحكم كنترول + الضغط سو� يتشارك بالاوامر.
-STR_CLONE_SHIP_INFO                                             :{BLACK}هذا سو� يشتري س�ينة مطابقة للمختارة. م�تاح التحكم كنترول + الضغط سو� يتشارك بالاوامر.
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}هذا سو� يشتري طائرة مطابقة للمختارة. م�تاح التحكم كنترول + الضغط سو� يتشارك بالاوامر.
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}هذا سو� يشتري نسخة مطابقة من القطار. اضغط على هذا الزر ثم اي قطار داخل او خارج ورشة الصيانة. م�ناح كنترول + الضغط سو� يشارك الأوامر.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}هذا سو� يشتري نسخة مطابقة من العربة. اضغط على هذا الزر ثم اي عربة داخل او خارج ورشة الصيانة. م�ناح كنترول + الضغط سو� يشارك الأوامر.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}هذا سو� يشتري نسخة مطابقة من الس�ينة. اضغط على هذا الزر ثم اي س�ينة داخل او خارج حوض الس�ن. م�ناح كنترول + الضغط سو� يشارك الأوامر.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}هذا سو� يشتري نسخة مطابقة من الطائرة. اضغط على هذا الزر ثم اي طائرة داخل او خارج حظيرة الطائرات. م�ناح كنترول + الضغط سو� يشارك الأوامر.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}متوجه لورشة قطارات {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}متوجه لورشة {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}متوجة الى ورشة {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}متوجه لحوض س�ن{TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}تتجة الى حوض {TOWN}للس�ن, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}متوجه لحظيرة {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}تتوجة الى حظيرة {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}صيانة �ي ورشة قطار {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE} صيانة �ي ورشة {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}صيانة �ي ورشة {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE} صيانة �ي ورشة {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}صيانة �ي حوض س�ن  {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}صيانة �ي حوض{TOWN}للس�ن, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}صيانه �ي حظيرة  {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}الصيانة �ي حظيرة {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}نسخ قطار
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}نسخ عربة
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}انسخ الس�ينة
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}نسخ الطائرة
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}هذا سو� يشتري نسخة عن قطار بكل عرباته. م�تاح التحكم + الضغط سو� يشارك الاوامر.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}هذا سو� يشتري عربة مطابقة للمختارة. م�تاح التحكم كنترول + الضغط سو� يتشارك بالاوامر.
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}هذا سو� يشتري س�ينة مطابقة للمختارة. م�تاح التحكم كنترول + الضغط سو� يتشارك بالاوامر.
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}هذا سو� يشتري طائرة مطابقة للمختارة. م�تاح التحكم كنترول + الضغط سو� يتشارك بالاوامر.
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}هذا سو� يشتري نسخة مطابقة من القطار. اضغط على هذا الزر ثم اي قطار داخل او خارج ورشة الصيانة. م�ناح كنترول + الضغط سو� يشارك الأوامر.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}هذا سو� يشتري نسخة مطابقة من العربة. اضغط على هذا الزر ثم اي عربة داخل او خارج ورشة الصيانة. م�ناح كنترول + الضغط سو� يشارك الأوامر.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}هذا سو� يشتري نسخة مطابقة من الس�ينة. اضغط على هذا الزر ثم اي س�ينة داخل او خارج حوض الس�ن. م�ناح كنترول + الضغط سو� يشارك الأوامر.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}هذا سو� يشتري نسخة مطابقة من الطائرة. اضغط على هذا الزر ثم اي طائرة داخل او خارج حظيرة الطائرات. م�ناح كنترول + الضغط سو� يشارك الأوامر.
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}عربات قطار جديدة
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}عربات قطار كهربائية جديدة
@@ -3200,28 +3200,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}وضع Ø
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}أنت على وشك بيع جميع المركبات الموجودة �ي الورشة، هل أنت متأكد؟
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :ورشةمن نوع خاطئ
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :ورشةمن نوع خاطئ
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}بع جميع القطارات الموجودة �ي الورشة
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}بع جميع المركبات الموجودة �ي الورشة
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}بع جميع الس�ن الموجودة �ي حوض الس�ن
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}بع جميع الطائرات �ي الحظيرة
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}بع جميع القطارات الموجودة �ي الورشة
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}بع جميع المركبات الموجودة �ي الورشة
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}بع جميع الس�ن الموجودة �ي حوض الس�ن
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}بع جميع الطائرات �ي الحظيرة
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}عرض قائمة بالقطارات �ي الورشة
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}عرض قائمة العربات التابعة لهذة الورشة بالترتيب
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}عرض قائمة بالس�ن �ي حوض الصيانة
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}عرض قائمة بالطائرات التابعة لهذا المطار �ي اي هنجر
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}عرض قائمة بالقطارات �ي الورشة
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}عرض قائمة العربات التابعة لهذة الورشة بالترتيب
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}عرض قائمة بالس�ن �ي حوض الصيانة
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}عرض قائمة بالطائرات التابعة لهذا المطار �ي اي هنجر
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}بدل جميع القطارات �ي الورشة آليا
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}بدل جميع المركبات �ي الورشة آلياً
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}بدل جميع الس�ن �ي حوض الس�ن آلياً
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}بدل جميع الطائرات �ي الحظيرة آلياً
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}بدل جميع القطارات �ي الورشة آليا
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}بدل جميع المركبات �ي الورشة آلياً
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}بدل جميع الس�ن �ي حوض الس�ن آلياً
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}بدل جميع الطائرات �ي الحظيرة آلياً
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE} تبديل {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK} بدأ تبديل العربات
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK} اوق� تبديل العربات
-STR_NOT_REPLACING                                               :{BLACK}لم يتم التبديل
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}لم يتم اختيار اي عربة
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}لم يتم التبديل
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}لم يتم اختيار اي عربة
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK} اختر نوع المحرك لاستبدالة
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK} اختر نوع المحرك المراد احلالة مكان المحرك المختار �ي القائمة اليسرى
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK} اضغط لايقا� تبديل المحركات المختارة �ي اليسار
@@ -3233,26 +3233,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK} المØ
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK} تبديل:  {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK} بدل بين نا�ذة استبدال المحركات و العربات
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}العربة غير متاحة
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE} العربات غير متاحة
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE} الس�ن غير متاحة
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}الطائرة غير متاحة
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}العربة غير متاحة
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE} العربات غير متاحة
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE} الس�ن غير متاحة
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}الطائرة غير متاحة
 
-STR_ENGINES                                                     :محركات
-STR_WAGONS                                                      :عربات
+STR_REPLACE_ENGINES                                             :محركات
+STR_REPLACE_WAGONS                                              :عربات
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}اضغط لايقا� جميع القطارات داخل مستودع الصيانة
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}اضغط لايقا� جميع العربات داخل مستودع الصيانة
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK} اضغط لايقا� جميع الس�ن داخل حوض الصيانة
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK} اضغط لايقا� جميع الطائرات داخل حظيرة الصيانة
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}اضغط لايقا� جميع القطارات داخل مستودع الصيانة
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}اضغط لايقا� جميع العربات داخل مستودع الصيانة
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK} اضغط لايقا� جميع الس�ن داخل حوض الصيانة
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK} اضغط لايقا� جميع الطائرات داخل حظيرة الصيانة
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}اضغط هنا لتشغيل كل القطارات المتوق�ة داخل الورشة
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}اضغط هنا لتشغيل كل العربات المتوق�ة داخل الورشة
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}اضغط هنا لتشغيل كل الس�ن المتوق�ة داخل حوض الس�ن
-STR_MASS_START_HANGAR_TIP                                       :{BLACK} اضغط لتشغيل جميع الطائرات داخل حظيرة الصيانة
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}اضغط هنا لتشغيل كل القطارات المتوق�ة داخل الورشة
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}اضغط هنا لتشغيل كل العربات المتوق�ة داخل الورشة
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}اضغط هنا لتشغيل كل الس�ن المتوق�ة داخل حوض الس�ن
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK} اضغط لتشغيل جميع الطائرات داخل حظيرة الصيانة
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}اضغط لايقا� جميع العربات �ي القائمة
-STR_MASS_START_LIST_TIP                                         :{BLACK}اضغط لتشغيل جميع العربات �ي القائمة
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}اضغط لايقا� جميع العربات �ي القائمة
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}اضغط لتشغيل جميع العربات �ي القائمة
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}قائمة العلامات -  {COMMA} علامة
@@ -3261,14 +3261,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE} امر
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :عربات القطار
-STR_ELRAIL_VEHICLES                                             :سكة حديد كهربائية
-STR_MONORAIL_VEHICLES                                           :عربات احادية السكة
-STR_MAGLEV_VEHICLES                                             :مركبات ممغنطة
+STR_REPLACE_RAIL_VEHICLES                                       :عربات القطار
+STR_REPLACE_ELRAIL_VEHICLES                                     :سكة حديد كهربائية
+STR_REPLACE_MONORAIL_VEHICLES                                   :عربات احادية السكة
+STR_REPLACE_MAGLEV_VEHICLES                                     :مركبات ممغنطة
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK} التكل�ة: {GOLD}{CURRENCY}{BLACK}   الوزن: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}السرعة: {GOLD}{VELOCITY}{BLACK} الطاقة: {GOLD}{POWER}
@@ -3295,70 +3295,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}ولد
-STR_RANDOM                                                      :{BLACK}عشوائي
-STR_RANDOM_HELP                                                 :{BLACK}غير المرجع العشوائي لتوليد تضاريس الخريطة
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE} مولد الخريطة
-STR_RANDOM_SEED                                                 :{BLACK}مرجع عشوائي
-STR_RANDOM_SEED_HELP                                            :{BLACK}اضغط لادخال مرجع عشوائي
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}ادخل مرجع عشوائي
-STR_LAND_GENERATOR                                              :{BLACK}مولد الخريطة:
-STR_TREE_PLACER                                                 :{BLACK} لوغاريثم الشجر:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}اتجاة خريطة المرت�عات:
-STR_TERRAIN_TYPE                                                :{BLACK} نوع التضاريس
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}مستوى البحر
-STR_SMOOTHNESS                                                  :{BLACK} النعومة:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK} ارت�اع خط الثلج
-STR_DATE                                                        :{BLACK}التاريخ:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}عدد المدن:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}عدد المصانع:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}ار�ع خط الثلج مستوى واحد
-STR_SNOW_LINE_DOWN                                              :{BLACK}خ�ض خط الثلج مستوى واحد
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE} غير مستوى خط الثلج
-STR_START_DATE_QUERY_CAPT                                       :{WHITE} غير سنة البداية
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}تحذير
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}اعادة تحجيم الخريطة المصدر كثيرا غير مستحسن. هل تريد اكمال توليد الخريطة؟
-STR_HEIGHTMAP_NAME                                              :{BLACK}اسم خريطة المرت�عات:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}الحجم: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}ولد
+STR_MAPGEN_RANDOM                                               :{BLACK}عشوائي
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}غير المرجع العشوائي لتوليد تضاريس الخريطة
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE} مولد الخريطة
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}مرجع عشوائي
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}اضغط لادخال مرجع عشوائي
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}ادخل مرجع عشوائي
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}مولد الخريطة:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK} لوغاريثم الشجر:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}اتجاة خريطة المرت�عات:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK} نوع التضاريس
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}مستوى البحر
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK} النعومة:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK} ارت�اع خط الثلج
+STR_MAPGEN_DATE                                                 :{BLACK}التاريخ:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}عدد المدن:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}عدد المصانع:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}ار�ع خط الثلج مستوى واحد
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}خ�ض خط الثلج مستوى واحد
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE} غير مستوى خط الثلج
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE} غير سنة البداية
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}تحذير
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}اعادة تحجيم الخريطة المصدر كثيرا غير مستحسن. هل تريد اكمال توليد الخريطة؟
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}اسم خريطة المرت�عات:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}الحجم: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}توليد الخريطة
 STR_GENERATION_ABORT                                            :{BLACK}ألغي
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}ايقا� توليد الخريطة
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}هل انت متأكد بأنك ترغبب �ي ايقا� توليد الخريطة؟
-STR_PROGRESS                                                    :{WHITE}{NUM}% انتهى
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK} مولد الخريطة
-STR_TREE_GENERATION                                             :{BLACK} مولد الشجر
-STR_UNMOVABLE_GENERATION                                        :{BLACK} غير قابل لتحريك
-STR_CLEARING_TILES                                              :{BLACK}مولد المناطق الخشنة والصخرية
-STR_SETTINGUP_GAME                                              :{BLACK}تجهيز لعبة
-STR_PREPARING_TILELOOP                                          :{BLACK} تشغيل المتكررة
-STR_PREPARING_GAME                                              :{BLACK}يتك تجهيز اللعبة
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}هذا التغيير سيحول مستوى الصعوبة الى اختياري
-STR_SE_FLAT_WORLD                                               :{WHITE} سطح مسطح مستوي
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}توليد سطح مسطح
-STR_SE_RANDOM_LAND                                              :{WHITE}ارض عشوائية
-STR_SE_NEW_WORLD                                                :{BLACK} انشاء خريطة جديدة
-STR_SE_CAPTION                                                  :{WHITE} نوع الخريطة
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}حرك ارت�اع الأرض المنبسطة واحد للاس�ل
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}حرك ارت�اع الأرض المنبسطة واحد للأعلى
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}غير ارت�اع الارض المنبسطة
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}ارت�اع الأرض المنبسطة
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% انتهى
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK} مولد الخريطة
+STR_GENERATION_TREE_GENERATION                                  :{BLACK} مولد الشجر
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK} غير قابل لتحريك
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}مولد المناطق الخشنة والصخرية
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}تجهيز لعبة
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK} تشغيل المتكررة
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}يتك تجهيز اللعبة
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}هذا التغيير سيحول مستوى الصعوبة الى اختياري
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE} سطح مسطح مستوي
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}توليد سطح مسطح
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}ارض عشوائية
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK} انشاء خريطة جديدة
+STR_SE_MAPGEN_CAPTION                                           :{WHITE} نوع الخريطة
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}حرك ارت�اع الأرض المنبسطة واحد للاس�ل
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}حرك ارت�اع الأرض المنبسطة واحد للأعلى
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}غير ارت�اع الارض المنبسطة
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}ارت�اع الأرض المنبسطة
 
 STR_SMALLMAP_CENTER                                             :{BLACK}وسط الخريطة الصغيرة على الموقع الحالي
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK} حدود الخريطة:
-STR_NORTHWEST                                                   :{BLACK} الشمال الغربي
-STR_NORTHEAST                                                   :{BLACK} الشمال الشرقي
-STR_SOUTHEAST                                                   :{BLACK} الجنوب الشرقي
-STR_SOUTHWEST                                                   :{BLACK} الجنوب الغربي
-STR_BORDER_FREEFORM                                             :{BLACK} حر
-STR_BORDER_WATER                                                :{BLACK} ماء
-STR_BORDER_RANDOM                                               :{BLACK} عشوائي
-STR_BORDER_RANDOMIZE                                            :{BLACK} عشوائيا
-STR_BORDER_MANUAL                                               :{BLACK} يدوي
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK} حدود الخريطة:
+STR_MAPGEN_NORTHWEST                                            :{BLACK} الشمال الغربي
+STR_MAPGEN_NORTHEAST                                            :{BLACK} الشمال الشرقي
+STR_MAPGEN_SOUTHEAST                                            :{BLACK} الجنوب الشرقي
+STR_MAPGEN_SOUTHWEST                                            :{BLACK} الجنوب الغربي
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK} حر
+STR_MAPGEN_BORDER_WATER                                         :{BLACK} ماء
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK} عشوائي
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK} عشوائيا
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK} يدوي
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}صغير
@@ -3383,21 +3383,21 @@ STR_MEASURE_AREA                                                :{BLACK}المس
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}الطول: {NUM}{}�رق الارت�اع: {NUM} م
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}المساحة: {NUM} x {NUM}{}�رق الارت�اع{NUM} م
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}مقدار التحويل: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}هذا طريق مملوك للمدينه
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... اتجاة الطريق خاطئ
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}خيارات الش�ا�ية
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}بدل ش�ا�ية اسماء المحطات. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}بدل الش�ا�ية للشجر. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}بدل الش�ا�ية للمباني. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}بدل الش�ا�ية للمصانع. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}بدل الش�ا�ية للمحطات و ملحقاتها. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK} بدل الش�ا�ية للجسور. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}بدل بين الش�ا�ية للعلامات مثل المنارات الضوئية و هواائيات الارسال. م�تاح كنترول لالغلاق.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK} غير ش�ا�ية سكك الحديد. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}غير الش�ا�ية لنسبة التحميل. م�تاح كنترول للاغلاق.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}اخ�اء الاجرام تماما بدلا من الش�ا�ية
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}مقدار التحويل: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}هذا طريق مملوك للمدينه
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... اتجاة الطريق خاطئ
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}خيارات الش�ا�ية
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}بدل ش�ا�ية اسماء المحطات. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}بدل الش�ا�ية للشجر. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}بدل الش�ا�ية للمباني. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}بدل الش�ا�ية للمصانع. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}بدل الش�ا�ية للمحطات و ملحقاتها. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK} بدل الش�ا�ية للجسور. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}بدل بين الش�ا�ية للعلامات مثل المنارات الضوئية و هواائيات الارسال. م�تاح كنترول لالغلاق.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK} غير ش�ا�ية سكك الحديد. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}غير الش�ا�ية لنسبة التحميل. م�تاح كنترول للاغلاق.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}اخ�اء الاجرام تماما بدلا من الش�ا�ية
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3407,7 +3407,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :جميع القطارات
 STR_GROUP_ALL_ROAD_VEHICLES                                     :جميع المركبات
 STR_GROUP_ALL_SHIPS                                             :جميع الس�ن
@@ -3416,24 +3416,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :قطار لات
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :لاتنتمي لأي مجموعة
 STR_GROUP_DEFAULT_SHIPS                                         :مركبة لاتنتمي لأي مجموعة
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :طائرة لاتنتمي لأي مجموعة
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :اضا�ة عربات مشتركة
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :أزل جميع المركبات
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}إعادة تسمية مجموعة
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}لايمكن إنشاء مجموعة
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}لايمكن حذ� المجموعة
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}لايمكن إعادة تسمية المجموعة
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}لايمكن إزالة جميع المركبات من هذه المجموعة
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}لا يمكن اضا�ة المركبة للمجموعة ...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}لا يمكن اضا�ة مركبات مشتركة للمجموعة ...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}لايمكن إنشاء مجموعة
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}لايمكن حذ� المجموعة
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}لايمكن إعادة تسمية المجموعة
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}لايمكن إزالة جميع المركبات من هذه المجموعة
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}لا يمكن اضا�ة المركبة للمجموعة ...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}لا يمكن اضا�ة مركبات مشتركة للمجموعة ...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}المجموعات: اضغط على اي مجموعة لعرض المركبات التابعة لها
-STR_GROUP_CREATE_TIP                                            :{BLACK}أضغط لإنشاء مجموعة
-STR_GROUP_DELETE_TIP                                            :{BLACK}أحذ� المجموعة المختارة
-STR_GROUP_RENAME_TIP                                            :{BLACK}أعد تسمية المجموعة المختارة
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}اضغط لحماية المجموعة من التغيير الكلي للعربات
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}المجموعات: اضغط على اي مجموعة لعرض المركبات التابعة لها
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}أضغط لإنشاء مجموعة
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}أحذ� المجموعة المختارة
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}أعد تسمية المجموعة المختارة
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}اضغط لحماية المجموعة من التغيير الكلي للعربات
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3494,35 +3494,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}السم يجب ان يكون �ريدا - غير مستخدم
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}السم يجب ان يكون �ريدا - غير مستخدم
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}توجة الى العلامة التالية
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}توجة الى الاشارة السابقة
-STR_SIGN_OSKTITLE                                               :{BLACK}ادخل اسم العلامة
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}توجة الى العلامة التالية
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}توجة الى الاشارة السابقة
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}ادخل اسم العلامة
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}مول
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK} الاحتمالية
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}بناء
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}اختر المصنع المناسب من القائمة
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}مول
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK} الاحتمالية
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}بناء
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}اختر المصنع المناسب من القائمة
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}متقدم
-STR_FACE_ADVANCED_TIP                                           :{BLACK}إختيار وجه متقدم
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}إختيار وجه متقدم
 STR_FACE_SIMPLE                                                 :{BLACK}بسيط
-STR_FACE_SIMPLE_TIP                                             :{BLACK}اختيار الوجة المبسط
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}اختيار الوجة المبسط
 STR_FACE_LOAD                                                   :{BLACK}حمل
-STR_FACE_LOAD_TIP                                               :{BLACK}حمل الوجه الم�ضل
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}حمل الوجه الم�ضل
 STR_FACE_LOAD_DONE                                              :{WHITE}وجهك الم�ضل تم تحميله من مل� التكوين الخاص بـ OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}رقم وجة اللاعب
-STR_FACE_FACECODE_TIP                                           :{BLACK}عرض او تغيير رقم الوجة
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}عرض او تغيير رقم الوجة
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}عرض او تغيير رقم وجة اللاعب
 STR_FACE_FACECODE_SET                                           :{WHITE}رقم الوجة الجديد - كود - تم تعيينة
 STR_FACE_FACECODE_ERR                                           :{WHITE}لا نتمكن من تغيير رقم الوجة. - يجب ان يكون من 0 الى 4,294,967,295 !
 STR_FACE_SAVE                                                   :{BLACK}ح�ظ
-STR_FACE_SAVE_TIP                                               :{BLACK}ح�ظ الوجه الم�ضل
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}ح�ظ الوجه الم�ضل
 STR_FACE_SAVE_DONE                                              :{WHITE}هذا الوجه سيح�ظ كالم�ضل �ي مل� تكوين الخاص بـ Open TTD.
 STR_FACE_EUROPEAN                                               :{BLACK}أوربي
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}إختيار وجوه أوربيه
@@ -3530,51 +3530,51 @@ STR_FACE_AFRICAN                                                :{BLACK}أ�ري
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}إختيار وجوه أ�ريقيه
 STR_FACE_YES                                                    :نعم
 STR_FACE_NO                                                     :لا
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}ت�عيل الشوارب أو أقراط الأذان
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}ت�عيل الشوارب أو أقراط الأذان
 STR_FACE_HAIR                                                   :الشعر:
-STR_FACE_HAIR_TIP                                               :{BLACK}غير الشعر
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}غير الشعر
 STR_FACE_EYEBROWS                                               :الحواجب:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}غير الحواجب
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}غير الحواجب
 STR_FACE_EYECOLOUR                                              :لون العيون:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}غير لون العيون
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}غير لون العيون
 STR_FACE_GLASSES                                                :نظارات:
-STR_FACE_GLASSES_TIP                                            :{BLACK}ت�عيل النظارات
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}غير النظارات
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}ت�عيل النظارات
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}غير النظارات
 STR_FACE_NOSE                                                   :الأن�:
-STR_FACE_NOSE_TIP                                               :{BLACK}غير الأن�
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}غير الأن�
 STR_FACE_LIPS                                                   :الش�اه:
 STR_FACE_MOUSTACHE                                              :الشوارب:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}غير الش�اه أو الشوارب
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}غير الش�اه أو الشوارب
 STR_FACE_CHIN                                                   :الذقن:
-STR_FACE_CHIN_TIP                                               :{BLACK}غير الذقن
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}غير الذقن
 STR_FACE_JACKET                                                 :سترة:
-STR_FACE_JACKET_TIP                                             :{BLACK}غير السترة
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}غير السترة
 STR_FACE_COLLAR                                                 :الياقة:
-STR_FACE_COLLAR_TIP                                             :{BLACK}غير الياقة
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}غير الياقة
 STR_FACE_TIE                                                    :الربطة:
 STR_FACE_EARRING                                                :أقراط الأذان:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}غير الربطة أو أقراط الأذن
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}غير الربطة أو أقراط الأذن
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}اختيار الاشارات
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}لا يمكن تحويل الاشارة هنا ...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}اشارة اق�ال (بالاعلام){}هذة الاشارة الأساسية. تسمح بتواجد قطار واحد �ي القسم و الوقت الواحد
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}اشارة دخول (بالاعلام){} تكون خضراء عندما توجد اشارة خضراء �ي اشارات الخروج التالية لها. والا تكون حمراء.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}اشارة خروج (بالاعلام) {}تعمل مثل اشارة الاق�ال, لكن يجب تنشيط الوضع الصحيح �ي الدخول و الاشارة المزدوجة.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}اشارة مزدوجة (بالاعلام) {} الاشارة المزدوجة تعمل للدخول و الخروج. �هي تسمح لك بعمل شجرة كبيرة من الاشارات
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}اشارة طريق (بالاعلام){}تسمح بمرور اكثر من قطار �ي القسم التالي اذا كان القطار يستطيع  الوصول الى نقطة آمنة. يمكن تخطي الاشارة بالاتجاهين.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}اشارة الاتجاة الواحد (بالاعلام){}اشارة طريق تسمح باكثر من قطار يدخل �ي القسم التالي �ي ن�س الوقت, اذا كان القطار يستطيع الوصول الى نقطة آمنة. لا يمكن تخطي اشارة الاتجاة الواحد من الخل�.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}اشارة اق�ال (كهربائية){}هذة الاشارة الأساسية. تسمح بتواجد قطار واحد �ي القسم و الوقت الواحد
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}اشارة دخول (كهربائية){} تكون خضراء عندما توجد اشارة خضراء �ي اشارات الخروج التالية لها. والا تكون حمراء.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}اشارة خروج (كهربائية) {}تعمل مثل اشارة الاق�ال, لكن يجب تنشيط الوضع الصحيح �ي الدخول و الاشارة المزدوجة.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}اشارة مزدوجة (كهربائية) {} الاشارة المزدوجة تعمل للدخول و الخروج. �هي تسمح لك بعمل شجرة كبيرة من الاشارات.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}اشارة طريق (كهربائية){}تسمح بمرور اكثر من قطار �ي القسم التالي اذا كان القطار يستطيع  الوصول الى نقطة آمنة. يمكن تخطي الاشارة بالاتجاهين.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}اشارة الاتجاة الواحد (كهربائية){}اشارة طريق تسمح باكثر من قطار يدخل �ي القسم التالي �ي ن�س الوقت, اذا كان القطار يستطيع الوصول الى نقطة آمنة. لا يمكن تخطي اشارة الاتجاة الواحد من الخل�.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK} تغيير الاشارات {} عند الاختيار, سو� يتم تغيير الاشارة الى النوع المختار. الضغط على م�تاح كنترول سو� يبدل بين انواع الاشارات.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}سرعة السحب
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}تقليل سرعة السحب
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}زيادة سرعة السحب
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}اختيار الاشارات
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}لا يمكن تحويل الاشارة هنا ...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}اشارة اق�ال (بالاعلام){}هذة الاشارة الأساسية. تسمح بتواجد قطار واحد �ي القسم و الوقت الواحد
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}اشارة دخول (بالاعلام){} تكون خضراء عندما توجد اشارة خضراء �ي اشارات الخروج التالية لها. والا تكون حمراء.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}اشارة خروج (بالاعلام) {}تعمل مثل اشارة الاق�ال, لكن يجب تنشيط الوضع الصحيح �ي الدخول و الاشارة المزدوجة.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}اشارة مزدوجة (بالاعلام) {} الاشارة المزدوجة تعمل للدخول و الخروج. �هي تسمح لك بعمل شجرة كبيرة من الاشارات
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}اشارة طريق (بالاعلام){}تسمح بمرور اكثر من قطار �ي القسم التالي اذا كان القطار يستطيع  الوصول الى نقطة آمنة. يمكن تخطي الاشارة بالاتجاهين.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}اشارة الاتجاة الواحد (بالاعلام){}اشارة طريق تسمح باكثر من قطار يدخل �ي القسم التالي �ي ن�س الوقت, اذا كان القطار يستطيع الوصول الى نقطة آمنة. لا يمكن تخطي اشارة الاتجاة الواحد من الخل�.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}اشارة اق�ال (كهربائية){}هذة الاشارة الأساسية. تسمح بتواجد قطار واحد �ي القسم و الوقت الواحد
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}اشارة دخول (كهربائية){} تكون خضراء عندما توجد اشارة خضراء �ي اشارات الخروج التالية لها. والا تكون حمراء.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}اشارة خروج (كهربائية) {}تعمل مثل اشارة الاق�ال, لكن يجب تنشيط الوضع الصحيح �ي الدخول و الاشارة المزدوجة.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}اشارة مزدوجة (كهربائية) {} الاشارة المزدوجة تعمل للدخول و الخروج. �هي تسمح لك بعمل شجرة كبيرة من الاشارات.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}اشارة طريق (كهربائية){}تسمح بمرور اكثر من قطار �ي القسم التالي اذا كان القطار يستطيع  الوصول الى نقطة آمنة. يمكن تخطي الاشارة بالاتجاهين.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}اشارة الاتجاة الواحد (كهربائية){}اشارة طريق تسمح باكثر من قطار يدخل �ي القسم التالي �ي ن�س الوقت, اذا كان القطار يستطيع الوصول الى نقطة آمنة. لا يمكن تخطي اشارة الاتجاة الواحد من الخل�.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK} تغيير الاشارات {} عند الاختيار, سو� يتم تغيير الاشارة الى النوع المختار. الضغط على م�تاح كنترول سو� يبدل بين انواع الاشارات.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}سرعة السحب
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}تقليل سرعة السحب
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}زيادة سرعة السحب
 ########
 
 ############ on screen keyboard
@@ -3586,37 +3586,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :Ø°1234567890-=Ø
 STR_INTRO_AI_SETTINGS                                           :{BLACK} اعدادات الذكاء الصناعي
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK} عرض اعدادات الذكاء الصناعي
 STR_AI_DEBUG                                                    :{WHITE} مكتش� اخطاء  الذكاء الصناعي
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK} اسم الذكاء الصناعي
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK} اسم الذكاء الصناعي
 STR_AI_DEBUG_RELOAD                                             :{BLACK} اعادة تحميل الذكاء الصناعي
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK} حذ� الذكاء الصناعي - اعادة تحميل الذكاء الصناعي و بدء تشغيلة من جديد
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW} شاشة اخطاء الذكاء الصناعي متو�رة �قط �ي الخادم
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK} حذ� الذكاء الصناعي - اعادة تحميل الذكاء الصناعي و بدء تشغيلة من جديد
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW} شاشة اخطاء الذكاء الصناعي متو�رة �قط �ي الخادم
 STR_AI_CONFIG_CAPTION                                           :{WHITE} اعداد الذكاء الصناعي
-STR_AI_CHANGE                                                   :{BLACK} اختر الذكاء الصناعي
-STR_AI_CONFIGURE                                                :{BLACK} اعداد
-STR_AI_CHANGE_TIP                                               :{BLACK} حمل ذكاء صناعي آخر
-STR_AI_CONFIGURE_TIP                                            :{BLACK} اعداد خواص الذكاء الصناعي
-STR_AI_LIST_TIP                                                 :{BLACK} كل الذكاء الصناعي سو� يحمل �ي اللعبة التالية
+STR_AI_CONFIG_CHANGE                                            :{BLACK} اختر الذكاء الصناعي
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK} اعداد
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK} حمل ذكاء صناعي آخر
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK} اعداد خواص الذكاء الصناعي
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK} كل الذكاء الصناعي سو� يحمل �ي اللعبة التالية
 STR_AI_LIST_CAPTION                                             :{WHITE} الذكاء الصناعي المتاح
-STR_AI_AILIST_TIP                                               :{BLACK} اضغط لاختيار ذكاء اصطناعي
-STR_AI_ACCEPT                                                   :{BLACK} اقبل
-STR_AI_ACCEPT_TIP                                               :{BLACK} اختر الذكاء الصناعي المنتقى
-STR_AI_CANCEL                                                   :{BLACK} الغاء
-STR_AI_CANCEL_TIP                                               :{BLACK} لا تغير الذكاء الصناعي
-STR_AI_CLOSE                                                    :{BLACK} اغلاق
-STR_AI_RESET                                                    :{BLACK} اعادة ضبط
-STR_AI_HUMAN_PLAYER                                             :لاعب انساني
-STR_AI_RANDOM_AI                                                :ذكاء صناعي عشوائي
+STR_AI_LIST_TOOLTIP                                             :{BLACK} اضغط لاختيار ذكاء اصطناعي
+STR_AI_LIST_ACCEPT                                              :{BLACK} اقبل
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK} اختر الذكاء الصناعي المنتقى
+STR_AI_LIST_CANCEL                                              :{BLACK} الغاء
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK} لا تغير الذكاء الصناعي
+STR_AI_SETTINGS_CLOSE                                           :{BLACK} اغلاق
+STR_AI_SETTINGS_RESET                                           :{BLACK} اعادة ضبط
+STR_AI_CONFIG_HUMAN_PLAYER                                      :لاعب انساني
+STR_AI_CONFIG_RANDOM_AI                                         :ذكاء صناعي عشوائي
 STR_AI_SETTINGS_CAPTION                                         :{WHITE} خصائص الذكاء الصناعي
-STR_AI_AUTHOR                                                   :{BLACK}المؤل�: {STRING}
-STR_AI_VERSION                                                  :{BLACK}الاصدار:  {NUM}
-STR_AI_URL                                                      :{BLACK}العنوان  :   {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE} واحد من الذكاء الصناعي �شل. الرجاء ابلاغ المبرمج عنه مصحوبا بصورة من شاشة مصحح الاخطاء.
-STR_AI_NO_AI_FOUND                                              :لا يوجد اضا�ات مناسبة للتحميل {} هذه اضا�ة غبية ولن ت�عل شيئا لك {} تستطيع تحميل اضا�ات من الشبكة عن طريق نظام التحميل
+STR_AI_LIST_AUTHOR                                              :{BLACK}المؤل�: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}الاصدار:  {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}العنوان  :   {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE} واحد من الذكاء الصناعي �شل. الرجاء ابلاغ المبرمج عنه مصحوبا بصورة من شاشة مصحح الاخطاء.
+STR_ERROR_AI_NO_AI_FOUND                                        :لا يوجد اضا�ات مناسبة للتحميل {} هذه اضا�ة غبية ولن ت�عل شيئا لك {} تستطيع تحميل اضا�ات من الشبكة عن طريق نظام التحميل
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}حدود الضوضاء داخل المدن: {ORANGE}{COMMA}{BLACK} القصوى: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK} الضوضاء المتولدة: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}حدود الضوضاء داخل المدن: {ORANGE}{COMMA}{BLACK} القصوى: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK} الضوضاء المتولدة: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3630,21 +3630,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :سناريو
 STR_CONTENT_TYPE_HEIGHTMAP                                      :خارطة المرت�عات
 STR_CONTENT_TITLE                                               :{WHITE} تحميل المحتوى
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK} نوع
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK} نوع المحتوى
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK} نوع المحتوى
 STR_CONTENT_NAME_CAPTION                                        :{BLACK} الاسم
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK} اسم المحتوى
-STR_CONTENT_MATRIX_TIP                                          :{BLACK} اضغط على الخط لرؤية الت�اصيل. {} اضغط على مربع الاختيار لتحميل.
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK} اسم المحتوى
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK} اضغط على الخط لرؤية الت�اصيل. {} اضغط على مربع الاختيار لتحميل.
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK} اختيار الكل
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK} تحميل كامل المحتوى
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK} تحميل كامل المحتوى
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK} اختر التحديث
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK} ضع علامة على التحديثات للمحتويات الموجودة و التي سيتم تحميلها
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK} ضع علامة على التحديثات للمحتويات الموجودة و التي سيتم تحميلها
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK} مسح الكل
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK} ضع علامة على المحتوى التي لن يتم تحميلها
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK} ضع علامة على المحتوى التي لن يتم تحميلها
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK} ادخل �لتر
-STR_CONTENT_FILTER_TIP                                          :{BLACK} اختر كلمة اساسية ل�لترة القائمة
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK} اختر كلمة اساسية ل�لترة القائمة
 STR_CONTENT_FILTER_TITLE                                        :{BLACK} �لتر:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK} تحميل
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK} ابدأ تحميل المحتويات المختارة
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK} ابدأ تحميل المحتويات المختارة
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER} حجم البيانات  التي سيتم تحميلها: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER} معلومات المحتوى
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER} لم تختر هذا المحتوى لتحميل
@@ -3677,6 +3677,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE} لم ي
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK} ابحث عن المحتوى على الانتر نت
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK} ابحث عن محتوى جديد او تحديث
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK} جد المحتوى الم�قود على الشبكة
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK} لتأكد ما اذا كان بالامكان ايجاد المحتوى الم�قود او الناقص عن طريق الشبكة العنكبوتية
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK} جد المحتوى الم�قود على الشبكة
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK} لتأكد ما اذا كان بالامكان ايجاد المحتوى الم�قود او الناقص عن طريق الشبكة العنكبوتية
 ########
diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt
index a22e9b0ae..9b1f5445d 100644
--- a/src/lang/brazilian_portuguese.txt
+++ b/src/lang/brazilian_portuguese.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mapa - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opções do Jogo
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Mensagem
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mensagem de {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Cuidado!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Impossível fazer isto....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Impossível limpar esta área....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 A equipe do OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Sair
-STR_YES                                                         :{BLACK}Sim
-STR_NO                                                          :{BLACK}Não
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Sim
+STR_QUIT_NO                                                     :{BLACK}Não
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}?
 
 STR_JUST_NOTHING                                                :Nada
 STR_COLOUR_DARK_BLUE                                            :Azul Escuro
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Deserto
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Neve
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mensagem
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Padrão
-STR_QUERY_CANCEL                                                :{BLACK}Cancelar
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Renomear
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Padrão
+STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Renomear
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Carga
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informação
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Capacidades
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Carga Total
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacidade total deste trem:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Capacidade total deste trem:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Novo Jogo
 STR_INTRO_LOAD_GAME                                             :{BLACK}Abrir Jogo
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Multi-jogador
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor de Cenário
 
-STR_MAPSIZE                                                     :{BLACK}Dimensões do mapa:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Dimensões do mapa:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opções do Jogo
 
 STR_COMPANY_SOMEONE                                             :alguém{SKIP}{SKIP}
@@ -309,10 +309,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Abandonar jogo
 STR_FILE_MENU_EXIT                                              :Sair
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Tem certeza que deseja abandonar este jogo?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandonar jogo
-STR_SORT_ORDER_TIP                                              :{BLACK}Selecionar forma de ordenação (descendente/ascendente)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecionar um critério de classificação
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecionar critério para filtração
-STR_SORT_BY                                                     :{BLACK}Ordenar por
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selecionar forma de ordenação (descendente/ascendente)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selecionar um critério de classificação
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selecionar critério para filtração
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordenar por
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}População
@@ -344,24 +344,24 @@ STR_SORT_BY_RUNNING_COST                                        :Custo de Manute
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potência por Custo
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacidade de Carga
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Não há carga de nenhum tipo aguardando
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Selecionar todas as instalações
-STR_SELECT_ALL_TYPES                                            :{BLACK}Selecionar todos os tipos de carga (inclusive as que não tem espera)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver uma lista dos designs de motor disponíveis para este tipo de veículo.
-STR_MANAGE_LIST                                                 :{BLACK}Administrar lista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Envia instruções a todos os veículos desta lista
-STR_REPLACE_VEHICLES                                            :Substituir veículos
-STR_SEND_FOR_SERVICING                                          :Enviar para Manutenção
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trens disponíveis
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Automóveis disponíveis
-STR_AVAILABLE_SHIPS                                             :{BLACK}Embarcações disponíveis
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronaves disponíveis
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Enviar para Depósito
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar para Garagem
-STR_SEND_SHIP_TO_DEPOT                                          :Enviar para Depósito Naval
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar para Hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Não há carga de nenhum tipo aguardando
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Selecionar todas as instalações
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Selecionar todos os tipos de carga (inclusive as que não tem espera)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Ver uma lista dos designs de motor disponíveis para este tipo de veículo.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Administrar lista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Envia instruções a todos os veículos desta lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Substituir veículos
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Enviar para Manutenção
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trens disponíveis
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Automóveis disponíveis
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Embarcações disponíveis
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aeronaves disponíveis
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar para Depósito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar para Garagem
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar para Depósito Naval
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar para Hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{} {NUM}
@@ -391,12 +391,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opções
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Impossível alterar o intervalo de manutenção...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fechar janela
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título da janela - arraste para mover a janela
-STR_STICKY_BUTTON                                               :{BLACK}Marcar esta janela para não fechar pela tecla 'Fechar Todas as Janelas'
-STR_RESIZE_BUTTON                                               :{BLACK}Clique e arraste para redimensionar a janela
+STR_TOOLTIP_STICKY                                              :{BLACK}Marcar esta janela para não fechar pela tecla 'Fechar Todas as Janelas'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Clique e arraste para redimensionar a janela
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Clique aqui para selecionar o diretório padrão de jogos salvos
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolir edifícios, etc. num quadrado de terreno
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Baixar um canto do terreno
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Elevar um canto do terreno
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Baixar um canto do terreno
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Elevar um canto do terreno
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de rolagem - rola a lista acima/abaixo
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de rolagem - Move a lista para esquerda/direita
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Exibir relevo do terreno no mapa
@@ -409,21 +409,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Alternar
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Lucro anual: {CURRENCY} (último ano: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} ano{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ano{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ano{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ano{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :{G=m}Trem
-STR_VEHICLE_ROAD_VEHICLE                                        :{G=m}Automóvel
-STR_VEHICLE_SHIP                                                :{G=m}Embarcação
-STR_VEHICLE_AIRCRAFT                                            :{G=f}Aeronave
+STR_REPLACE_VEHICLE_TRAIN                                       :{G=m}Trem
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :{G=m}Automóvel
+STR_REPLACE_VEHICLE_SHIP                                        :{G=m}Embarcação
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :{G=f}Aeronave
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} está ficando velho
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} está ficando muito velho
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} está ficando muito velho e necessita ser substituído
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informações do Terreno
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Custo para limpar: {LTBLUE}N/D
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Custo para limpar: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Ganhos pela limpeza: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Ganhos pela limpeza: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/D
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Proprietário: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Dono da estrada: {LTBLUE}{STRING}
@@ -432,7 +432,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Dono da
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoridade local: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nenhum
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -544,7 +544,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Clique n
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Clique na música para remover da programação (Custom1 ou Custom2 somente)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Alternar exibir/ocultar programação aleatória
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Exibir janela de seleção de faixas de música
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Clique num serviço para centralizar a visualização numa indústria/cidade
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clique num serviço para centralizar a visualização numa indústria/cidade
 STR_INTRO_DIFFICULTY                                            :{BLACK}Dificuldade ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Última mensagem/notícia
@@ -593,7 +593,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Diminuir
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Gerar terreno aleatório
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Limpar terreno
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Limpar Terreno
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Remover todas as propriedades do jogador no mapa
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Remover todas as propriedades do jogador no mapa
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Tem certeza que deseja remover todas as propriedades do jogador?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Gerar terreno
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Gerar cidades
@@ -607,11 +607,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...muito
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...muito perto de outra cidade
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...local inadequado
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...muitas cidades
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Impossível construir qualquer cidade
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...não há mais espaço no mapa
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Impossível construir qualquer cidade
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...não há mais espaço no mapa
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar o tamanho da cidade
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}A cidade não irá construir estradas. Você pode ativar essa opção através de Config. Avançadas>Economia>Cidades.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}A cidade não irá construir estradas. Você pode ativar essa opção através de Config. Avançadas>Economia>Cidades.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Cidade Aleatória
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construir cidade num local aleatório
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Impossível construir {STRING} aqui...
@@ -625,13 +625,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Colocar
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Colocar farol
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Colocar transmissor
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Define área desértica.{} Pressione e segure CTRL para removê-la
-STR_CREATE_LAKE                                                 :{BLACK}Define área com água.{}Faz um canal, a menos se CTRL for pressionado ao nível do mar, neste caso inundará ao redor
-STR_CREATE_RIVER                                                :{BLACK}Criar Rios
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Define área com água.{}Faz um canal, a menos se CTRL for pressionado ao nível do mar, neste caso inundará ao redor
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Criar Rios
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Remover
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Remover esta cidade completamente
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Salvar cenário
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Abrir cenário
-STR_MENU_LOAD_HEIGHTMAP                                         :Carregar relevo
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carregar relevo
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sair do editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Sair
@@ -641,7 +641,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Salvar C
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Jogar Cenário
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Jogar num mapa de relevo
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Inica um novo jogo, a partir de um mapa de relevo
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Tem a certeza que deseja abandonar este cenário?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Tem a certeza que deseja abandonar este cenário?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...só pode ser construído em cidades com pelo menos 1200 habitantes
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Retroceder data de inicio em 1 ano
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Avançar data de inicio em 1 ano
@@ -649,21 +649,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...os ex
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Pequena
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Média
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grande
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Randômico
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Randômico
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cidades grandes cresem mais rápido que as cidades normais{}Dependendo das configs. são maiores quando fundadas.
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selecionar tamanho da cidade
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Tamanho da cidade:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Disposição das ruas das cidades
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selecione a disposição de ruas a ser utilizada nessa cidade
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Melhorado
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Quadras 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Quadras 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Randômico
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposição das ruas das cidades
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selecione a disposição de ruas a ser utilizada nessa cidade
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Melhorado
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Quadras 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Quadras 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Randômico
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Exibir a última mensagem ou notícia
 STR_NEWS_MESSAGES_OFF                                           :Desligado
 STR_NEWS_MESSAGES_SUMMARY                                       :Resumo
@@ -763,10 +763,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Foto salvado com sucesso como '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Falha ao tirar foto!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Comprar terreno para uso futuro
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Comprar terreno para uso futuro
 STR_STATUSBAR_AUTOSAVE                                          :{RED}Gravado automaticamente
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SALVANDO JOGO  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Gravação em progresso,{}por favor aguarde até que termine!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Gravação em progresso,{}por favor aguarde até que termine!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Selecionar programa 'Ezy Street'
 
 ############ start of townname region
@@ -829,7 +829,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selecion
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Tela cheia
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Selecione esta opção para jogar o OpenTTD em modo de tela cheia
-STR_FULLSCREEN_FAILED                                           :{WHITE}Falha no modo de tela cheia
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Falha no modo de tela cheia
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolução da tela
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecionar a resolução da tela que deseja utilizar
@@ -842,12 +842,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selecion
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} arquivo faltando/corrupto{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informações adicionais sobre o set de gráficos base
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Falha ao salvar automaticamente
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Falha ao salvar automaticamente
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Indo para {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Indo para {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sem ordens
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sem ordens, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Indo para {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Indo para {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sem ordens
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sem ordens, {VELOCITY}
 
 STR_PASSENGERS                                                  :passageiros
 STR_BAGS                                                        :sacos
@@ -858,9 +858,9 @@ STR_CRATES                                                      :caixas
 STR_RES_OTHER                                                   :outra
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Impossível compartilhar a lista de ordens...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Impossível copiar a lista de ordens...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Compartilhadas - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Impossível compartilhar a lista de ordens...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Impossível copiar a lista de ordens...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fim de Ordens Compartilhadas - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} não pode encontrar um caminho para seguir
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} está perdido
@@ -1129,15 +1129,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-taman
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desativado
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Alterar valor
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Alterar valor
 
-STR_TEMPERATE_LANDSCAPE                                         :terreno temperado
-STR_SUB_ARCTIC_LANDSCAPE                                        :terreno subártico
-STR_SUB_TROPICAL_LANDSCAPE                                      :terreno subtropical
-STR_TOYLAND_LANDSCAPE                                           :terreno 'toyland'
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :terreno temperado
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :terreno subártico
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :terreno subtropical
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :terreno 'toyland'
 
 STR_CHEATS                                                      :{WHITE}Trapaças
-STR_CHEATS_TIP                                                  :{BLACK}As caixas de verificação indicam se esta trapaça já foi usada antes
+STR_CHEATS_TOOLTIP                                              :{BLACK}As caixas de verificação indicam se esta trapaça já foi usada antes
 STR_CHEATS_WARNING                                              :{BLACK}Atenção! Você está prestes a trair os seus oponentes. Saiba que isto ficará registrado para sempre.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jogando pela Co.: {ORANGE}{COMMA}
@@ -1149,179 +1149,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Mudar d
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Alterar data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ativar modificação de valores de produção: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Indo para {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Indo para {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Indo para {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Indo para {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Ir via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sem parar via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ir via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ir sem parar via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Ponto de controle {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Ponto de controle {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Bóia
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Bóia #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Ponto de controle
+STR_FORMAT_WAYPOINT_NAME                                        :Ponto de controle {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Ponto de controle {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Bóia
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bóia #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Ponto de controle
 
-STR_WAYPOINT                                                    :{WHITE}Ponto de controle
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selecione um tipo de ponto de controle
+STR_WAYPOINT_CAPTION                                            :{WHITE}Ponto de controle
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Selecione um tipo de ponto de controle
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editar nome do ponto de controle
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Impossível alterar o nome do ponto de controle...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Impossível alterar o nome do ponto de controle...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Converter linha em ponto de controle
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Impossível construir ponto de controle de trem aqui...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Impossível remover ponto de controle de trem aqui...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Impossível construir ponto de controle de trem aqui...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Impossível remover ponto de controle de trem aqui...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Construir ferrovias usando o modo automático
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...não existe cidade neste cenário
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Geração do mapa abortada... {}... não há locais para criação de cidades
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...não existe cidade neste cenário
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Geração do mapa abortada... {}... não há locais para criação de cidades
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Várias cidades aleatórias
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Cobrir o mapa com cidades colocadas aleatoriamente
-STR_MANY_RANDOM_INDUSTRIES                                      :Várias indústrias aleatórias
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Cobrir o mapa com indústrias colocadas aleatoriamente
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Impossível gerar indústrias...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Várias cidades aleatórias
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cobrir o mapa com cidades colocadas aleatoriamente
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Várias indústrias aleatórias
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Cobrir o mapa com indústrias colocadas aleatoriamente
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Impossível gerar indústrias...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Abra a barra de modelação ambiental para elevar ou baixar terreno, plantar árvores, etc.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreno
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivelar terreno
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivelar terreno
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}�rvores de tipo aleatório
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plantar árvores de tipo aleatório
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plantar árvores de tipo aleatório
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Impossível construir canais aqui...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Impossível construir canais aqui...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construir canais.
-STR_LANDINFO_CANAL                                              :Canal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Impossível construir eclusas aqui...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Impossível construir eclusas aqui...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Construir eclusas
-STR_LANDINFO_LOCK                                               :Eclusa
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Eclusa
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Impossível fazer rios aqui...
-STR_LANDINFO_RIVER                                              :Rio
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Impossível fazer rios aqui...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rio
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...bóia está em uso!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...bóia está em uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Impossível remover parte da estação...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Impossível converter o tipo de linha aqui...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Impossível remover parte da estação...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Impossível converter o tipo de linha aqui...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converter/Atualizar tipo de linha
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Arraste locomotiva aqui para vender todo o trem
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Arraste locomotiva aqui para vender todo o trem
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Arrastar
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construir estação arrastando
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecionar a classe de estação a ser exibida
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecionar o tipo de estação a construir
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Selecionar a classe de estação a ser exibida
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Selecionar o tipo de estação a construir
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Aumentar velocidade do jogo
 STR_MESSAGE_HISTORY                                             :{WHITE}Histórico de Mensagens
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Lista de notícias recentes
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Desativar tudo
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Ativar tudo
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Lista de notícias recentes
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desativar tudo
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Ativar tudo
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes das indústrias - clique no nome para localizar a indústria
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Indústrias
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomes das indústrias - clique no nome para localizar a indústria
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...muito perto de outra indústria
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multi-jogador
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nome:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Este é o nome pelo qual os outros jogadores irão te identificar
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Coloque seu nome
-STR_NETWORK_CONNECTION                                          :{BLACK}Conexão:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Escolha entre um jogo pela Internet ou pela rede local
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Iniciar servidor
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Iniciar um servidor próprio
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nome
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nome do jogo
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versão do servidor, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Clique num jogo da lista para o selecionar
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}O servidor que você entrou da última vez:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Clique para selecionar o servidor que você jogou da última vez
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Localizar servidor
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Pesquisar por um servidor na rede
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Adicionar servidor
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adiciona um servidor à lista que será sempre verificada se existem jogos ocorrendo.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Coloque o endereço IP do servidor
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / max. clientes{}Empresas ligados / max, empresas
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Tamanho do mapa
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Tamanho do mapa do jogo{}Clique para exibir por área
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data atual
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anos
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Número de anos{}decorridos no jogo
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DO JOGO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do mapa: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}IP do servidor: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data de inicio: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data atual: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protegido por senha!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR DESLIGADO
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR CHEIO
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSÃO INCOMPAT�VEL
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NÃO ENCONTRADO
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Entrar no jogo
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Iniciar novo jogo
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nome do jogo:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}O nome do jogo será exibido aos outros jogadores no menu de seleção de jogos multi-jogador
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Coloque o nome para o jogo em rede
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Definir senha
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Proteja o jogo com uma senha se não desejar que seja publicamente acessível
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selecionar um mapa:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Em qual mapa deseja jogar?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Rede Local
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :Rede Local / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (divulgar)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Máx de clientes:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Escolha o número máximo de clientes. Não é necessário estarem todos preenchidos
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} empresa{P "" s}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Máximo de empresas:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limita o servidor para uma certa quantia de empresas
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Máx de espectadores:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limita o servidor para um certa quantia de espectadores
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma falado:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Outros jogadores saberão o idioma utilizado no servidor.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Iniciar Jogo
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Iniciar um novo jogo em rede com mapa ou cenário aleatórios
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Abrir Jogo
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Continuar um jogo multi-jogador anteriormente gravado (assegure-se de conectar com o jogador correto)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multi-jogador
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Coloque seu nome
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Conexão:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Escolha entre um jogo pela Internet ou pela rede local
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Iniciar servidor
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Iniciar um servidor próprio
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nome
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nome do jogo
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Idioma, versão do servidor, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Clique num jogo da lista para o selecionar
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}O servidor que você entrou da última vez:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Clique para selecionar o servidor que você jogou da última vez
+
+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_ENTER_IP                                :{BLACK}Coloque o endereço IP do servidor
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clientes
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clientes ligados / max. clientes{}Empresas ligados / max, empresas
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Tamanho do mapa
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Tamanho do mapa do jogo{}Clique para exibir por área
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Data atual
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Anos
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Número de anos{}decorridos no jogo
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFORMAÇÃO DO JOGO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tileset: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Tamanho do mapa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versão do servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}IP do servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data de inicio: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data atual: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protegido por senha!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR DESLIGADO
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR CHEIO
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSÃO INCOMPAT�VEL
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF NÃO ENCONTRADO
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Entrar no jogo
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Iniciar novo jogo
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nome do jogo:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome do jogo será exibido aos outros jogadores no menu de seleção de jogos multi-jogador
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Coloque o nome para o jogo em rede
+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_SELECT_MAP                             :{BLACK}Selecionar um mapa:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Em qual mapa deseja jogar?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Rede Local
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Rede Local / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (divulgar)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Máx de clientes:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Escolha o número máximo de clientes. Não é necessário estarem todos preenchidos
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} empresa{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Máximo de empresas:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limita o servidor para uma certa quantia de empresas
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Máx de espectadores:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limita o servidor para um certa quantia de espectadores
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Idioma falado:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Outros jogadores saberão o idioma utilizado no servidor.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Iniciar Jogo
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Iniciar um novo jogo em rede com mapa ou cenário aleatórios
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Abrir Jogo
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Continuar um jogo multi-jogador anteriormente gravado (assegure-se de conectar com o jogador correto)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Qualquer
@@ -1362,33 +1362,33 @@ STR_NETWORK_LANG_GREEK                                          :Grego
 STR_NETWORK_LANG_LATVIAN                                        :Letão
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Sala de espera do jogo
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Sala de espera do jogo
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparando para conectar em: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista de todas as empresas ativas no jogo. Você pode juntar-se a uma delas ou iniciar uma nova empresa.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova empresa
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Criar uma nova empresa
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Observar jogo
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Ver jogo como um espectador
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Unir-se à empresa
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Auxiliar na gestão desta empresa
-STR_NETWORK_REFRESH                                             :{BLACK}Atualizar dados
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Atualiza as informações sobre o servidor
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparando para conectar em: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Lista de todas as empresas ativas no jogo. Você pode juntar-se a uma delas ou iniciar uma nova empresa.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova empresa
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Criar uma nova empresa
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Observar jogo
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Ver jogo como um espectador
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Unir-se à empresa
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Auxiliar na gestão desta empresa
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atualizar dados
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atualiza as informações sobre o servidor
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAÇÃO DA EMPRESA
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFORMAÇÃO DA EMPRESA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da empresa: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valor da empresa: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanço atual: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nome da empresa: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguração: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valor da empresa: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balanço atual: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Desempenho: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estações: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Jogadores: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Veículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Estações: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Jogadores: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Conectando...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Conectando..
@@ -1404,49 +1404,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Obtendo
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} à sua frente
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} obtidos até agora
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectar
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconectar
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Entre a quantia a ser dada
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor está protegido. Digite a senha
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa está protegida. Digite a senha
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de clientes
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Assistir
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Companhia
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Não foram encontradas interfaces de rede ou o jogo foi compilado sem ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Não foram encontrados jogos em rede
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}O servidor não respondeu ao pedido
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Não pode conectar devido ao NewGRF errado
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}A sincronização do jogo falhou.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}A conexão do jogo foi perdida
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Não foi possível abrir o jogo.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Não foi possível iniciar o servidor
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Não foi possível estabelecer conexão
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Tempo de espera esgotado na conexão #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Ocorreu um erro de protocolo e a conexão foi encerrada
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}A versão deste cliente não condiz com a versão do servidor
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Senha incorreta
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}O servidor está cheio
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Você foi banido deste servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Você foi expulso do jogo
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Trapaceiros não são permitidos neste servidor
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Não foram encontradas interfaces de rede ou o jogo foi compilado sem ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Não foram encontrados jogos em rede
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}O servidor não respondeu ao pedido
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Não pode conectar devido ao NewGRF errado
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}A sincronização do jogo falhou.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}A conexão do jogo foi perdida
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Não foi possível abrir o jogo.
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Não foi possível iniciar o servidor
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Não foi possível estabelecer conexão
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Tempo de espera esgotado na conexão #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Ocorreu um erro de protocolo e a conexão foi encerrada
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}A versão deste cliente não condiz com a versão do servidor
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Senha incorreta
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}O servidor está cheio
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Você foi banido deste servidor
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Você foi expulso do jogo
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Trapaceiros não são permitidos neste servidor
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :erro geral
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :erro de dessincronização
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :não foi possível carregar o mapa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :conexão perdida
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erro de protocolo
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF errado
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :não autorizado
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :recebido um pacote estranho
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :versão incorreta
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nome já está em uso
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :senha incorreta
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :wrong company-id in DoCommand (ERRO)
-STR_NETWORK_ERR_CLIENT_KICKED                                   :expulso pelo servidor
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :estava tentando trapacear
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheio
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :erro geral
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :erro de dessincronização
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :não foi possível carregar o mapa
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :conexão perdida
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :erro de protocolo
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF errado
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :não autorizado
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :recebido um pacote estranho
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :versão incorreta
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nome já está em uso
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :senha incorreta
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :wrong company-id in DoCommand (ERRO)
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :expulso pelo servidor
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava tentando trapacear
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheio
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1456,15 +1456,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Jogo pausado (c
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Jogo des-pausado (cliente conectado)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Jogo des-pausado (cliente não se conectou)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :saindo
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} entrou no jogo
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} entrou na companhia #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} está assistindo ao jogo
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} abriu uma nova companhia (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} saiu do jogo ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} mudou seu nome para {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} deu à sua companhia{2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Você deu a {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :saindo
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} entrou no jogo
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} entrou na companhia #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} está assistindo ao jogo
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} abriu uma nova companhia (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} saiu do jogo ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} mudou seu nome para {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} deu à sua companhia{2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Você deu a {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Equipe] :
 STR_NETWORK_CHAT_COMPANY                                        :[Equipe] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Equipe] Para {STRING}: {WHITE}{STRING}
@@ -1474,8 +1474,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privado] Para
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Todos] :
 STR_NETWORK_CHAT_ALL                                            :[Todos] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Coloque o texto para o jogo em rede
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} O servidor fechou a sessão
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} O servidor está reiniciando...{}Aguarde...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} O servidor fechou a sessão
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} O servidor está reiniciando...{}Aguarde...
 
 STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
@@ -1489,19 +1489,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Falar com a emp
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Mensagem privada
 
 
-STR_NETWORK_SEND                                                :{BLACK}Enviar
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Enviar
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Impossível carregar terreno a partir de PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...arquivo não encontrado.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...impossível converter tipo de imagem. Precisa imagem PNG de 8 ou 24-bit.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...alguma coisa deu errado. Desculpe. (provavel arquivo corrupto)
+STR_ERROR_PNGMAP                                                :{WHITE}Impossível carregar terreno a partir de PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...arquivo não encontrado.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...impossível converter tipo de imagem. Precisa imagem PNG de 8 ou 24-bit.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...alguma coisa deu errado. Desculpe. (provavel arquivo corrupto)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Impossível carregar terreno a partir de BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...não foi possível converter o tipo de imagem
+STR_ERROR_BMPMAP                                                :{WHITE}Impossível carregar terreno a partir de BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...não foi possível converter o tipo de imagem
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Custo: {CURRENCY}
@@ -1515,13 +1515,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Lucro Es
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Impossível elevar terreno aqui...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Impossível baixar terreno aqui...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Impossível terraplanar aqui...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rochas
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Terreno Irregular
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Deserto
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gramado
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Campos
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Neve
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Deserto
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rochas
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Terreno Irregular
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Deserto
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gramado
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campos
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Neve
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deserto
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Terreno inclinado na direção incorreta
@@ -1529,11 +1529,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Impossí
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}A escavação estragaria o túnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Já está ao nível do mar
 STR_ERROR_TOO_HIGH                                              :{WHITE}Muito alto
-STR_ALREADY_LEVELLED                                            :{WHITE}... já está plano
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... já está plano
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tipo de linha não apropriado
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...já construído
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Deve remover a ferrovia primeiro
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Rua é mão única ou está bloqueado
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Rua é mão única ou está bloqueado
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Construir ferrovias
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Construir ferrovias (elétricas)
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Construir ferrovias (monotrilho)
@@ -1557,41 +1557,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Construir ponte ferroviária
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construir túnel ferroviário
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Alternar construir/remover ferrovias e sinais
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Seleção de ponte - clique na ponte desejada para construir
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Seleção de ponte - clique na ponte desejada para construir
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecionar a orientação do depósito ferroviário
-STR_RAILROAD_TRACK                                              :Ferrovia
-STR_RAILROAD_TRAIN_DEPOT                                        :Depósito ferroviário
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Ferrovia
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depósito ferroviário
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...a área é propriedade de outra empresa
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Ferrovia com sinais de bloco
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Ferrovia com pré-sinais
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Ferrovia com sinais de saída
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Ferrovia com sinais combo
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Ferrovia com sinais de via
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Ferrovia com sinais de mão única de via
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Linha de trem com sinais de bloco e pré-sinais
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Linha de trem com sinais de bloco e de saída
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Ferrovia com sinais de bloco e combo
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Ferrovia com sinais de bloco e de via
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Ferrovia com sinais de bloco e de via de mão única
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Linha de trem com pré-sinais e de saída
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Ferrovia com pré-sinais e combo
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Ferrovia com pré-sinais e sinais de via
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Ferrovia com pré-sinais e sinais de via de mão única
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Ferrovia com sinais combo e de saída
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Ferrovia com sinais de saída e de via
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Ferrovia com sinais de saída e sinais de via de mão única
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Ferrovia com sinais combo e de via
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Ferrovia com sinais combo e sinais de via de mão única
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Ferrovia com sinais de via e de via de mão única
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Deve remover a estação de trem antes
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construir uma estação separada
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Unir estações
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Ferrovia com sinais de bloco
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Ferrovia com pré-sinais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Ferrovia com sinais de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Ferrovia com sinais combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Ferrovia com sinais de via
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Ferrovia com sinais de mão única de via
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Linha de trem com sinais de bloco e pré-sinais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Linha de trem com sinais de bloco e de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Ferrovia com sinais de bloco e combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Ferrovia com sinais de bloco e de via
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Ferrovia com sinais de bloco e de via de mão única
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Linha de trem com pré-sinais e de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Ferrovia com pré-sinais e combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Ferrovia com pré-sinais e sinais de via
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Ferrovia com pré-sinais e sinais de via de mão única
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Ferrovia com sinais combo e de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Ferrovia com sinais de saída e de via
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Ferrovia com sinais de saída e sinais de via de mão única
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Ferrovia com sinais combo e de via
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Ferrovia com sinais combo e sinais de via de mão única
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Ferrovia com sinais de via e de via de mão única
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Deve remover a estação de trem antes
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construir uma estação separada
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Unir estações
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Deve remover a rodovia primeiro
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Recapeamento rodoviário em progresso
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Recapeamento rodoviário em progresso
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Construir rodovias
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Construção de Bonde
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecionar Ponte Rodoviária
@@ -1627,14 +1627,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construi
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Ativar/Desativar vias de mão única
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Alternar construir/remover para contrução rodoviária
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Alternar construir/remover linhas de bonde e sinais
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Selecionar a orientação da garagem
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Selecionar a orientação do depósito de bonde
-STR_ROAD_DESCRIPTION_ROAD                                       :Rodovia
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Rodovia iluminada
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Rodovia arborizada
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garagem
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Passagem de nível
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Linha de bonde
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecionar a orientação da garagem
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecionar a orientação do depósito de bonde
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Rodovia
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Rodovia iluminada
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Rodovia arborizada
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garagem
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Passagem de nível
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Linha de bonde
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Impossível remover estação de ônibus
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Impossível remover parada de caminhões
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Impossível remover estação de bonde...
@@ -1642,12 +1642,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Impossí
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}O edifício deve ser demolido primeiro
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Cidade)
@@ -1660,9 +1660,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrali
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Alterar o nome da cidade
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passageiros no mês passado: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Cartas no mês passado: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Carga necessária para prover o crescimento:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} necessário(a)
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} entregue no mes passado
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Carga necessária para prover o crescimento:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} necessário(a)
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} entregue no mes passado
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Edifício alto de escritórios
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Edifício de escritórios
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Edifício de apartamentos grande
@@ -1699,7 +1699,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subsídio concedido a {STRING}!{}{} Transporte de {STRING} de {STATION} para {STATION} receberá o triplo durante um ano!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subsídio concedido a {STRING}!{}{} Transporte de {STRING} de {STATION} para {STATION} receberá o quadruplo durante um ano!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}a autoridade local de {TOWN} não permite que outro aeroporto seja construído nesta cidade
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}A prefeitura de {TOWN} reclama do barulho que será gerado pelo aeroporto
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}A prefeitura de {TOWN} reclama do barulho que será gerado pelo aeroporto
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Casas de campo
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Casas
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Apartamentos
@@ -1735,7 +1735,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{} Programa de reconstrução rodoviária financiado por {STRING} provoca 6 meses de miséria aos condutores!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (em construção)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (em construção)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglú
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Ocas
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Casa-bule
@@ -1748,17 +1748,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Colocar placas
 STR_PLANT_TREE_CAPTION                                          :{WHITE}�rvores
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...árvore já plantada aqui
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Impossível plantar árvore aqui...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...muitas placas
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Impossível colocar placa aqui...
-STR_SIGN_DEFAULT                                                :Placa
+STR_DEFAULT_SIGN_NAME                                           :Placa
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editar texto da placa
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Impossível alterar nome da placa...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Impossível remover placa
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecionar um tipo de árvore para plantar
-STR_TREE_NAME_TREES                                             :�rvores
-STR_TREE_NAME_RAINFOREST                                        :Floresta Tropical
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactos
+STR_LAI_TREE_NAME_TREES                                         :�rvores
+STR_LAI_TREE_NAME_RAINFOREST                                    :Floresta Tropical
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactos
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Seleção de Estação
@@ -1778,7 +1778,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Deve dem
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Muito perto de outro aeroporto
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Deve demolir o aeroporto primeiro
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Renomear estação/área de carga
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Renomear estação/área de carga
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Impossível renomear a estação...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Avaliações
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aceita
@@ -1796,10 +1796,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Proeminente
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Exibir todos os trens que possuem esta estação nas ordens de serviço
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Exibir todos os automóveis que possuem esta estação nas ordens de serviço
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Exibir todas as aeronaves que possuem esta estação nas ordens de serviço
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Exibir todas as embarcações que possuem esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Exibir todos os trens que possuem esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Exibir todos os automóveis que possuem esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Exibir todas as aeronaves que possuem esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Exibir todas as embarcações que possuem esta estação nas ordens de serviço
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} não aceita mais {STRING}
@@ -1832,47 +1832,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Alterar
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Exibir lista de carga aceita
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nome da estação - clique no nome para centralizar a visualização na estação
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Selecionar tamanho/tipo de aeroporto
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Estação ferroviária
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeroporto
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :�rea de carga de caminhões
-STR_STATION_DESCRIPTION_BUS_STATION                             :Estação de ônibus
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Doca
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Estação ferroviária
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeroporto
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :�rea de carga de caminhões
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Estação de ônibus
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Doca
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Destacar área de cobertura da construção proposta
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Não destacar área de cobertura da construção proposto
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Destacar cobertura
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Doca
-STR_STATION_DESCRIPTION_BUOY                                    :Bóia
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bóia
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bóia no caminho
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...estação muito extensa
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...Estações não-uniformes desativadas
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Segure CTRL para selecionar mais de um item
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...Estações não-uniformes desativadas
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Segure CTRL para selecionar mais de um item
 
 STR_UNDEFINED                                                   :(undefined string)
-STR_STAT_CLASS_DFLT                                             :Estação padrão
-STR_STAT_CLASS_WAYP                                             :Pontos de controle
+STR_STATION_CLASS_DFLT                                          :Estação padrão
+STR_STATION_CLASS_WAYP                                          :Pontos de controle
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientação do Depósito Naval
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...deve ser construído na água
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Impossível construir depósito naval aqui...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Selecionar orientação do depósito naval
-STR_WATER_DESCRIPTION_WATER                                     :�gua
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Costa ou margem
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Depósito naval
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aqueduto
+STR_LAI_WATER_DESCRIPTION_WATER                                 :�gua
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Costa ou margem
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Depósito naval
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqueduto
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Impossível construir na água
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Deve demolir o canal primeiro
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Deve demolir o canal primeiro
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Salvar Jogo
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Abrir Jogo
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Salvar
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Remover
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Espectador, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} livres
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Incapaz de ler unidade
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Falha ao Salvar Jogo{}{STRING}
@@ -1888,12 +1888,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nome selecionado para salvar o jogo
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Remover o jogo selecionado
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Salvar o jogo atual, usando o nome escolhido
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Gerar novo jogo aleatório
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Carregar Relevo
-STR_SAVE_OSKTITLE                                               :{BLACK}Coloque o nome para o jogo salvo
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Gerar novo jogo aleatório
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carregar Relevo
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Coloque o nome para o jogo salvo
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} no caminho
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} no caminho
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Mina de Carvão
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Usina de Energia
@@ -1951,7 +1951,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centralizar visualização na localização da indústria
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Nov{G o a} {STRING} em construção em {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nov{G o a} {STRING} sendo plantada em {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Custo: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Custo: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Impossível construir este tipo de indústria aqui...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...a floresta só pode ser plantada acima do nível de neve
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} anuncia o fechamento!
@@ -1969,16 +1969,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Há outro túnel no caminho
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}O túnel não tem onde sair
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}O túnel não tem onde sair
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Incapaz de escavar o terreno para o outro lado do túnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Deve demolir o túnel primeiro
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Deve demolir a ponte primeiro
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Impossível iniciar e terminar no mesmo ponto
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Extremidades da ponte não estão no mesmo nível
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Ponte é muito baixa para o terreno
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Impossível iniciar e terminar no mesmo ponto
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Extremidades da ponte não estão no mesmo nível
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Ponte é muito baixa para o terreno
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Inicio e fim devem estar alinhados
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}O local não é adequado para a entrada do túnel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensa, Aço
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Vigas, Aço
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Cantilever, Aço
@@ -1989,30 +1989,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Tubular, Aço
 STR_BRIDGE_TUBULAR_SILICON                                      :Tubular, Silício
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Impossível construir ponte aqui...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Impossível construir túnel aqui...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Túnel ferroviário
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Túnel rodoviário
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ponte ferroviária suspensa em aço
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ponte ferroviária com vigas em aço
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ponte ferroviária cantilever em aço
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Ponte ferroviária suspensa de concreto reforçado
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Ponte ferroviária de madeira
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Ponte ferroviária de concreto
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ponte rodoviária suspensa em aço
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ponte rodoviária com vigas em aço
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ponte rodoviária cantilever em aço
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Ponte rodoviária suspensa de concreto reforçado
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Ponte rodoviária de madeira
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Ponte rodoviária de concreto
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Ponte ferroviária tubular
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Ponte rodoviária tubular
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Túnel ferroviário
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel rodoviário
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ponte ferroviária suspensa em aço
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ponte ferroviária com vigas em aço
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ponte ferroviária cantilever em aço
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Ponte ferroviária suspensa de concreto reforçado
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ponte ferroviária de madeira
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Ponte ferroviária de concreto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ponte rodoviária suspensa em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ponte rodoviária com vigas em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ponte rodoviária cantilever em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Ponte rodoviária suspensa de concreto reforçado
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ponte rodoviária de madeira
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Ponte rodoviária de concreto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Ponte ferroviária tubular
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Ponte rodoviária tubular
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objeto no caminho
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmissor
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Farol
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sede de Empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmissor
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Farol
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sede de Empresa
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...sede de empresa no caminho
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :O terreno é propriedade de uma empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :O terreno é propriedade de uma empresa
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Impossível comprar esta área...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...já a possui!
 
@@ -2060,7 +2060,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Estaç
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :Nível de Dificuldade{WHITE}
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Salvar
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Salvar
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Fácil
@@ -2133,8 +2133,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cores:
 STR_LIVERY_CAPTION                                              :{WHITE}Novo Esquema de Cores
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Empresa
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Presidente
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nome da Empresa
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nome do Presidente
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nome da Empresa
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome do Presidente
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Impossível alterar o nome da empresa...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Impossível alterar o nome do presidente...
 STR_FINANCES_CAPTION                                            :{WHITE}Finanças de {COMPANY} {BLACK}{COMPANYNUM}
@@ -2158,11 +2158,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Gráfico de Rendimentos
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Gráfico de Lucros Operacionais
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanço Bancário
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Empréstimo
-STR_MAX_LOAN                                                    :{WHITE}Empréstimo Máximo: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Empréstimo Máximo: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pedir {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Pagar {SKIP}{SKIP}{CURRENCY}
@@ -2171,7 +2171,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Impossí
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...não há empréstimo para pagar
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...precisa de {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Impossível pagar empréstimo...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Impossível dar o dinheiro emprestado do banco
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Impossível dar o dinheiro emprestado do banco
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Selecionar novo rosto para o presidente
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Alterar cores dos veículos
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Alterar nome do presidente
@@ -2181,10 +2181,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Pagar pa
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Veículos:
-STR_TRAINS                                                      :{WHITE}{COMMA} tre{P m ns}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} automóve{P l is}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeronave{P "" s}
-STR_SHIPS                                                       :{WHITE}{COMMA} embarcaç{P ão ões}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tre{P m ns}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automóve{P l is}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aeronave{P "" s}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} embarcaç{P ão ões}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nenhum
 STR_FACE_CAPTION                                                :{WHITE}Seleção de Rosto
 STR_FACE_MALE_BUTTON                                            :{BLACK}Masculino
@@ -2197,9 +2197,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Rostos f
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Gerar novo rosto aleatoriamente
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Legenda
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Exibir legenda dos gráficos
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Exibir avaliações de performance detalhadas
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Exibir avaliações de performance detalhadas
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legendas dos gráficos da empresa
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Clique aqui para alternar exibir/ocultar empresas no gráfico
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clique aqui para alternar exibir/ocultar empresas no gráfico
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Unidades de carga entregues
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Avaliações da empresa (máximo=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Valor da empresa
@@ -2233,23 +2233,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Presidente
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnata
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir sede
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construir sede da empresa / ver sede da empresa
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Reconstruir sede da empresa em outro local por 1% do valor da empresa
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Reconstruir sede da empresa em outro local por 1% do valor da empresa
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Impossível construir sede da empresa...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Ver sede
-STR_RELOCATE_HQ                                                 :{BLACK}Mover sede
-STR_COMPANY_JOIN                                                :{BLACK}Entrar
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Entrar e jogar como essa companhia
-STR_COMPANY_PASSWORD                                            :{BLACK}Senha
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Usar senha na empresa para prevenir utilizadores não autorizados.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Definir senha para empresa
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Mover sede
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Entrar
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Entrar e jogar como essa companhia
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Senha
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Usar senha na empresa para prevenir utilizadores não autorizados.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Definir senha para empresa
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não salvar a senha digitada
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Dar à empresa uma nova senha
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Senha da empresa
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Senha padrão da empresa
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Usar esta senha de empresa como padrão para novas empresas
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Senha padrão da empresa
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usar esta senha de empresa como padrão para novas empresas
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Recessão Mundial!{}{}Economistas temem crise!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Fim da recessão!{}{}Melhoras no comércio inspiram confiança nas indústrias à medida que a economia se fortalece!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Alternar entre janela grande/pequena
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alternar entre janela grande/pequena
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da empresa: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Comprar 25% de ações
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 25% de ações
@@ -2259,7 +2259,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Impossí
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Impossível vender 25% das ações desta empresa...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propriedade de {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} foi comprada por {STRING}!
-STR_PROTECTED                                                   :{WHITE}Esta empresa ainda não troca ações...
+STR_ERROR_PROTECTED                                             :{WHITE}Esta empresa ainda não troca ações...
 
 STR_LIVERY_DEFAULT                                              :Cores padrão
 STR_LIVERY_STEAM                                                :Máquina a Vapor
@@ -2285,14 +2285,14 @@ STR_LIVERY_LARGE_PLANE                                          :Aeronave Grande
 STR_LIVERY_PASSENGER_TRAM                                       :Bonde de Passageiros
 STR_LIVERY_FREIGHT_TRAM                                         :Bonde de Carga
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Exibir esquemas de cor gerais
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Exibir esquemas de cor de trens
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Exibir os esquemas de cor de automóveis
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Exibir esquemas de cor de embarcação
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Exibir esquemas de cor de aviões
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Escolha a cor principal para o esquema selecionado
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Escolha a cor secundária para o esquema selecionado
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Selecionar um esquema de cores para mudar, ou múltiplos esquemas com CTRL+clique. Marque a opção para utilizar o esquema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Exibir esquemas de cor gerais
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Exibir esquemas de cor de trens
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Exibir os esquemas de cor de automóveis
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Exibir esquemas de cor de embarcação
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Exibir esquemas de cor de aviões
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Escolha a cor principal para o esquema selecionado
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Escolha a cor secundária para o esquema selecionado
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selecionar um esquema de cores para mudar, ou múltiplos esquemas com CTRL+clique. Marque a opção para utilizar o esquema
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Vapor)
@@ -2600,9 +2600,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Não descarreg
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Altera a instrução de paradas da ordem selecionada
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Altera a instrução de carregamento da ordem selecionada
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Altera a instrução de descargas da ordem selecionada
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Inserir ordem avançada
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Inserir ordem avançada
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir para depósito mais próximo
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir para hangar mais próximo
 STR_ORDER_NEAREST_DEPOT                                         :mais próximo
@@ -2612,9 +2612,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Manutenção se
 STR_ORDER_TRAIN_DEPOT                                           :Deósito de Trem
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de Veículos
 STR_ORDER_SHIP_DEPOT                                            :Depósito de Navios
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ir sempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Manutenção, se necessária
@@ -2639,10 +2639,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :é maior que
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :é maior ou igual a
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :é verdadeiro
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :é falso
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Saltar para a ordem {COMMA}
-STR_CONDITIONAL_NUM                                             :Saltar para a ordem {COMMA} quando {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Saltar para a ordem {COMMA} quando {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Saltar para a ordem {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Saltar para a ordem {COMMA} quando {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Saltar para a ordem {COMMA} quando {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Não viajar
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viajar (não progamado)
@@ -2665,18 +2665,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Os trens
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Remover
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ir Para
-STR_REFIT                                                       :{BLACK}Adaptar
-STR_REFIT_TIP                                                   :{BLACK}Selecionar a adaptação na ordem atual. CTRL + Clique para remover a instrução
-STR_REFIT_ORDER                                                 :(Adaptar para {STRING})
-STR_REFIT_STOP_ORDER                                            :(Adaptar a {STRING} e parar)
-STR_STOP_ORDER                                                  :(Parar)
-STR_TIMETABLE_VIEW                                              :{BLACK}Plano de horário
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Exibe o plano de horário
-STR_ORDER_VIEW                                                  :{BLACK}Ordens
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Alternar para ver as ordens
+STR_ORDER_REFIT                                                 :{BLACK}Adaptar
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecionar a adaptação na ordem atual. CTRL + Clique para remover a instrução
+STR_ORDER_REFIT_ORDER                                           :(Adaptar para {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Adaptar a {STRING} e parar)
+STR_ORDER_STOP_ORDER                                            :(Parar)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Plano de horário
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Exibe o plano de horário
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordens
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Alternar para ver as ordens
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fim de Ordens - -
-STR_SERVICE                                                     :{BLACK}Manutenção
+STR_ORDER_SERVICE                                               :{BLACK}Manutenção
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2696,7 +2696,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}o veícu
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}um veículo com essa mesma ordem não chega àquela estação
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Impossível mover veículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A locomotiva traseira sempre deve seguir sua complementar frontal
-STR_CARGO_N_A                                                   :N/D{SKIP}
+STR_QUANTITY_N_A                                                :N/D{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Incapaz de encontrar rota para o depósito local
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
@@ -2716,10 +2716,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Plano de
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Mude a quantidade de tempo que a ordem deverá levar
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Reseta a quantidade de tempo para a ordem selecionada
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reseta o contador de atraso, fazendo o veículo estar na hora
-STR_SERVICE_HINT                                                :{BLACK}Pular esta ordem a menos que necessite de manutenção
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Preço: {CURRENCY} Velocidade Max: {VELOCITY}{}Capacidade: {CARGO}, {CARGO}{}Custo de manutenção: {CURRENCY}/ano
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Custo: {CURRENCY} Velocidade Max; {VELOCITY}{}Capacidade: {CARGO}{}Custo de manuteção: {CURRENCY}/ano
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Pular esta ordem a menos que necessite de manutenção
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Preço: {CURRENCY} Velocidade Max: {VELOCITY}{}Capacidade: {CARGO}, {CARGO}{}Custo de manutenção: {CURRENCY}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Custo: {CURRENCY} Velocidade Max; {VELOCITY}{}Capacidade: {CARGO}{}Custo de manuteção: {CURRENCY}/ano
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de manutenção: {LTBLUE}{CURRENCY}/ano
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Velocidade Max: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Força: {LTBLUE}{POWER}{BLACK} Velocidade Max: {LTBLUE}{VELOCITY}
@@ -2739,27 +2739,27 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Impossível inverter a direção do trem...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossível virar o veículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Impossível virar veículos formados por unidades múltiplas
-STR_CLEAR_TIME                                                  :{BLACK}Resetar horário
-STR_RESET_LATENESS                                              :{BLACK}Resetar contador de atraso
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Renomear ponto de controle
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Resetar horário
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Resetar contador de atraso
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Renomear ponto de controle
 
-STR_TRAIN_STOPPING                                              :{RED}Parando
-STR_TRAIN_STOPPING_VEL                                          :{RED}Parando, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipo de ferrovia incompatível
-STR_TRAIN_NO_POWER                                              :{RED}Sem força
-STR_TRAIN_START_NO_CATENARY                                     :Essa linha não tem energia, portanto o trem não parte
-STR_TRAIN_STUCK                                                 :{ORANGE}Aguardando via livre
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Parando
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Parando, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Tipo de ferrovia incompatível
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sem força
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Essa linha não tem energia, portanto o trem não parte
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Aguardando via livre
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nov{G o a} {STRING} agora disponível!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nov{G o a} {STRING} agora disponível!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Impossível vender veículo destruído...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Impossível adptar veículo destruído...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Impossível vender veículo destruído...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Impossível adptar veículo destruído...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Impossível programar veículo...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Veículos só podem aguardar em estações
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Esse veículo não pára nesta estação
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Impossível programar veículo...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Veículos só podem aguardar em estações
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Esse veículo não pára nesta estação
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Mudar horário
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Esse veículo está no horário
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Esse veículo está {STRING} atrasado
@@ -2773,7 +2773,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Preenche
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...deve estar parado dentro de uma garagem
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Incapaz de encontrar a garagem local
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forçar veículo a dar a volta
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacidade: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacidade: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veículo{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2800,11 +2800,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Posicione a bóia, que pode ser usada para marcar pontos de rota adicionais
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Impossível posicionar bóia aqui...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construir aqueduto
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Impossível construir aqueduto aqui
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Impossível construir aqueduto aqui
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Adaptar)
 STR_REFIT_TITLE                                                 :{GOLD}Selecionar tipo de carga:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacidade: {GOLD}{CARGO}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(adaptável)
+STR_PURCHASE_INFO_REFITTABLE                                    :(adaptável)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroportos
@@ -2817,7 +2817,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construi
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Cidadãos celebram . . .{}Primeira aeronave chega a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Acidente Aéreo!{} {COMMA} mortos numa explosão em {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Acidente Aéreo!{} Aeronave ficou sem combustivél, {COMMA} mortos numa explosão!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
@@ -2830,13 +2830,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Afundamento da mina de carvão deixa um rasto de destruição em {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Inundações!{}Pelo menos {COMMA} perdidos ou mortos após terríveis inundações!
 
-STR_BRIBE_FAILED                                                :{WHITE}A sua tentativa de suborno foi
-STR_BRIBE_FAILED_2                                              :{WHITE}descoberta por um investigador regional
-STR_BUILD_DATE                                                  :{BLACK}Construído: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}A sua tentativa de suborno foi
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}descoberta por um investigador regional
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construído: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Classe de Estação: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipo de Estação: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Classe de Estação: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipo de Estação: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detalhes de rendimentos
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalhes
@@ -2856,28 +2856,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Dinheiro
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Empréstimo:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Número de veículos: Incluindo automóveis, trens, embarcações e aeronaves.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Número de segmentos de estação. Cada parte de uma estação (ex. estação ferroviária, estação de ônibus, aeroporto) é contado, mesmo se eles estiverem ligados a uma estação.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}O lucro do veículo com o rendimento menor (de todos os veículos com mais de 2 anos)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Dinheiro conseguido no mês com os lucros mais altos dos últimos 12 trimestres
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unidades de carga entregues nos últimos 4 trimestres.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tipos de carga entregues no último trimestre.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Dinheiro 'em mãos'
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Tem um empréstimo muito elevado?
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total de pontos sobre o máximo de pontos
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Número de veículos: Incluindo automóveis, trens, embarcações e aeronaves.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de segmentos de estação. Cada parte de uma estação (ex. estação ferroviária, estação de ônibus, aeroporto) é contado, mesmo se eles estiverem ligados a uma estação.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}O lucro do veículo com o rendimento menor (de todos os veículos com mais de 2 anos)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais altos dos últimos 12 trimestres
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unidades de carga entregues nos últimos 4 trimestres.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipos de carga entregues no último trimestre.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Dinheiro 'em mãos'
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Tem um empréstimo muito elevado?
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total de pontos sobre o máximo de pontos
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configurar NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Exibir configs. dos NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configurar NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplicar alterações
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Liga/Desliga paleta
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Liga/desliga a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Definir parâmetros
-STR_NEWGRF_FILENAME                                             :{BLACK}Nome do arquivo: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}SomaMD5 (verf. de segurança): {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar alterações
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Liga/Desliga paleta
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Liga/desliga a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nome do arquivo: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}SomaMD5 (verf. de segurança): {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Você está prestes a efetuar alterações neste jogo atual; isto pode danificar o OpenTTD. {}Tem absoluta certeza que deseja fazer isto?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2900,34 +2900,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de us
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um sprite corrupto. Todos os sprites corruptos serão exibidos como um "?" vermelho.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém 8 entradas de Ação múltipla.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Carrega o padrão selecionado
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Salvar padrão
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Salva a lista atual como um padrão
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Digite um nome para o padrão
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Remover padrão
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Remove o padrão selecionado
-STR_NEWGRF_ADD                                                  :{BLACK}Adicionar
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Adiciona um NewGRF à lista
-STR_NEWGRF_REMOVE                                               :{BLACK}Remover
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Remove o NewGRF selecionado da lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Mover cima
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move o NewGRF selecionado para cima
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mover baixo
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move o NewGRF selecionado para baixo
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Lista dos NewGRF instalados. Clique em um deles para mudar seus parâmetros
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parâmetros: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Insira novos parâmetros de NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}Sem informação disponível
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Carrega o padrão selecionado
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Salvar padrão
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Salva a lista atual como um padrão
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Digite um nome para o padrão
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Remover padrão
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Remove o padrão selecionado
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Adicionar
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Adiciona um NewGRF à lista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Remover
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Remove o NewGRF selecionado da lista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Mover cima
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Move o NewGRF selecionado para cima
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mover baixo
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o NewGRF selecionado para baixo
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos NewGRF instalados. Clique em um deles para mudar seus parâmetros
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parâmetros: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Insira novos parâmetros de NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Sem informação disponível
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}NewGRF disponíveis
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Adicionar à seleção
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Adiciona o NewGRF selecionado à sua configuração
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Procurar arquivos NewGRF
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Atualiza a lista de NewGRF disponíveis
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Adiciona o NewGRF selecionado à sua configuração
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Procurar arquivos NewGRF
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Atualiza a lista de NewGRF disponíveis
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Impossível adicionar: registro de GRF já existe
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Arquivo correspondente não encontrado
-STR_NEWGRF_DISABLED                                             :{RED}Desativado
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Arquivo correspondente não encontrado
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desativado
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Arquivo procurado não encontrado (carregado compatível com GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Carregado compativel com GRF(s)  por falta de arquivo
@@ -2943,7 +2943,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}O NewGRF
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}A informação de adaptação para '{1:ENGINE}' difere da lista de compras após a construção. Isso pode causar erros na autosubstituição/autoadaptação.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' causou um loop infinito no callback da produção.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Jogo foi salvo numa versão sem suporte a bondes. Todos os bondes foram removidos.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Jogo foi salvo numa versão sem suporte a bondes. Todos os bondes foram removidos.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de câmbio: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2954,16 +2954,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar p
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mudar para Euro: {ORANGE}nunca
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prevêr: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Mudar parametro de moeda personalizada
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Diminui a taxa de câmbio em uma Libra (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Aumenta a taxa de câmbio em uma Libra (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Define a taxa de câmbio para 1:1 Libra (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Define o separador numérico
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Define o prefixo
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Define o sufixo
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Trocar para Euro antes
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Trocar para Euro depois
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Selecionar o ano para trocar para Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Libras (£) na sua moeda
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Diminui a taxa de câmbio em uma Libra (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Aumenta a taxa de câmbio em uma Libra (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Define a taxa de câmbio para 1:1 Libra (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Define o separador numérico
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Define o prefixo
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Define o sufixo
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Trocar para Euro antes
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Trocar para Euro depois
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Selecionar o ano para trocar para Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Libras (£) na sua moeda
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2982,8 +2982,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Embarcaç{P ão ões}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronaves
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordens compartilhadas de {COMMA} veículo{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Exibir todos os veículos com a mesma rota
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordens compartilhadas de {COMMA} veículo{P "" s}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Exibir todos os veículos com a mesma rota
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} está aguardando no depósito
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} está aguardando no depósito
@@ -3090,39 +3090,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Adaptar
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Adaptar a carga da embarcação para transportar uma carga diferente
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Adaptar aeronave para transportar uma carga diferente
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Indo para o depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Indo para o depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Indo para a garagem de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Indo para a garagem de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Indo para o depósito naval de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Indo para o depósito naval {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Indo para o hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Indo para o hangar de {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Manutenção no depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Manutenção no depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Manutenção na garagem de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Manutenção na garagem de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Manutenção no depósito naval de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenção no depósito naval de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Manutenção no Hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Manutenção no Hangar de {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar Trem
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Automóvel
-STR_CLONE_SHIP                                                  :{BLACK}Clonar Embarcação
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Isso vai construir uma cópia do trem, incluindo os vagões. Control-clique vai compartilhar as ordens
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Isso irá construir uma cópia do automóvel. Control-clique vai compartilhar as ordens
-STR_CLONE_SHIP_INFO                                             :{BLACK}Isso vai construir uma cópia da embarcação. Control-clique vai compartilhar as ordens
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Isso vai construir uma cópia da aeronave. Control-clique vai compartilhar as ordens
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Isso irá construir uma cópia do trem, incluindo os vagões. Clique neste botão e depois em um trem dentro ou fora do depósito . Control-clique vai compartilhar as ordens
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Isso irá construir uma cópia do automóvel. Clique neste botão e depois em um automóvel dentro ou fora da garagem. Control-clique vai compartilhar as ordens
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Isso irá construir uma cópia da embarcação. Clique neste botão e depois em uma embarcação dentro ou fora do depósito naval. Control-clique vai compartilhar as ordens
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Isso vai construir uma cópia de uma aeronave. Clique nesse botão e depois em uma aeronave dentro ou fora do hangar. Control-clique vai compartilhar as ordens
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Indo para o depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Indo para o depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Indo para a garagem de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Indo para a garagem de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Indo para o depósito naval de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Indo para o depósito naval {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Indo para o hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Indo para o hangar de {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Manutenção no depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Manutenção no depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Manutenção na garagem de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Manutenção na garagem de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Manutenção no depósito naval de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Manutenção no depósito naval de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Manutenção no Hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Manutenção no Hangar de {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clonar Trem
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clonar Automóvel
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonar Embarcação
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonar Aeronave
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Isso vai construir uma cópia do trem, incluindo os vagões. Control-clique vai compartilhar as ordens
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Isso irá construir uma cópia do automóvel. Control-clique vai compartilhar as ordens
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Isso vai construir uma cópia da embarcação. Control-clique vai compartilhar as ordens
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Isso vai construir uma cópia da aeronave. Control-clique vai compartilhar as ordens
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Isso irá construir uma cópia do trem, incluindo os vagões. Clique neste botão e depois em um trem dentro ou fora do depósito . Control-clique vai compartilhar as ordens
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Isso irá construir uma cópia do automóvel. Clique neste botão e depois em um automóvel dentro ou fora da garagem. Control-clique vai compartilhar as ordens
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Isso irá construir uma cópia da embarcação. Clique neste botão e depois em uma embarcação dentro ou fora do depósito naval. Control-clique vai compartilhar as ordens
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Isso vai construir uma cópia de uma aeronave. Clique nesse botão e depois em uma aeronave dentro ou fora do hangar. Control-clique vai compartilhar as ordens
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Veículos Ferroviários
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova Locomotiva Elétrica
@@ -3192,28 +3192,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Você está prestes a vender todos os automóveis da garagem. Você tem certeza?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito errado
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipo de depósito errado
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender todos os trens no depósito
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vender todos os automóveis na garagem
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vender todas as embarcações no depósito naval
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vender todas as aeronaves no hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vender todos os trens no depósito
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vender todos os automóveis na garagem
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vender todas as embarcações no depósito naval
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vender todas as aeronaves no hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obtém uma lista de todos os trens com este depósito em suas ordens
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Obtém uma lista de todos os automóveis com esta garagem em suas ordens
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Obtém uma lista de todas as embarcações com este depósito naval em suas ordens
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Obtém uma lista de todas as aeronaves com este hangar em suas ordens
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Obtém uma lista de todos os trens com este depósito em suas ordens
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Obtém uma lista de todos os automóveis com esta garagem em suas ordens
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Obtém uma lista de todas as embarcações com este depósito naval em suas ordens
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Obtém uma lista de todas as aeronaves com este hangar em suas ordens
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autosubstituir todos os trens no depósito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autosubstituir todos os automóveis na garagem
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autosubstituir todos as embarcações no depósito naval
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autosubstituir todas as aeronaves no hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autosubstituir todos os trens no depósito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autosubstituir todos os automóveis na garagem
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autosubstituir todos as embarcações no depósito naval
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autosubstituir todas as aeronaves no hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar Substituição
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Substituição
-STR_NOT_REPLACING                                               :{BLACK}Não substituindo
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nenhum veículo selecionado
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Não substituindo
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nenhum veículo selecionado
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selecionar o tipo de motor para substituir
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selecionar o novo tipo de motor para substituir o que selecionou à esquerda
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Pressione para parar a subsituição do tipo de motor que selecionou à esquerda
@@ -3225,26 +3225,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Faz auto
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituindo: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Troca entre substituir máquinas e substituir vagões
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Trem não disponível
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Automóvel não disponível
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Embarcação não disponível
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronave não disponível
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Trem não disponível
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Automóvel não disponível
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Embarcação não disponível
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aeronave não disponível
 
-STR_ENGINES                                                     :Motores
-STR_WAGONS                                                      :Vagões
+STR_REPLACE_ENGINES                                             :Motores
+STR_REPLACE_WAGONS                                              :Vagões
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Clique para parar todos os trens dentro do depósito
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Clique para parar todos os automoveis dentro da garagem
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Clique para parar todos as embarcações dentro do depósito naval
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Clique para parar todos as aeronaves
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Clique para parar todos os trens dentro do depósito
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Clique para parar todos os automoveis dentro da garagem
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Clique para parar todos as embarcações dentro do depósito naval
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Clique para parar todos as aeronaves
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Clique para mandar todos os trens para o trabalho
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Clique para mandar todos os automóveis para o trabalho
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Clique para mandar todos as embarcações para o trabalho
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Clique para mandar todos as aeronaves para o trabalho
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Clique para mandar todos os trens para o trabalho
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Clique para mandar todos os automóveis para o trabalho
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Clique para mandar todos as embarcações para o trabalho
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Clique para mandar todos as aeronaves para o trabalho
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Clique para mandar todos os veículos pararem
-STR_MASS_START_LIST_TIP                                         :{BLACK}Clique para mandar todos os veículos para o trabalho
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Clique para mandar todos os veículos pararem
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Clique para mandar todos os veículos para o trabalho
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de Placas - {COMMA} Placa{P "" s}
@@ -3253,14 +3253,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Trens
-STR_ELRAIL_VEHICLES                                             :Locomotivas Elétricas
-STR_MONORAIL_VEHICLES                                           :Monotrilho
-STR_MAGLEV_VEHICLES                                             :Trem-Bala
+STR_REPLACE_RAIL_VEHICLES                                       :Trens
+STR_REPLACE_ELRAIL_VEHICLES                                     :Locomotivas Elétricas
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monotrilho
+STR_REPLACE_MAGLEV_VEHICLES                                     :Trem-Bala
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK} Potência: {GOLD}{POWER}
@@ -3287,70 +3287,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Gerar
-STR_RANDOM                                                      :{BLACK}Randomizar
-STR_RANDOM_HELP                                                 :{BLACK}Muda a semente randômica da Geração de Terreno
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Geração de mundo
-STR_RANDOM_SEED                                                 :{BLACK}Semente:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Clique para digitar uma semente
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Coloque uma semente randomica
-STR_LAND_GENERATOR                                              :{BLACK}Gerador de terra
-STR_TREE_PLACER                                                 :{BLACK}Algorítimo de árvores
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotação do mapa em relevo:
-STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreno
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nível do mar:
-STR_SMOOTHNESS                                                  :{BLACK}Regularidade
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Linha da neve
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}No. de cidades:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. de indústrias:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Aumentar a linha da neve em um ponto
-STR_SNOW_LINE_DOWN                                              :{BLACK}Diminuir a linha da neve em um ponto
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Mudar linha da neve
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Mudar data de início
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Aviso de Escala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Alterar muito o tamanho do mapa original não é recomendado. Continuar com a geração?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nome do mapa em relevo:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Tamanho: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Gerar
+STR_MAPGEN_RANDOM                                               :{BLACK}Randomizar
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Muda a semente randômica da Geração de Terreno
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Geração de mundo
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Semente:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Clique para digitar uma semente
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Coloque uma semente randomica
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Gerador de terra
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algorítimo de árvores
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotação do mapa em relevo:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipo de terreno
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nível do mar:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Regularidade
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Linha da neve
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}No. de cidades:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}No. de indústrias:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Aumentar a linha da neve em um ponto
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Diminuir a linha da neve em um ponto
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Mudar linha da neve
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Mudar data de início
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Aviso de Escala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Alterar muito o tamanho do mapa original não é recomendado. Continuar com a geração?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome do mapa em relevo:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Tamanho: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Gerando mundo...
 STR_GENERATION_ABORT                                            :{BLACK}Abortar
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Abortar Geração de Mundo
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Você quer mesmo abortar a geração?
-STR_PROGRESS                                                    :{WHITE}{NUM}% completo
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Geração de mundo
-STR_TREE_GENERATION                                             :{BLACK}Geração de árvores
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Geração imóvel
-STR_CLEARING_TILES                                              :{BLACK}Geração de area rochosa e irregular
-STR_SETTINGUP_GAME                                              :{BLACK}Preparando jogo
-STR_PREPARING_TILELOOP                                          :{BLACK}Passando tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Preparando jogo
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Essa ação mudou o nível de dificuldade para personalizado
-STR_SE_FLAT_WORLD                                               :{WHITE}Terra plana
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Gera uma terra plana
-STR_SE_RANDOM_LAND                                              :{WHITE}Terra randômica
-STR_SE_NEW_WORLD                                                :{BLACK}Criar novo cenário
-STR_SE_CAPTION                                                  :{WHITE}Tipo de cenário
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Mover a altitude da terra plana em uma unidade a menos
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Mover a altitude da terra plana em uma unidade a mais
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Mudar a altitude da terra plana
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Altitude da terra plana
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% completo
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Geração de mundo
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Geração de árvores
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Geração imóvel
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Geração de area rochosa e irregular
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Preparando jogo
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Passando tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparando jogo
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Essa ação mudou o nível de dificuldade para personalizado
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Terra plana
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Gera uma terra plana
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Terra randômica
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Criar novo cenário
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipo de cenário
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Mover a altitude da terra plana em uma unidade a menos
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Mover a altitude da terra plana em uma unidade a mais
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Mudar a altitude da terra plana
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Altitude da terra plana
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centralizar o minimapa na posição atual
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Bordas do mapa:
-STR_NORTHWEST                                                   :{BLACK}Noroeste
-STR_NORTHEAST                                                   :{BLACK}Nordeste
-STR_SOUTHEAST                                                   :{BLACK}Sudeste
-STR_SOUTHWEST                                                   :{BLACK}Sudoeste
-STR_BORDER_FREEFORM                                             :{BLACK}Livre
-STR_BORDER_WATER                                                :{BLACK}Mar
-STR_BORDER_RANDOM                                               :{BLACK}Randômico
-STR_BORDER_RANDOMIZE                                            :{BLACK}Randômico
-STR_BORDER_MANUAL                                               :{BLACK}Manual
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Bordas do mapa:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Noroeste
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordeste
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sudeste
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sudoeste
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Livre
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Mar
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Randômico
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Randômico
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Pequeno
@@ -3375,21 +3375,21 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Comprimento: {NUM}{}Diferença de Altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Diferença de altura: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transferir Dinheiro: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...é uma rua local
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...rua na direção errada
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opções de Transparência
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Alternar transparência para sinais de estação. Ctrl+Clique para travar.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Alternar transparência para árvores. Ctrl+Clique para travar.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Alternar transparência para casas. Ctrl+Clique para travar.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Alternar transparência para indústrias. Ctrl+Clique para travar.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Alternar transparência para construções como estações, depósitos, pontos de controle e eletrificação da ferrovia. Ctrl+Clique para travar.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Alternar transparência para pontes. Ctrl+Clique para travar.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Alternar transparência para estruturas como faróis e antenas. Ctrl+Clique para travar.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Alternar transparência para catenária. CTRL+click para travar.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Altera transparência para os indicadores de carga. Ctrl+Clique para travar.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Definir objetivos como invisíveis ao invés de transparentes.
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transferir Dinheiro: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...é uma rua local
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...rua na direção errada
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opções de Transparência
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Alternar transparência para sinais de estação. Ctrl+Clique para travar.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Alternar transparência para árvores. Ctrl+Clique para travar.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Alternar transparência para casas. Ctrl+Clique para travar.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Alternar transparência para indústrias. Ctrl+Clique para travar.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Alternar transparência para construções como estações, depósitos, pontos de controle e eletrificação da ferrovia. Ctrl+Clique para travar.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Alternar transparência para pontes. Ctrl+Clique para travar.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Alternar transparência para estruturas como faróis e antenas. Ctrl+Clique para travar.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Alternar transparência para catenária. CTRL+click para travar.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Altera transparência para os indicadores de carga. Ctrl+Clique para travar.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Definir objetivos como invisíveis ao invés de transparentes.
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3399,7 +3399,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Todos os trens
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Todos os automóveis
 STR_GROUP_ALL_SHIPS                                             :Todas as embarcações
@@ -3408,24 +3408,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Trens sem grupo
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Automóveis sem grupo
 STR_GROUP_DEFAULT_SHIPS                                         :Embarcações sem grupo
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeronaves sem grupo
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Adicionar veículos compartilhados
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Remover todos os veículos
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Renomear um grupo
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Impossível criar grupo...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Impossível remover grupo...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Impossível renomear grupo...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Impossível remover todos os veículos desse grupo...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Impossível adicionar veículo a esse grupo
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Impossível adicionar veículos compartilhados a esse grupo...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Impossível criar grupo...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Impossível remover grupo...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Impossível renomear grupo...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Impossível remover todos os veículos desse grupo...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Impossível adicionar veículo a esse grupo
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Impossível adicionar veículos compartilhados a esse grupo...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupos - Clique em um grupo para listar seus veículos
-STR_GROUP_CREATE_TIP                                            :{BLACK}Clique para criar um grupo
-STR_GROUP_DELETE_TIP                                            :{BLACK}Remove o grupo selecionado
-STR_GROUP_RENAME_TIP                                            :{BLACK}Renomeia o grupo selecionado
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Clique para excluir esse grupo da substituição automática
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos - Clique em um grupo para listar seus veículos
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Clique para criar um grupo
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Remove o grupo selecionado
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renomeia o grupo selecionado
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Clique para excluir esse grupo da substituição automática
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3486,35 +3486,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nome deve ser único
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nome deve ser único
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Próxima Placa
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Placa anterior
-STR_SIGN_OSKTITLE                                               :{BLACK}Coloque um nome para a placa
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Próxima Placa
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Placa anterior
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Coloque um nome para a placa
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fundar
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prosperir
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construir
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Escolha a indústria apropriada
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fundar
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prosperir
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construir
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Escolha a indústria apropriada
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avançado
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Seleção de face avançada.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Seleção de face avançada.
 STR_FACE_SIMPLE                                                 :{BLACK}Simples
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Seleção de face simples.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Seleção de face simples.
 STR_FACE_LOAD                                                   :{BLACK}Carregar
-STR_FACE_LOAD_TIP                                               :{BLACK}Carregar face favorita
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Carregar face favorita
 STR_FACE_LOAD_DONE                                              :{WHITE}Seu rosto favorito foi carregado do arquivo de configuração do OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Número da face do jogador.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Ver e/ou alterar número da face do jogador
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Ver e/ou alterar número da face do jogador
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Ver e/ou alterar número da face do jogador
 STR_FACE_FACECODE_SET                                           :{WHITE}Novo código de número da face face foi alterado
 STR_FACE_FACECODE_ERR                                           :{WHITE}Não pode alterar o número de face do jogador  precisa ser um número entre 0 e 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Salvar
-STR_FACE_SAVE_TIP                                               :{BLACK}Salvar face favorita
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Salvar face favorita
 STR_FACE_SAVE_DONE                                              :{WHITE}Este rosto irá ser salvo como seu rosto favorito no arquivo de configuração do OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europeu
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Selecione faces européias
@@ -3522,51 +3522,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Africano
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Selecione faces africanas
 STR_FACE_YES                                                    :Sim
 STR_FACE_NO                                                     :Não
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Ativar bigode ou brinco
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Ativar bigode ou brinco
 STR_FACE_HAIR                                                   :Cabelo:
-STR_FACE_HAIR_TIP                                               :{BLACK}Alterar cabelo
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Alterar cabelo
 STR_FACE_EYEBROWS                                               :Sombrancelhas:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Alterar sombrancelhas
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Alterar sombrancelhas
 STR_FACE_EYECOLOUR                                              :Cor do olho:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Alterar cor do olho
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Alterar cor do olho
 STR_FACE_GLASSES                                                :Óculos:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Ativar óculos
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Alterar óculos
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Ativar óculos
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Alterar óculos
 STR_FACE_NOSE                                                   :Nariz:
-STR_FACE_NOSE_TIP                                               :{BLACK}Alterar nariz
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Alterar nariz
 STR_FACE_LIPS                                                   :Boca:
 STR_FACE_MOUSTACHE                                              :Bigode:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Alterar boca ou bigode
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Alterar boca ou bigode
 STR_FACE_CHIN                                                   :Queixo:
-STR_FACE_CHIN_TIP                                               :{BLACK}Alterar queixo
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Alterar queixo
 STR_FACE_JACKET                                                 :Casaco:
-STR_FACE_JACKET_TIP                                             :{BLACK}Alterar casaco
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Alterar casaco
 STR_FACE_COLLAR                                                 :Colarinho:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Alterar colarinho
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Alterar colarinho
 STR_FACE_TIE                                                    :Gravata:
 STR_FACE_EARRING                                                :Brinco:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Alterar gravata ou brinco
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Alterar gravata ou brinco
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Seleção de Sinais
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Impossível converter sinais aqui...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Sinais padrão (semáforos){}Sinais são necessários para impedir trens de colidirem nas malhas ferroviárias com mais de um trem.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sinal de Entrada (semáforo){}Verde contanto que haja um ou mais sinais de saída verdes na atual seção dos trilhos. Do contrário, fica vermelho.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Sinal de saída (semáforo){}Funciona como um sinal normal, porém é necessário para o funcionamento correto do sistema de sinais combo ou de entrada.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Sinal combo (semáforo){}O sinal combo funciona tanto como um sinal de entrada quanto de saída. Permite construir várias ramificações.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Sinal avançado(Semáforo){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Sinal avançado de mão única(Semáforo){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo, porém não permite a passagem na via contrária.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Sinal Padrão (elétrico){}Sinais são necessários para impedir que trens batam em redes de ferrovias com mais de uma máquina.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sinal de entrada (elétrico){}Verde contanto que haja um ou mais sinais de saída verdes na atual seção dos trilhos. Do contrário, fica vermelho.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Sinal de saída(elétrico){}Funciona como um sinal normal, porém é necessário para o funcionamento correto do sistema de sinais combo ou de entrada.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Sinal combo (elétrico){}O sinal combo funciona tanto como um sinal de entrada quanto de saída. Permite construir várias ramificações.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Sinal avançado(Elétrico){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Sinal avançado de mão única(Elétrico){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo, porém não permite a passagem na via contrária.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Converter sinal{}Quando selecionado, clicar num sinal existente converte-o para o tipo selecionado e suas variantes. CTRL+clique muda a variante atual.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densidade dos sinais ao clicar e arrastar
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Diminuir a densidade dos sinais
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Aumentar a densidade dos sinais
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Seleção de Sinais
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Impossível converter sinais aqui...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Sinais padrão (semáforos){}Sinais são necessários para impedir trens de colidirem nas malhas ferroviárias com mais de um trem.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sinal de Entrada (semáforo){}Verde contanto que haja um ou mais sinais de saída verdes na atual seção dos trilhos. Do contrário, fica vermelho.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Sinal de saída (semáforo){}Funciona como um sinal normal, porém é necessário para o funcionamento correto do sistema de sinais combo ou de entrada.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Sinal combo (semáforo){}O sinal combo funciona tanto como um sinal de entrada quanto de saída. Permite construir várias ramificações.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Sinal avançado(Semáforo){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Sinal avançado de mão única(Semáforo){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo, porém não permite a passagem na via contrária.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Sinal Padrão (elétrico){}Sinais são necessários para impedir que trens batam em redes de ferrovias com mais de uma máquina.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sinal de entrada (elétrico){}Verde contanto que haja um ou mais sinais de saída verdes na atual seção dos trilhos. Do contrário, fica vermelho.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Sinal de saída(elétrico){}Funciona como um sinal normal, porém é necessário para o funcionamento correto do sistema de sinais combo ou de entrada.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Sinal combo (elétrico){}O sinal combo funciona tanto como um sinal de entrada quanto de saída. Permite construir várias ramificações.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Sinal avançado(Elétrico){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Sinal avançado de mão única(Elétrico){}Um sinal avançado permite mais de um trem em um bloco de ferrovia, Se o trem no bloco puder reservar um local seguro para parar, o sinal avançado já permite a passada do próximo, porém não permite a passagem na via contrária.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Converter sinal{}Quando selecionado, clicar num sinal existente converte-o para o tipo selecionado e suas variantes. CTRL+clique muda a variante atual.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Densidade dos sinais ao clicar e arrastar
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Diminuir a densidade dos sinais
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Aumentar a densidade dos sinais
 ########
 
 ############ on screen keyboard
@@ -3578,37 +3578,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Opções da IA
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Exibir configs. da IA
 STR_AI_DEBUG                                                    :{WHITE}Debug da IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nome da IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome da IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recarregar IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Desativar a IA, recarregar o script e religar a IA
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Debug de IA só é acessível pelo servidor
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Desativar a IA, recarregar o script e religar a IA
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Debug de IA só é acessível pelo servidor
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuração da IA
-STR_AI_CHANGE                                                   :{BLACK}Selecionar IA
-STR_AI_CONFIGURE                                                :{BLACK}Configurar
-STR_AI_CHANGE_TIP                                               :{BLACK}Carregar outra IA
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configurar os parâmetros da IA
-STR_AI_LIST_TIP                                                 :{BLACK}Todas as IA's que serão carregadas no próximo jogo
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecionar IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carregar outra IA
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros da IA
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Todas as IA's que serão carregadas no próximo jogo
 STR_AI_LIST_CAPTION                                             :{WHITE}IA's disponíveis
-STR_AI_AILIST_TIP                                               :{BLACK}Clique para selecionar uma IA
-STR_AI_ACCEPT                                                   :{BLACK}Aceitar
-STR_AI_ACCEPT_TIP                                               :{BLACK}Aceita a IA selecionada
-STR_AI_CANCEL                                                   :{BLACK}Cancelar
-STR_AI_CANCEL_TIP                                               :{BLACK}Não muda a IA atual
-STR_AI_CLOSE                                                    :{BLACK}Fechar
-STR_AI_RESET                                                    :{BLACK}Resetar
-STR_AI_HUMAN_PLAYER                                             :Jogador Humano
-STR_AI_RANDOM_AI                                                :IA Randômica
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para selecionar uma IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Aceitar
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Aceita a IA selecionada
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não muda a IA atual
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fechar
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetar
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Jogador Humano
+STR_AI_CONFIG_RANDOM_AI                                         :IA Randômica
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parâmetros da IA
-STR_AI_AUTHOR                                                   :{BLACK}Progamador: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versão: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Uma das IA's travou. Favor relatar ao autor da IA com uma screenshot da Janela de Debug da IA.
-STR_AI_NO_AI_FOUND                                              :Nenhuma IA encontrada. {} Essa é uma IA inativa e não faz nada. {} Você pode pode baixar várias IA através do sistema de 'Conteúdo Online'.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Progamador: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versão: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Uma das IA's travou. Favor relatar ao autor da IA com uma screenshot da Janela de Debug da IA.
+STR_ERROR_AI_NO_AI_FOUND                                        :Nenhuma IA encontrada. {} Essa é uma IA inativa e não faz nada. {} Você pode pode baixar várias IA através do sistema de 'Conteúdo Online'.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Limite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Ruído gerado: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído gerado: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3622,21 +3622,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Cenário
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa de altitudes
 STR_CONTENT_TITLE                                               :{WHITE}Baixando conteúdo
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipo
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipo do conteúdo
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipo do conteúdo
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nome
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nome do conteúdo
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Clique numa linha para ver os detalhes{}Clique na caixa para selecionar para baixar
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nome do conteúdo
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Clique numa linha para ver os detalhes{}Clique na caixa para selecionar para baixar
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Selecionar todos
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Seleciona todos para serem baixados
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Seleciona todos para serem baixados
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Selecionar upgrades
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Seleciona tudo que consistir em upgrades para conteúdo existente para ser baixado
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Seleciona tudo que consistir em upgrades para conteúdo existente para ser baixado
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Descelecionar tudo
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Desceleciona todos
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Desceleciona todos
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Entre com o filtro desejado
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Entre uma palavra a ser filtrada
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Entre uma palavra a ser filtrada
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag/nome do filtro:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Baixar
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Baixa o conteúdo selecionado
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Baixa o conteúdo selecionado
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Tamanho total do download: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO DO CONT.
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Você não selecionou para ser baixado
@@ -3669,6 +3669,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Falha na
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Checar conteúdo on-line
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Checka por conteúdo on-line e upgrades
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Procurar o conteúdo on-line
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Checa se o conteúdo que falta pode ser encontrado on-line
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Procurar o conteúdo on-line
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Checa se o conteúdo que falta pode ser encontrado on-line
 ########
diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt
index 9a4ba80bc..81995a11c 100644
--- a/src/lang/bulgarian.txt
+++ b/src/lang/bulgarian.txt
@@ -160,7 +160,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Карт
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}�а�тройки
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Съобщение
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Съобщение от {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Внимание!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Внимание!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Това е невъзможно....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Изчи�тването е невъзможно....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}�втор�ки права {COPYRIGHT} 1995 Кри� Сойер (Chris Sawyer), В�ички права �а запазени
@@ -168,9 +168,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}Изход
-STR_YES                                                         :{BLACK}Да
-STR_NO                                                          :{BLACK}�е
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Желаете ли да прекъ�нете играта и да �е върнете към {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Да
+STR_QUIT_NO                                                     :{BLACK}�е
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Желаете ли да прекъ�нете играта и да �е върнете към {STRING}?
 
 STR_JUST_NOTHING                                                :�ищо
 STR_COLOUR_DARK_BLUE                                            :Тъмно �иньо
@@ -231,11 +231,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Пу�тин�
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Сн�г
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Съобщение
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}По подразбиране
-STR_QUERY_CANCEL                                                :{BLACK}Отказ
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Преименувай
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}По подразбиране
+STR_BUTTON_CANCEL                                               :{BLACK}Отказ
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Преименувай
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :ДОС
@@ -252,16 +252,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Това
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Информаци�
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Вме�тимо�ти
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Общо товар
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Обща товарна вме�тимо�т на влака:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Обща товарна вме�тимо�т на влака:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}�ова игра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Отвар�не на игра
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Много играчи
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Редактор �ценарии
 
-STR_MAPSIZE                                                     :{BLACK}Размер:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Размер:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}�а�тройки
 
 STR_COMPANY_SOMEONE                                             :н�кой{SKIP}{SKIP}
@@ -310,9 +310,9 @@ STR_FILE_MENU_QUIT_GAME                                         :ПрекъÑ�вÐ
 STR_FILE_MENU_EXIT                                              :Изход
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}И�кате ли да прекъ�нете играта?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Прекъ�ване на играта
-STR_SORT_ORDER_TIP                                              :{BLACK}Избери вида на �ортирането (намал�ващо/нара�тващо)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Избери критерий за �ортиране
-STR_SORT_BY                                                     :{BLACK}Сортирай по
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Избери вида на �ортирането (намал�ващо/нара�тващо)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Избери критерий за �ортиране
+STR_BUTTON_SORT_BY                                              :{BLACK}Сортирай по
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}�а�еление
@@ -344,24 +344,24 @@ STR_SORT_BY_RUNNING_COST                                        :Цена за Ð
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Мощно�т/Цена за движение
 STR_SORT_BY_CARGO_CAPACITY                                      :Товарен капацитет
 
-STR_NO_WAITING_CARGO                                            :{BLACK}��ма чакащ товар
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избор на в�ички �ъоръжени�
-STR_SELECT_ALL_TYPES                                            :{BLACK}Избор на в�ички товари (включително нечакащите)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Виж �пи�ъкът � наличните видове машини за този тип превозно �ред�тво.
-STR_MANAGE_LIST                                                 :{BLACK}�аправи �пи�ък
-STR_MANAGE_LIST_TIP                                             :{BLACK}Прати ин�трукциите до в�ички машини в този ли�т
-STR_REPLACE_VEHICLES                                            :Зам�на на превозни �ред�тва
-STR_SEND_FOR_SERVICING                                          :Прати за об�лужване
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}�алични влакове
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}�алични коли
-STR_AVAILABLE_SHIPS                                             :{BLACK}�алични кораби
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}�алични �амолети
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Прати в депото
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Прати в �ервиза
-STR_SEND_SHIP_TO_DEPOT                                          :Прати в дока
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Прати в хангара
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}��ма чакащ товар
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Избор на в�ички �ъоръжени�
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Избор на в�ички товари (включително нечакащите)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Виж �пи�ъкът � наличните видове машини за този тип превозно �ред�тво.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}�аправи �пи�ък
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Прати ин�трукциите до в�ички машини в този ли�т
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Зам�на на превозни �ред�тва
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Прати за об�лужване
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}�алични влакове
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}�алични коли
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}�алични кораби
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}�алични �амолети
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Прати в депото
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Прати в �ервиза
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Прати в дока
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Прати в хангара
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -391,12 +391,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}�а�т
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Интервала на техн. преглед не може да �е промени...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Затвори прозореца
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Заглавие на прозорец - преме�тване на прозореца � мишката
-STR_STICKY_BUTTON                                               :{BLACK}Маркиране прозореца за незатвар�не от клавиша 'Затвар�не в�ички прозороци'
-STR_RESIZE_BUTTON                                               :{BLACK}Преме�тете за оразмер�ване прозореца
+STR_TOOLTIP_STICKY                                              :{BLACK}Маркиране прозореца за незатвар�не от клавиша 'Затвар�не в�ички прозороци'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Преме�тете за оразмер�ване прозореца
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Пре�качане към директори�та за запи�/зарездане по подразбиране
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Разруши по�тройки и др. върху квадрат от картата
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Понижи ъгъл от зем�та
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Повиши ъгъл от зем�та
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Понижи ъгъл от зем�та
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Повиши ъгъл от зем�та
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Лента за позициониране - превърта �пи�ъка нагоре/надолу
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Превъртаща ивица - превърта �пи�ъка на л�во/д��но
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Покажи земните контури на картата
@@ -409,21 +409,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Пока
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Печалба тази година: {CURRENCY} (минала година: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} годин{P а и} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} годин{P а и} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} годин{P а и} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} годин{P а и} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Влак
-STR_VEHICLE_ROAD_VEHICLE                                        :�втобу�/камион
-STR_VEHICLE_SHIP                                                :Кораб
-STR_VEHICLE_AIRCRAFT                                            :Самолет
+STR_REPLACE_VEHICLE_TRAIN                                       :Влак
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :�втобу�/камион
+STR_REPLACE_VEHICLE_SHIP                                        :Кораб
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Самолет
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} започва да о�тар�ва
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} е много о�тар�ло
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} е прекалено о�тар�ло и �пешно има нужда от зам�на
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Информаци� за зем�та
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Цена за изчи�тване: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Цена за изчи�тване: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Приход от изчи�тване: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Приход от изчи�тване: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :�е �е предлага
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Соб�твеник: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Соб�твеник на шо�ето: {LTBLUE}{STRING}
@@ -432,7 +432,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Соб�
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Община: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :�ищо
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Име
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1-ви
@@ -544,7 +544,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}�ати
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}�ати�нете върху парче за да го премахнете от програмата (Custom1 и Custom2 �амо)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}�ктивирай/деактивирай разме�тване на парчетата
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Покажи прозореца за избор на музикални парчета
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Кликни върху у�лугата, за да �е фоку�ира върху инду�три�та/града
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Кликни върху у�лугата, за да �е фоку�ира върху инду�три�та/града
 STR_INTRO_DIFFICULTY                                            :{BLACK}Сложно�т ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :По�ледно �ъобщение/новини
@@ -593,7 +593,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}�ама
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Генерирай �лучаен терен
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Изчи�ти терена
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Изчи�ти терена
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Премахни в�ичко, принадлежащо на играча, от картата
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Премахни в�ичко, принадлежащо на играча, от картата
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Сигурен ли �и, че и�каш да премахнеш в�ичко, принадлежашо на играча?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Създаване на терен
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Създаване на град
@@ -607,8 +607,8 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...прÐ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...прекалено близо до друг град
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...неподход�що м��то
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...прекалено много градове
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�е може да �е �тро�т градове
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...н�ма повече м��то на картата
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�е може да �е �тро�т градове
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...н�ма повече м��то на картата
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Увеличи размера на града
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Увеличи
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Случаен град
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}По�т
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}По�тав�не фар
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}По�тави предавател
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Избери пу�тинен терен.{}Задръж CTRL за да го премахнеш.
-STR_CREATE_LAKE                                                 :{BLACK}Определи водна площ.{}По�трои канал, о�вем когато CTRL е нати�нат на мор�ко ниво, когато ще наводни околната �реда в зам�на
-STR_CREATE_RIVER                                                :{BLACK}�аправи реки.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Определи водна площ.{}По�трои канал, о�вем когато CTRL е нати�нат на мор�ко ниво, когато ще наводни околната �реда в зам�на
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}�аправи реки.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Изтрий
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Премахни напълно града
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Запи� на �ценарий
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Зареждане на �ценарий
-STR_MENU_LOAD_HEIGHTMAP                                         :Отвори ви�очинна карта
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Отвори ви�очинна карта
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Изход от редактора
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Изход
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Запи
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Играене на �ценарий
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Игра ви�очинна карта
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}�ова игра, използвайки ви�очинна карта като терен
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}И�кате ли да прекъ�нете �ценари�?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}И�кате ли да прекъ�нете �ценари�?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...може да бъде по�троен �амо в градове � на�еление повече от 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Преме�ти назад началната дата � 1 година
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Преме�ти напред началната дата � 1 година
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...крÐ
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Малък
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Среден
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Гол�м
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Случаен
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Случаен
 STR_FOUND_TOWN_CITY                                             :{BLACK}Град
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Градовете �е разра�тват по-бързо от градчетата.{}В зави�имо�т от на�тройките те �а по-големи при т�хното �ъздаване
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Избери големина на града
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Големина на града:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}План на пътищата:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Изберете план за пътищата в този град
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Оргинален
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}По-добри пътища
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}мрежа 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}мрежа 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Случаен
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}План на пътищата:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Изберете план за пътищата в този град
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Оргинален
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}По-добри пътища
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}мрежа 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}мрежа 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Случаен
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Покажи по�ледното �ъобщение или отчет на новините
 STR_NEWS_MESSAGES_OFF                                           :изключено
 STR_NEWS_MESSAGES_SUMMARY                                       :Обобщение
@@ -761,10 +761,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* * ИÐ
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Екрано�нимката е у�пешно зъхранена � името '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Екрано�нимката не �е получи!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Купи зем� за бъдещо ползване
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Купи зем� за бъдещо ползване
 STR_STATUSBAR_AUTOSAVE                                          :{RED}�ВТОЗ�П�ЗВ��Е
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  З�ПИСВ��Е �� ИГР�  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Запи�ването продължава,{}мол� изчакайте да �ръши!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Запи�ването продължава,{}мол� изчакайте да �ръши!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Избери програмата 'Ezy Street style music'
 
 ############ start of townname region
@@ -827,7 +827,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Избо
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Ц�л екран
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Изберете тази опци� за да играете OpenTTD в ц�л екран
-STR_FULLSCREEN_FAILED                                           :{WHITE}Проблем при включване на режим "ц�л екран"
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Проблем при включване на режим "ц�л екран"
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Размер на екрана
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Избор размера на екран
@@ -838,12 +838,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Избо
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Базов графичен набор
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Изберете базов графичен набор
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}�втозапазването е неу�пешно
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}�втозапазването е неу�пешно
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Отиващ към {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Отиващ към {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Без заповеди
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Без заповеди, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Отиващ към {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Отиващ към {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Без заповеди
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Без заповеди, {VELOCITY}
 
 STR_PASSENGERS                                                  :па�ажери
 STR_BAGS                                                        :торби
@@ -854,9 +854,9 @@ STR_CRATES                                                      :кратери
 STR_RES_OTHER                                                   :друго
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}�е може да �е �подел� �пи�ъка �ъ� задачи...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}�е може да �е копира �пи�ъка от задачи...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Край на Споделени� пътен ли�т - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}�е може да �е �подел� �пи�ъка �ъ� задачи...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}�е може да �е копира �пи�ъка от задачи...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Край на Споделени� пътен ли�т - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} не може да намери път за да продължи.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} �е е загубил.
@@ -1108,15 +1108,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-раÐ
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :изключено
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Пром�на �тойно�та на на�тройка
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Пром�на �тойно�та на на�тройка
 
-STR_TEMPERATE_LANDSCAPE                                         :умерен климат
-STR_SUB_ARCTIC_LANDSCAPE                                        :�рктичен климат
-STR_SUB_TROPICAL_LANDSCAPE                                      :Тропиче�ки климат
-STR_TOYLAND_LANDSCAPE                                           :Зем�та на играчките
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :умерен климат
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :�рктичен климат
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Тропиче�ки климат
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Зем�та на играчките
 
 STR_CHEATS                                                      :{WHITE}Кодове
-STR_CHEATS_TIP                                                  :{BLACK}Кутийките показват дали този код е бил използван
+STR_CHEATS_TOOLTIP                                              :{BLACK}Кутийките показват дали този код е бил използван
 STR_CHEATS_WARNING                                              :{BLACK}Внимание! По този начин ще измамите �воите �ъперници. Имайте в предвид, че това безче�тие ще бъде запомнено вовеки веков.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Увеличаване на парите � {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Играе като компани�: {ORANGE}{COMMA}
@@ -1128,176 +1128,176 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}ПроÐ
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Пром�на на датата: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Пром�на на производ�твените �тойно�ти: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Отиващ към {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Отиващ към {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Отиващ към {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Отиващ към {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Отиди чрез  пътеводител {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Премини без �пиране през {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Отиди чрез  пътеводител {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Премини без �пиране през {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Пътна точка {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Пътна точка {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Пътна точка
+STR_FORMAT_WAYPOINT_NAME                                        :Пътна точка {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Пътна точка {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Пътна точка
 
-STR_WAYPOINT                                                    :{WHITE}Пътна точка
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Избор тип на пътни точки
+STR_WAYPOINT_CAPTION                                            :{WHITE}Пътна точка
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Избор тип на пътни точки
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Редакци� името на пътна точка
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}�е може да �е промен� името на пункта...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}�е може да �е промен� името на пункта...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Пром�на ЖП лини� на пункт
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Тук не може да �е �трои влаков пункт...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Оттук не може да �е премахва влакови� пункт...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Тук не може да �е �трои влаков пункт...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Оттук не може да �е премахва влакови� пункт...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK} Строеж на жп лини� в режим �втоматичен
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...н�ма град в този �ценарий
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...н�ма град в този �ценарий
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Много �лучайни градове
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Покриване на картата �ъ� �лучайно по�тавени градове
-STR_MANY_RANDOM_INDUSTRIES                                      :Много �лучайни инду�трии
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Покриване на картата �ъ� �лучайно по�тавени инду�трии
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}�е може да �е генерира промишлено�т...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Много �лучайни градове
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Покриване на картата �ъ� �лучайно по�тавени градове
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Много �лучайни инду�трии
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Покриване на картата �ъ� �лучайно по�тавени инду�трии
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}�е може да �е генерира промишлено�т...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Отворете ивицата � ин�трументи за тераформиране за да повишавате/понижавате зем�, за�аждате дърва, и др.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Тераформиране
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Подравн�ване на зем�
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Подравн�ване на зем�
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Дървета от произволен тип
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}По�тави дървета от произволен тип
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}По�тави дървета от произволен тип
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Тук не може да �е �тро�т канали...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Тук не може да �е �тро�т канали...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}По�трои канал.
-STR_LANDINFO_CANAL                                              :Канал
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Канал
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Тук не може да �е �тро�т шлюзове...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Тук не може да �е �тро�т шлюзове...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Строеж на шлюзове
-STR_LANDINFO_LOCK                                               :Заключване
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Заключване
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}�е можеш да �ложиш реката тук...
-STR_LANDINFO_RIVER                                              :Река
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}�е можеш да �ложиш реката тук...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Река
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...шамандурата �е използва!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...шамандурата �е използва!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Координати: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Координати: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}�е може да �е премахва ча�т от гарата...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Тук не може да �е промен� типа на жп лини�та...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}�е може да �е премахва ча�т от гарата...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Тук не може да �е промен� типа на жп лини�та...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Пром�на/обнов�ване на ЖП лини�
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Преме�тването на локомотив тук ще продаде цели� влак
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Преме�тването на локомотив тук ще продаде цели� влак
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Влачене & Пу�кане
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Строене на �танци� чрез изтегл�не
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Избор на кла� �танци� за показване
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Избор тип на �танци� за �троене
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Избор на кла� �танци� за показване
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Избор тип на �танци� за �троене
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Бързо превъртане на играта
 STR_MESSAGE_HISTORY                                             :{WHITE}И�тори� на �ъобщени�та
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Спи�ък � по�ледните новини
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Изключване на в�ички
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Включване на в�ички
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Спи�ък � по�ледните новини
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Изключване на в�ички
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Включване на в�ички
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Инду�трии
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% превозено)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% превозено)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Имена на инду�тиите - нати�ни за да центрираш изгледа
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Инду�трии
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% превозено)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% превозено)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Имена на инду�тиите - нати�ни за да центрираш изгледа
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...прекалено близо до друка инду�три�
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...прекалено близо до друка инду�три�
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Пром�на на производ�тво
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}��колко играча
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Име на играч:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Чрез това име другите играчи ще ви идентифицират
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Въведете името �и
-STR_NETWORK_CONNECTION                                          :{BLACK}Връзка:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Избор между игра в интернет или локална мрежа (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Пу�кане на �ървър
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Пу�нете ваш �об�твен �ървър
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Име
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Име на играта
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Език, вер�и� на �ървъра, и др.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Щракни върху игра от �пи�ъка, за да � избереш
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}По�ледно използвани� �ървър:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}�ати�ни за да избереш по�ледно използвани� �ървър
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Тър�ене на �ървър
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Претър�ване на мрежата за �ървър
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Добави �ървър
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Доб�ви �ървър към �пи�акът, който винаги ще бъде провер�ван за активни игри.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Въведете адре�а на хо�та
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Играчи
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Онлайн играчи / мак�. брой играчи{}Онлайн компании / мак�. компании
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Големина на картата
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Големина на картата в играта{}�ати�ни за �ортиране по площ
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Дата
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}�а�то�ща дата
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Години
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Брой години{}през които продължава играта
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}И�ФО З� ИГР�Т�
-STR_NETWORK_CLIENTS                                             :{SILVER}Играчи:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Език:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Терен:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Големина на картата:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Вер�и� на �ървъра:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}�дре� на �ървъра:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}�ачална дата:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Текуща дата:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Защитено � парола!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}ИЗКЛЮЧЕ� СЪРВЪР
-STR_NETWORK_SERVER_FULL                                         :{SILVER}ПЪЛЕ� СЪРВЪР
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ГРЕШ�� ВЕРСИЯ
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF БЪРКОТИЯ
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}При�ъедин�ване към игра
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Започване на нова игра
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Име на игра:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Името на играта ще �е вижда от другите играчи при избор на игра
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Въведете име за мрежовата игра
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}По�тав�не на парола
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Защитаване на вашата игра � парола за да не е публично до�тъпна
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Избор на карта:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ко� карта желаете да играете?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Интернет
-STR_NETWORK_LAN_INTERNET                                        :LAN / Интернет
-STR_NETWORK_INTERNET_ADVERTISE                                  :Интернет (реклама)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} клиент{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Мак�. брой клиенти:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Избор на мак�имални� брой клиенти. �е в�ички �лотове тр�бва да �е попълн�т
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} компани{P а ий}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Мак�. брой компании:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Ограничаване на играта до определен брой компании
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}  зрител{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Мак�. брой наблюдатели:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ограничаване на �ървъра до определен брой наблюдатели
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Говорим език:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Другите играчи ще зна�т езика на който �е говори на �ървъра
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}�ачало на игра
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Започване на нова мрежова игра от �лучайна карта или �ценарий
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Зареждане на игра
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Продължаване на предварително запи�ана мрежова игра (проверете дали �е �вързвате като правилни� играч)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}��колко играча
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Име на играч:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Чрез това име другите играчи ще ви идентифицират
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Въведете името �и
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Връзка:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Избор между игра в интернет или локална мрежа (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Пу�кане на �ървър
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Пу�нете ваш �об�твен �ървър
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Име
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Име на играта
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Език, вер�и� на �ървъра, и др.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Щракни върху игра от �пи�ъка, за да � избереш
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}По�ледно използвани� �ървър:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}Въведете адре�а на хо�та
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Играчи
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Онлайн играчи / мак�. брой играчи{}Онлайн компании / мак�. компании
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Големина на картата
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Големина на картата в играта{}�ати�ни за �ортиране по площ
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Дата
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}�а�то�ща дата
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Години
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Брой години{}през които продължава играта
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}И�ФО З� ИГР�Т�
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Играчи:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Език:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Терен:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Големина на картата:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Вер�и� на �ървъра:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}�дре� на �ървъра:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}�ачална дата:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Текуща дата:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Защитено � парола!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}ИЗКЛЮЧЕ� СЪРВЪР
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}ПЪЛЕ� СЪРВЪР
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}ГРЕШ�� ВЕРСИЯ
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF БЪРКОТИЯ
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}При�ъедин�ване към игра
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Започване на нова игра
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Име на игра:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Името на играта ще �е вижда от другите играчи при избор на игра
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Въведете име за мрежовата игра
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}По�тав�не на парола
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Защитаване на вашата игра � парола за да не е публично до�тъпна
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Избор на карта:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Ко� карта желаете да играете?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Интернет
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Интернет
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Интернет (реклама)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} клиент{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Мак�. брой клиенти:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Избор на мак�имални� брой клиенти. �е в�ички �лотове тр�бва да �е попълн�т
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} компани{P а ий}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Мак�. брой компании:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Ограничаване на играта до определен брой компании
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}  зрител{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Мак�. брой наблюдатели:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Ограничаване на �ървъра до определен брой наблюдатели
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Говорим език:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Другите играчи ще зна�т езика на който �е говори на �ървъра
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}�ачало на игра
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Започване на нова мрежова игра от �лучайна карта или �ценарий
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Зареждане на игра
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Продължаване на предварително запи�ана мрежова игра (проверете дали �е �вързвате като правилни� играч)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :В�еки
@@ -1338,33 +1338,33 @@ STR_NETWORK_LANG_GREEK                                          :Гръцки
 STR_NETWORK_LANG_LATVIAN                                        :Латвий�ки
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Преддверие
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Преддверие
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Подготовка за при�ъедин�ване:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Спи�ък � в�ички компании в играта. Можете да �е при�ъедините към н�ко� или да започнете нова ако има �вободно м��то
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}�ова компани�
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Създаване на нова компани�
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}�аблюдаване на играта
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}�аблюдаване на играта като наблюдател
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}При�ъедин�ване към компани�
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Помощ за управлението на компани�та
-STR_NETWORK_REFRESH                                             :{BLACK}Обнов�ване �ървъра
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Обнов�ва информаци�та за �ъръра
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Подготовка за при�ъедин�ване:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Спи�ък � в�ички компании в играта. Можете да �е при�ъедините към н�ко� или да започнете нова ако има �вободно м��то
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}�ова компани�
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Създаване на нова компани�
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}�аблюдаване на играта
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}�аблюдаване на играта като наблюдател
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}При�ъедин�ване към компани�
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Помощ за управлението на компани�та
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Обнов�ване �ървъра
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Обнов�ва информаци�та за �ъръра
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}И�ФОРМ�ЦИЯ З� КОМП��ИЯ
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}И�ФОРМ�ЦИЯ З� КОМП��ИЯ
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Име на компани�:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}О�новаване:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Стойно�т на компани�та:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Текущ балан�:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Приход от предходната година:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Пред�тав�не:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Име на компани�:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}О�новаване:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Стойно�т на компани�та:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Текущ балан�:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Приход от предходната година:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Пред�тав�не:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Превозни �ред�тва:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Станции:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Играчи:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Превозни �ред�тва:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Станции:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Играчи:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Свързване...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Свързване...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Свързване..
@@ -1379,48 +1379,48 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Свал
 ############ End of leave-in-this-order
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} клиент{P "" и} �рещу ва�
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Изключване
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Изключване
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Въведете количе�твото пари, което и�кате да дадете
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сървъра е защитен. Въведете парола
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компани�та е защитена. Въведете парола
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Спи�ък � играчите
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Спи�ък � играчите
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}�ова Фирма
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} �е �а открити мрежови у�трой�тва или е компилирано без ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} �е може да откри� мрежови игри
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Сървърът не отговори на за�вката
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} �е може да �е �върже поради различие в NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Синхронизаци�та на мрежовата игра �е провали
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Връзката � мрежовата игра �е загуби
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} �е може да зареди играта
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Сървъра не може да бъде �тартиран
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} �е може да �е �върже
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Връзка #{NUM} изтече времето
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Грешка в протокола �е �лучи и връзката бе прекъ�ната
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Ревизи�та на клиента не отговар� на �ървъра
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Грешна парола
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Сървъра е пълен
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Забранено ви е влизането на този �ървър
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Б�хте изхвърлен от играта
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Маменето не е разрешено на този �ървър
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} �е �а открити мрежови у�трой�тва или е компилирано без ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} �е може да откри� мрежови игри
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Сървърът не отговори на за�вката
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} �е може да �е �върже поради различие в NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Синхронизаци�та на мрежовата игра �е провали
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Връзката � мрежовата игра �е загуби
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} �е може да зареди играта
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Сървъра не може да бъде �тартиран
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} �е може да �е �върже
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Връзка #{NUM} изтече времето
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Грешка в протокола �е �лучи и връзката бе прекъ�ната
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Ревизи�та на клиента не отговар� на �ървъра
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Грешна парола
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Сървъра е пълен
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Забранено ви е влизането на този �ървър
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Б�хте изхвърлен от играта
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Маменето не е разрешено на този �ървър
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :обща грешка
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :загуба на �инхронизаци�
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :не може да зареди картата
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :връзката прекъ�на
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :грешка в протокола
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF �е различават
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :не оторизиран
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :получен �транен пакет
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :грешна ревизи�
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :името вече �е използва
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :грешна парола
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :wrong company-id in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :изхрърлен от �ървъра
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :�е опита да използва измама
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :�ървърът е пълен
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :обща грешка
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :загуба на �инхронизаци�
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :не може да зареди картата
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :връзката прекъ�на
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :грешка в протокола
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF �е различават
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :не оторизиран
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :получен �транен пакет
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :грешна ревизи�
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :името вече �е използва
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :грешна парола
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :wrong company-id in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :изхрърлен от �ървъра
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :�е опита да използва измама
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :�ървърът е пълен
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1430,15 +1430,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Играта е
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Играта продължава (нови�т играч �е �върза)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Играта продължава (нови�т играч не у�п� да �е �върже)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :напу�кам
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} �е при�ъедини към играта
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} пое контрола над компани� #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} �е при�ъедини като наблюдател
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} �ъздаде нова компани� (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} напу�на играта ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} �и промени името на {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} изпрати {2:CURRENCY} на тво�та компани�
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Ти даде {2:CURRENCY} на {1:STRING}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :напу�кам
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} �е при�ъедини към играта
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} пое контрола над компани� #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} �е при�ъедини като наблюдател
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} �ъздаде нова компани� (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} напу�на играта ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} �и промени името на {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} изпрати {2:CURRENCY} на тво�та компани�
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Ти даде {2:CURRENCY} на {1:STRING}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] До {STRING}: {WHITE}{STRING}
@@ -1448,8 +1448,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] До
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Въведи тек�т за мрежов разговор
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Сървъра прекъ�на �е�и�та
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Сървъра �е ре�тартира...{}Мол� изчакайте...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Сървъра прекъ�на �е�и�та
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Сървъра �е ре�тартира...{}Мол� изчакайте...
 
 STR_NETWORK_SERVER                                              :Сървър
 STR_NETWORK_CLIENT                                              :Клиент
@@ -1463,19 +1463,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Кажи на Ð
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Лично �ъобщение
 
 
-STR_NETWORK_SEND                                                :{BLACK}Изпращане
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Изпращане
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}�е може да зареди терена от PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...файла не е намерен.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...преобразуване типа на картинката е невъзможно. Тр�бва 8 или 24-битова PNG картинка.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...нещо лошо �лочи. Извинени�. (веро�тно повреден файл)
+STR_ERROR_PNGMAP                                                :{WHITE}�е може да зареди терена от PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...файла не е намерен.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...преобразуване типа на картинката е невъзможно. Тр�бва 8 или 24-битова PNG картинка.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...нещо лошо �лочи. Извинени�. (веро�тно повреден файл)
 
-STR_BMPMAP_ERROR                                                :{WHITE}�е може да отвориш пейзаж от BMP..
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...не може да �е промени бида на �нимката.
+STR_ERROR_BMPMAP                                                :{WHITE}�е може да отвориш пейзаж от BMP..
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...не може да �е промени бида на �нимката.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Цена: {CURRENCY}
@@ -1489,13 +1489,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Приб
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}�е може да повдигаш зем�та тук...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}�е може да понижиш зем�та тук...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}�е може да �е изравн�ва зем�та на това м��то...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Скали
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :�еравна зем�
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Пу�та зем�
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Трева
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Пол�
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :За�нежена зем�
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Пу�тин�
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Скали
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :�еравна зем�
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Пу�та зем�
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Трева
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Пол�
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :За�нежена зем�
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Пу�тин�
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Зем�та е наклонена в неправилна по�ока
@@ -1503,11 +1503,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}�евъ
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Изкопните работи ще повред�т тунела
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Мор�кото ниво е вече до�тигнато
 STR_ERROR_TOO_HIGH                                              :{WHITE}Прекалено ви�око
-STR_ALREADY_LEVELLED                                            :{WHITE}... вече е равно
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... вече е равно
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}�еподход�щ за употреба рел�ов път
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...вече е по�троено
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Първо тр�бва да премахнеш рел�ови� път
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Път�т е еднопо�очен или блокиран
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Път�т е еднопо�очен или блокиран
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Кон�трукции за Двурел�ов път
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Строене на електрифицирана ЖП мрежа
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Кон�трукции за Еднорел�ов път
@@ -1531,41 +1531,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}По�т
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}По�трой ЖП мо�т
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Строене на жп тунел
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Строене/премахване на жп лини� и �емафори
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Избиране на мо�т - нати�ни върху избрани� от теб мо�т, за да �е по�трои
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Избиране на мо�т - нати�ни върху избрани� от теб мо�т, за да �е по�трои
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Избиране ориентаци� на ЖП депо
-STR_RAILROAD_TRACK                                              :ЖП лини�
-STR_RAILROAD_TRAIN_DEPOT                                        :ЖП депо
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :ЖП лини�
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :ЖП депо
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...зем�та е притежание на друга компани�
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :ЖП лини� � нормални �игнали
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :ЖП лини� � пре-�игнали
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :ЖП лини� � изходни �игнали
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Железопътна линиа � комбинирани знаци
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :ЖП лини� � маршрутизиращи знаци
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :ЖП лини� � еднопо��очни маршрутизиращи знаци
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Железопътна линиа � нормални и пре-�игнали
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Железопътна линиа � нормални и изходни �игнали
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Железопътна линиа � нормални и комбинирани знаци
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :ЖП лини� � обикновени и маршрутизиращи знаци
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :ЖП лини� � обикновени и еднопо�очни маршрутизиращи знаци
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Железопътна линиа � пре- и изходни �игнали
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Железопътна линиа � пре- и комбинирани �игнали
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :ЖП лини� � пре- и маршрутизиращи �игнали
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :ЖП лини� � пре- и еднопо�очни маршрутизиращи �игнали
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Железопътна линиа � изходни и комбинирани знаци
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :ЖП лини� � изходни и еднопо�очни маршрутизиращи �игнали
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :ЖП лини� � изходни и еднопо�очни маршрутизиращи �игнали
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Рел�ов път �ъ� �ме�ени и двупо�очни знаци
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Рел�ов път �ъ� �ме�ени и еднопо�очни знаци
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Рел�ов път � двупо�очни и еднопо�очни знаци
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Железопътната гара тр�бва да бъде премахната първо
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}�аправи отделна �танци�
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}При�ъедини �танци�та
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :ЖП лини� � нормални �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :ЖП лини� � пре-�игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :ЖП лини� � изходни �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Железопътна линиа � комбинирани знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :ЖП лини� � маршрутизиращи знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :ЖП лини� � еднопо��очни маршрутизиращи знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Железопътна линиа � нормални и пре-�игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Железопътна линиа � нормални и изходни �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Железопътна линиа � нормални и комбинирани знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :ЖП лини� � обикновени и маршрутизиращи знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :ЖП лини� � обикновени и еднопо�очни маршрутизиращи знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Железопътна линиа � пре- и изходни �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Железопътна линиа � пре- и комбинирани �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :ЖП лини� � пре- и маршрутизиращи �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :ЖП лини� � пре- и еднопо�очни маршрутизиращи �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Железопътна линиа � изходни и комбинирани знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :ЖП лини� � изходни и еднопо�очни маршрутизиращи �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :ЖП лини� � изходни и еднопо�очни маршрутизиращи �игнали
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Рел�ов път �ъ� �ме�ени и двупо�очни знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Рел�ов път �ъ� �ме�ени и еднопо�очни знаци
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Рел�ов път � двупо�очни и еднопо�очни знаци
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Железопътната гара тр�бва да бъде премахната първо
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}�аправи отделна �танци�
+STR_JOIN_STATION_CAPTION                                        :{BLACK}При�ъедини �танци�та
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Първо махнете път�
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Пътни ремонти в проце�
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Пътни ремонти в проце�
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Пътно �троител�тво
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Трамвайно �троител�тво
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Избор на а�фалтов мо�т
@@ -1601,14 +1601,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Прок
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}�ктивирай/Деактивирай еднопо�очни пътища
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Премахване на а�фалтов път
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Превключване �троене/разрушаване на трамвайни кон�ктрукции
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Ориентаци� на гараж
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Избор по�оката на трамвайно депо
-STR_ROAD_DESCRIPTION_ROAD                                       :път
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :��фалтов път � улични лампи
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :��фалтов път � дървета
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :�вто депо
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :ЖП прелез
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Трамвайна лини�
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Ориентаци� на гараж
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Избор по�оката на трамвайно депо
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :път
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :��фалтов път � улични лампи
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :��фалтов път � дървета
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :�вто депо
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :ЖП прелез
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Трамвайна лини�
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}�е може да премахне автогарата...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}�е може да премахне товарната гара...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}�е може да �е разруши пътниче�ката трамвайната �пирка...
@@ -1616,12 +1616,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Ð�е мÐ
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Градове
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Сградата първо тр�бва да бъде разрушена
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Град)
@@ -1634,7 +1634,7 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Цент
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Пром�на на име на град
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Па�ажери през по�ледни� ме�ец: {ORANGE}{COMMA}{BLACK}  мак�имум: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Поща през по�ледни� ме�ец: {ORANGE}{COMMA}{BLACK}  мак�имум: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} необходим
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} необходим
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Ви�ока офи� �града
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Офи� �града
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Малък жилищен блок
@@ -1671,7 +1671,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING} �печели �уб�иди�!!{}{}Превоз на {STRING} от {STATION} до {STATION} ще �е заплаща тройно през �ледващата година!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING} �печели �уб�иди�!!{}{}Превоз на {STRING} от {STATION} до {STATION} ще �е заплаща четворно през �ледващата година!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} ме�тни вла�ти отказват да позвол�т по�тро�ването на друго летище в града
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} локалните вла�ти отказват разрешение за летището (твърде шумно)
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} локалните вла�ти отказват разрешение за летището (твърде шумно)
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Сел�ки къщи
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Къщи
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :�партаменти
@@ -1707,7 +1707,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Хао� на трафика в {TOWN}!{}{}Програмата за пътна рекон�трукци�, финан�ирана от {STRING}, доведе до 6 ме�еца мизери� за мотори�тите!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (в проце� на изграждане)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (в проце� на изграждане)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Иглу
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Индиан�ки колиби
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Фабрика за чай
@@ -1720,17 +1720,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :ПоÑ�тавÑ�Ð
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Дървета
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...вече има дърво
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Тук не може да бъде за�адено дърво...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...твърде много знаци
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Тук не може да бъде по�тав�н знак...
-STR_SIGN_DEFAULT                                                :Знак
+STR_DEFAULT_SIGN_NAME                                           :Знак
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Пром�на тек�та на знака
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Името на знака не може да бъде промен�но...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}�е може да изтриеш знака....
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Избор тип на дърво за за�аждане
-STR_TREE_NAME_TREES                                             :Дървета
-STR_TREE_NAME_RAINFOREST                                        :Дъждовни гори
-STR_TREE_NAME_CACTUS_PLANTS                                     :Какту�и
+STR_LAI_TREE_NAME_TREES                                         :Дървета
+STR_LAI_TREE_NAME_RAINFOREST                                    :Дъждовни гори
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Какту�и
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Избор на жп гара
@@ -1750,7 +1750,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Първ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Прекалено близо до друго летище
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Първо разрушете летището
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Преименуване на �танци�
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Преименуване на �танци�
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Станци�та не може да бъде преименувана...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Рейтинги
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Приема
@@ -1768,10 +1768,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Ð�евероÑ�Ñ
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Показване на в�ички влакове които минават през гарата
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Показване на в�ички автомобили които минават през гарата
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Показване на в�ички �амолети които кацат на летището
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Показване на в�ички кораби които �пират на при�танището
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Показване на в�ички влакове които минават през гарата
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Показване на в�ички автомобили които минават през гарата
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Показване на в�ички �амолети които кацат на летището
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Показване на в�ички кораби които �пират на при�танището
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} вече не приема {STRING}
@@ -1804,47 +1804,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Пром
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Покажи �пи�ък � приетите товари
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Имена на �танции - нати�нете върху името за да центрирате главни� прозорец върху �танци�та
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Големина/тип на летището
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :ЖП гара
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Хангар за �амолети
-STR_STATION_DESCRIPTION_AIRPORT                                 :Летище
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Товарна гара
-STR_STATION_DESCRIPTION_BUS_STATION                             :�втогара
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Корабен док
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :ЖП гара
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Хангар за �амолети
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Летище
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Товарна гара
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :�втогара
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Корабен док
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Отбележи зоната от предложеното м��то
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}�е отбел�звай зоната от предложеното м��то
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Маркиране на Отбел�заната зона
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Док
-STR_STATION_DESCRIPTION_BUOY                                    :Шамандура
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Шамандура
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...шамандура на път�
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...�танци�та е прекалено разпръ�ната
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...неправилните �танции �а изключени
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Задържете CTRL за да изберете повече от един обект
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...неправилните �танции �а изключени
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Задържете CTRL за да изберете повече от един обект
 
 STR_UNDEFINED                                                   :(неопределен тек�т)
-STR_STAT_CLASS_DFLT                                             :Станци� по подразбиране
-STR_STAT_CLASS_WAYP                                             :Пътни точки
+STR_STATION_CLASS_DFLT                                          :Станци� по подразбиране
+STR_STATION_CLASS_WAYP                                          :Пътни точки
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Ориентаци� на дока
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...тр�бва да �е по�трои във вода
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Дока не може да бъде по�троен тук...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Избор на ориентаци� на док
-STR_WATER_DESCRIPTION_WATER                                     :Вода
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Бр�г или поречие
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Корабно депо
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :�кведукт
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Вода
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Бр�г или поречие
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Корабно депо
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :�кведукт
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...�е може да бъде по�троено във водата
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Тр�бва да разрушиш каналът първо
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Тр�бва да разрушиш каналът първо
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Запази играта
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Отвар�не на игра
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Запази
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Изтрий
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :�аблюдател, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :�аблюдател, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} �вободно
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}�е може да прочете ди�ка
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Запазването на играта е неу�пешно{}{STRING}
@@ -1860,12 +1860,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Спи�
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Избрано име за запазена игра
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Изтрий избраната запазената игра
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Запазване на на�то�щата игра � избраното име
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Генерирай произволна нова игра
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Отвар�не на ви�очинна карта
-STR_SAVE_OSKTITLE                                               :{BLACK}Въведете име за запазената игра
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Генерирай произволна нова игра
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Отвар�не на ви�очинна карта
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Въведете име за запазената игра
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} пречи
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} пречи
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Мина за въглища
 STR_INDUSTRY_NAME_POWER_STATION                                 :Електроцентрала
@@ -1923,7 +1923,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Центриране главни� прозорец върху инду�три�та
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}�ова {STRING} �е �трои близо до {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}�ова {STRING} �е за�ажда близо до {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Цена: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Цена: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Този вид инду�ти� не може да бъде по�троена тук...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...гора може да �е за�ажда �амо над лини�та на �нега
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} об�ви незабавно закриване!
@@ -1941,16 +1941,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Друг тунел пречи
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Тунела би завършил извън картата
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Тунела би завършил извън картата
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}�е може да бъде изкопан други� край на тунела
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Първо разрушете тунела
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Първо тр�бва да разрушите мо�та
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}�е може да започва и да �върша на едно и �ъщо м��то
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Мо�тни начала не �а на �ъщото ниво
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Мо�тът е ту ни�ък за теренът
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}�е може да започва и да �върша на едно и �ъщо м��то
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Мо�тни начала не �а на �ъщото ниво
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Мо�тът е ту ни�ък за теренът
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}�ачалото и кра�т тр�бва да �а на една лини�
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}М��тото е неподход�що за вход на тунел
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Ви��щ, Стоманен
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Гредоред, Стоманен
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Конзолен, Стоманен
@@ -1961,30 +1961,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Тръбен, Ð
 STR_BRIDGE_TUBULAR_SILICON                                      :Тръбен, Силиконов
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}�е може да бъде по�троен мо�т тук...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}�е може да бъде по�троен тунел тук...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :ЖП тунел
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Пътен тунел
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Стоманен ви��щ ЖП мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Стоманен гредореден ЖП мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Стоманен конзолен ЖП мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Железобетонен ви��щ ЖП мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Дървен ЖП мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Бетонен ЖП мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Стоманен ви��щ пътен мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Стоманен гредореден пътен мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Стоманен конзолен пътен мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Железобетонен ви��щ пътен мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Дървен пътен мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Бетонен пътен мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Тръбовиден ЖП мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Тръбовиден пътен мо�т
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :ЖП тунел
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Пътен тунел
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Стоманен ви��щ ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Стоманен гредореден ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Стоманен конзолен ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Железобетонен ви��щ ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Дървен ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Бетонен ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Стоманен ви��щ пътен мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Стоманен гредореден пътен мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Стоманен конзолен пътен мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Железобетонен ви��щ пътен мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Дървен пътен мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Бетонен пътен мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Тръбовиден ЖП мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Тръбовиден пътен мо�т
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Обект на път�
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Предавател
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Фар
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :централа
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Предавател
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Фар
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :централа
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...централата е на път�
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Зем�, притежавана от компани�та
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Зем�, притежавана от компани�та
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Зем�та не може да бъде закупена...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...вие вече притежавате това!
 
@@ -2030,7 +2030,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Гар
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}�иво на трудно�т
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Запи�
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Запи�
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}ле�но
@@ -2103,8 +2103,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}ЦветÐ
 STR_LIVERY_CAPTION                                              :{WHITE}�ова цветове
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Име на компани�та
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Име на управител�т
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Име на компани�та
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Име на управител�
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Име на компани�та
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Име на управител�
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}�е може да бъде променено името на компани�та...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}�е може да �е промени името на управител�...
 STR_FINANCES_CAPTION                                            :{WHITE}Финан�ов отчет на {COMPANY} {BLACK}{COMPANYNUM}
@@ -2128,11 +2128,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}В�ичко:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Графика на приходите
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Графика на оперативните приходи
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Балан� на банковата �метка
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Заем
-STR_MAX_LOAN                                                    :{WHITE}Мак�имален заем:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Мак�имален заем:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Изтегли {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Изплати {SKIP}{SKIP}{CURRENCY}
@@ -2141,7 +2141,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Ð�е мÐ
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...н�ма заем за изплащане
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} �а необходими
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}�е може да изплатиш заема...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}�е може да �е харчат пари които �а заети от банка...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}�е може да �е харчат пари които �а заети от банка...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Избери друго лице за управител�
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Смени цвета на компани�та
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Смени името на управител�
@@ -2151,10 +2151,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Изпл
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Управител)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Открита: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}МПС-та:
-STR_TRAINS                                                      :{WHITE}{COMMA} влак{P "" ове}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} автомобил{P "" и}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} �амолет
-STR_SHIPS                                                       :{WHITE}{COMMA} кораб{P "" и}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} влак{P "" ове}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} автомобил{P "" и}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} �амолет
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} кораб{P "" и}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}�иколко
 STR_FACE_CAPTION                                                :{WHITE}Избор на лице
 STR_FACE_MALE_BUTTON                                            :{BLACK}Мъж
@@ -2168,7 +2168,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Гене
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Легенда
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Покажи легендата на графиката
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Легенда на графиката за компаниите
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Кликни тук, за да активираш по�в�ването/�криването на компани�та от графиката
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Кликни тук, за да активираш по�в�ването/�криването на компани�та от графиката
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Брой на до�тавените �токи
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Райтинг на пред�тав�нето на компани�та (мак�имален рейтинг=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Стойно�т на Компани�та
@@ -2202,23 +2202,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :ПреÑ�идеÐ
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Магнат
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}По�трой Централен Офи�
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}По�трой централен офи� на компани�та / покажи централни� офи� на компани�та
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Преме�тване централата на компани�та другаде за 1% от �тойно�та на компани�та
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Преме�тване централата на компани�та другаде за 1% от �тойно�та на компани�та
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}�е може на по�троиш централен офи�...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Покажи Централни� Офи�
-STR_RELOCATE_HQ                                                 :{BLACK}Преме�тване ЦК
-STR_COMPANY_JOIN                                                :{BLACK}При�ъедини �е
-STR_COMPANY_JOIN_TIP                                            :{BLACK}При�ъедини �е, управл�вайки тази компани�
-STR_COMPANY_PASSWORD                                            :{BLACK}Парола
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}По�тави парола за да предпазиш компани�та �и от неоторизирани потребители.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}По�тав�не парола на компани�та
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Преме�тване ЦК
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}При�ъедини �е
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}При�ъедини �е, управл�вайки тази компани�
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Парола
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}По�тави парола за да предпазиш компани�та �и от неоторизирани потребители.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}По�тав�не парола на компани�та
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}�езапазвай паролата
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Дай на компани�та новата парола
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Парола на компани�та
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Парола по подразбиране за компани�
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Използване на тази парола по подразбиране за нови компании
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Парола по подразбиране за компани�
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Използване на тази парола по подразбиране за нови компании
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Световна икономиче�ка криза!{}{}Финан�овите ек�перти очакват най-лошото от �риващата �е �ветовна икономика!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Световната икономиче�ка криза отмина!{}{}Възходът на търгови�та дава уверено�т на инду�триите в новата за�илваща �е икономиче�ка реално�т!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}�ктивирай гол�м/малък размер на прозореца
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}�ктивирай гол�м/малък размер на прозореца
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Стойно�т на Компани�та: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Купи 25% от акциите на компани�та
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Продай 25% от акциите на компани�та
@@ -2228,7 +2228,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Ð�е мÐ
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}�е може да продадеш 25% от акциите на тази компани�...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% е притежание на {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} бе закупена от {STRING}!
-STR_PROTECTED                                                   :{WHITE}Тази компани� в�е още не е до�татъчно �тара да предлага акции...
+STR_ERROR_PROTECTED                                             :{WHITE}Тази компани� в�е още не е до�татъчно �тара да предлага акции...
 
 STR_LIVERY_DEFAULT                                              :Стандартен Ливъри
 STR_LIVERY_STEAM                                                :Парен локомотив
@@ -2254,14 +2254,14 @@ STR_LIVERY_LARGE_PLANE                                          :Гол�м ае
 STR_LIVERY_PASSENGER_TRAM                                       :Пътниче�ки трамвай
 STR_LIVERY_FREIGHT_TRAM                                         :Товарен трамвай
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Показване на общи цветови �хеми
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Показване цветовите �хеми на влаковете
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Показване на цветови �хеми за автомобилите
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Показване цветови �хеми на корабите
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Показване цветовата �хема на �амолетите
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Изберете о�новни� цв�т за избранта �хема
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Изберете допълнителен жв�т за избраната �хема
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Изберете цветова �хема за пром�на или н�колко - CTRL+щрак. �ати�нете в кути�та за да превключите използването на �хемата
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Показване на общи цветови �хеми
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Показване цветовите �хеми на влаковете
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Показване на цветови �хеми за автомобилите
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Показване цветови �хеми на корабите
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Показване цветовата �хема на �амолетите
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Изберете о�новни� цв�т за избранта �хема
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Изберете допълнителен жв�т за избраната �хема
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Изберете цветова �хема за пром�на или н�колко - CTRL+щрак. �ати�нете в кути�та за да превключите използването на �хемата
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Ци�терна (Парен)
@@ -2569,9 +2569,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(�еразто
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Промени начинат на �пиране на о�ветената заповед
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Промени начинат на натовар�не на о�ветената заповед
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Промени начинат на разтовар�не на о�ветената заповед
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Вмъкни допълнителна заповед
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Вмъкни допълнителна заповед
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Отиди до най-близкото депо
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Отиди до най-близки�т хангар
 STR_ORDER_NEAREST_DEPOT                                         :най-близкото депо
@@ -2581,9 +2581,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Сервиз б
 STR_ORDER_TRAIN_DEPOT                                           :Депо за влакове
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Депо за пътни превозни �ред�тва
 STR_ORDER_SHIP_DEPOT                                            :Депо за кораби
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} хангар
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} хангар
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Винаги напред
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Сервиз, когато е необходимо
@@ -2608,10 +2608,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :е повече
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :е повече или равно на
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :е правилно
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :е неправилно
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Премини на заповед {COMMA}
-STR_CONDITIONAL_NUM                                             :Премини на заповед {COMMA} когато {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Премини на заповед {COMMA} когато {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Премини на заповед {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Премини на заповед {COMMA} когато {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Премини на заповед {COMMA} когато {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Без преминаване
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Патувай (без разпи�ание)
@@ -2634,18 +2634,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Влак
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}О�тави
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Изтрий
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Отиди на
-STR_REFIT                                                       :{BLACK}Преу�трой�тво
-STR_REFIT_TIP                                                   :{BLACK}Избор какво преу�трой�то да �е направи. Щракване �ъ� задържан контрол премахва ин�трукци�та
-STR_REFIT_ORDER                                                 :(Преу�трой�тво към {STRING})
-STR_REFIT_STOP_ORDER                                            :(Преоборудване на {STRING} и �пиране)
-STR_STOP_ORDER                                                  :(Спри)
-STR_TIMETABLE_VIEW                                              :{BLACK}Разпи�ание
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Виж разпи�анието
-STR_ORDER_VIEW                                                  :{BLACK}Сортиране
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Промени �ортаци�та
+STR_ORDER_REFIT                                                 :{BLACK}Преу�трой�тво
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Избор какво преу�трой�то да �е направи. Щракване �ъ� задържан контрол премахва ин�трукци�та
+STR_ORDER_REFIT_ORDER                                           :(Преу�трой�тво към {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Преоборудване на {STRING} и �пиране)
+STR_ORDER_STOP_ORDER                                            :(Спри)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Разпи�ание
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Виж разпи�анието
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Сортиране
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Промени �ортаци�та
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Заповеди)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Край на Заповедите - -
-STR_SERVICE                                                     :{BLACK}Ремонт
+STR_ORDER_SERVICE                                               :{BLACK}Ремонт
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Купи: {LTBLUE}{NUM}{BLACK} Цена: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Цена: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2664,7 +2664,7 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}прев
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}превозно�то �ред�тво не може да отиде до тази �танци�
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}�е може да преме�тиш машината...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Задни� локомотив ще �ледва винаги предни� �и �ъбрат
-STR_CARGO_N_A                                                   :�е �е предлага{SKIP}
+STR_QUANTITY_N_A                                                :�е �е предлага{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}�е може да намери маршрута до ме�тното депо
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Дни на об�лужване: {LTBLUE}{COMMA}дни{BLACK}   По�ледно облужване: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Интервал на �ервиз: {LTBLUE}{COMMA}%{BLACK}   По�леден �ервиз: {LTBLUE}{DATE_LONG}
@@ -2684,8 +2684,8 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Врем
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Промени времетраенето на маркираната заповед
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Изчи�ти времетраенето на маркираната заповед
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time
-STR_SERVICE_HINT                                                :{BLACK}Пропу�ни о�вен ако е необходим ремонт
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скоро�т: {VELOCITY}  Мощно�т: {POWER}{}Разход: {CURRENCY}/г.{}Капацитет: {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Пропу�ни о�вен ако е необходим ремонт
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скоро�т: {VELOCITY}  Мощно�т: {POWER}{}Разход: {CURRENCY}/г.{}Капацитет: {CARGO}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Капацитет: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Капацитет: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Капацитет: {LTBLUE}{CARGO}, {CARGO}{STRING}
@@ -2696,27 +2696,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Ката�
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Влакова ката�трофа!{}{COMMA} умрели в огнената ек�плози�
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}�е може да обърне по�оката на влак...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}�е може да обърне превозно �ред�тво �ъ�то�що �е от н�колко елемента
-STR_CLEAR_TIME                                                  :{BLACK}Изчи�ти времето
-STR_RESET_LATENESS                                              :{BLACK}Преправи закъ�н�лата бройка
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}См�на на името на пътната точка
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Изчи�ти времето
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Преправи закъ�н�лата бройка
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}См�на на името на пътната точка
 
-STR_TRAIN_STOPPING                                              :{RED}Спира
-STR_TRAIN_STOPPING_VEL                                          :{RED}Спира, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :�е�ъвме�тими ЖП линии
-STR_TRAIN_NO_POWER                                              :{RED}��ма мощно�т
-STR_TRAIN_START_NO_CATENARY                                     :Влака не може да тръгне, защото ЖП лини�та н�ма catenary
-STR_TRAIN_STUCK                                                 :{ORANGE}Изчакване за �вободен път
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Спира
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Спира, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :�е�ъвме�тими ЖП линии
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}��ма мощно�т
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Влака не може да тръгне, защото ЖП лини�та н�ма catenary
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Изчакване за �вободен път
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}�ов {STRING} е на разположение!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}�ов {STRING} е на разположение! - {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Унищожено превозно �ред�тво не може да �е продаде...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}�е може да �е преу�тройва разрушено превозно �ред�тво...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Унищожено превозно �ред�тво не може да �е продаде...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}�е може да �е преу�тройва разрушено превозно �ред�тво...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}�е може да добави разпи�ание на превозно �ред�тво...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Превозни �ред�тва могат да чакат �амо на гари.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Това превознот �ред�тво не �пира на тази гара.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}�е може да добави разпи�ание на превозно �ред�тво...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Превозни �ред�тва могат да чакат �амо на гари.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Това превознот �ред�тво не �пира на тази гара.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Промени времето
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Това превознот �ред�тво е в момента на време
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Това превознот �ред�тво е в момента � {STRING} закъ�нение
@@ -2730,7 +2730,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Запъ
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...тр�бва да бъде �пр�но в �ервиз за коли
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}�е може да намери локални� �ервиз
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}�а�ил�твено обръщане на ПС
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Капацитет: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Капацитет: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} превозно �ред�тво{P о а}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2756,11 +2756,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}По�тавете шамандура, използва �е като отправна точка
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}�е може да по�тави шамандура...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}По�трой акведукт
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}�е може да по�троиш акведукт тук...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}�е може да по�троиш акведукт тук...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Преу�тройване)
 STR_REFIT_TITLE                                                 :{GOLD}Изберете вид товар за превозване:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}�ов капацитет: {GOLD}{CARGO}{}{BLACK}Цена за преу�трой�тво: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(преу�троим)
+STR_PURCHASE_INFO_REFITTABLE                                    :(преу�троим)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Летища
@@ -2773,7 +2773,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Стро
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Гражданите празнуват . . .{}Първи� �амолет кацнал на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Самолетна ката�трофа!{}{COMMA} умират в огън� на {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Самолетна ката�трофа!{}Самолета о�тана без гориво, {COMMA} умр�ха в огненото кълбо!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Разпи�ание)
 
@@ -2786,13 +2786,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Срутване на мина за въглища о�тави �леди от разрушение близо до {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}�аводнени�!{}�ай-малко {COMMA} �а изчезнали, �читат �е за загинали �лед значителни наводнени�!
 
-STR_BRIBE_FAILED                                                :{WHITE}Тво�т опит за подкуп беше
-STR_BRIBE_FAILED_2                                              :{WHITE}разкрит от ме�тен дознател
-STR_BUILD_DATE                                                  :{BLACK}По�троен: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Тво�т опит за подкуп беше
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}разкрит от ме�тен дознател
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}По�троен: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Кла� на �танци�та: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Тип на �танци�та: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Кла� на �танци�та: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Тип на �танци�та: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Подробна оценка на пред�тав�нето
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Подробно�ти
@@ -2812,28 +2812,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Пари
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Заем:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Общо:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Брой превозни �ред�тва; това включва автомобили, влакове, кораби и �амолети
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Брой �танции. В��ка ча�т на �танци� (напр. ЖП гара, автогара, летище) �е брои отделно, даже ако �а �вързани като една �танци�
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Печалбата на превозното �ред�тво � най-ни�ък доход (от в�ички на поне 2 години)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Сумата пари �печелена през ме�еца � най-ни�ка печалба от по�ледните 12 четвъртини
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Сумата пари �печелена през ме�еца � най-ви�ока печалба от по�ледните 12 четвъртини
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Единици товар до�тавени през по�ледната година
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Брой различни видове товари до�тавени през по�ледните 4 ме�еца
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Сума пари тази компани� има в банката
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Сума пари тази компани� е в�ела от банката
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}�атрупани точки от общи� възможен брой
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Брой превозни �ред�тва; това включва автомобили, влакове, кораби и �амолети
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Брой �танции. В��ка ча�т на �танци� (напр. ЖП гара, автогара, летище) �е брои отделно, даже ако �а �вързани като една �танци�
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Печалбата на превозното �ред�тво � най-ни�ък доход (от в�ички на поне 2 години)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Сумата пари �печелена през ме�еца � най-ни�ка печалба от по�ледните 12 четвъртини
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Сумата пари �печелена през ме�еца � най-ви�ока печалба от по�ледните 12 четвъртини
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Единици товар до�тавени през по�ледната година
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Брой различни видове товари до�тавени през по�ледните 4 ме�еца
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Сума пари тази компани� има в банката
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Сума пари тази компани� е в�ела от банката
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}�атрупани точки от общи� възможен брой
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF на�тройки
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Покажи NewGRF на�тройки
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Newgrf на�тройки
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Прилагане на промените
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Превключване на палитрата
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Превключване на палитрата на избрани� NewGRF.{}Когато графиката от NewGRF изглежда розова в играта
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}�а�тройване на параметрите
-STR_NEWGRF_FILENAME                                             :{BLACK}Име на файл:  {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Палитра: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 �ума: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Прилагане на промените
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Превключване на палитрата
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Превключване на палитрата на избрани� NewGRF.{}Когато графиката от NewGRF изглежда розова в играта
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}�а�тройване на параметрите
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Име на файл:  {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Палитра: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5 �ума: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}�а път �и да извършиш промени в активна игра; това може да крашне OpenTTD.{}�апълно ли �и �игурен в това?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2856,34 +2856,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} �ъдържа повреден обект. В�кички повредени обекти ще бъдат показани като червена въпро�ителна (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Съдържа множе�тво Дей�твие 8 впи�вани�.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Зареди избрани� шаблон
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Запиши шаблон
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Запиши текущи� �пи�ък като шаблон
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Въведи име на шаблона
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Изтрий шаблон
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Изтрий текущо избрани� шаблон
-STR_NEWGRF_ADD                                                  :{BLACK}Добави
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Добав�не на NewGRF файл към �пи�ъка
-STR_NEWGRF_REMOVE                                               :{BLACK}Махни
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Премахва избрани� NewGRF файл от �пи�ъка
-STR_NEWGRF_MOVEUP                                               :{BLACK}�агоре
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Преме�тва избрани� NewGRF файл нагоре в �пи�ъка
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}�адолу
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Преме�тва избрани� NewGRF файл надолу в �пи�ъка
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Спи�ък на ин�талираните NewGRF файлове. Изберете файл за да промените параметрите му
-STR_NEWGRF_PARAMETER                                            :{BLACK}Параметри: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Въвеждане на NewGRF параметри
-STR_NEWGRF_NO_INFO                                              :{BLACK}��ма налична информаци�
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Зареди избрани� шаблон
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Запиши шаблон
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Запиши текущи� �пи�ък като шаблон
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Въведи име на шаблона
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Изтрий шаблон
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Изтрий текущо избрани� шаблон
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Добави
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Добав�не на NewGRF файл към �пи�ъка
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Махни
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Премахва избрани� NewGRF файл от �пи�ъка
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}�агоре
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Преме�тва избрани� NewGRF файл нагоре в �пи�ъка
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}�адолу
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Преме�тва избрани� NewGRF файл надолу в �пи�ъка
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Спи�ък на ин�талираните NewGRF файлове. Изберете файл за да промените параметрите му
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Параметри: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Въвеждане на NewGRF параметри
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}��ма налична информаци�
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}�алични NewGRF файлове
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Добави избраните
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Добав� избраните NewGRF файлове към конфигураци�та
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Обнови
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Обнов�ва �пи�ъка � налични NewGRF файлове
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Добав� избраните NewGRF файлове към конфигураци�та
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Обнови
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Обнов�ва �пи�ъка � налични NewGRF файлове
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}�е може да добавиш файл: дупликиран GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}�е е намерен отговар�щ файл
-STR_NEWGRF_DISABLED                                             :{RED}Изключен
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}�е е намерен отговар�щ файл
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Изключен
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Лип�ват файлове (заредени �а �ъвме�тими GRF файлове)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Съвме�тими GRF файлове за заредени вме�то лип�ващите
@@ -2897,7 +2897,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Влак
 
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{STRING}' дава нев�рна информаци�.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Играта бе запи�ана във вер�и� без поддръжка на трамваи. В�ички трамваи �а изтрити.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Играта бе запи�ана във вер�и� без поддръжка на трамваи. В�ички трамваи �а изтрити.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Парична единица
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Обменен кур�: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2926,8 +2926,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Кораб{P "" и}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Самолет
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Споделено разпи�ание � {COMMA} превозн{P о и} �ред�т{P о а}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Показване на в�ички превозни �ред�тва които �подел�т разпи�анието
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Споделено разпи�ание � {COMMA} превозн{P о и} �ред�т{P о а}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Показване на в�ички превозни �ред�тва които �подел�т разпи�анието
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чака в депото
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} чака в депото
@@ -3034,39 +3034,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Прео
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Преу�тройване на товарен кораб за друг тип товар
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Преу�тройване на �амолета за превоз на друг товар
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Отиващ към Влаковото депо на {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Отиващ към Влаковото депо на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Отиващ към �втодепото на {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Отиващ към �втодепото на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Отиващ към Корабното депо на {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Отиващ към Корабното депо на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Отиващ към Хангара на летище {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Отиващ към Хангара на летище {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}�а ремонт във Влаковото депо на {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Ремонт във Влаковото депо на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}�а ремонт в �втодепото на {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}�а ремонт в �втодепото на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}�а ремонт в Корабното депо на {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}�а ремонт в Корабното депо на {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}�а ремонт в Хангара на летище {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}�а ремонт в Хангара на летище {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Клониране на влак
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Копиране на превозно �ред�тво
-STR_CLONE_SHIP                                                  :{BLACK}Клониране на кораб
-STR_CLONE_AIRCRAFT                                              :{BLACK}Клониране на летателен апарат
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Така ще бъде по�троено копие на влака заедно � в�ички негови вагони. �ати�ни CTRL за да �поделиш задачите
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Така ще бъде по�троено копие на пътното превозно �ред�тво. �ати�ни CTRL за да �поделиш задачите
-STR_CLONE_SHIP_INFO                                             :{BLACK}Така ще бъде по�троено копие на кораб. �ати�ни CTRL за да �поделиш задачите
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Така ще бъде по�троено копие на летателни� апарат. �ати�ни CTRL за да �поделиш задачите
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Така ще бъде по�троено копие на влака заедно � в�ички негови вагони. �ати�ни на този бутон и �лед това на влак вътре или вън от депото. �ати�ни CTRL за да �поделиш задачите
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Така ще бъде по�троено копие на пътното превозно �ред�тво. �ати�ни на този бутон и �лед това на пътно превозно �ред�тво вътре или вън от депото. �ати�ни CTRL за да �поделиш задачите
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Така ще бъде по�троено копие на кораб. �ати�ни този бутон и �лед това върху кораб вътре или вън от депото. �ати�ни CTRL за да �поделиш задачите
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Така ще бъде по�троено копие на летателни� апарат. �ати�ни на този бутон и �лед това на летателен апарат вътре или вън от хангара. �ати�ни CTRL за да �поделиш задачите
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Отиващ към Влаковото депо на {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Отиващ към Влаковото депо на {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Отиващ към �втодепото на {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Отиващ към �втодепото на {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Отиващ към Корабното депо на {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Отиващ към Корабното депо на {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Отиващ към Хангара на летище {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Отиващ към Хангара на летище {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}�а ремонт във Влаковото депо на {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Ремонт във Влаковото депо на {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}�а ремонт в �втодепото на {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}�а ремонт в �втодепото на {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}�а ремонт в Корабното депо на {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}�а ремонт в Корабното депо на {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}�а ремонт в Хангара на летище {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}�а ремонт в Хангара на летище {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Клониране на влак
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Копиране на превозно �ред�тво
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Клониране на кораб
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Клониране на летателен апарат
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Така ще бъде по�троено копие на влака заедно � в�ички негови вагони. �ати�ни CTRL за да �поделиш задачите
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Така ще бъде по�троено копие на пътното превозно �ред�тво. �ати�ни CTRL за да �поделиш задачите
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Така ще бъде по�троено копие на кораб. �ати�ни CTRL за да �поделиш задачите
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Така ще бъде по�троено копие на летателни� апарат. �ати�ни CTRL за да �поделиш задачите
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Така ще бъде по�троено копие на влака заедно � в�ички негови вагони. �ати�ни на този бутон и �лед това на влак вътре или вън от депото. �ати�ни CTRL за да �поделиш задачите
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Така ще бъде по�троено копие на пътното превозно �ред�тво. �ати�ни на този бутон и �лед това на пътно превозно �ред�тво вътре или вън от депото. �ати�ни CTRL за да �поделиш задачите
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Така ще бъде по�троено копие на кораб. �ати�ни този бутон и �лед това върху кораб вътре или вън от депото. �ати�ни CTRL за да �поделиш задачите
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Така ще бъде по�троено копие на летателни� апарат. �ати�ни на този бутон и �лед това на летателен апарат вътре или вън от хангара. �ати�ни CTRL за да �поделиш задачите
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}�ови Машини за Двурел�ов път
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}�ови електриче�ки влакове
@@ -3136,28 +3136,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Цент
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}И�кате ли да продадете в�ички коли в депото?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Погрешен депо теп
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Погрешен депо теп
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Продажба в�ички влакове в депото
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Продажба в�ички автомобили в гаража
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Продажба в�ички кораби в депото
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Продажба в�ички �амолети в хангара
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Продажба в�ички влакове в депото
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Продажба в�ички автомобили в гаража
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Продажба в�ички кораби в депото
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Продажба в�ички �амолети в хангара
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Спи�ък на в�ички влакове � това депо в техни� пътен ли�т
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Спи�ък на в�ички автомобили � този гараж в техни� пътен ли�т
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Спи�ък на в�ички кораби � това депо в техни� пътен ли�т
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Спи�ък на в�ички �амолети � хангар на това летище в техни� пътен ли�т
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Спи�ък на в�ички влакове � това депо в техни� пътен ли�т
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Спи�ък на в�ички автомобили � този гараж в техни� пътен ли�т
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Спи�ък на в�ички кораби � това депо в техни� пътен ли�т
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Спи�ък на в�ички �амолети � хангар на това летище в техни� пътен ли�т
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}�втоматична зам�на на в�ички влакове в депото
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}�втоматична зам�на на в�ички автомобили в депото
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}�втоматична зам�на на в�ички кораби в депото
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}�втоматична зам�на на в�ички �амолети в хангара
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}�втоматична зам�на на в�ички влакове в депото
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}�втоматична зам�на на в�ички автомобили в депото
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}�втоматична зам�на на в�ички кораби в депото
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}�втоматична зам�на на в�ички �амолети в хангара
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Зам�на {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Започване зам�ната
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Спиране на зам�ната
-STR_NOT_REPLACING                                               :{BLACK}�езамен�
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}��ма избрани превозни �ред�тва
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}�езамен�
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}��ма избрани превозни �ред�тва
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Избор на нов двигател за зам�ната
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Изберете нов двигател, който бихте желали да по�тавите на м��тото на избрани� в л�во двигател
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}�ати�нете за �пиране поднов�ването на избрани� в л�во двигател
@@ -3169,26 +3169,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}�вто
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Зам�на: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Превключване между зам�на на локомотиви и вагони
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Превозното �ред�тво не е на разположение
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Превозното �ред�тво не е на разположение
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Корабът не е на разположение
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Самолетът не е на разположение
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Превозното �ред�тво не е на разположение
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Превозното �ред�тво не е на разположение
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Корабът не е на разположение
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Самолетът не е на разположение
 
-STR_ENGINES                                                     :Двигатели
-STR_WAGONS                                                      :Вагони
+STR_REPLACE_ENGINES                                             :Двигатели
+STR_REPLACE_WAGONS                                              :Вагони
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Спиране на в�ички влакове в депото
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Спиране на в�ички автомобили в гаража
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Спиране на в�ички кораби в депото
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Спиране на в�ички �амолети в хангара
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Спиране на в�ички влакове в депото
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Спиране на в�ички автомобили в гаража
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Спиране на в�ички кораби в депото
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Спиране на в�ички �амолети в хангара
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Стартиране на в�ички влакове в депото
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Стартиране на в�ички автомобили в депото
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Стартиране на в�ички кораби в депото
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Стартиране на в�ички �амолети в хангара
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Стартиране на в�ички влакове в депото
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Стартиране на в�ички автомобили в депото
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Стартиране на в�ички кораби в депото
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Стартиране на в�ички �амолети в хангара
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Спиране на в�ички превозни �ред�тва в �пи�ъка
-STR_MASS_START_LIST_TIP                                         :{BLACK}Стартиране на в�ички превозни �ред�тва в �пи�ъка
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Спиране на в�ички превозни �ред�тва в �пи�ъка
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Стартиране на в�ички превозни �ред�тва в �пи�ъка
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Спи�ък � табели - {COMMA} Табел{P а и}
@@ -3197,14 +3197,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Пров
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :ЖП влакове
-STR_ELRAIL_VEHICLES                                             :Електриче�ки локомотиви
-STR_MONORAIL_VEHICLES                                           :Монорел�ови локомотиви
-STR_MAGLEV_VEHICLES                                             :Маглев влакове
+STR_REPLACE_RAIL_VEHICLES                                       :ЖП влакове
+STR_REPLACE_ELRAIL_VEHICLES                                     :Електриче�ки локомотиви
+STR_REPLACE_MONORAIL_VEHICLES                                   :Монорел�ови локомотиви
+STR_REPLACE_MAGLEV_VEHICLES                                     :Маглев влакове
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Цена: {GOLD}{CURRENCY}{BLACK} Тегло: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Скоро�т: {GOLD}{VELOCITY}{BLACK}   Мощно�т: {GOLD}{POWER}
@@ -3231,67 +3231,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Генериране
-STR_RANDOM                                                      :{BLACK}Произволно
-STR_RANDOM_HELP                                                 :{BLACK}Пром�на на �лучайно�тта използване за генериране на терен
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Световна генераци�
-STR_RANDOM_SEED                                                 :{BLACK}Случайно�т:
-STR_RANDOM_SEED_HELP                                            :{BLACK}�ати�нете за въвеждане �еме на �лучайно�т
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Въведи �лучаено �еме
-STR_LAND_GENERATOR                                              :{BLACK}Земегенератор:
-STR_TREE_PLACER                                                 :{BLACK}Дървораз�ад:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Завъртане на ви�очинна карта:
-STR_TERRAIN_TYPE                                                :{BLACK}Тип на терен:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Мор�ко ниво:
-STR_SMOOTHNESS                                                  :{BLACK}Полегато�т:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Снежна лини�:
-STR_DATE                                                        :{BLACK}Дата:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Брой градове:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Брой инду�трии:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Преме�тване �нежната лини� нагоре
-STR_SNOW_LINE_DOWN                                              :{BLACK}Преме�тване �нежната лини� надолу
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ви�очина на �нежната лини�
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Пром�на началната година
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Мащаб предупреждение
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Прекаленото оразмер�ване не е препорачително. Продължаване � генераци�та?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Име на ви�очинна карта:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Размер: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Генериране
+STR_MAPGEN_RANDOM                                               :{BLACK}Произволно
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Пром�на на �лучайно�тта използване за генериране на терен
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Световна генераци�
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Случайно�т:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}�ати�нете за въвеждане �еме на �лучайно�т
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Въведи �лучаено �еме
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Земегенератор:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Дървораз�ад:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Завъртане на ви�очинна карта:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Тип на терен:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Мор�ко ниво:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Полегато�т:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Снежна лини�:
+STR_MAPGEN_DATE                                                 :{BLACK}Дата:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Брой градове:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Брой инду�трии:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Преме�тване �нежната лини� нагоре
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Преме�тване �нежната лини� надолу
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ви�очина на �нежната лини�
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Пром�на началната година
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Мащаб предупреждение
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Прекаленото оразмер�ване не е препорачително. Продължаване � генераци�та?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Име на ви�очинна карта:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Размер: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Създаване на �в�т...
 STR_GENERATION_ABORT                                            :{BLACK}Прекъ�ване
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Прекъ�ване генерирането на �в�т
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}И�кате ли да прекъ�нете �ъздаването?
-STR_PROGRESS                                                    :{WHITE}{NUM}% готово
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Генераци� на �в�т
-STR_TREE_GENERATION                                             :{BLACK}Генераци� на дърва
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Генераци� на �татични
-STR_CLEARING_TILES                                              :{BLACK}Създаване на твърда и �кална повърно�т
-STR_SETTINGUP_GAME                                              :{BLACK}�а�тройка на играта
-STR_PREPARING_TILELOOP                                          :{BLACK}Изпълн�ване цикъл на плочките
-STR_PREPARING_GAME                                              :{BLACK}Подготв�не на играта
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Това дей�твие промени нивото на трудно�т на custom
-STR_SE_FLAT_WORLD                                               :{WHITE}Пло�ка зем�
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Генериране на пло�ка зем�
-STR_SE_RANDOM_LAND                                              :{WHITE}Случайна карта
-STR_SE_NEW_WORLD                                                :{BLACK}Създаване на нов �ценарий
-STR_SE_CAPTION                                                  :{WHITE}Тип на �ценари�
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Свал�не ви�очината на пло�ка зем�
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Повишаване ви�очината на пло�ка зем�
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Пром�на ви�очината на пло�ка зем�
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Ви�очина на пло�ка зем�:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% готово
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Генераци� на �в�т
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Генераци� на дърва
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Генераци� на �татични
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Създаване на твърда и �кална повърно�т
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}�а�тройка на играта
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Изпълн�ване цикъл на плочките
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Подготв�не на играта
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Това дей�твие промени нивото на трудно�т на custom
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Пло�ка зем�
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Генериране на пло�ка зем�
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Случайна карта
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Създаване на нов �ценарий
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Тип на �ценари�
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Свал�не ви�очината на пло�ка зем�
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Повишаване ви�очината на пло�ка зем�
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Пром�на ви�очината на пло�ка зем�
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Ви�очина на пло�ка зем�:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Центриране на малката карта на текущата позици�
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_NORTHWEST                                                   :{BLACK}Северозапад
-STR_NORTHEAST                                                   :{BLACK}Североизток
-STR_SOUTHEAST                                                   :{BLACK}Югоизток
-STR_SOUTHWEST                                                   :{BLACK}Югозапад
-STR_BORDER_WATER                                                :{BLACK}Вода
-STR_BORDER_RANDOM                                               :{BLACK}Случаен
-STR_BORDER_RANDOMIZE                                            :{BLACK}Случаен
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Северозапад
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Североизток
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Югоизток
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Югозапад
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Вода
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Случаен
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Случаен
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Малко
@@ -3316,21 +3316,21 @@ STR_MEASURE_AREA                                                :{BLACK}Площ
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Дължина: {NUM}{}Разлика във ви�очината: {NUM} м
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Площ: {NUM} x {NUM}{}Разлика във ви�очината: {NUM} м
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Сума за преме�тване: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...този път принадлежи на градът
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...път�т е на�очен в погрешната по�ока
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Опций на прозрачно�т
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Използвай прозрачно�т за знаци на гара
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Използвай прозрачно�т за дървета
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Използвай прозрачно�т за къщи
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Използвай прозрачно�т за промишлено�т
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Използвай прозрачно�т за �гради като гари, депа, пътни точки и ви��щи жици
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Използвай прозрачно�т за мо�тове
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Използвай прозрачно�т за �гради като фарове и антени, може би в бъдеще за укра�и
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}�ктивирай прозрачно�т за ви��щите. CTRL+клик за фик�иране.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Вклучи прозрачно�т за товарещи указатели
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}�аправи обектите невидими вме�то прозрачни
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Сума за преме�тване: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...този път принадлежи на градът
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...път�т е на�очен в погрешната по�ока
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Опций на прозрачно�т
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Използвай прозрачно�т за знаци на гара
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Използвай прозрачно�т за дървета
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Използвай прозрачно�т за къщи
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Използвай прозрачно�т за промишлено�т
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Използвай прозрачно�т за �гради като гари, депа, пътни точки и ви��щи жици
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Използвай прозрачно�т за мо�тове
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Използвай прозрачно�т за �гради като фарове и антени, може би в бъдеще за укра�и
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}�ктивирай прозрачно�т за ви��щите. CTRL+клик за фик�иране.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Вклучи прозрачно�т за товарещи указатели
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}�аправи обектите невидими вме�то прозрачни
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3340,7 +3340,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :В�ички влакове
 STR_GROUP_ALL_ROAD_VEHICLES                                     :В�ички пътни превозни �ред�тва
 STR_GROUP_ALL_SHIPS                                             :В�ички кораби
@@ -3349,24 +3349,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :БезгрупÐ
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Безгрупни пътни превозни �ред�тва
 STR_GROUP_DEFAULT_SHIPS                                         :Безгрупни кораби
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Безгрупни �амолети
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Добави �поделени превозни �ред�тва
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Премахни в�ички превозни �ред�ва
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Преименовай група
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Групата неможе да бъде �ъздадена...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Тази група неможе да бъде изтрита...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Групата неможе да бъде преименована...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}В�ички превозни �ред�тва немогат да бъдат премахнати от тази група...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Превозното �ред�тво неможе да �е добави към тази група...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Поделени превозни �ред�ва немогат да бъдат добавени към групата...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Групата неможе да бъде �ъздадена...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Тази група неможе да бъде изтрита...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Групата неможе да бъде преименована...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}В�ички превозни �ред�тва немогат да бъдат премахнати от тази група...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Превозното �ред�тво неможе да �е добави към тази група...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Поделени превозни �ред�ва немогат да бъдат добавени към групата...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Групи - Щракни на група за да видиш �пи�ък на в�ички превозни �ред�тва от тази група
-STR_GROUP_CREATE_TIP                                            :{BLACK}Щракни да �ъздадеш група
-STR_GROUP_DELETE_TIP                                            :{BLACK}Изтрий избраната група
-STR_GROUP_RENAME_TIP                                            :{BLACK}Преименувай избраната група
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Щракни да защитиш тази група от глобална автоматична зам�на
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Групи - Щракни на група за да видиш �пи�ък на в�ички превозни �ред�тва от тази група
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Щракни да �ъздадеш група
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Изтрий избраната група
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Преименувай избраната група
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Щракни да защитиш тази група от глобална автоматична зам�на
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3427,35 +3427,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Името тр�бва да е уникално
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Името тр�бва да е уникално
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Отиди до �ледващиат знак
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Отиди до предишниат знак
-STR_SIGN_OSKTITLE                                               :{BLACK}Въведете име за знакът
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Отиди до �ледващиат знак
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Отиди до предишниат знак
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Въведете име за знакът
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Фонд
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Пер�пектива
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}По�трои
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Избери правилната промишлено�т от �ледниат �пи�ък
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Фонд
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Пер�пектива
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}По�трои
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Избери правилната промишлено�т от �ледниат �пи�ък
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Hапреднат
-STR_FACE_ADVANCED_TIP                                           :{BLACK}�апредната лице �елекциа.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}�апредната лице �елекциа.
 STR_FACE_SIMPLE                                                 :{BLACK}Про�т
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Про�та лице �елекциа.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Про�та лице �елекциа.
 STR_FACE_LOAD                                                   :{BLACK}Отвар�не
-STR_FACE_LOAD_TIP                                               :{BLACK}Отвар�не на любимо лице
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Отвар�не на любимо лице
 STR_FACE_LOAD_DONE                                              :{WHITE}Твоето любимо лице е заредено от OpenTTD config файлът.
 STR_FACE_FACECODE                                               :{BLACK}�омер на лице на играч.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Виж и/или избери номер на лицето на играчът
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Виж и/или избери номер на лицето на играчът
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Виж и/или избери номер на лицето на играчът
 STR_FACE_FACECODE_SET                                           :{WHITE}�ов номер на лицето е избран.
 STR_FACE_FACECODE_ERR                                           :{WHITE}�ов номер на лицето неможе да бъде избран - тр�бва да бъде номер между 0 и 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Запази
-STR_FACE_SAVE_TIP                                               :{BLACK}Запази любимо лице
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Запази любимо лице
 STR_FACE_SAVE_DONE                                              :{WHITE}Това лице ще бъде запазено като твоето любимо в OpenTTD config файлът.
 STR_FACE_EUROPEAN                                               :{BLACK}Eвропеец
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Избери Европей�ки лица
@@ -3463,51 +3463,51 @@ STR_FACE_AFRICAN                                                :{BLACK}AфриÐ
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Избери �фрикан�ки лица
 STR_FACE_YES                                                    :Дa
 STR_FACE_NO                                                     :He
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Позволи му�так или обица
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Позволи му�так или обица
 STR_FACE_HAIR                                                   :Kо�а:
-STR_FACE_HAIR_TIP                                               :{BLACK}Cмени kocaтa
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Cмени kocaтa
 STR_FACE_EYEBROWS                                               :Вежди:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Смени веждите
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Смени веждите
 STR_FACE_EYECOLOUR                                              :Цв�т на очи:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Смени цветът на очите
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Смени цветът на очите
 STR_FACE_GLASSES                                                :Oчила:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Позволи oчила
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Cмени очилатa
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Позволи oчила
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Cмени очилатa
 STR_FACE_NOSE                                                   :Hoc:
-STR_FACE_NOSE_TIP                                               :{BLACK}Cмени но�ът
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Cмени но�ът
 STR_FACE_LIPS                                                   :У�тни:
 STR_FACE_MOUSTACHE                                              :Mу�так :
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Cмени у�тните или mу�такът
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Cмени у�тните или mу�такът
 STR_FACE_CHIN                                                   :Брада:
-STR_FACE_CHIN_TIP                                               :{BLACK}Cмени брадатa
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Cмени брадатa
 STR_FACE_JACKET                                                 :Cако:
-STR_FACE_JACKET_TIP                                             :{BLACK}Cмени cakoтo
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Cмени cakoтo
 STR_FACE_COLLAR                                                 :Яка:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Cмени �катa
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Cмени �катa
 STR_FACE_TIE                                                    :Вратовръзкa:
 STR_FACE_EARRING                                                :Oбица:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Cмени вратовръзкатa или oбицатa
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cмени вратовръзкатa или oбицатa
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Сигнал �елекци�
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Тук не може да �е конвертират �игналите...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}�ормален �игнал (�емафор){}Сигналите �а необходими за да предпазват влаковете от ката�трофи по ЖП мрежата.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Входен �игнал (�емафор){}Свети зелено докато има поне един зелен изходен �игнал от �ледващи� �егмент от път�. В противен �лучай �вети червено.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Изходен �игнал (�емафор){}Дей�тва като нормален �игнал, но е необходим за да работ�т входните и комбинираните �игнали.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Комбиниран �игнал (�емафор){}Комбинирани� �игнал дей�тва едновременно като входен и изходен �игнал. Това позвол�ва за изграждането на големи "дървета" от �игнали.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Маршрутизиращ знак(�емафор){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. През �тандартните �игнали може да �е преминава и в двете по�оки.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Еднопо�очен маршрутизиращ знак(�емафор){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. рез еднопо�очните �игнали може да �е премине �амо в едната по�ока.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}�ормален �игнал (електриче�ки){}Сигналите �а необходими за да предпазват влаковете от ката�трофи по ЖП мрежата.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Входен �игнал (електриче�ки){}Свети зелено докато има поне един зелен изходен �игнал от �ледващи� �егмент от път�. В противен �лучай �вети червено.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Изходен �игнал (електриче�ки){}Дей�тва като нормален �игнал, но е необходим за да работ�т входните и комбинираните �игнали.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Комбиниран �игнал (електриче�ки){}Комбинирани� �игнал дей�тва едновременно като входен и изходен �игнал. Това позвол�ва за изграждането на големи "дървета" от �игнали.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Маршрутизиращ знак(електриче�ки){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. През �тандартните �игнали може да �е преминава и в двете по�оки.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Еднопо�очен маршрутизиращ знак(електриче�ки){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. рез еднопо�очните �игнали може да �е премине �амо в едната по�ока.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Конвертиране на �игнал{}Когато е избран, нати�кането на �ъще�твуващ �игнал ще го конвертира в избрани� тип и вариант, CTRL-click ще �мени �ъще�твуващи� вариант.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Плътно�т на �игналите при влачене
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}�амал�ва плътно�та на �игналите при влачене
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Увеличава плътно�та на �игналите при влачене
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Сигнал �елекци�
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Тук не може да �е конвертират �игналите...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}�ормален �игнал (�емафор){}Сигналите �а необходими за да предпазват влаковете от ката�трофи по ЖП мрежата.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Входен �игнал (�емафор){}Свети зелено докато има поне един зелен изходен �игнал от �ледващи� �егмент от път�. В противен �лучай �вети червено.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Изходен �игнал (�емафор){}Дей�тва като нормален �игнал, но е необходим за да работ�т входните и комбинираните �игнали.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Комбиниран �игнал (�емафор){}Комбинирани� �игнал дей�тва едновременно като входен и изходен �игнал. Това позвол�ва за изграждането на големи "дървета" от �игнали.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Маршрутизиращ знак(�емафор){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. През �тандартните �игнали може да �е преминава и в двете по�оки.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Еднопо�очен маршрутизиращ знак(�емафор){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. рез еднопо�очните �игнали може да �е премине �амо в едната по�ока.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}�ормален �игнал (електриче�ки){}Сигналите �а необходими за да предпазват влаковете от ката�трофи по ЖП мрежата.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Входен �игнал (електриче�ки){}Свети зелено докато има поне един зелен изходен �игнал от �ледващи� �егмент от път�. В противен �лучай �вети червено.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Изходен �игнал (електриче�ки){}Дей�тва като нормален �игнал, но е необходим за да работ�т входните и комбинираните �игнали.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Комбиниран �игнал (електриче�ки){}Комбинирани� �игнал дей�тва едновременно като входен и изходен �игнал. Това позвол�ва за изграждането на големи "дървета" от �игнали.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Маршрутизиращ знак(електриче�ки){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. През �тандартните �игнали може да �е преминава и в двете по�оки.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Еднопо�очен маршрутизиращ знак(електриче�ки){}Маршрутизиращите знаци позвол�ват на повече от един влак да навл�зат в �игнален блок едновременно ако влаковете могат да резервират маршрут до безопа�но м��то. рез еднопо�очните �игнали може да �е премине �амо в едната по�ока.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Конвертиране на �игнал{}Когато е избран, нати�кането на �ъще�твуващ �игнал ще го конвертира в избрани� тип и вариант, CTRL-click ще �мени �ъще�твуващи� вариант.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Плътно�т на �игналите при влачене
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}�амал�ва плътно�та на �игналите при влачене
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Увеличава плътно�та на �игналите при влачене
 ########
 
 ############ on screen keyboard
@@ -3518,29 +3518,29 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!?+"%=:/_№І
 ############ AI GUI
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI �а�тройки
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Покажи AI на�тройки
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Име на AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Име на AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Презареждане AI
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Конфигураци�
-STR_AI_CHANGE                                                   :{BLACK}Изберете AI
-STR_AI_CONFIGURE                                                :{BLACK}Конфигуриране
-STR_AI_CHANGE_TIP                                               :{BLACK}Зареди друг AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Конфигурирайте параметрите на AI
-STR_AI_AILIST_TIP                                               :{BLACK}Кликнете за да изберете AI
-STR_AI_ACCEPT                                                   :{BLACK}Приеми
-STR_AI_CANCEL                                                   :{BLACK}Отмени
-STR_AI_CANCEL_TIP                                               :{BLACK}�е промен�й AI
-STR_AI_CLOSE                                                    :{BLACK}Затвари
-STR_AI_HUMAN_PLAYER                                             :Човешки играч
-STR_AI_RANDOM_AI                                                :Случаен AI
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Изберете AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Конфигуриране
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Зареди друг AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Конфигурирайте параметрите на AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Кликнете за да изберете AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Приеми
+STR_AI_LIST_CANCEL                                              :{BLACK}Отмени
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�е промен�й AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Затвари
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Човешки играч
+STR_AI_CONFIG_RANDOM_AI                                         :Случаен AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Параметри
-STR_AI_AUTHOR                                                   :{BLACK}�втор: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Вер�и�: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}�втор: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Вер�и�: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Лимит на шумът в градът: {ORANGE}{COMMA}{BLACK}  най-много: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Произведен шум: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Лимит на шумът в градът: {ORANGE}{COMMA}{BLACK}  най-много: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Произведен шум: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3549,21 +3549,21 @@ STR_CONTENT_TYPE_AI                                             :AI
 STR_CONTENT_TYPE_AI_LIBRARY                                     :AI библиотека
 STR_CONTENT_TYPE_SCENARIO                                       :Сценарий
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Вид
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Вид на �ъдържанието
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Вид на �ъдържанието
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Име
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Име на �ъдържанието
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Кликни върху лини�та за да видиш детайлите{}Сложи отметка за да избереш за �вал�не
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Име на �ъдържанието
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Кликни върху лини�та за да видиш детайлите{}Сложи отметка за да избереш за �вал�не
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Избери в�ички
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Избери в�ичко за �вал�не
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Избери в�ичко за �вал�не
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Избери обнов�вани�
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Избери в�ичко, което ще обновнови вече ин�тралирани компоненти
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Избери в�ичко, което ще обновнови вече ин�тралирани компоненти
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Премахнете в�ички
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Размаркирай в�ичко
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Размаркирай в�ичко
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Въведете филтър
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Въведете ключова дума за филтър на �пи�ъка
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Въведете ключова дума за филтър на �пи�ъка
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Филтър по таг/име:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Свал�не
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Започни �вал�нето на избраните модули
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Започни �вал�нето на избраните модули
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Общо за �вал�не: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}И�ФОРМ�ЦИЯ
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}�е �те избрали този модул за �вал�не
diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt
index 6f28f44de..8381c0fe5 100644
--- a/src/lang/catalan.txt
+++ b/src/lang/catalan.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mapa - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcions del Joc
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Missatge
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Missatge de {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Alerta!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Alerta!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}No es pot fer això....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}No es pot netejar l'àrea....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyright original {COPYRIGHT} 1995 Chris Sawyer, Tots els drets reservats
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 L'equip d'OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Surt
-STR_YES                                                         :{BLACK}Si
-STR_NO                                                          :{BLACK}No
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Si
+STR_QUIT_NO                                                     :{BLACK}No
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
 
 STR_JUST_NOTHING                                                :Res
 STR_COLOUR_DARK_BLUE                                            :Blau Fosc
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Desert
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Neu
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Missatge
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Predeterminat
-STR_QUERY_CANCEL                                                :{BLACK}Cancel·la
-STR_QUERY_OK                                                    :{BLACK}Bé
-STR_QUERY_RENAME                                                :{BLACK}Reanomena
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Predeterminat
+STR_BUTTON_CANCEL                                               :{BLACK}Cancel·la
+STR_BUTTON_OK                                                   :{BLACK}Bé
+STR_BUTTON_RENAME                                               :{BLACK}Reanomena
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Càrrega
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informació
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Capacitats
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Càrrega Total
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Càrrega total (capacitat) d'aquest tren:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Càrrega total (capacitat) d'aquest tren:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nou Joc
 STR_INTRO_LOAD_GAME                                             :{BLACK}Carrega un Joc
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Multijugador
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor d'Escenaris
 
-STR_MAPSIZE                                                     :{BLACK}Mida del mapa:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Mida del mapa:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opcions del Joc
 
 STR_COMPANY_SOMEONE                                             :algú{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Abandona el joc
 STR_FILE_MENU_EXIT                                              :Surt
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Estàs segur que vols abandonar aquest joc?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandona el Joc
-STR_SORT_ORDER_TIP                                              :{BLACK}Selecciona ordre de classificació (descendent/ascendent)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecciona criteri de classificació
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecciona el criteri de filtratge
-STR_SORT_BY                                                     :{BLACK}Ordenar per
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selecciona ordre de classificació (descendent/ascendent)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selecciona criteri de classificació
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selecciona el criteri de filtratge
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordenar per
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Població
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :Cost d'utilitza
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potència/Cost d'utilització
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacitat de càrrega
 
-STR_NO_WAITING_CARGO                                            :{BLACK}No hi ha càrrega d'aquest tipus esperant
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar totes les instal·lacions
-STR_SELECT_ALL_TYPES                                            :{BLACK}Selecciona tots els tipus de càrrega (incloent carga sense espera)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Veure una llista dels motors disponibles per aquest tipus de vehicle
-STR_MANAGE_LIST                                                 :{BLACK}Administra llista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Envia instruccions a tots els vehicles de la llista
-STR_REPLACE_VEHICLES                                            :Substitueix Vehicles
-STR_SEND_FOR_SERVICING                                          :Enviar a fer Revisió
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Disponibles
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicles Disponibles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Vaixells Disponibles
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Avions Disponibles
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Enviar a la Cotxera
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar a la Cotxera
-STR_SEND_SHIP_TO_DEPOT                                          :Enviar a la Drassana
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar a l'Hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}No hi ha càrrega d'aquest tipus esperant
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleccionar totes les instal·lacions
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Selecciona tots els tipus de càrrega (incloent carga sense espera)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Veure una llista dels motors disponibles per aquest tipus de vehicle
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Administra llista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Envia instruccions a tots els vehicles de la llista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Substitueix Vehicles
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Enviar a fer Revisió
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trens Disponibles
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Vehicles Disponibles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Vaixells Disponibles
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Avions Disponibles
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar a la Cotxera
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar a la Cotxera
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar a la Drassana
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar a l'Hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcions
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}No es pot canviar l'interval del manteniment...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Tanca la finestra
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Títol de la finestra - arrossega això per moure la finestra
-STR_STICKY_BUTTON                                               :{BLACK}Marca aquesta finestra com a no eliminable pel 'Tanca totes les Finestres'
-STR_RESIZE_BUTTON                                               :{BLACK}Prem i arrossega per canviar la mida de la finestra
+STR_TOOLTIP_STICKY                                              :{BLACK}Marca aquesta finestra com a no eliminable pel 'Tanca totes les Finestres'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Prem i arrossega per canviar la mida de la finestra
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Prem aquí per anar a la carpeta per defecte actual de desa/carrega
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Enderroca edificis, etc. en un quadre de terreny
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Rebaixa una cantonada del terreny
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Eleva una cantonada del terreny
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Rebaixa una cantonada del terreny
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Eleva una cantonada del terreny
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de desplaçament - desplaça la llista amunt/avall
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de desplaçament - desplaça la llista dreta/esquerra
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Mostra els límits de terreny al mapa
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Activa/d
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Benefici enguany: {CURRENCY} (darrer any: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} any{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} any{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} any{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} any{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Tren
-STR_VEHICLE_ROAD_VEHICLE                                        :Vehicle
-STR_VEHICLE_SHIP                                                :Vaixell
-STR_VEHICLE_AIRCRAFT                                            :Avió
+STR_REPLACE_VEHICLE_TRAIN                                       :Tren
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Vehicle
+STR_REPLACE_VEHICLE_SHIP                                        :Vaixell
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Avió
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} s'està fent vell
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} s'està fent molt vell
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} s'està fent molt vell i necessita ser substituït urgentment
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informació del terreny
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Cost de neteja: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Cost de neteja: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Ingressos en netejar: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Ingressos en netejar: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/D
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Propietari: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Propietari de la carretera: {LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Propieta
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoritat Local: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ningú
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nom
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Clica a
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Clica a la pista de música per treure-la del programa actual (Custom1 o Custom2 només)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Control de programa aleatori actiu/inactiu
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Mostra la finestra de selecció de pistes de música
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Clica al servei per centrar la vista a l'indústria/població
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clica al servei per centrar la vista a l'indústria/població
 STR_INTRO_DIFFICULTY                                            :{BLACK}Dificultat ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Darrer missatge/notícia
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Disminue
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Genera un terreny aleatori
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Restableix paisatge
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Restablir Paisatge
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Treure totes les propietats pertanyents a jugadors del mapa
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Treure totes les propietats pertanyents a jugadors del mapa
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Estàs segur que vols treure totes les propietats pertanyents a jugadors?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generació de Paisatges
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generació de Poblacions
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...massa
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...massa prop d'una altra població
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...lloc inadequat
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...massa poblacions
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Impossible construir poblacions
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...no queda espai al mapa
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Impossible construir poblacions
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...no queda espai al mapa
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Incrementa la mida de la població
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandeix
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}El poble no construirà carrers. Pots activar la construcció de carrers via Paràmetres avançats->Economia->Pobles.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}El poble no construirà carrers. Pots activar la construcció de carrers via Paràmetres avançats->Economia->Pobles.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Localitat Aleatòria
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construeix una població en un lloc aleatori
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Aquí no es pot construir {STRING}...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Situa à
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Situa un far
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Situa un repetidor
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Defineix àrea de desert.{}Prem i mantingues la tecla CTRL per treure'l
-STR_CREATE_LAKE                                                 :{BLACK}Defineix l'àrea d'aigua.{}Fa un canal, excepte si CTRL està polsat al nivell del mar, llavors s'inundaran els voltants
-STR_CREATE_RIVER                                                :{BLACK}Posa rius.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Defineix l'àrea d'aigua.{}Fa un canal, excepte si CTRL està polsat al nivell del mar, llavors s'inundaran els voltants
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Posa rius.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Esborra
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Esborra totalment aquesta població
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Desa l'escenari
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Carrega un escenari
-STR_MENU_LOAD_HEIGHTMAP                                         :Carrega Mapa d'alçades
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carrega Mapa d'alçades
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Surt de l'editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Surt
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Desa l'E
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Juga un Escenari
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Juga un mapa d'alçades
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Comença un nou joc, utilitzant un mapa d'alçades com a terreny
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Estàs segur que vols sortir d'aquest escenari ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...només es pot construir en poblacions de més de 1200 hab.
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Retarda la data d'inici 1 any
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Avança la data d'inici 1 any
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...els e
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Petit
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mitjà
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Gran
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Aleatori
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Aleatori
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciutat
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Les ciutats creixen més ràpid que els pobles normals{}Depenent de la configuració, són més grans quan es funden
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selecciona la mida de la població
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Mida de població:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Disposició de les carreteres del poble:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selecciona la disposició de les carreteres utilitzades per aquest poble
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Millors carreteres
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}graella 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}graella 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Aleatori
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposició de les carreteres del poble:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selecciona la disposició de les carreteres utilitzades per aquest poble
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Millors carreteres
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}graella 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}graella 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aleatori
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Mostra el darrer missatge o notícia
 STR_NEWS_MESSAGES_OFF                                           :Fora
 STR_NEWS_MESSAGES_SUMMARY                                       :Resum
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  EN
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Còpia de pantalla desada correctament a disc com a '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Error a la còpia de pantalla!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Compra un terreny per un ús posterior
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Compra un terreny per un ús posterior
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTO DESAR
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  DESANT JOC  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}S'està desant el joc,{}espera a que acabi l'operació!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}S'està desant el joc,{}espera a que acabi l'operació!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Selecciona el programa 'Ezy Street style music'
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Seleccio
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pantalla Completa
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marca la casella per tenir l'OpenTTD en pantalla completa
-STR_FULLSCREEN_FAILED                                           :{WHITE}El mode en pantalla completa ha fallat
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}El mode en pantalla completa ha fallat
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolució de Pantalla
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Selecciona la resolució de pantalla
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Seleccio
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} arxiu{P "" s} faltant{P "" s}/corromput{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informació adicional sobre el conjunt de gràfics base
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Ha fallat el desat automàtic
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Ha fallat el desat automàtic
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Cap a {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Cap a {STATION}, a {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sense ordres
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sense ordres, a {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Cap a {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Cap a {STATION}, a {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sense ordres
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sense ordres, a {VELOCITY}
 
 STR_PASSENGERS                                                  :passatgers
 STR_BAGS                                                        :sacs
@@ -857,9 +857,9 @@ STR_CRATES                                                      :palets
 STR_RES_OTHER                                                   :altres
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}No es pot compartir la llista d'ordres...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}No es pot copiar la llista d'ordres...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fi d'Ordres Compartides - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}No es pot compartir la llista d'ordres...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}No es pot copiar la llista d'ordres...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fi d'Ordres Compartides - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} no pot trobar un camí per on continuar.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} està perdut.
@@ -1128,15 +1128,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Mida-Y
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desactivat
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Canvia el valor de l'ajustament
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Canvia el valor de l'ajustament
 
-STR_TEMPERATE_LANDSCAPE                                         :paisatge temperat
-STR_SUB_ARCTIC_LANDSCAPE                                        :paisatge subàrtic
-STR_SUB_TROPICAL_LANDSCAPE                                      :paisatge subtropical
-STR_TOYLAND_LANDSCAPE                                           :paisatge de joguines
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :paisatge temperat
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :paisatge subàrtic
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :paisatge subtropical
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :paisatge de joguines
 
 STR_CHEATS                                                      :{WHITE}Trampes
-STR_CHEATS_TIP                                                  :{BLACK}Els quadres marcats indiquen que ja has fet servir aquesta trampa
+STR_CHEATS_TOOLTIP                                              :{BLACK}Els quadres marcats indiquen que ja has fet servir aquesta trampa
 STR_CHEATS_WARNING                                              :{BLACK}Atenció! Estàs a punt d'enredar als teus companys competidors. Pensa que una cosa així serà recordada per tota la eternitat!.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementa els diners en {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jugant com la companyia: {ORANGE}{COMMA}
@@ -1148,179 +1148,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Canvia
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Canvia la data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activa la modificació de valors de producció: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Cap a {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Cap a {WAYPOINT}, a {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Cap a {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Cap a {WAYPOINT}, a {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Ves via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ves sense parar via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ves via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ves sense parar via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Punt de Control
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Punt de Control #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Boia
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boia #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Punt de Control
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Punt de Control
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Punt de Control #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Boia
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boia #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Punt de Control
 
-STR_WAYPOINT                                                    :{WHITE}Punt de control
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selecciona tipus de punt de control
+STR_WAYPOINT_CAPTION                                            :{WHITE}Punt de control
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Selecciona tipus de punt de control
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Edita nom de punt de control
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}No es pot canviar el nom del punt de control...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}No es pot canviar el nom del punt de control...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Converteix una via a punt de control
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Aquí no es pot construir punt de control de tren...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Aquí no es pot treure punt de control de tren...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Aquí no es pot construir punt de control de tren...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Aquí no es pot treure punt de control de tren...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Construeix vies de tren utilitzant el mode Autorail
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...no hi ha poblacions en aquest escenari
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generació del mapa avortada...{}...no hi ha llocs adequats per als pobles
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...no hi ha poblacions en aquest escenari
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generació del mapa avortada...{}...no hi ha llocs adequats per als pobles
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Moltes poblacions aleatòries
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Omple el mapa amb poblacions situades aleatòriament
-STR_MANY_RANDOM_INDUSTRIES                                      :Moltes indústries aleatòries
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Omple el mapa amb indústries situades aleatòriament
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}No es poden generar indústries...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Moltes poblacions aleatòries
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Omple el mapa amb poblacions situades aleatòriament
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Moltes indústries aleatòries
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Omple el mapa amb indústries situades aleatòriament
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}No es poden generar indústries...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Obre la barra d'eines del terreny per elevar/rebaixar nivell, plantar arbres, etc.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Creació de paisatge
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Anivella el terreny
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Anivella el terreny
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbres de tipus aleatori
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Situar arbres de tipus aleatori
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Situar arbres de tipus aleatori
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Aquí no es poden construir canals...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Aquí no es poden construir canals...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Construir canals.
-STR_LANDINFO_CANAL                                              :Canal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Aquí no es pot construir una resclosa...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Aquí no es pot construir una resclosa...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Construeix rescloses
-STR_LANDINFO_LOCK                                               :Resclosa
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Resclosa
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Aquí no es poden posar rius...
-STR_LANDINFO_RIVER                                              :Riu
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Aquí no es poden posar rius...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Riu
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...boia en ús!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...boia en ús!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenades: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordenades: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}No es pot treure part de la estació...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Aquí no es pot convertir el tipus de via...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}No es pot treure part de la estació...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Aquí no es pot convertir el tipus de via...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converteix/Millora el tipus de via
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Arrossega la màquina de tren aquí per vendre el tren sencer
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Arrossega la màquina de tren aquí per vendre el tren sencer
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Arrossega i Deixa
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construeix una estació arrossegant i deixant
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecciona un tipus de estació a mostrar
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecciona el tipus de estació a construir
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Selecciona un tipus de estació a mostrar
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Selecciona el tipus de estació a construir
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avanç ràpid del joc
 STR_MESSAGE_HISTORY                                             :{WHITE}Històric de Missatges
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Llista de les notícies més recents
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Desactiva tots
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activa tots
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Llista de les notícies més recents
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desactiva tots
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activa tots
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nom de les indústries - clica al nom per centrar la vista a la indústria
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Indústries
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportat)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nom de les indústries - clica al nom per centrar la vista a la indústria
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...massa prop d'altres indústries
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...massa prop d'altres indústries
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Canvi de producció
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multijugador
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nom del jugador:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Aquest és el nom amb el que els altres jugadors t'identificaran
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Posa el teu nom
-STR_NETWORK_CONNECTION                                          :{BLACK}Connexió:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Tria entre jugar per internet o jugar en xarxa local
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Inicia el servidor
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Inicia en un servidor propi
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nom
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nom del joc
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versió de servidor, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Clica en un joc de la llista per triar-lo
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}El servidor en el que has entrat per darrera vegada:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Clica per seleccionar al servidor en el que has jugat per darrera vegada:
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Busca servidor
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Cercant un servidor a la xarxa
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Afegeix un servidor
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Afegeix un servidor a la llista que sempre es comprovarà per a jocs iniciats.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Entra l'adreça IP del servidor
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en línia / clients màxim{}Companyies en línia / companyies màxim
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Mida del Mapa
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Mida del mapa del joc{}Clica per ordenar l'àrea
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data actual
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anys
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombre d'anys{}el joc està corrent
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓ DEL JOC
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Grup de cel·les: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Mida del mapa: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versió del servidor: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreça del servidor: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data inicial: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protegit per contrasenya!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR DESCONNECTAT
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR PLÉ
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}LA VERSIÓ NO COINCIDEIX
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NO COINCIDÈNCIA DE NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Connectar-se al joc
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Inicia un nou joc multijugador
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nom del joc:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}El nom del joc es mostrarà a altres jugadors en el menú de selecció de joc multijugador
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Posa el nom del joc per xarxa
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Posa una contrasenya
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protegeix el teu joc amb una contrasenya si no vols que d'altre gent el pugui utilitzar
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selecciona un mapa:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}amb quin mapa vols jugar?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (anunci)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max clients:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Tria el nombre màxim de clients. No és necessari omplir tots els llocs.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} companyi{P a es}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Màx companyies:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limita el servidor a un cert nombre de companyies
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Màx espectadors:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limita el servidor a un cert nombre de espectadors
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma parlat:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Els altres jugadors sabran quin idioma es parla en aquest servidor.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Inicia el Joc
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Inicia un nou joc de xarxa des de un mapa aleatori, o escenari
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Carrega Joc
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Continua amb un joc multijugador desat prèviament (comprova que estàs connectat amb el jugador correcte)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijugador
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Posa el teu nom
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Connexió:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Tria entre jugar per internet o jugar en xarxa local
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Inicia el servidor
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Inicia en un servidor propi
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nom
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nom del joc
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Idioma, versió de servidor, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Clica en un joc de la llista per triar-lo
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}El servidor en el que has entrat per darrera vegada:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Clica per seleccionar al servidor en el que has jugat per darrera vegada:
+
+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 a jocs iniciats.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Entra l'adreça IP del servidor
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clients
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clients en línia / clients màxim{}Companyies en línia / companyies màxim
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Mida del Mapa
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Mida del mapa del joc{}Clica per ordenar l'àrea
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Data actual
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Anys
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Nombre d'anys{}el joc està corrent
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFORMACIÓ DEL JOC
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Grup de cel·les: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Mida del mapa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versió del servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adreça del servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data inicial: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data actual: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protegit per contrasenya!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR DESCONNECTAT
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR PLÉ
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}LA VERSIÓ NO COINCIDEIX
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NO COINCIDÈNCIA DE NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Connectar-se al joc
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Inicia un nou joc multijugador
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nom del joc:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}El nom del joc es mostrarà a altres jugadors en el menú de selecció de joc multijugador
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Posa el nom del joc per xarxa
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Posa una contrasenya
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protegeix el teu joc amb una contrasenya si no vols que d'altre gent el pugui utilitzar
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Selecciona un mapa:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}amb quin mapa vols jugar?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (anunci)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max clients:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Tria el nombre màxim de clients. No és necessari omplir tots els llocs.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} companyi{P a es}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Màx companyies:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limita el servidor a un cert nombre de companyies
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Màx espectadors:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limita el servidor a un cert nombre de espectadors
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Idioma parlat:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Els altres jugadors sabran quin idioma es parla en aquest servidor.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Inicia el Joc
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Inicia un nou joc de xarxa des de un mapa aleatori, o escenari
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Carrega Joc
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Continua amb un joc multijugador desat prèviament (comprova que estàs connectat amb el jugador correcte)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Qualsevol
@@ -1361,33 +1361,33 @@ STR_NETWORK_LANG_GREEK                                          :Grec
 STR_NETWORK_LANG_LATVIAN                                        :Letó
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Lobby de partida multijugador
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Lobby de partida multijugador
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparant per connectar: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Una llista de totes les empreses actuals en aquest joc. Pots utilitzar-ne una o bé iniciar-ne una de nova si hi ha algun lloc lliure
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova Empresa
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Obre una nova Empresa
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Espectador
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Veure el joc com a espectador
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Uneix-te a la companyia
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Ajuda a gestionar aquesta companyia
-STR_NETWORK_REFRESH                                             :{BLACK}Actualitza servidor
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualitza la informació del servidor
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparant per connectar: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Una llista de totes les empreses actuals en aquest joc. Pots utilitzar-ne una o bé iniciar-ne una de nova si hi ha algun lloc lliure
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova Empresa
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Obre una nova Empresa
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Espectador
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Veure el joc com a espectador
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Uneix-te a la companyia
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Ajuda a gestionar aquesta companyia
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualitza servidor
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualitza la informació del servidor
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMACIÓ DE L'EMPRESA
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFORMACIÓ DE L'EMPRESA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom companyia: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguració: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valor de la companyia: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanç actual: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingressos de l'últim any: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendiment: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nom companyia: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguració: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valor de la companyia: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balanç actual: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Ingressos de l'últim any: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Rendiment: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estacions: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Jugadors: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Estacions: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Jugadors: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Connectant...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Connectant...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connectant..
@@ -1403,49 +1403,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Obtenint
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} rivals
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} descarregats fins ara
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Desconnecta
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconnecta
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introdueix la quantitat de diners que vols donar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegit. Entra la contrasenya
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Entra la contrasenya
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Llista de Clients
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Llista de Clients
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Espectador
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Companyia
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}No s'han trobat dispositius de xarxa o s'ha compilat sense l'opció ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}No s'ha pogut trobar cap joc en xarxa
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}El servidor no ha contestat a la petició
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}No s'ha pogut connectar degut a una diferència de NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Ha fallat la sincronització del joc en xarxa.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}S'ha perdut la connexió al joc en xarxa.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}No s'ha pogut carregar el joc desat
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}No s'ha pogut iniciar el servidor
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}No s'ha pogut connectar
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}La connexió #{NUM} ha esgotat el temps d'espera
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}S'ha obtingut un error de protocol i s'ha tancat la connexió
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}La revisió d'aquest client no concorda amb la revisió del servidor
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Contrasenya incorrecta
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}El servidor està ple
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Estàs exclòs d'aquest servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE}T'han fet fora del joc
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}No es permet fer trampes en aquest servidor
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}No s'han trobat dispositius de xarxa o s'ha compilat sense l'opció ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}No s'ha pogut trobar cap joc en xarxa
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}El servidor no ha contestat a la petició
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}No s'ha pogut connectar degut a una diferència de NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Ha fallat la sincronització del joc en xarxa.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}S'ha perdut la connexió al joc en xarxa.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}No s'ha pogut carregar el joc desat
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}No s'ha pogut iniciar el servidor
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}No s'ha pogut connectar
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}La connexió #{NUM} ha esgotat el temps d'espera
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}S'ha obtingut un error de protocol i s'ha tancat la connexió
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}La revisió d'aquest client no concorda amb la revisió del servidor
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Contrasenya incorrecta
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}El servidor està ple
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Estàs exclòs d'aquest servidor
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}T'han fet fora del joc
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}No es permet fer trampes en aquest servidor
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :error general
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :error de sincronització
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :no es pot carregar el mapa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connexió perduda
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :error de protocol
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Diferència NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :no autoritzat
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :s'ha rebut un paquet estrany
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisió incorrecta
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nom ja utilitzat
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasenya incorrecta
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :id-companyia erroni en DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :tret pel servidor
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :s'ha intentat utilitzar una trampa
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor ple
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :error general
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :error de sincronització
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :no es pot carregar el mapa
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connexió perduda
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :error de protocol
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Diferència NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :no autoritzat
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :s'ha rebut un paquet estrany
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :revisió incorrecta
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nom ja utilitzat
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :contrasenya incorrecta
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :id-companyia erroni en DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :tret pel servidor
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :s'ha intentat utilitzar una trampa
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor ple
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1455,15 +1455,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Joc en pausa (c
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Joc en marxa (client connectat)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Joc en marxa (el client no s'ha pogut connectar)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :deixant
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} s'ha unit al joc
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} s'ha unit a la companyia #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} s'ha unit als espectadors
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ha començat una nova companyia (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} ha deixat el joc ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} ha canviat el seu nom a {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} ha donat a la teva companyia {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Has donat {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :deixant
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} s'ha unit al joc
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} s'ha unit a la companyia #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} s'ha unit als espectadors
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ha començat una nova companyia (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ha deixat el joc ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ha canviat el seu nom a {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} ha donat a la teva companyia {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Has donat {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] a {STRING}: {WHITE}{STRING}
@@ -1473,8 +1473,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privat] A {STR
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Posa el text pel xat de xarxa
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} El servidor ha tancat la sessió
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} El servidor està reiniciant...{}Espera un moment...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} El servidor ha tancat la sessió
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} El servidor està reiniciant...{}Espera un moment...
 
 STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Client
@@ -1488,19 +1488,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Parla a l'Empre
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Missatge Privat
 
 
-STR_NETWORK_SEND                                                :{BLACK}Envia
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Envia
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Impossible carregar un terreny des del PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fitxer no trobat.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...no s'ha pogut convertir la imatge. Es necessita una imatge PNG de 8 o 24-bit.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...alguna cosa ha anat malament. Ho sento. (probablement un fitxer corrupte)
+STR_ERROR_PNGMAP                                                :{WHITE}Impossible carregar un terreny des del PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fitxer no trobat.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...no s'ha pogut convertir la imatge. Es necessita una imatge PNG de 8 o 24-bit.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...alguna cosa ha anat malament. Ho sento. (probablement un fitxer corrupte)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Impossible carregar el terreny des del BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...no s'ha pogut convertir la imatge.
+STR_ERROR_BMPMAP                                                :{WHITE}Impossible carregar el terreny des del BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...no s'ha pogut convertir la imatge.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Cost: {CURRENCY}
@@ -1514,13 +1514,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Ingresso
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Aquí no es pot elevar el terreny...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Aquí no es pot rebaixar el terreny...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Aquí no es pot anivellar...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Roques
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Terreny Irregular
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Terreny erm
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gespa
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Camps
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Terreny nevat
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Desert
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Roques
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Terreny Irregular
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terreny erm
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gespa
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Camps
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Terreny nevat
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Desert
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Terreny inclinat en direcció incorrecta
@@ -1528,11 +1528,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Combinac
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}La excavació pot malmetre el túnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Ja ets a nivell del mar
 STR_ERROR_TOO_HIGH                                              :{WHITE}Massa alt
-STR_ALREADY_LEVELLED                                            :{WHITE}... ja és pla
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... ja és pla
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Via de tren no apropiada
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...ja construït
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}S'ha de treure la via primer
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}La carretera és un d'un sol sentit o està bloquejada
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}La carretera és un d'un sol sentit o està bloquejada
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Construcció de Ferrocarril
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Construcció de Ferrocarril Elèctric
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Construcció de Monorail
@@ -1556,44 +1556,44 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Construe
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Construeix un pont de tren
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Construeix túnel de tren
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Intercanvia funció construeix/treu per vies de tren i senyals
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Selecció de pont - clica al pont triat per construir-lo
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selecció de pont - clica al pont triat per construir-lo
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona l'orientació de les cotxeres de tren
-STR_RAILROAD_TRACK                                              :Via de tren
-STR_RAILROAD_TRAIN_DEPOT                                        :Cotxeres de tren
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Via de tren
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Cotxeres de tren
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...l'àrea és propietat d'una altra companyia
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Via de tren amb senyals tram
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Via de tren amb pre-senyals
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Via de tren amb senyals de sortida
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Via de tren amb senyals combinades
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Via de tren amb senyals de camí
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Via de tren amb senyals de camí d'un sentit
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Via de tren amb senyals tram i pre-senyals
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Via de tren amb senyals tram i senyals de sortida
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Via de tren amb senyals tram i senyals combinades
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Via de tren amb senyals tram i de camí
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Via de tren amb senyals tram i de camí d'un sentit
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Via de tren amb pre-senyals i senyals de sortida
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Via de tren amb pre-senyals i senyals combinades
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Via de tren amb senyals pre- i de camí
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Via de tren amb senyals pre- i de camí d'un sentit
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Via de tren amb senyals de sortida i senyals combinades
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Via de tren amb senyals sortida- i de camí
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Via de tren amb senyals sortida- i de camí d'un sentit
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Via de tren amb senyals combo- i de camí
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Via de tren amb senyals combo- i de camí d'un sentit
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Via de tren amb senyals de camí i de camí d'un sentit
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Primer has de treure la via de l'estació
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Primer s'ha de treure la via punt de control
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construir una estació separada
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Construeix un punt de control separat
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Ajuntar estació
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Uneix punt de control
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Via de tren amb senyals tram
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Via de tren amb pre-senyals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Via de tren amb senyals de sortida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Via de tren amb senyals combinades
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Via de tren amb senyals de camí
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Via de tren amb senyals de camí d'un sentit
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Via de tren amb senyals tram i pre-senyals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Via de tren amb senyals tram i senyals de sortida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Via de tren amb senyals tram i senyals combinades
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Via de tren amb senyals tram i de camí
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Via de tren amb senyals tram i de camí d'un sentit
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Via de tren amb pre-senyals i senyals de sortida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Via de tren amb pre-senyals i senyals combinades
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Via de tren amb senyals pre- i de camí
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Via de tren amb senyals pre- i de camí d'un sentit
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Via de tren amb senyals de sortida i senyals combinades
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Via de tren amb senyals sortida- i de camí
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Via de tren amb senyals sortida- i de camí d'un sentit
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Via de tren amb senyals combo- i de camí
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Via de tren amb senyals combo- i de camí d'un sentit
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Via de tren amb senyals de camí i de camí d'un sentit
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Primer has de treure la via de l'estació
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Primer s'ha de treure la via punt de control
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construir una estació separada
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Construeix un punt de control separat
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Ajuntar estació
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Uneix punt de control
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}S'ha de treure la carretera primer
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Obres en progrés
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Obres en progrés
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Construcció de Carreteres
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Construcció de Tramvies
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecciona un Pont per Carretera
@@ -1629,14 +1629,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Construe
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Activa/Desactiva les carreteres d'un sentit
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Intercanvia funció construeix/treu per la construcció de carreteres
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Canvia construeix/treu de la construcció de vies de tramvia
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Selecciona l'orientació de les cotxeres
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Selecciona l'orientació de les cotxeres de tramvies
-STR_ROAD_DESCRIPTION_ROAD                                       :Carretera
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Carretera amb fanals
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Carretera de tres carrils
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Cotxeres
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Pas a nivell
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Rail de Tramvia
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecciona l'orientació de les cotxeres
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecciona l'orientació de les cotxeres de tramvies
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Carretera
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Carretera amb fanals
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Carretera de tres carrils
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Cotxeres
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Pas a nivell
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Rail de Tramvia
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}No es pot treure l'estació d'autobusos...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}No es pot treure l'estació de camions...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}No puc treure l'estació de tramvies de passatgers
@@ -1644,12 +1644,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}No puc t
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Poblacions
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}L'edifici s'ha d'enderrocar primer
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Ciutat)
@@ -1662,9 +1662,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centra l
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Canvia el nom de la població
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passatgers el darrer mes: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Correu el darrer mes: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Càrrega requerida per tal de que el poble creixi:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} requerides
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} lliurades el darrer mes
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Càrrega requerida per tal de que el poble creixi:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} requerides
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} lliurades el darrer mes
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloc d'oficines alt
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Bloc d'oficines
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Petit bloc d'apartaments
@@ -1701,7 +1701,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subvenció per Servei concedida a {STRING}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el triple de la tarifa durant el pròxim any!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subvenció per Servei concedida a {STRING}!{}{} Servei de {STRING} des de {STATION} fins a {STATION} percebrà el quàdruple de la tarifa durant el pròxim any!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} l'autoritat local denega el permís de construir un altre aeroport en aquesta població
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}L'autoritat local de {TOWN} rebutja donar el permís per a l'aeroport degut al soroll que causaria
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}L'autoritat local de {TOWN} rebutja donar el permís per a l'aeroport degut al soroll que causaria
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Xalets
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Cases
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Apartaments
@@ -1737,7 +1737,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Caos de trànsit en  {TOWN}!{}{}El programa de rehabilitació dels carrers patrocinat per {STRING} porta 6 mesos de misèria als motoristes!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (en construcció)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (en construcció)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglú
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipis
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Casa-Tetera
@@ -1750,17 +1750,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Situa una senya
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Arbres
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...aquí ja hi ha arbres
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Aquí no es poden plantar arbres...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...massa senyals
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Aquí no es pot situar una senyal...
-STR_SIGN_DEFAULT                                                :Senyal
+STR_DEFAULT_SIGN_NAME                                           :Senyal
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edita el text de la senyal
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}No es pot canviar el nom del senyal...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}La senyal no es pot esborrar...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecciona el tipus d'arbre a plantar
-STR_TREE_NAME_TREES                                             :Arbres
-STR_TREE_NAME_RAINFOREST                                        :Selva Tropical
-STR_TREE_NAME_CACTUS_PLANTS                                     :Plantes de Cactus
+STR_LAI_TREE_NAME_TREES                                         :Arbres
+STR_LAI_TREE_NAME_RAINFOREST                                    :Selva Tropical
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Plantes de Cactus
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Estacions de Tren
@@ -1782,7 +1782,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Primer h
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Massa prop d'un altre aeroport
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Primer has d'enderrocar l'aeroport
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Reanomena l'estació/àrea de càrrega
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Reanomena l'estació/àrea de càrrega
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}No es pot reanomenar l'estació...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ratis
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepta
@@ -1800,10 +1800,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Excepcional
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostra tots els trens que tinguin aquesta estació en el seu itinerari
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostra tots els vehicles que tinguin aquesta estació en el seu itinerari
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostra tots els avions que tinguin aquest aeroport en el seu itinerari
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostra tots els vaixells que tinguin aquest port en el seu itinerari
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} ja no accepta més {STRING}
@@ -1839,47 +1839,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Canvia e
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Mostra la llista de càrregues admeses
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Noms d'estació - clica al nom per centrar la vista principal a l'estació
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Selecciona mida/tipus d'aeroport
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Estació de Ferrocarril
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar d'Avions
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeroport
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Àrea de càrrega de camions
-STR_STATION_DESCRIPTION_BUS_STATION                             :Parada d'autobús
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Moll per vaixells
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Estació de Ferrocarril
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar d'Avions
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeroport
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Àrea de càrrega de camions
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Parada d'autobús
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Moll per vaixells
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Marcar l'àrea de cobertura del lloc proposat
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}No marcar l'àrea de cobertura del lloc proposat
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Marca l'àrea de cobertura
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Moll
-STR_STATION_DESCRIPTION_BUOY                                    :Boia
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boia
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boia en el camí
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...estació massa extensa
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...estacions no uniformes desactivades
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Mantingues polsat CTRL per a seleccionar més d'un ítem
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...estacions no uniformes desactivades
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Mantingues polsat CTRL per a seleccionar més d'un ítem
 
 STR_UNDEFINED                                                   :(cadena sense definir)
-STR_STAT_CLASS_DFLT                                             :Estació per defecte
-STR_STAT_CLASS_WAYP                                             :Punt de pas
+STR_STATION_CLASS_DFLT                                          :Estació per defecte
+STR_STATION_CLASS_WAYP                                          :Punt de pas
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Drassanes
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...s'han de construir dins l'aigua
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Aquí no es pot construir una drassana...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Selecciona l'orientació de la drassana
-STR_WATER_DESCRIPTION_WATER                                     :Aigua
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Costa o marge de riu
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Drassana
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aqüeducte
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Aigua
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Costa o marge de riu
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Drassana
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqüeducte
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...No es pot construir dins l'aigua
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Has de demolir el canal primer
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Has de demolir el canal primer
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Desa el Joc
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Carrega un Joc
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Desa
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Esborra
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Espectador, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} lliures
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Impossible llegir la unitat de disc
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Desat del Joc erroni{}{STRING}
@@ -1895,12 +1895,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Llista d
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nom actualment seleccionat per joc desat
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Esborra el joc desat actualment seleccionat
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Desa el joc actual, usant el nom seleccionat
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Genera un nou joc aleatori
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Carrega un Mapa d'alçades
-STR_SAVE_OSKTITLE                                               :{BLACK}Posa el nom pel joc desat
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Genera un nou joc aleatori
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carrega un Mapa d'alçades
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Posa el nom pel joc desat
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} en el camí
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} en el camí
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Mina de Carbó
 STR_INDUSTRY_NAME_POWER_STATION                                 :Central Tèrmica
@@ -1958,7 +1958,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centra la vista principal al lloc de l'indústria
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Nou/nova {STRING} en construcció prop de {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}S'està plantant un nou {STRING} prop de {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cost: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cost: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Aquí no es pot construir aquest tipus d'indústria...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...els boscos només es poden plantar sota la cota de neu
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} anuncia el seu imminent tancament!
@@ -1976,16 +1976,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Un altre túnel en el camí
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}El túnel acabarà fora del mapa
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}El túnel acabarà fora del mapa
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Impossible excavar la terra a l'altre extrem del túnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Primer has d'enderrocar el túnel
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Primer has d'enderrocar el pont
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}No es pot començar i acabar a la mateixa posició
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Les capçaleres del pont no són al mateix nivell
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}El pont és massa baix pel terreny
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}No es pot començar i acabar a la mateixa posició
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Les capçaleres del pont no són al mateix nivell
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}El pont és massa baix pel terreny
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Inici i final han d'estar en línia recta
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Lloc inadequat per l'entrada del túnel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensió, Acer
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Biga, Acer
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Volada, Acer
@@ -1996,30 +1996,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Tubular, Acer
 STR_BRIDGE_TUBULAR_SILICON                                      :Tubular, Silicona
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Aquí no es pot construir el pont...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Aquí no es pot construir el túnel...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Túnel ferroviari
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Túnel de carretera
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Pont ferroviari en suspensió d'acer
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Pont ferroviari de biga d'acer
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Pont ferroviari de volada d'acer
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Pont ferroviari en suspensió de formigó reforçat
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Pont ferroviari de fusta
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Pont ferroviari de formigó
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Pont de carretera en suspensió d'acer
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Pont de carretera de biga d'acer
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Pont de carretera de volada d'acer
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Pont de carretera en suspensió de formigó reforçat
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Pont de carretera de fusta
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Pont de carretera de formigó
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Pont ferroviari tubular
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Pont de carretera tubular
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Túnel ferroviari
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel de carretera
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Pont ferroviari en suspensió d'acer
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Pont ferroviari de biga d'acer
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Pont ferroviari de volada d'acer
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Pont ferroviari en suspensió de formigó reforçat
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Pont ferroviari de fusta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Pont ferroviari de formigó
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Pont de carretera en suspensió d'acer
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Pont de carretera de biga d'acer
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Pont de carretera de volada d'acer
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Pont de carretera en suspensió de formigó reforçat
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Pont de carretera de fusta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Pont de carretera de formigó
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Pont ferroviari tubular
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Pont de carretera tubular
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objecte en el camí
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Repetidor
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Far
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Seu de l'Empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Repetidor
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Far
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Seu de l'Empresa
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...seu en el camí
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :terreny propietat de l'Empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :terreny propietat de l'Empresa
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}No pots comprar aquesta àrea de terreny...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...ja és propietat teva!
 
@@ -2067,7 +2067,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Estaci
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Nivell de Dificultat
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Desa
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Desa
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Fàcil
@@ -2140,8 +2140,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Esquema d
 STR_LIVERY_CAPTION                                              :{WHITE}Nou esquema de color
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Nom Empresa
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Nom President
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nom Empresa
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nom President
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nom Empresa
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nom President
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}No es pot canviar el nom de la companyia...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}No es pot canviar el nom de president...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Economia {BLACK}{COMPANYNUM}
@@ -2165,11 +2165,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Gràfic d'Ingressos
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Gràfic de Rendiment d'Operacions
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanç del Banc
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Préstec
-STR_MAX_LOAN                                                    :{WHITE}Préstec Màxim: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Préstec Màxim: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Demana {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Amortitza {SKIP}{SKIP}{CURRENCY}
@@ -2178,7 +2178,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}No pots
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...No queda préstec per amortitzar
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} necessari
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}No es pot amortitzar préstec...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}No es poden regalar els diners deixats pel banc...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}No es poden regalar els diners deixats pel banc...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Selecciona una nova cara pel president
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Canvia l'aspecte dels vehicles de la companyia
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Canvia el nom del president
@@ -2188,10 +2188,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Amortitz
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(President)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurat: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehicles:
-STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} automòbil{P "" s}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} avió{P "" ns}
-STR_SHIPS                                                       :{WHITE}{COMMA} vaixell{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automòbil{P "" s}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} avió{P "" ns}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} vaixell{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Cap
 STR_FACE_CAPTION                                                :{WHITE}Selecció de cares
 STR_FACE_MALE_BUTTON                                            :{BLACK}Home
@@ -2204,9 +2204,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Seleccio
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Genera una nova cara aleatòria
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Llegenda
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Mostra la llegenda als gràfics
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Mostra ratis de rendiment detallats
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Mostra ratis de rendiment detallats
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Llegenda dels gràfics de la companyia
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Clica aquí per activar/desactivar l'entrada als gràfics de la companyia
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clica aquí per activar/desactivar l'entrada als gràfics de la companyia
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Unitats de càrrega entregada
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Ratis de rendiment de la companyia (màxim rati=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Valors de la companyia
@@ -2240,23 +2240,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnat
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir Seu
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construir seu de la companyia / veure seu de la companyia
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Trasllada la seu de la companyia a un altre lloc amb el cost d'un 1% del seu valor
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Trasllada la seu de la companyia a un altre lloc amb el cost d'un 1% del seu valor
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}No es pot construir la seu de la companyia...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Veure Seu
-STR_RELOCATE_HQ                                                 :{BLACK}Trasllada la Seu
-STR_COMPANY_JOIN                                                :{BLACK}Unir-se
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Unir-se i jugar amb aquesta companyia
-STR_COMPANY_PASSWORD                                            :{BLACK}Contrasenya
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Protegeix la teva Empresa amb contrasenya per tal d'evitar que la utilitzin usuaris no autoritzats.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Estableix la contrasenya de l'Empresa
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Trasllada la Seu
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Unir-se
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Unir-se i jugar amb aquesta companyia
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Contrasenya
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Protegeix la teva Empresa amb contrasenya per tal d'evitar que la utilitzin usuaris no autoritzats.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Estableix la contrasenya de l'Empresa
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No desis la contrasenya introduïda
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Dóna a la companyia una nova contrasenya
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Contrasenya de la companyia
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Contrasenya de la companyia predeterminada
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Utilitza la contrasenya d'aquesta companyia com a predeterminada per a noves companyies
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Contrasenya de la companyia predeterminada
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Utilitza la contrasenya d'aquesta companyia com a predeterminada per a noves companyies
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Recessió Mundial!{}{}Economistes experts temen que l'economia es desplomi!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Recessió Acabada!{}{}La millora als negocis dóna confiança a les indústries a la vegada que l'economia s'enforteix!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Intercanvia mida gran/petita de finestra
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Intercanvia mida gran/petita de finestra
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor de l'Empresa: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Compra un 25% d'accions
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vendre un 25% d'accions
@@ -2266,7 +2266,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}No pots
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}No pots vendre el 25% de participació en aquesta companyia...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propietat de {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} ha estat absorbida per {STRING}!
-STR_PROTECTED                                                   :{WHITE}Aquesta companyia ja no negocia participacions...
+STR_ERROR_PROTECTED                                             :{WHITE}Aquesta companyia ja no negocia participacions...
 
 STR_LIVERY_DEFAULT                                              :Decoració estàndard
 STR_LIVERY_STEAM                                                :Motor de vapor
@@ -2292,14 +2292,14 @@ STR_LIVERY_LARGE_PLANE                                          :Avió gran
 STR_LIVERY_PASSENGER_TRAM                                       :Tramvia de passatgers
 STR_LIVERY_FREIGHT_TRAM                                         :Tramvia de càrrega
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Mostra esquemes de colors generals
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Mostra els esquemes de colors dels trens
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Mostra els esquemes de colors dels automòbils
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Mostra els esquemes de colors dels vaixells
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Mostra esquemes de colors dels avions
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Escolleix el color primari per l'esquema triat
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Escolleix el color secundari per l'esquema triat
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Selecciona un esquema de colors per canviar-lo, o diversos esquemes amb CTRL+Clic. Clica a la casella per canviar l'esquema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Mostra esquemes de colors generals
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Mostra els esquemes de colors dels trens
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Mostra els esquemes de colors dels automòbils
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Mostra els esquemes de colors dels vaixells
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Mostra esquemes de colors dels avions
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Escolleix el color primari per l'esquema triat
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Escolleix el color secundari per l'esquema triat
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selecciona un esquema de colors per canviar-lo, o diversos esquemes amb CTRL+Clic. Clica a la casella per canviar l'esquema
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Vapor)
@@ -2607,9 +2607,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(No descarregui
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Canvia el comportament de parada de l'ordre remarcada
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Canvia el comportament de càrrega de l'ordre remarcada
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Canvia el comportament de descàrrega de l'ordre remarcada
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Insereix una ordre avançada
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Insereix una ordre avançada
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ves al dipòsit més proper
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ves a l'hangar més proper
 STR_ORDER_NEAREST_DEPOT                                         :el més proper
@@ -2619,9 +2619,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Revisió sense
 STR_ORDER_TRAIN_DEPOT                                           :Cotxeres de tren
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Cotxera de Vehicles
 STR_ORDER_SHIP_DEPOT                                            :Drassanes
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ves sempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Revisa si és necessari
@@ -2646,10 +2646,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :és més gran q
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :és més gran o igual que
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :és verdader
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :és fals
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :salta a l'ordre {COMMA}
-STR_CONDITIONAL_NUM                                             :Salta a l'ordre {COMMA} quan {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Salta a l'ordre {COMMA} quan {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :salta a l'ordre {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Salta a l'ordre {COMMA} quan {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Salta a l'ordre {COMMA} quan {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Sense viatge
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viatge (fora d'horari)
@@ -2672,18 +2672,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Els tren
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Salta
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Esborra
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ves a
-STR_REFIT                                                       :{BLACK}Remodela
-STR_REFIT_TIP                                                   :{BLACK}Selecciona quin tipus de càrrega vols remodelar en aquesta ordre. Control+Clic per eliminar l'ordre de remodelar
-STR_REFIT_ORDER                                                 :(Remodela a {STRING})
-STR_REFIT_STOP_ORDER                                            :(Remodela a {STRING} i para)
-STR_STOP_ORDER                                                  :(Para)
-STR_TIMETABLE_VIEW                                              :{BLACK}Horari
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Canvia cap a la vista d'horari
-STR_ORDER_VIEW                                                  :{BLACK}Ordres
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Commuta l'ordre de la vista
+STR_ORDER_REFIT                                                 :{BLACK}Remodela
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecciona quin tipus de càrrega vols remodelar en aquesta ordre. Control+Clic per eliminar l'ordre de remodelar
+STR_ORDER_REFIT_ORDER                                           :(Remodela a {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Remodela a {STRING} i para)
+STR_ORDER_STOP_ORDER                                            :(Para)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horari
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Canvia cap a la vista d'horari
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordres
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Commuta l'ordre de la vista
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordres)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fi d'Ordres - -
-STR_SERVICE                                                     :{BLACK}Servei
+STR_ORDER_SERVICE                                               :{BLACK}Servei
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construït: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2703,7 +2703,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}el vehic
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un vehicle que comparteix aquesta ordre no pot anar a aquesta estació
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}No es pot moure el vehicle...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}La màquina posterior sempre ha de seguir la seva parella davantera
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Incapaç de trobar el camí a la cotxera local
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}dies{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Interval de manteniment: {LTBLUE}{COMMA}%{BLACK}   Darrer manteniment: {LTBLUE}{DATE_LONG}
@@ -2723,10 +2723,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horari -
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Canvia la quantitat de temps que l'ordre marcada hauria de prendre
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Esborra la quantitat de temps de l'ordre marcada
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reseteja el comptador de retards, de manera que el vehicle serà puntual
-STR_SERVICE_HINT                                                :{BLACK}Saltar l'ordre a menys que es necessiti manteniment
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Pes: {WEIGHT_S}{}Velocitat: {VELOCITY}  Potència: {POWER}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cost: {CURRENCY} Vel. Max: {VELOCITY}{}Capacitat: {CARGO}, {CARGO}{}Cost d'utilització: {CURRENCY}/any
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cost: {CURRENCY} Vel. Max: {VELOCITY}{}Capacitat: {CARGO}{}Cost d'utilització: {CURRENCY}/any
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Saltar l'ordre a menys que es necessiti manteniment
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {CURRENCY} Pes: {WEIGHT_S}{}Velocitat: {VELOCITY}  Potència: {POWER}{}Cost de circulació: {CURRENCY}/any{}Capacitat: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY} Vel. Max: {VELOCITY}{}Capacitat: {CARGO}, {CARGO}{}Cost d'utilització: {CURRENCY}/any
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY} Vel. Max: {VELOCITY}{}Capacitat: {CARGO}{}Cost d'utilització: {CURRENCY}/any
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Anys: {LTBLUE}{STRING}{BLACK}   Cost d'utilització: {LTBLUE}{CURRENCY}/any
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Vel. Max: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Pes: {LTBLUE}{WEIGHT_S} {BLACK}Potència: {LTBLUE}{POWER}{BLACK} Vel. Max: {LTBLUE}{VELOCITY}
@@ -2746,28 +2746,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}No es pot invertir la direcció del tren...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}No s'ha pogut invertir el sentit del vehicle...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}No es poden girar vehicles que estan formats per múltiples unitats
-STR_CLEAR_TIME                                                  :{BLACK}Esborra Temps
-STR_RESET_LATENESS                                              :{BLACK}Reset. control de retard
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Canvia el nom del punt de trobada
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Canvia el nom de la boia
-
-STR_TRAIN_STOPPING                                              :{RED}Parant
-STR_TRAIN_STOPPING_VEL                                          :{RED}Parant, a {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipus de rail incompatible
-STR_TRAIN_NO_POWER                                              :{RED}Sense energia
-STR_TRAIN_START_NO_CATENARY                                     :Aquesta via no té catenària, el tren no pot arrencar
-STR_TRAIN_STUCK                                                 :{ORANGE}Esperant una ruta lliure
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Esborra Temps
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset. control de retard
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Canvia el nom del punt de trobada
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Canvia el nom de la boia
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Parant
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Parant, a {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Tipus de rail incompatible
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sense energia
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Aquesta via no té catenària, el tren no pot arrencar
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Esperant una ruta lliure
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nou/Nova {STRING} disponible!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nou/Nova {STRING} disponible!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}No es pot vendre el vehicle destruït...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}No es pot remodelar el vehicle destruït...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}No es pot vendre el vehicle destruït...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}No es pot remodelar el vehicle destruït...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Impossible establir l'horari del vehicle...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Els vehicles només poden esperar a les estacions.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Aquest vehicle no para en aquesta estació.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Impossible establir l'horari del vehicle...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Els vehicles només poden esperar a les estacions.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Aquest vehicle no para en aquesta estació.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Canvia Temps
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Actualment aquest vehicle és puntual
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Actualment aquest vehicle va {STRING} tard
@@ -2781,7 +2781,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Omple au
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...s'ha de parar dins d'una cotxera
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossible trobar la cotxera local
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Obliga al vehicle a tornar
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacitat: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacitat: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2808,11 +2808,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Situa boia, que pot ser útil per marques de ruta addicionals
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Aquí no es pot situar una boia...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK} Construeix aqüeducte
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Aquí no es pot construir un aqüeducte...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Aquí no es pot construir un aqüeducte...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Remodela)
 STR_REFIT_TITLE                                                 :{GOLD}Selecciona el tipus de càrrega a transportar:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacitat: {GOLD}{CARGO}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(remodelable)
+STR_PURCHASE_INFO_REFITTABLE                                    :(remodelable)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroports
@@ -2825,7 +2825,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Construe
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Celebració popular . . .{}El primer avió arriba a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Accident d'avió!{}{COMMA} moren en una bola de foc a {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Accident d'aviació!{}L'avió s'ha quedat sense combustible, {COMMA} morts en l'accident!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horari)
 
@@ -2838,13 +2838,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}L'enfonsament d'una mina de carbó deixa un rastre de destrucció prop de {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Inundacions!{}Al menys {COMMA} presumptament desapareguts o morts després de les inundacions!
 
-STR_BRIBE_FAILED                                                :{WHITE}El teu intent de suborn ha estat
-STR_BRIBE_FAILED_2                                              :{WHITE}descobert per un investigador regional
-STR_BUILD_DATE                                                  :{BLACK}Construït: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}El teu intent de suborn ha estat
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}descobert per un investigador regional
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construït: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Classe d'estació: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipus d'estació: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Classe d'estació: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipus d'estació: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detall de ratis de rendiment
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detall
@@ -2864,28 +2864,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Diner:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Préstec:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Quantitat de vehicles. Inclou els automòbils, trens, vaixells i avions.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Quantitat de parts d'estacions. Cada part d'una estació es compta (ex. estació de tren, parada d'autobús, aeroport), encara que estigui connectada a una altra estació.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}El benefici del vehicle amb els menors ingressos (de tots els vehicles més antics de 2 anys)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Quantitat de diners fets durant el mes amb el mínim benefici dels darrers 12 trimestres
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Quantitat de diners fets durant el mes amb el màxim benefici dels darrers 12 trimestres
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unitats de càrrega entregades en els darrers quatre trimestres.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tipus de càrrega entregada durant el darrer trimestre.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Quantitats de diners en efectiu
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}La quantitat de diners que aquesta companyia té com a préstec
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total de punts sobre els punts possibles
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Quantitat de vehicles. Inclou els automòbils, trens, vaixells i avions.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Quantitat de parts d'estacions. Cada part d'una estació es compta (ex. estació de tren, parada d'autobús, aeroport), encara que estigui connectada a una altra estació.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}El benefici del vehicle amb els menors ingressos (de tots els vehicles més antics de 2 anys)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Quantitat de diners fets durant el mes amb el mínim benefici dels darrers 12 trimestres
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Quantitat de diners fets durant el mes amb el màxim benefici dels darrers 12 trimestres
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unitats de càrrega entregades en els darrers quatre trimestres.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipus de càrrega entregada durant el darrer trimestre.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Quantitats de diners en efectiu
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}La quantitat de diners que aquesta companyia té com a préstec
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total de punts sobre els punts possibles
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Extensions NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Mostra els paràmetres NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Extensions NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplica els canvis
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Commuta paleta
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Commuta la paleta del NewGRF seleccionat.{}Fes això quan els gràfics del NewGRF en el joc siguin rosats
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Estableix paràm.
-STR_NEWGRF_FILENAME                                             :{BLACK}Nom d'arxiu: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}Id de GRF: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplica els canvis
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Commuta paleta
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Commuta la paleta del NewGRF seleccionat.{}Fes això quan els gràfics del NewGRF en el joc siguin rosats
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Estableix paràm.
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nom d'arxiu: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}Id de GRF: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Estàs a punt de fer canvis en un joc actiu; això pot fer que OpenTTD es pengi.{}Estàs completament segur que vols fer-los?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2908,34 +2908,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Intenta utilitz
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} conté un sprite corrupte. Tots els sprites corruptes seran mostrats amb un interrogant vermell (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Conté múltiples Accions 8 entrades.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Carrega la predefinició seleccionada
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Desa predef.
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Desa la llista actual com a predefinició
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Introdueix el nom de la predefinició
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Esborra predef.
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Esborra la predefinició selecciona actualment
-STR_NEWGRF_ADD                                                  :{BLACK}Afegeix
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Afegeix un arxiu NewGRF a la llista
-STR_NEWGRF_REMOVE                                               :{BLACK}Treu
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Treu l'arxiu NewGRF seleccionat de la llista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Mou amunt
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Mou amunt l'arxiu NewGRF seleccionat de la llista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mou avall
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Mou avall l'arxiu NewGRF seleccionat de la llista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Una llista d'arxius NewGRF que han estat instal·lats. Clica un arxiu per canviar els seus paràmetres
-STR_NEWGRF_PARAMETER                                            :{BLACK}Paràmetres: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Introdueix els paràmetres NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}No hi ha informació disponible
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Carrega la predefinició seleccionada
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Desa predef.
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Desa la llista actual com a predefinició
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Introdueix el nom de la predefinició
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Esborra predef.
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Esborra la predefinició selecciona actualment
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Afegeix
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Afegeix un arxiu NewGRF a la llista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Treu
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Treu l'arxiu NewGRF seleccionat de la llista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Mou amunt
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Mou amunt l'arxiu NewGRF seleccionat de la llista
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mou avall
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mou avall l'arxiu NewGRF seleccionat de la llista
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Una llista d'arxius NewGRF que han estat instal·lats. Clica un arxiu per canviar els seus paràmetres
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paràmetres: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Introdueix els paràmetres NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}No hi ha informació disponible
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Arxius NewGRF disponibles
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Afegeix a la selecció
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Afegeix l'arxiu NewGRF seleccionat a la teva configuració
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Reescaneja arxius
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Actualitza la llista d'arxius NewGRF disponibles
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Afegeix l'arxiu NewGRF seleccionat a la teva configuració
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Reescaneja arxius
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Actualitza la llista d'arxius NewGRF disponibles
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}No es pot afegir l'arxiu: ID GRF duplicada
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}No s'ha trobat cap arxiu coincident
-STR_NEWGRF_DISABLED                                             :{RED}Desactivat
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}No s'ha trobat cap arxiu coincident
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivat
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}No s'ha trobat un arxiu coincident (els GRF compatibles s'han carregat)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}S'han carregat els GRF(s) compatibles pels arxius faltants
@@ -2951,7 +2951,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}El NewGR
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}La informació de càrrega/remodelació per '{1:ENGINE}' no encaixa amb la llista de compres després de la construcció. Això podria causar un mal funcionament de autorenov/-substitueix.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' ha provocat un bucle infinit en la crida de producció.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El joc s'ha desat en una versió sense suport de tramvies. Tots els tramvies s'han eliminat.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}El joc s'ha desat en una versió sense suport de tramvies. Tots els tramvies s'han eliminat.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalitzada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Canvi de moneda: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2962,16 +2962,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Canvi a
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Canvi a Euro: {ORANGE}mai
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Vista prèvia: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Canvia el paràmetre de la moneda personalitzada
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Disminueix la quantitat de moneda per cada Lliura (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Augmenta la quantitat de moneda per cada Lliura (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Estableix el tipus de canvi per a la teva moneda per cada Lliura (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Estableix el separador per a la teva moneda
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Estableix el prefix de text per a la teva moneda
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Estableix el sufix de text per a la teva moneda
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Canvia a l'Euro més aviat
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Canvia a l'Euro més tard
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Estableix l'any d'introducció de l'Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Lliures (£) en la teva moneda
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Disminueix la quantitat de moneda per cada Lliura (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Augmenta la quantitat de moneda per cada Lliura (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Estableix el tipus de canvi per a la teva moneda per cada Lliura (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Estableix el separador per a la teva moneda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Estableix el prefix de text per a la teva moneda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Estableix el sufix de text per a la teva moneda
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Canvia a l'Euro més aviat
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Canvia a l'Euro més tard
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Estableix l'any d'introducció de l'Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Lliures (£) en la teva moneda
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2990,8 +2990,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Vaixells
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Avions
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordres compartides de {COMMA} Vehicle{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordres compartides de {COMMA} Vehicle{P "" s}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra tots els vehicles que tenen les mateixes ordres
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} està esperant a la cotxera
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} està esperant a la cotxera
@@ -3098,39 +3098,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Remodela
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Remodela vaixell mercant per portar un tipus diferent de càrrega
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Remodela avions per poder transportar diferents tipus de càrrega
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Cap a cotxeres de {TOWN}.
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Cap a cotxeres de {TOWN}, a {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Cap a la cotxera de {TOWN}.
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Cap a la cotxera de {TOWN}, a {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Cap a la drassana de {TOWN}.
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Cap a la drassana de{TOWN}, a {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Cap a l'hangar de {STATION}.
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Revisió a la cotxera de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Revisió a la cotxera de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Revisió a la drassana de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisió a la drassana de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisió a l'hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisió a l'hangar de {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Clona Tren
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clona Vehicle
-STR_CLONE_SHIP                                                  :{BLACK}Clona Vaixell
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clona Avió
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Fa una còpia del tren inclosos tots els vagons. Control+Clic compartirà les ordres
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Fa una còpia del vehicle. Control+Clic compartirà les ordres
-STR_CLONE_SHIP_INFO                                             :{BLACK}Fa una còpia del vaixell. Control+Clic compartirà les ordres
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Fa una còpia de l'avió. Control+Clic compartirà les ordres
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Fa una còpia del tren inclosos tots els vagons. Clica aquest botó i després en un tren dins o fora de les cotxeres. Control+Clic compartirà les ordres
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Fa una còpia del vehicle. Clica aquest botó i després en un vehicle dins o fora de les cotxeres. Control+Clic compartirà les ordres
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control+Clic compartirà les ordres
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control+Clic compartirà les ordres
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Cap a cotxeres de {TOWN}.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Cap a cotxeres de {TOWN}, a {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Cap a la cotxera de {TOWN}.
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Cap a la cotxera de {TOWN}, a {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Cap a la drassana de {TOWN}.
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Cap a la drassana de{TOWN}, a {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Cap a l'hangar de {STATION}.
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Cap a l'hangar de {STATION}, a {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Revisió a la cotxera de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Revisió a la cotxera de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Revisió a la cotxera de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Revisió a la drassana de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Revisió a la drassana de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Revisió a l'hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Revisió a l'hangar de {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clona Tren
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clona Vehicle
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clona Vaixell
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clona Avió
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Fa una còpia del tren inclosos tots els vagons. Control+Clic compartirà les ordres
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Fa una còpia del vehicle. Control+Clic compartirà les ordres
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Fa una còpia del vaixell. Control+Clic compartirà les ordres
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Fa una còpia de l'avió. Control+Clic compartirà les ordres
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Fa una còpia del tren inclosos tots els vagons. Clica aquest botó i després en un tren dins o fora de les cotxeres. Control+Clic compartirà les ordres
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Fa una còpia del vehicle. Clica aquest botó i després en un vehicle dins o fora de les cotxeres. Control+Clic compartirà les ordres
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Fa una còpia del vaixell. Prem aquest botó i després en un vaixell dins o fora les drassanes. Control+Clic compartirà les ordres
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Fa una còpia de l'avió. Prem aquest botó i després en un avió dins o fora l'hangar. Control+Clic compartirà les ordres
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nous Trens
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nous Trens de Via Electrificada
@@ -3200,28 +3200,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra l
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Estàs a punt de vendre tots els vehicles de la cotxera. N'estàs segur?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipus de cotxera incorrecta
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipus de cotxera incorrecta
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vendre tots els trens de la cotxera
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vendre tots els vehicles de la cotxera
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vendre tots els vaixells de la drassana
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vendre tots els avions de l'hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vendre tots els trens de la cotxera
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vendre tots els vehicles de la cotxera
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vendre tots els vaixells de la drassana
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vendre tots els avions de l'hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Treure una llista de tots els trens amb aquesta cotxera en les seves ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Treure una llista de tots els vehicles amb aquesta cotxera en les seves ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Treure una llista de tots els vaixells amb aquesta drassana en les seves ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Treu una llista de tots els avions amb algun hangar d'aquest aeroport en les seves ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Treure una llista de tots els trens amb aquesta cotxera en les seves ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Treure una llista de tots els vehicles amb aquesta cotxera en les seves ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Treure una llista de tots els vaixells amb aquesta drassana en les seves ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Treu una llista de tots els avions amb algun hangar d'aquest aeroport en les seves ordres
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autosubstitueix tots els trens de la cotxera
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autosubstitueix tots els vehicles de la cotxera
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autosubstitueix tots els vaixells de la drassana
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autosubstitueix tots els avions de l'hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autosubstitueix tots els trens de la cotxera
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autosubstitueix tots els vehicles de la cotxera
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autosubstitueix tots els vaixells de la drassana
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autosubstitueix tots els avions de l'hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substitueix {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Comença a substituir
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Para de substituir
-STR_NOT_REPLACING                                               :{BLACK}No substituint
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Cap vehicle seleccionat
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}No substituint
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Cap vehicle seleccionat
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selecciona el tipus de motor a substituir
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selecciona el nou tipus de motor que vols fer servir en lloc del seleccionat
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Prem per aturar el reemplaçament del tipus de motor seleccionat a l'esquerra
@@ -3233,26 +3233,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Fer que
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituint: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Alterna entre finestres de substitució de vagons i de motors
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}El tren no està disponible
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}El vehicle no està disponible
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}El vaixell no està disponible
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}L'avió no està disponible
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}El tren no està disponible
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}El vehicle no està disponible
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}El vaixell no està disponible
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}L'avió no està disponible
 
-STR_ENGINES                                                     :Motors
-STR_WAGONS                                                      :Vagons
+STR_REPLACE_ENGINES                                             :Motors
+STR_REPLACE_WAGONS                                              :Vagons
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Clica per parar tots els trens de dins de la cotxera
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Clica per parar tots els vehicles de dins de la cotxera
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Clica per parar tots els vaixells de dins de la drassana
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Clica per parar tots els avions de dins de l'hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Clica per parar tots els trens de dins de la cotxera
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Clica per parar tots els vehicles de dins de la cotxera
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Clica per parar tots els vaixells de dins de la drassana
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Clica per parar tots els avions de dins de l'hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Clica per arrencar tots els trens de dins de la cotxera
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Clica per arrencar tots els vehicles de dins de la cotxera
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Clica per arrencar tots els vaixells de dins de la drassana
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Clica per arrencar tots els avions de dins de l'hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Clica per arrencar tots els trens de dins de la cotxera
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Clica per arrencar tots els vehicles de dins de la cotxera
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Clica per arrencar tots els vaixells de dins de la drassana
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Clica per arrencar tots els avions de dins de l'hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Clica per parar tots els vehicles de la llista
-STR_MASS_START_LIST_TIP                                         :{BLACK}Clica per arrencar tots els vehicles de la llista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Clica per parar tots els vehicles de la llista
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Clica per arrencar tots els vehicles de la llista
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Llista de senyals - {COMMA} Senyals
@@ -3261,14 +3261,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}L'ordre
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Trens de Vapor i Dièsel
-STR_ELRAIL_VEHICLES                                             :Trens Elèctrics
-STR_MONORAIL_VEHICLES                                           :Trens Monorail
-STR_MAGLEV_VEHICLES                                             :Trens Maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Trens de Vapor i Dièsel
+STR_REPLACE_ELRAIL_VEHICLES                                     :Trens Elèctrics
+STR_REPLACE_MONORAIL_VEHICLES                                   :Trens Monorail
+STR_REPLACE_MAGLEV_VEHICLES                                     :Trens Maglev
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Pes: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocitat: {GOLD}{VELOCITY}{BLACK} Potència: {GOLD}{POWER}
@@ -3295,70 +3295,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Genera
-STR_RANDOM                                                      :{BLACK}Aleatoritza
-STR_RANDOM_HELP                                                 :{BLACK}Canvia el nombre aleatori utilitzat pel Generador de Terrenys
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generació del món
-STR_RANDOM_SEED                                                 :{BLACK}Nombre aleatori:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Clica per introduir un nombre aleatori
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Posa un valor aleatori
-STR_LAND_GENERATOR                                              :{BLACK}Gen. de terrenys:
-STR_TREE_PLACER                                                 :{BLACK}Algoritme d'arbres:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotació del mapa d'alçades:
-STR_TERRAIN_TYPE                                                :{BLACK}Tipus de terreny:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivell del mar:
-STR_SMOOTHNESS                                                  :{BLACK}Planitut:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Alçada de la neu:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}No. de pobles:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. d'indústries:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Mou la línia de neu un pas amunt
-STR_SNOW_LINE_DOWN                                              :{BLACK}Mou la línia de neu un pas avall
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Canviar alçada de la línia de neu
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Canviar l'any inicial
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Alerta d'escala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}No es recomana redimensionar massa el mapa d'origen. Vols continuar amb la generació?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nom del mapa d'alçades:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Mida: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Genera
+STR_MAPGEN_RANDOM                                               :{BLACK}Aleatoritza
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Canvia el nombre aleatori utilitzat pel Generador de Terrenys
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generació del món
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Nombre aleatori:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Clica per introduir un nombre aleatori
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Posa un valor aleatori
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Gen. de terrenys:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritme d'arbres:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotació del mapa d'alçades:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipus de terreny:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nivell del mar:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Planitut:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Alçada de la neu:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}No. de pobles:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}No. d'indústries:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Mou la línia de neu un pas amunt
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Mou la línia de neu un pas avall
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Canviar alçada de la línia de neu
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Canviar l'any inicial
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Alerta d'escala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}No es recomana redimensionar massa el mapa d'origen. Vols continuar amb la generació?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nom del mapa d'alçades:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Mida: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generant món...
 STR_GENERATION_ABORT                                            :{BLACK}Avorta
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Avorta la Generació del Món
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Realment vols avortar la generació?
-STR_PROGRESS                                                    :{WHITE}{NUM}% complet
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generació del món
-STR_TREE_GENERATION                                             :{BLACK}Generació d'arbres
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Generació inamovible
-STR_CLEARING_TILES                                              :{BLACK}Generació d'una àrea escarpada i rocosa
-STR_SETTINGUP_GAME                                              :{BLACK}Configurant el joc
-STR_PREPARING_TILELOOP                                          :{BLACK}Passant el bucle de cel·les
-STR_PREPARING_GAME                                              :{BLACK}Preparant el joc
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Aquesta acció canviarà el nivell de dificultat a personalitzat
-STR_SE_FLAT_WORLD                                               :{WHITE}Terreny pla
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generar un terreny pla
-STR_SE_RANDOM_LAND                                              :{WHITE}Terreny aleatori
-STR_SE_NEW_WORLD                                                :{BLACK}Crear nou escenari
-STR_SE_CAPTION                                                  :{WHITE}Tipus d'escenari
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Mou l'alçada del terreny pla un pas avall
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Mou l'alçada del terreny pla un pas amunt
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Canvia alçada del terreny pla
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Alçada del terreny pla:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% complet
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generació del món
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generació d'arbres
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Generació inamovible
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generació d'una àrea escarpada i rocosa
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Configurant el joc
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Passant el bucle de cel·les
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparant el joc
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Aquesta acció canviarà el nivell de dificultat a personalitzat
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Terreny pla
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generar un terreny pla
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Terreny aleatori
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Crear nou escenari
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipus d'escenari
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Mou l'alçada del terreny pla un pas avall
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Mou l'alçada del terreny pla un pas amunt
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Canvia alçada del terreny pla
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Alçada del terreny pla:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrar el mapa petit a la posició actual
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Vores del mapa:
-STR_NORTHWEST                                                   :{BLACK}Nordoest
-STR_NORTHEAST                                                   :{BLACK}Nordest
-STR_SOUTHEAST                                                   :{BLACK}Sudest
-STR_SOUTHWEST                                                   :{BLACK}Sudoest
-STR_BORDER_FREEFORM                                             :{BLACK}Forma lliure
-STR_BORDER_WATER                                                :{BLACK}Aigua
-STR_BORDER_RANDOM                                               :{BLACK}Aleatori
-STR_BORDER_RANDOMIZE                                            :{BLACK}Aleatori
-STR_BORDER_MANUAL                                               :{BLACK}Manual
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Vores del mapa:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordoest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordest
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sudest
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sudoest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Forma lliure
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Aigua
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleatori
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleatori
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Petit
@@ -3383,21 +3383,21 @@ STR_MEASURE_AREA                                                :{BLACK}Àrea: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Llargada: {NUM}{}Diferència d'alçada: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Àrea: {NUM} x {NUM}{}Diferència d'alçada: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transferir Crèdits: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...aquesta carretera es propietat del poble
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...sentit de la carretera en la direcció incorrecta
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opcions de transparència
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Commuta la transparència dels rètols d'estació. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Commuta la transparència dels arbres. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Commuta la transparència de les cases. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Commuta la transparència de les indústries. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Commuta la transparència dels edificis com ara estacions, cotxeres, punts de trobada i catenàries. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Commuta la transparència dels ponts. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Commuta la transparència de les estructures com ara fars i antenes. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Commuta la transparència de la catenària. CTRL+clic per bloquejar.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Commuta la transparència dels indicadors de càrrega. Ctrl+Clic per bloquejar.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Mostra els objectes invisibles enlloc de transparents
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transferir Crèdits: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...aquesta carretera es propietat del poble
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...sentit de la carretera en la direcció incorrecta
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcions de transparència
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Commuta la transparència dels rètols d'estació. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Commuta la transparència dels arbres. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Commuta la transparència de les cases. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Commuta la transparència de les indústries. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Commuta la transparència dels edificis com ara estacions, cotxeres, punts de trobada i catenàries. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Commuta la transparència dels ponts. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Commuta la transparència de les estructures com ara fars i antenes. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Commuta la transparència de la catenària. CTRL+clic per bloquejar.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Commuta la transparència dels indicadors de càrrega. Ctrl+Clic per bloquejar.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Mostra els objectes invisibles enlloc de transparents
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3407,7 +3407,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Tots els trens
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Tots els vehicles
 STR_GROUP_ALL_SHIPS                                             :Tots els vaixells
@@ -3416,24 +3416,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Trens desagrupa
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Vehicles desagrupats
 STR_GROUP_DEFAULT_SHIPS                                         :Vaixells desagrupats
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Avions desagrupats
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Afegeix vehicles compartits
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Treu tots els vehicles
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Canvia de nom el grup
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}No puc crear el  grup...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}No puc eliminar aquest grup...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}No puc canviar el nom del grup...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}No puc eliminar tots els vehicles d'aquest grup...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}No puc afegir el vehicle a aquest grup...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}No puc afegir vehicles compartits al grup...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}No puc crear el  grup...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}No puc eliminar aquest grup...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}No puc canviar el nom del grup...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}No puc eliminar tots els vehicles d'aquest grup...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}No puc afegir el vehicle a aquest grup...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}No puc afegir vehicles compartits al grup...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grups - Clica en un grup per llistar tots els vehicles d'aquest grup
-STR_GROUP_CREATE_TIP                                            :{BLACK}Clica per crear un grup
-STR_GROUP_DELETE_TIP                                            :{BLACK}Elimina el grup seleccionat
-STR_GROUP_RENAME_TIP                                            :{BLACK}Canvia el nom del grup seleccionat
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Clica per protegir aquest grup de l'autosubstitueix global
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grups - Clica en un grup per llistar tots els vehicles d'aquest grup
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Clica per crear un grup
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Elimina el grup seleccionat
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Canvia el nom del grup seleccionat
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Clica per protegir aquest grup de l'autosubstitueix global
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3494,35 +3494,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}El nom ha de ser únic
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}El nom ha de ser únic
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Ves a la propera senyal
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Ves a la senyal anterior
-STR_SIGN_OSKTITLE                                               :{BLACK}Posa el nom del signe
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ves a la propera senyal
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ves a la senyal anterior
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Posa el nom del signe
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Financia
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospecciona
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construeix
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Escolleix el tipus d'indústria adequada d'aquesta llista
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Financia
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospecciona
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construeix
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Escolleix el tipus d'indústria adequada d'aquesta llista
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avançat
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Selecció de cara avançada.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selecció de cara avançada.
 STR_FACE_SIMPLE                                                 :{BLACK}Simple
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Selecció de cara simple.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selecció de cara simple.
 STR_FACE_LOAD                                                   :{BLACK}Carrega
-STR_FACE_LOAD_TIP                                               :{BLACK}Carrega la cara preferida
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Carrega la cara preferida
 STR_FACE_LOAD_DONE                                              :{WHITE}La teva cara preferida ha estat carregada des de l'arxiu de configuració d'OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Cara jugador nu.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Veure i/o assigna la cara del jugador número
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Veure i/o assigna la cara del jugador número
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Veure i/o assigna la cara del jugador número
 STR_FACE_FACECODE_SET                                           :{WHITE}El número de la nova cara ha estat assignat.
 STR_FACE_FACECODE_ERR                                           :{WHITE}No s'ha pogut assignar el número de cara del jugador - ha de ser un nombre entre 0 i 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Desa
-STR_FACE_SAVE_TIP                                               :{BLACK}Desa la cara preferida
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Desa la cara preferida
 STR_FACE_SAVE_DONE                                              :{WHITE}Aquesta cara serà desada com a preferida a l'arxiu de configuració d'OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europea
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Selecciona cares europees
@@ -3530,51 +3530,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Africana
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Selecciona cares africanes
 STR_FACE_YES                                                    :Si
 STR_FACE_NO                                                     :No
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Activa el bigoti o les arracades
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Activa el bigoti o les arracades
 STR_FACE_HAIR                                                   :Cabell:
-STR_FACE_HAIR_TIP                                               :{BLACK}Canvia el cabell
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Canvia el cabell
 STR_FACE_EYEBROWS                                               :Celles
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Canvia les celles
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Canvia les celles
 STR_FACE_EYECOLOUR                                              :Color dels ulls:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Canvia el color del ulls:
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Canvia el color del ulls:
 STR_FACE_GLASSES                                                :Ulleres:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Activa les ulleres
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Canvia les ulleres
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Activa les ulleres
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Canvia les ulleres
 STR_FACE_NOSE                                                   :Nas:
-STR_FACE_NOSE_TIP                                               :{BLACK}Canvia el nas
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Canvia el nas
 STR_FACE_LIPS                                                   :Llavis:
 STR_FACE_MOUSTACHE                                              :Bigoti:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Canvia els llavis o el bigoti
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Canvia els llavis o el bigoti
 STR_FACE_CHIN                                                   :Barbeta:
-STR_FACE_CHIN_TIP                                               :{BLACK}Canvia la barbeta
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Canvia la barbeta
 STR_FACE_JACKET                                                 :Jaqueta:
-STR_FACE_JACKET_TIP                                             :{BLACK}Canvia la jaqueta
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Canvia la jaqueta
 STR_FACE_COLLAR                                                 :Coll:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Canvia el collaret
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Canvia el collaret
 STR_FACE_TIE                                                    :Corbata:
 STR_FACE_EARRING                                                :Arracades:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Canvia la corbata o les arracades
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Canvia la corbata o les arracades
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Selecció de senyals
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Aquí no es pot convertir les senyals...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Senyal de tram (semàfor){}Aquest es el tipus més bàsic de senyal, permetent només un tren en el mateix tram a la vegada.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Senyal d'entrada (semàfor){}En verd mentre hi hagi una o més senyals de sortida en verd en la secció següent de vies. En cas contrari està en vermell.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Senyal de Sortida (semàfor){}Es comporta com una senyal de tram però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinada.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Senyal Combinada (semàfor){}La senyal combinada simplement actua com a senyal d'entrada i sortida. Això permet construir grans extensions de pre-senyals.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Senyal de camí (semàfor){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí poden ser passades des de darrera.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Senyal de camí d'un sentit (semàfor){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí d'un sentit poden ser passades des de darrera.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Senyal de tram (elèctrica){}Aquest es el tipus més bàsic de senyal, permeten entrar a cada tram només un tren a la vegada.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Senyal d'entrada (elèctrica){}En verd mentre hi hagi una o més senyals de sortida en verd en la secció següent de vies. En cas contrari està en vermell.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Senyal de Sortida (elèctrica){}Es comporta com una senyal de tram però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinades.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Senyal Combinada (elèctrica){}La senyal combinada simplement actua com a senyal d'entrada i sortida. Això permet construir grans extensions de pre-senyals.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Senyal de camí (elèctrica){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí estàndard poden ser passades des de darrera.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Senyal de camí d'un sentit (elèctrica){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí d'un sentit poden ser passades des de darrera.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Conversió de senyals{}Quan esta seleccionat, clicant una senyal existent la converteix en el tipus de senyal seleccionada i variants, CTRL+Clic commuta la variant existent.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densitat de senyals en arrossegar
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Disminueix la densitat de senyals en arrossegar
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Incrementa la densitat de senyals en arrossegar
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Selecció de senyals
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Aquí no es pot convertir les senyals...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Senyal de tram (semàfor){}Aquest es el tipus més bàsic de senyal, permetent només un tren en el mateix tram a la vegada.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Senyal d'entrada (semàfor){}En verd mentre hi hagi una o més senyals de sortida en verd en la secció següent de vies. En cas contrari està en vermell.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Senyal de Sortida (semàfor){}Es comporta com una senyal de tram però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinada.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Senyal Combinada (semàfor){}La senyal combinada simplement actua com a senyal d'entrada i sortida. Això permet construir grans extensions de pre-senyals.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Senyal de camí (semàfor){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí poden ser passades des de darrera.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Senyal de camí d'un sentit (semàfor){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí d'un sentit poden ser passades des de darrera.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Senyal de tram (elèctrica){}Aquest es el tipus més bàsic de senyal, permeten entrar a cada tram només un tren a la vegada.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Senyal d'entrada (elèctrica){}En verd mentre hi hagi una o més senyals de sortida en verd en la secció següent de vies. En cas contrari està en vermell.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Senyal de Sortida (elèctrica){}Es comporta com una senyal de tram però és necessari actuar sobre el color correcte en les pre-senyals d'entrada i combinades.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Senyal Combinada (elèctrica){}La senyal combinada simplement actua com a senyal d'entrada i sortida. Això permet construir grans extensions de pre-senyals.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Senyal de camí (elèctrica){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí estàndard poden ser passades des de darrera.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Senyal de camí d'un sentit (elèctrica){}Una senyal de camí permet entrar dins d'un tram a més d'un tren a la vegada, si el tren pot reservar una ruta cap a un punt de parada segur. Les senyals de camí d'un sentit poden ser passades des de darrera.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Conversió de senyals{}Quan esta seleccionat, clicant una senyal existent la converteix en el tipus de senyal seleccionada i variants, CTRL+Clic commuta la variant existent.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Densitat de senyals en arrossegar
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Disminueix la densitat de senyals en arrossegar
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Incrementa la densitat de senyals en arrossegar
 ########
 
 ############ on screen keyboard
@@ -3586,37 +3586,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Paràmetres IA
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Mostra els paràmetres IA
 STR_AI_DEBUG                                                    :{WHITE}Depuració IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nom de la IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nom de la IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recarrega IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Mata la IA, recarrega l'script, i reinicia la IA
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}La finestra de depuració IA només està disponible pel servidor
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Mata la IA, recarrega l'script, i reinicia la IA
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}La finestra de depuració IA només està disponible pel servidor
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuració IA
-STR_AI_CHANGE                                                   :{BLACK}Selecciona IA
-STR_AI_CONFIGURE                                                :{BLACK}Configura
-STR_AI_CHANGE_TIP                                               :{BLACK}Carrega una altra IA
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configura els paràmetres de la IA
-STR_AI_LIST_TIP                                                 :{BLACK}Totes les IAs que seran carregades en el proper joc
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecciona IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configura
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carrega una altra IA
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura els paràmetres de la IA
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Totes les IAs que seran carregades en el proper joc
 STR_AI_LIST_CAPTION                                             :{WHITE}IAs Disponibles
-STR_AI_AILIST_TIP                                               :{BLACK}Clica per a seleccionar una IA
-STR_AI_ACCEPT                                                   :{BLACK}Accepta
-STR_AI_ACCEPT_TIP                                               :{BLACK}Selecciona la IA realçada
-STR_AI_CANCEL                                                   :{BLACK}Cancel·la
-STR_AI_CANCEL_TIP                                               :{BLACK}No canvïis la IA
-STR_AI_CLOSE                                                    :{BLACK}Tanca
-STR_AI_RESET                                                    :{BLACK}Reset
-STR_AI_HUMAN_PLAYER                                             :Jugador humà
-STR_AI_RANDOM_AI                                                :IA Aleatòria
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Clica per a seleccionar una IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accepta
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecciona la IA realçada
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancel·la
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No canvïis la IA
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tanca
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Jugador humà
+STR_AI_CONFIG_RANDOM_AI                                         :IA Aleatòria
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Paràmetres IA
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versió: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Una de les IAs s'ha penjat. Si us plau reporta això a l'autor de la IA amb una captura de pantalla de la finestra de depuració IA.
-STR_AI_NO_AI_FOUND                                              :No s'ha trobat una IA adequada per carregar.{}Aquesta IA és una IA falsa i no farà res.{}Pots descarregar diverses IAs via el sistema de "Contingut en línia".
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versió: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Una de les IAs s'ha penjat. Si us plau reporta això a l'autor de la IA amb una captura de pantalla de la finestra de depuració IA.
+STR_ERROR_AI_NO_AI_FOUND                                        :No s'ha trobat una IA adequada per carregar.{}Aquesta IA és una IA falsa i no farà res.{}Pots descarregar diverses IAs via el sistema de "Contingut en línia".
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Límit de soroll a la ciutat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Soroll generat: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Límit de soroll a la ciutat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Soroll generat: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3630,21 +3630,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Escenari
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa d'alçades
 STR_CONTENT_TITLE                                               :{WHITE}Descàrregues de contingut
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipus
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipus de contingut
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipus de contingut
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nom
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nom del contingut
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Clica sobre la línia per veure detalls{}Clica sobre la casella per seleccionar-lo per descarregar
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nom del contingut
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Clica sobre la línia per veure detalls{}Clica sobre la casella per seleccionar-lo per descarregar
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Selecciona tot
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marca tots els continguts per a ser descarregats
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marca tots els continguts per a ser descarregats
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Sel. actualitzacions
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marca tots els continguts que siguin actualitzacions dels continguts a ser descarregats
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marca tots els continguts que siguin actualitzacions dels continguts a ser descarregats
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Deselecciona tot
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Marca tots els continguts a no ser descarregats
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marca tots els continguts a no ser descarregats
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Introdueix cadena filtrant
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Introdueix una paraula clau per filtrar la llista de
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Introdueix una paraula clau per filtrar la llista de
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Marca/anomena filtre:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Descarrega
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Comença a descarregar el contingut seleccionat
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Comença a descarregar el contingut seleccionat
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Mida de la descàrrega total: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO CONTINGUT
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}No has seleccionat això per a ser descarregat
@@ -3677,6 +3677,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No s'han
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contingut en línia
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Comprova si hi ha continguts nous i actualitzats per a descarregar
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Cerca contingut que falta en línia
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Comprova si el contingut que falta pot ser trobat en línia
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Cerca contingut que falta en línia
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Comprova si el contingut que falta pot ser trobat en línia
 ########
diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt
index e0e6cd31c..120cdbdc3 100644
--- a/src/lang/croatian.txt
+++ b/src/lang/croatian.txt
@@ -223,7 +223,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Karta -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Postavke igre
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Poruka
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Poruka od {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Oprez!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Oprez!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}To nije moguće u�initi....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Nije moguće o�istiti ovo podru�je....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Izvorno autorsko pravo {COPYRIGHT} 1995 Chris Sawyer, sva prava pridržana
@@ -231,9 +231,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD tim
 
 STR_QUIT_CAPTION                                                :{WHITE}Prekid
-STR_YES                                                         :{BLACK}Da
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
+STR_QUIT_YES                                                    :{BLACK}Da
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
 
 STR_JUST_NOTHING                                                :Ništa
 STR_COLOUR_DARK_BLUE                                            :Tamnoplava
@@ -294,11 +294,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Pustinja
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Snijeg
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Poruka
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Zadano
-STR_QUERY_CANCEL                                                :{BLACK}Odustani
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Preimenuj
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Zadano
+STR_BUTTON_CANCEL                                               :{BLACK}Odustani
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Preimenuj
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -315,16 +315,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Teret
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informacije
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Nosivosti
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Ukupni teret
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Ukupna nosivost tereta ovog vlaka:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Ukupna nosivost tereta ovog vlaka:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova igra
 STR_INTRO_LOAD_GAME                                             :{BLACK}U�itaj igru
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Više igra�a
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor scenarija
 
-STR_MAPSIZE                                                     :{BLACK}Veli�ina karte:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Veli�ina karte:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Postavke igre
 
 STR_COMPANY_SOMEONE                                             :netko{SKIP}{SKIP}
@@ -373,9 +373,9 @@ STR_FILE_MENU_QUIT_GAME                                         :Napusti igru
 STR_FILE_MENU_EXIT                                              :Izlaz
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Jesi li siguran da želiš napustiti ovu igru?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Napusti igru
-STR_SORT_ORDER_TIP                                              :{BLACK}Izaberi na�in sortiranja (silazno/uzlazno)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Izaberi kriterij za sortiranje
-STR_SORT_BY                                                     :{BLACK}Sortiraj prema
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Izaberi na�in sortiranja (silazno/uzlazno)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Izaberi kriterij za sortiranje
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortiraj prema
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Stanovništvo
@@ -405,24 +405,24 @@ STR_SORT_BY_RUNNING_COST                                        :Trošak uporabe
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Snaga/trošak uporabe
 STR_SORT_BY_CARGO_CAPACITY                                      :Nosivost tereta
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Nijedna vrsta tereta ne �eka
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Odaberi sva sredstva
-STR_SELECT_ALL_TYPES                                            :{BLACK}Odaberi sve vrste tereta (uklju�ujući i teret koji ne �eka)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Pogledaj popis dostupnih dizajna motora za ovu vrstu vozila.
-STR_MANAGE_LIST                                                 :{BLACK}Uredi popis
-STR_MANAGE_LIST_TIP                                             :{BLACK}Pošalji upute svim vozilima na ovom popisu
-STR_REPLACE_VEHICLES                                            :Zamjeni vozila
-STR_SEND_FOR_SERVICING                                          :Pošalji na servis
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni vlakovi
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna vozila
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni brodovi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupni zrakoplovi
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Pošalji u spremište
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Pošalji u spremište
-STR_SEND_SHIP_TO_DEPOT                                          :Pošalji u spremište
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošalji u hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nijedna vrsta tereta ne �eka
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Odaberi sva sredstva
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Odaberi sve vrste tereta (uklju�ujući i teret koji ne �eka)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Pogledaj popis dostupnih dizajna motora za ovu vrstu vozila.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Uredi popis
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Pošalji upute svim vozilima na ovom popisu
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Zamjeni vozila
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Pošalji na servis
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Dostupni vlakovi
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Dostupna vozila
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Dostupni brodovi
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Dostupni zrakoplovi
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Pošalji u spremište
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Pošalji u spremište
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Pošalji u spremište
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Pošalji u hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -452,12 +452,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Postavke
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nije moguće promijeniti servisni interval...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zatvori prozor
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Naslov prozora - povuci ovo za micanje prozora
-STR_STICKY_BUTTON                                               :{BLACK}Ozna�i ovaj prozor kao nezatvoriv kad se rabi tipka 'Zatvori sve prozore'
-STR_RESIZE_BUTTON                                               :{BLACK}Pritisni i povuci za promjenu veli�ine prozora
+STR_TOOLTIP_STICKY                                              :{BLACK}Ozna�i ovaj prozor kao nezatvoriv kad se rabi tipka 'Zatvori sve prozore'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Pritisni i povuci za promjenu veli�ine prozora
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Pritisni ovdje za prelazak u trenutnu pretpostavljenu mapu za snimanje/u�itavanje
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Sruši građevine itd. na kvadratu zemlje
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Snizi vrh kvadrata zemlje
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Povisi vrh kvadrata zemlje
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Snizi vrh kvadrata zemlje
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Povisi vrh kvadrata zemlje
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Klizna traka - lista gore/dolje
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Klizna traka - pomi�i listu lijevo/desno
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Pokaži obrise zemlje na karti
@@ -470,21 +470,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Prikaži
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Ovogodišnja dobit: {CURRENCY} (prošlogodišnja: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} godin{P a e a} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} godin{P a e a} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} godin{P a e a} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} godin{P a e a} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Vlak
-STR_VEHICLE_ROAD_VEHICLE                                        :Cestovno vozilo
-STR_VEHICLE_SHIP                                                :Brod
-STR_VEHICLE_AIRCRAFT                                            :Zrakoplov
+STR_REPLACE_VEHICLE_TRAIN                                       :Vlak
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Cestovno vozilo
+STR_REPLACE_VEHICLE_SHIP                                        :Brod
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Zrakoplov
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} postaje star
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} postaje vrlo star
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} postaje vrlo star i hitno treba zamjenu
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Podaci o zemlji
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Troškovi �išćenja: {LTBLUE}Nedostupno
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Troškovi �išćenja: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Prihod kada je o�išćeno: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Prihod kada je o�išćeno: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :NIJE DOSTUPNO
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Vlasnik: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Vlasnik ceste: {LTBLUE}{STRING}
@@ -493,7 +493,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Vlasnik
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Podru�na nadležnost: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nijedan/Nitko/Ništa
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -605,7 +605,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klikni n
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klikni na glazbenu traku kako bi ju uklonio iz trenutnog programa (samo Proizvoljno1 ili Proizvoljno2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Uklju�i/isklju�i miješanje programa
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Pokaži prozor za izbor glazbenih traka
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klikni na uslugu za centriranje pogleda na industriju/grad
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klikni na uslugu za centriranje pogleda na industriju/grad
 STR_INTRO_DIFFICULTY                                            :{BLACK}Težina ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Poslijednja poruka/vijest
@@ -654,7 +654,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Smanji p
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Napravi nasumi�no zemljište
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Poništi krajolik
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Poništi krajolik
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Obriši sa mape sve u vlasništvu igra�a
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Obriši sa mape sve u vlasništvu igra�a
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Jeste li sigurni da želite obrisati sve u vlasništvu igra�a?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Stvaranje krajolika
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Stvaranje gradova
@@ -668,11 +668,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...prebl
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...preblizu drugome gradu
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...neprikladno mjesto
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...previše gradova
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nije moguće graditi gradove
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nema više mjesta na karti
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nije moguće graditi gradove
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...nema više mjesta na karti
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Povećaj veli�inu grada
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Proširi
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Grad neće graditi ceste. Možete uklju�iti gradnju cesta putem Naprednih postavki -> Ekonomija -> Gradovi
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Grad neće graditi ceste. Možete uklju�iti gradnju cesta putem Naprednih postavki -> Ekonomija -> Gradovi
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Nasumi�an grad
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Izgradi grad na nasumi�no odabranom pložaju
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Ovdje nije moguće izgraditi {STRING}...
@@ -686,13 +686,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Stavi st
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Postavi svjetionik
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Postavi odašilja�
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Odredi pustinjsko podru�je.{}Pritisni i drži CTRL za uklanjanje
-STR_CREATE_LAKE                                                 :{BLACK}Odredi vodeno podru�je.{}Napravi kanal, osim ako CTRL nije pritisnut na morskom nivou, kada će umjesto toga potopiti okolna podru�ja
-STR_CREATE_RIVER                                                :{BLACK}Postavi rijeke.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Odredi vodeno podru�je.{}Napravi kanal, osim ako CTRL nije pritisnut na morskom nivou, kada će umjesto toga potopiti okolna podru�ja
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Postavi rijeke.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Obriši
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Obriši ovaj grad u cjelosti
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Spremi scenarij
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :U�itaj secenarij
-STR_MENU_LOAD_HEIGHTMAP                                         :U�itaj visinsku kartu
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :U�itaj visinsku kartu
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Završi s uređivanjem
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Završi
@@ -702,7 +702,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Spremi s
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Igraj scenarij
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Igraj visinsku kartu
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Pokreni novu igru, koristeći visinsku kartu kao krajolik
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Jeste li sigurni da želite završiti ovaj scenarij?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Jeste li sigurni da želite završiti ovaj scenarij?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...može biti izgrađen samo u gradovima s najmanje 1200 stanovnika
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Pomakni po�etni datum 1 godinu unatrag
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Pomakni po�etni datum 1 godinu unaprijed
@@ -710,21 +710,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...oba k
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Malo
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Srednje
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Veliko
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Nasumi�no
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Nasumi�no
 STR_FOUND_TOWN_CITY                                             :{BLACK}Grad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velegradovi rastu brže od obi�nih gradova{}Ovisno o postavkama, veći su prilikom osnivanja
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Odaberi veli�inu grada
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Veli�ina grada:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Raspored gradskih cesta
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Odaberi raspored ceste za ovaj grad
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bolje ceste
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 mreža
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 mreža
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Nasumi�no
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Raspored gradskih cesta
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Odaberi raspored ceste za ovaj grad
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bolje ceste
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 mreža
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 mreža
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Nasumi�no
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Pokaži zadnju poruku ili vijest
 STR_NEWS_MESSAGES_OFF                                           :Isklju�eno
 STR_NEWS_MESSAGES_SUMMARY                                       :Sažetak
@@ -824,10 +824,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ST
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Slika zaslona uspješno spremljena kao '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Slika zaslona nije uspjela!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kupi zemlju za buduću uporabu
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kupi zemlju za buduću uporabu
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOMATSKO SPREMANJE
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SPREMAM IGRU  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Spremanje još u tijeku,{}molimo pri�ekajte dok se ne završi!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Spremanje još u tijeku,{}molimo pri�ekajte dok se ne završi!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Odaberi glazbeni program 'Ezy Street style'
 
 ############ start of townname region
@@ -890,7 +890,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Izaberi
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cijeli ekran
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Ozna�i ovu kućicu kako bi igrao OpenTTD preko cijelog ekrana
-STR_FULLSCREEN_FAILED                                           :{WHITE}Neuspješan prelazak na prikaz na cijelom ekranu
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Neuspješan prelazak na prikaz na cijelom ekranu
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Razlu�ivost ekrana
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Izaberi razlu�ivost ekrana
@@ -901,12 +901,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Izaberi
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Osnovni set grafike
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Odaberi osnovni grafi�ki set za igru
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automatsko spremanje neuspješno
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automatsko spremanje neuspješno
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Kreće se prema {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Kreće se prema {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Nema naredbi
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Nema naredbi, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Kreće se prema {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Kreće se prema {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Nema naredbi
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Nema naredbi, {VELOCITY}
 
 STR_PASSENGERS                                                  :putnici
 STR_PASSENGERS.gen                                              :putnika
@@ -918,9 +918,9 @@ STR_CRATES                                                      :sanduci
 STR_RES_OTHER                                                   :ostalo
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nije moguće dijeliti popis naredbi...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nije moguće kopirati popis naredbi...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Kraj dijeljenih naredbi - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nije moguće dijeliti popis naredbi...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nije moguće kopirati popis naredbi...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Kraj dijeljenih naredbi - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ne može naći put da nastavi
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} je izgubljeno
@@ -1184,15 +1184,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y veliÄ
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :onemogućeno
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Promijeni vrijednost postavke
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Promijeni vrijednost postavke
 
-STR_TEMPERATE_LANDSCAPE                                         :Blagi krajolik
-STR_SUB_ARCTIC_LANDSCAPE                                        :Subarkti�ki krajolik
-STR_SUB_TROPICAL_LANDSCAPE                                      :Suptropski krajolik
-STR_TOYLAND_LANDSCAPE                                           :Toyland krajolik
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Blagi krajolik
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Subarkti�ki krajolik
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Suptropski krajolik
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Toyland krajolik
 
 STR_CHEATS                                                      :{WHITE}Varanje
-STR_CHEATS_TIP                                                  :{BLACK}Kva�ice ukazuju na to jesi li koristio ovo varanje prije
+STR_CHEATS_TOOLTIP                                              :{BLACK}Kva�ice ukazuju na to jesi li koristio ovo varanje prije
 STR_CHEATS_WARNING                                              :{BLACK}Upozorenje! Upravo se spremaš izdati svoj kolege natjecatelje. Imaj na umu da se takva sramota pamti zauvijek.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Povećaj novce za iznos {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Igraj kao tvrtka: {ORANGE}{COMMA}
@@ -1204,177 +1204,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Promije
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Promijeni datum: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Omogući izmjeni produkcijskih vrijednosti: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Ide prema {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Ide prema {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Ide prema {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Ide prema {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Idi preko {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Idi neprekidno preko {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Idi preko {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Idi neprekidno preko {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Čvorište {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Čvorište {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Čvorište
+STR_FORMAT_WAYPOINT_NAME                                        :Čvorište {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Čvorište {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Čvorište
 
-STR_WAYPOINT                                                    :{WHITE}Čvorište
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Odaberi vrstu �vorišta
+STR_WAYPOINT_CAPTION                                            :{WHITE}Čvorište
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Odaberi vrstu �vorišta
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Promijeni ime �vorišta
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nije moguće promijeniti ime �vorišta...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nije moguće promijeniti ime �vorišta...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Pretvori prugu u �vorište
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Ovdje nije moguće izgraditi željezni�ko �vorište...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nije moguće ukloniti željezni�ko �vorište odavdje...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Ovdje nije moguće izgraditi željezni�ko �vorište...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Nije moguće ukloniti željezni�ko �vorište odavdje...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Izgradi željezni�ku prugu koristeći Autorail na�in
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...u ovom scenariju nema gradova
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generiranje karte prekinuto...{}...ne postoje prigodne lokacije za gradove
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...u ovom scenariju nema gradova
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generiranje karte prekinuto...{}...ne postoje prigodne lokacije za gradove
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mnogo nasumi�nih gradova
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Popuni kartu nasumi�no raspoređenim gradovima
-STR_MANY_RANDOM_INDUSTRIES                                      :Mnoge nasumi�ne industrije
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Popuni kartu nasumce smještenim industrijama
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nije moguće generirati industrije...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Mnogo nasumi�nih gradova
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Popuni kartu nasumi�no raspoređenim gradovima
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Mnoge nasumi�ne industrije
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Popuni kartu nasumce smještenim industrijama
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nije moguće generirati industrije...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Otvori alatnu traku za snižavanje/povećavanje, sadnju drveća, itd.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Uređivanje krajolika
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Ravnanje površine
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Ravnanje površine
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Raznovrsno drveće
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Posadi raznovrsno drveće
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Posadi raznovrsno drveće
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Ovdje nije moguće izgraditi kanale...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Ovdje nije moguće izgraditi kanale...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Izgradi kanale.
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Ovdje nije moguće izgraditi brane...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Ovdje nije moguće izgraditi brane...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Izgradi brane
-STR_LANDINFO_LOCK                                               :Brana
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Brana
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Ne mogu postaviti rijeku ovdje...
-STR_LANDINFO_RIVER                                              :Rijeka
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Ne mogu postaviti rijeku ovdje...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rijeka
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...pluta�a je u uporabi!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...pluta�a je u uporabi!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nije moguće ukloniti dio postaje...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Ovdje nije moguće pretvoriti vrstu pruge...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nije moguće ukloniti dio postaje...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Ovdje nije moguće pretvoriti vrstu pruge...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Pretvori/nadogradi vrstu pruge
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Ovdje povuci lokomotivu kako bi prodao cijeli vlak
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Ovdje povuci lokomotivu kako bi prodao cijeli vlak
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Povuci i spusti
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Napravi postaju koristeći drag & drop
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Odaberi vrstu postaje za prikazivanje
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Odaberi vrstu postaje za izgradnju
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Odaberi vrstu postaje za prikazivanje
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Odaberi vrstu postaje za izgradnju
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Premotaj igru naprijed
 STR_MESSAGE_HISTORY                                             :{WHITE}Povijest poruka
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Popis nedavnih novinskih poruka
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Onemogući sve
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Omogući sve
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Popis nedavnih novinskih poruka
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Onemogući sve
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Omogući sve
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrije
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prevezeno)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prevezeno)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena industrija - za centriranje pogleda klikni na ime
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrije
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prevezeno)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prevezeno)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Imena industrija - za centriranje pogleda klikni na ime
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugoj industriji
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...preblizu drugoj industriji
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Promijeni proizvodnju
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Više igra�a
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ime igra�a:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ovo je ime po kojem će te drugi igra�i raspoznavati
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Upiši svoje ime
-STR_NETWORK_CONNECTION                                          :{BLACK}Veza:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Izaberi između internetske igre ili igre preko lokalne mreže (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Pokreni poslužitelj
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Pokreni vlastiti poslužitelj
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Ime
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Ime igre
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Jezik, verzija poslužitelja, itd.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klikni na igru s popisa kako bi ju odabrao
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server kojemu st ezadnji put pristupili:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klikni kako bi izabrao server koji si igrao zadnji put
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Pronađi poslužitelj
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Pronađi poslužitelje u mreži
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Dodaj poslužitelj
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Dodaje poslužitelj na popis koji će uvijek biti provjeren postoje li igre u tijeku.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Unesi adresu domaćina
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klijenti
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klijenata online / klijenata maks{}Tvrtki online / tvrki maks.
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Veli�ina karte
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Veli�ina karte za igru{}Klikni kako bi sortirao prema podru�ju
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Trenutni datum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Godine
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Broj godina{}koliko igra traje
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O IGRI
-STR_NETWORK_CLIENTS                                             :{SILVER}Klijenti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Jezik:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Set plo�ica:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Veli�ina karte:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzija poslužitelja:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa poslužitelja:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Datum po�etka:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Trenutni datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Zaštićeno zaporkom!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}POSLUŽITELJ NEDOSTUPAN
-STR_NETWORK_SERVER_FULL                                         :{SILVER}POSLUŽITELJ PUN
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}RAZLIKA U VERZIJAMA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF RAZLIKA
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Pridruži se igri
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Zapo�ni novu igru za više igra�a
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Ime igre:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Ime igre bit će prikazno drugim igra�ima u izborniku za odabir igre s više igra�a
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Upišite ime mrežne igre
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Postavi zaporku
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Zaštiti svoju igru pomoću zaporke ukoliko ne želiš da bude javno dostupna
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Odaberi kartu:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Koju kartu želiš igrati?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (oglasi)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klijen{P t a ata}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maks klijenata:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Izaberi maksimalan broj klijenata. Ne moraju sva mjesta biti popunjena.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} tvrtk{P a e i}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks tvrtki:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Ograni�i poslužitelj na određeni broj tvrtki
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} gledatelj{P "" a a}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks promatra�a:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ograni�i poslužitelj na određeni broj gledatelja
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Jezik kojim se govori:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Drugi igra�i znat će kojim se jezikom govori na poslužitelju
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Zapo�ni igru
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Zapo�ni novu igru u mreži na nasumi�noj mapi ili iz scenarija
-STR_NETWORK_LOAD_GAME                                           :{BLACK}U�itaj igru
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Nastavi ranije snimljenu igru za više igra�a (pazite da se spojite pod svojim imenom)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Više igra�a
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Upiši svoje ime
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Veza:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Izaberi između internetske igre ili igre preko lokalne mreže (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Pokreni poslužitelj
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Pokreni vlastiti poslužitelj
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Ime
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Ime igre
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Jezik, verzija poslužitelja, itd.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klikni na igru s popisa kako bi ju odabrao
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Server kojemu st ezadnji put pristupili:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klikni kako bi izabrao server koji si igrao zadnji put
+
+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_ENTER_IP                                :{BLACK}Unesi adresu domaćina
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klijenti
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klijenata online / klijenata maks{}Tvrtki online / tvrki maks.
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Veli�ina karte
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Veli�ina karte za igru{}Klikni kako bi sortirao prema podru�ju
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Trenutni datum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Godine
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Broj godina{}koliko igra traje
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO O IGRI
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klijenti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Jezik:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Set plo�ica:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Veli�ina karte:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Verzija poslužitelja:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adresa poslužitelja:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Datum po�etka:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Trenutni datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Zaštićeno zaporkom!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}POSLUŽITELJ NEDOSTUPAN
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}POSLUŽITELJ PUN
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}RAZLIKA U VERZIJAMA
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF RAZLIKA
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pridruži se igri
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Zapo�ni novu igru za više igra�a
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Ime igre:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Ime igre bit će prikazno drugim igra�ima u izborniku za odabir igre s više igra�a
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Upišite ime mrežne 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_SELECT_MAP                             :{BLACK}Odaberi kartu:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Koju kartu želiš igrati?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (oglasi)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klijen{P t a ata}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maks klijenata:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Izaberi maksimalan broj klijenata. Ne moraju sva mjesta biti popunjena.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} tvrtk{P a e i}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maks tvrtki:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Ograni�i poslužitelj na određeni broj tvrtki
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} gledatelj{P "" a a}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maks promatra�a:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Ograni�i poslužitelj na određeni broj gledatelja
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Jezik kojim se govori:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Drugi igra�i znat će kojim se jezikom govori na poslužitelju
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Zapo�ni igru
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Zapo�ni novu igru u mreži na nasumi�noj mapi ili iz scenarija
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}U�itaj igru
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Nastavi ranije snimljenu igru za više igra�a (pazite da se spojite pod svojim imenom)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Bilo koji
@@ -1415,33 +1415,33 @@ STR_NETWORK_LANG_GREEK                                          :Gr�ki
 STR_NETWORK_LANG_LATVIAN                                        :Latvijski
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Predvorje igre za više igra�a
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Predvorje igre za više igra�a
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Pripremanje za pridruživanje:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Popis svih tvrtki trenutno u igri. Možete se pridružiti jednoj ili osnovati novu ako postoji slobodno mjesto
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova tvrtka
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Otvori novu tvrtku
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Gledaj igru
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Promatraj igru kao gledatelj
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Pridruži se tvrtki
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Pomozi upravljati ovom tvrtkom
-STR_NETWORK_REFRESH                                             :{BLACK}Osvježi poslužitelj
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Osvježi podatke o poslužitelju
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Pripremanje za pridruživanje:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Popis svih tvrtki trenutno u igri. Možete se pridružiti jednoj ili osnovati novu ako postoji slobodno mjesto
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova tvrtka
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Otvori novu tvrtku
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Gledaj igru
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Promatraj igru kao gledatelj
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Pridruži se tvrtki
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Pomozi upravljati ovom tvrtkom
+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_COMPANY_INFO                                        :{SILVER}PODACI O TVRTKI
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}PODACI O TVRTKI
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Ime tvrtke:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Ustoli�enje:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Vrijednost tvrtke:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Trenutno stanje:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Prošlogodišnji prihod:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}U�inkovitost: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Ime tvrtke:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Ustoli�enje:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Vrijednost tvrtke:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Trenutno stanje:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Prošlogodišnji prihod:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}U�inkovitost: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozila:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Postaje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Igra�i:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vozila:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Postaje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Igra�i:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Spajanje...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Spajanje...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Spajanje u tijeku..
@@ -1457,49 +1457,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Dohvaća
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klijen{P t ta ata} {P je su je} prije Vas
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} preuzeto do sada
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Odspoji
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Odspoji
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Unesite iznos novca koji želite dati
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Poslužitelj je zaštićen. Unesite zaporku
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Tvrtka je zaštićena. Unesite zaporku
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Popis klijenata
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Popis klijenata
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Promatraj
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova tvrtka
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Nisu pronađeni mrežni uređaji ili je kompajlirano bez ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Niti jedna mrežna igra nije pronađena
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Poslužitelj nije odgovorio na zahtjev
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Ne mogu se spojiti zbog razlike u NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Neuspješno usklađivanje mrežne igre
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Izgubljena veza sa mrežnom igrom
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nije moguće u�itati snimljenu igru
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nemoguće je pokrenuti poslužitelj
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nije se moguće spojiti
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Istekla je veza #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Napravljena je greška u protokolu te se veza prekinula
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Revizija ovog klijenta ne slaže se s revizijom poslužitelja
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Pogrešna zaporka
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Poslužitelj je pun
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Zabranjen ti je pristup ovom poslužitelju
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Izba�en si iz igre
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Na ovome poslužitelju varanje nije dopušteno
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Nisu pronađeni mrežni uređaji ili je kompajlirano bez ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Niti jedna mrežna igra nije pronađena
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Poslužitelj nije odgovorio na zahtjev
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Ne mogu se spojiti zbog razlike u NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Neuspješno usklađivanje mrežne igre
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Izgubljena veza sa mrežnom igrom
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Nije moguće u�itati snimljenu igru
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Nemoguće je pokrenuti poslužitelj
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Nije se moguće spojiti
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Istekla je veza #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Napravljena je greška u protokolu te se veza prekinula
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Revizija ovog klijenta ne slaže se s revizijom poslužitelja
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Pogrešna zaporka
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Poslužitelj je pun
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Zabranjen ti je pristup ovom poslužitelju
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Izba�en si iz igre
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Na ovome poslužitelju varanje nije dopušteno
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :opća greška
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :greška u sinkronizaciji
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nije moguće u�itati kartu
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :veza je izgubljena
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :greška u protokolu
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF nepodudaranje
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nije ovlašten
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :primljen je nepoznat paket
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :pogrešna revizija
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :ime se već koristi
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :pogrešna zaporka
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :krivi id tvrtke u DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :izba�en{G "" a o} od strane poslužitelja
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :je pokuša{G o la lo} varati
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :poslužitelj je pun
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :opća greška
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :greška u sinkronizaciji
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :nije moguće u�itati kartu
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :veza je izgubljena
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :greška u protokolu
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF nepodudaranje
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nije ovlašten
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :primljen je nepoznat paket
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :pogrešna revizija
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :ime se već koristi
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :pogrešna zaporka
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :krivi id tvrtke u DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :izba�en{G "" a o} od strane poslužitelja
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :je pokuša{G o la lo} varati
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :poslužitelj je pun
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1509,15 +1509,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Igra zaustavlje
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Igra nastavljena (klijent spojen)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Igra nastavljena (klijent se nije uspio spojiti)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :odlazim
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} se pridružio igri
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} se pridružio tvrtci #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} se pridružio promatra�ima
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} je osnovao novu tvrtku (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} je izašao iz igre ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} je promijenio/la ime u {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} je dao vašoj kompaniji {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Dali ste {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :odlazim
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} se pridružio igri
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} se pridružio tvrtci #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} se pridružio promatra�ima
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} je osnovao novu tvrtku (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} je izašao iz igre ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} je promijenio/la ime u {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} je dao vašoj kompaniji {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dali ste {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Ekipa]:
 STR_NETWORK_CHAT_COMPANY                                        :[Ekipa] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Ekipa] Za {STRING}: {WHITE}{STRING}
@@ -1527,8 +1527,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privatno] Za {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Svima] :
 STR_NETWORK_CHAT_ALL                                            :[Svima] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Upišite tekst mrežnog razgovora
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Poslužitelj je zatvorio sesiju
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Poslužitelj se ponovno pokreće...{}Molimo pri�ekajte...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Poslužitelj je zatvorio sesiju
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Poslužitelj se ponovno pokreće...{}Molimo pri�ekajte...
 
 STR_NETWORK_SERVER                                              :Poslužitelj
 STR_NETWORK_CLIENT                                              :Klijent
@@ -1542,19 +1542,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Razgovaraj s tv
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privatna poruka
 
 
-STR_NETWORK_SEND                                                :{BLACK}Pošalji
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Pošalji
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nemoguće je u�itati krajolik iz PNG-a...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...datoteka nije pronađena.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ne mogu pretvoriti vrstu slike. Potrebna je 8 ili 24-bitna PNG slika.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...nešto je otišlo u krivom smjeru. Oprostite. (vjerojatno je pokvarena datoteka)
+STR_ERROR_PNGMAP                                                :{WHITE}Nemoguće je u�itati krajolik iz PNG-a...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...datoteka nije pronađena.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...ne mogu pretvoriti vrstu slike. Potrebna je 8 ili 24-bitna PNG slika.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...nešto je otišlo u krivom smjeru. Oprostite. (vjerojatno je pokvarena datoteka)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Ne mogu u�itati krajolik iz BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ne mogu pretvoriti vrstu slike.
+STR_ERROR_BMPMAP                                                :{WHITE}Ne mogu u�itati krajolik iz BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...ne mogu pretvoriti vrstu slike.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Cijena: {CURRENCY}
@@ -1568,13 +1568,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Predviđ
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Ovdje nije moguće povisiti zemlju...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Ovdje nije moguće sniziti zemlju...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Ovdje nije moguće sravniti zemlju...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Stijenje
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Surova zemlja
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Ogoljena zemlja
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Trava
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Polja
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Zemlja pokrivena snijegom
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Pustinja
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Stijenje
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Surova zemlja
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Ogoljena zemlja
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Trava
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Polja
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Zemlja pokrivena snijegom
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Pustinja
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Zemlja nakošena u krivom smjeru
@@ -1582,11 +1582,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Nemoguć
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Iskopavanje bi oštetilo tunel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Već je na razini mora
 STR_ERROR_TOO_HIGH                                              :{WHITE}Previsoko
-STR_ALREADY_LEVELLED                                            :{WHITE}... već je sravnjeno
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... već je sravnjeno
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nije prikladno za želježnicku prugu
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...već izgrađeno
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Najprije je potrebno ukloniti željezni�ku prugu
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Cesta je jednosmjerna ili je blokirana
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Cesta je jednosmjerna ili je blokirana
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Izgradnja željeznice
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Izgradnja elektrificirane željeznice
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Izgradnja jednotra�ne željeznice
@@ -1610,41 +1610,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Izgradi
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Izgradi željezni�ki most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Izgradi željezni�ki tunel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Aktiviraj izgradnju/uklanjanje željezni�ke pruge i znakova
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Izbor mosta - klikni na most koji želiš izgraditi
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Izbor mosta - klikni na most koji želiš izgraditi
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Odaberi smjer željezni�kog spremišta
-STR_RAILROAD_TRACK                                              :Željezni�ka pruga
-STR_RAILROAD_TRAIN_DEPOT                                        :Željezni�ko spremište vlakova
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Željezni�ka pruga
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Željezni�ko spremište vlakova
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...podru�je je u vlasništvu druge tvrke
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Željezni�ka pruga s blokirajućim signalima
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Željezni�ka pruga s pre-signalima
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Željezni�ka pruga s izlaznim signalima
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Željezni�ka pruga s kombo signalima
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Željezni�ka pruga s putnim signalima
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Željezni�ka pruga s jednosmjernim putnim signalima
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Željezni�ka pruga s normalnim i pre-signalima
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Željezni�ka pruga s blokirajućim i izlaznim signalima
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Željezni�ka pruga s blokirajućim i kombo signalima
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Željezni�ka pruga s blokirajućim i putnim signalima
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Željezni�ka pruga s blokirajućim i jednosmjernim putnim signalima
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Željezni�ka pruga s pre- i izlaznim signalima
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Željezni�ka pruga s pre- i kombo signalima
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Željezni�ka pruga s pre- i putnim znakovima
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Željezni�ka pruga s pre- i jednosmjernim putnim signalima
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Željezni�ka pruga s izlaznim i kombo signalima
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Željezni�ka pruga s izlaznim i putnim signalima
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Željezni�ka pruga s izlaznim i jednosmjernim putnim signalima
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Željezni�ka pruga s kombo i putnim signalima
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Željezni�ka pruga s kombo i jednosmjernim putnim signalima
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Željezni�ka pruga s putnim i jednosmjernim putnim signalima
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Najprije je potrebno ukloniti željezni�ku postaju
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Izgradi odvojenu stanicu
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Pridruži stanicu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Željezni�ka pruga s blokirajućim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Željezni�ka pruga s pre-signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Željezni�ka pruga s izlaznim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Željezni�ka pruga s kombo signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Željezni�ka pruga s putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Željezni�ka pruga s jednosmjernim putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Željezni�ka pruga s normalnim i pre-signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Željezni�ka pruga s blokirajućim i izlaznim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Željezni�ka pruga s blokirajućim i kombo signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Željezni�ka pruga s blokirajućim i putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Željezni�ka pruga s blokirajućim i jednosmjernim putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Željezni�ka pruga s pre- i izlaznim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Željezni�ka pruga s pre- i kombo signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Željezni�ka pruga s pre- i putnim znakovima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Željezni�ka pruga s pre- i jednosmjernim putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Željezni�ka pruga s izlaznim i kombo signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Željezni�ka pruga s izlaznim i putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Željezni�ka pruga s izlaznim i jednosmjernim putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Željezni�ka pruga s kombo i putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Željezni�ka pruga s kombo i jednosmjernim putnim signalima
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Željezni�ka pruga s putnim i jednosmjernim putnim signalima
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Najprije je potrebno ukloniti željezni�ku postaju
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Izgradi odvojenu stanicu
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Pridruži stanicu
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Najprije je potrebno ukloniti cestu
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Cestovni radovi u tijeku
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Cestovni radovi u tijeku
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Izgradnja ceste
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Izgradnja tramvaja
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Odaberi cestovni most
@@ -1680,14 +1680,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Izgradi
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktiviraj/deaktiviraj jednosmjerne ceste
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Aktiviraj izgradnju/uklanjanje ceste
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Aktiviraj izgradnju/brisanje za izgradnju tramvaja
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Odaberi smjer spremišta cestovnih vozila
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Odaberi smjer tramvajskog spremišta
-STR_ROAD_DESCRIPTION_ROAD                                       :Cesta
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Cesta sa semaforima
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Cesta s tri trake
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Spremište cestovnih vozila
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Prijelaz ceste preko željezni�ke pruge
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramvaj
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Odaberi smjer spremišta cestovnih vozila
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Odaberi smjer tramvajskog spremišta
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Cesta
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Cesta sa semaforima
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Cesta s tri trake
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Spremište cestovnih vozila
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Prijelaz ceste preko željezni�ke pruge
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramvaj
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nije moguće ukloniti autobusnu postaju...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nije moguće ukloniti kamionsku postaju...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nije moguće ukloniti putni�ku tramvajsku postaju...
@@ -1695,12 +1695,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nije mog
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Gradovi
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Najprije je potrebno srušiti građevinu
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Metropola)
@@ -1713,9 +1713,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrira
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Promijeni ime grada
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Putnika prošli mjesec: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Pošte prošli mjesec: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Potrebno tereta za rast grada:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} potrebno
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} isporu�eno prošli mjesec
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Potrebno tereta za rast grada:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} potrebno
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} isporu�eno prošli mjesec
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visoki uredski blok
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Uredski blok
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Mali stambeni blok
@@ -1752,7 +1752,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subvencija je dodijeljena tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STATION} do postaje {STATION} plaćat će se trostruko sljedećih godinu dana!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subvencija je dodijeljena tvrtki {STRING}!{}{}Prijevoz {STRING.gen} od postaje {STATION} do postaje {STATION} plaćat će se �etverostruko sljedećih godinu dana!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Lokalna samouprava grada {TOWN}a odbija dozvoliti izgradnju još jedne zra�ne luke u ovom gradu
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} ne dozvoljava izgradnju zrakoplovne luke zbog brige o buci
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} ne dozvoljava izgradnju zrakoplovne luke zbog brige o buci
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Kolibe
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Kuće
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Stanovi
@@ -1788,7 +1788,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Grad {TOWN} zahvatio je prometni kaos!{}{}Program rekonstrukcije cesta koji financira tvrtka {STRING} sljedećih će 6 mjeseci zadavati glavobolje motoriziranima!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (u izgradnji)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (u izgradnji)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglu
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indijanski Å¡ator
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :ÄŒajnik za stanovanje
@@ -1801,17 +1801,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Postavi znak
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drveće
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...ovdje već postoji drvo
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Ovdje nije moguće posaditi drvo...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...previše znakova
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Ovdje nije moguće postaviti znak...
-STR_SIGN_DEFAULT                                                :Znak
+STR_DEFAULT_SIGN_NAME                                           :Znak
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Izmijeni tekst znaka
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nije moguće promijeniti ime znaka...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Znak nije moguće obrisati...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Odaberi vrstu drveta za sadnju
-STR_TREE_NAME_TREES                                             :Drveće
-STR_TREE_NAME_RAINFOREST                                        :Kišna šuma
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusi
+STR_LAI_TREE_NAME_TREES                                         :Drveće
+STR_LAI_TREE_NAME_RAINFOREST                                    :Kišna šuma
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusi
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Izbor željezni�ke postaje
@@ -1831,7 +1831,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Najprije
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Preblizu drugoj zra�noj luci
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Najprije je potrebno srušiti zra�nu luku
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Preimenuj postaju/terminal
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Preimenuj postaju/terminal
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nije moguće preimenovati postaju...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ocjene
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prihvaća
@@ -1849,10 +1849,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Izvanredno
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokaži sve vlakove koji imaju ovu postaju u svom rasporedu
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaži sva cestovna vozila koja imaju ovu postaju u svom rasporedu
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaži sve zrakoplove koji imaju ovu postaju u svom rasporedu
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaži sve brodove koji imaju ovu postaju u svom rasporedu
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Pokaži sve vlakove koji imaju ovu postaju u svom rasporedu
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Prikaži sva cestovna vozila koja imaju ovu postaju u svom rasporedu
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Prikaži sve zrakoplove koji imaju ovu postaju u svom rasporedu
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Prikaži sve brodove koji imaju ovu postaju u svom rasporedu
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} više ne prihvaća {STRING.aku}
@@ -1885,47 +1885,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Promijen
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Prikaži popis tereta koji se prihvaća
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Imena postaja - klikni na ime kako bi centrirao glavni pogled na postaju
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Odaberi veli�inu/vrstu zra�ne luke
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Željezni�ka postaja
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Zrakoplovni hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Zra�na luka
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Ukrcajno podru�je
-STR_STATION_DESCRIPTION_BUS_STATION                             :Autobusna postaja
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Brodsko pristanište
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Željezni�ka postaja
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Zrakoplovni hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Zra�na luka
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Ukrcajno podru�je
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Autobusna postaja
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Brodsko pristanište
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Ozna�i podru�je koje pokriva željeno mjesto
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nemoj ozna�iti podru�je koje pokriva željeno mjesto
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Ozna�avanje podru�ja pokrivanja
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Pristanište
-STR_STATION_DESCRIPTION_BUOY                                    :Pluta�a
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Pluta�a
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...pluta�a na putu
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...postaja previše proširena
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...neujedna�ene postaje onemogućene
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Drži CTRL kako bi odabrao više od jedne stavke
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...neujedna�ene postaje onemogućene
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Drži CTRL kako bi odabrao više od jedne stavke
 
 STR_UNDEFINED                                                   :(neodređen znakovni niz)
-STR_STAT_CLASS_DFLT                                             :Zadana postaja
-STR_STAT_CLASS_WAYP                                             :Čvorišta
+STR_STATION_CLASS_DFLT                                          :Zadana postaja
+STR_STATION_CLASS_WAYP                                          :Čvorišta
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Smjer spremišta brodova
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...mora biti izgrađen na vodi
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Ovdje nije moguće izgraditi spremište brodova...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Odaberi smjer spremišta brodova
-STR_WATER_DESCRIPTION_WATER                                     :Voda
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Obala ili rije�ni nasip
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Spremište brodova
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvadukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Voda
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Obala ili rije�ni nasip
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Spremište brodova
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Nije moguće graditi na vodi
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Najprije je potrebno srušiti kanal
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Najprije je potrebno srušiti kanal
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spremi igru
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}U�itaj igru
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Spremi
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Obriši
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Gledatelj, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Gledatelj, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} slobod{P an na no}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Ne mogu pro�itati disk
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Spremanje igre nije uspjelo{}{STRING}
@@ -1941,12 +1941,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Popis di
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Trenutno odabrano ime za spremanje igre
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Obriši trenutno odabranu spremljenu igru
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Spremi trenutnu igru koristeći odabrano ime
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Stvori nasumi�nu novu igru
-STR_LOAD_HEIGHTMAP                                              :{WHITE}U�itaj visinsku kartu
-STR_SAVE_OSKTITLE                                               :{BLACK}Upiši ime za spremanje igre
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Stvori nasumi�nu novu igru
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}U�itaj visinsku kartu
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Upiši ime za spremanje igre
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} na putu
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} na putu
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Rudnik ugljena
 STR_INDUSTRY_NAME_POWER_STATION                                 :Elektrana
@@ -2004,7 +2004,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centriraj glavni pogled na položaj industrije
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Zapo�ela je izgradnja nove {STRING.gen} u blizini grada {TOWN}a!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nova {STRING} trenutno se sadi blizu grada {TOWN}a!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cijena: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cijena: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Ovdje nije moguće izgraditi ovu vrstu industrije...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...šume mogu jedino biti posađene iznad linije snijega
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} objavljuje skoro zatvaranje!
@@ -2022,16 +2022,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Smeta drugi tunel
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunel bi završio izvan karte
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunel bi završio izvan karte
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Ne moguće iskopoati zemlju na drugoj strani tunela
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Najprije je potrebno srušiti tunel
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Najprije je potrebno srušiti most
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Po�etak i kraj ne mogu biti na istom mjestu
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Glave mosta nisu na istoj razini
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Most je prenizak za teren
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Po�etak i kraj ne mogu biti na istom mjestu
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Glave mosta nisu na istoj razini
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je prenizak za teren
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Po�etak i kraj moraju biti u ravnini
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Neprikladan teren za ulaz u tunel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Viseći, �eli�ni
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Noseći, �eli�ni
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Konzolni, �eli�ni
@@ -2042,30 +2042,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cijevni, Ä�eliÄ
 STR_BRIDGE_TUBULAR_SILICON                                      :Cjevni, silikonski
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Ovdje nije moguće izgraditi most...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Ovdje nije moguće izgraditi tunel...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Željezni�ki tunel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Cestovni tunel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Čeli�ni viseći željezni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Čeli�ni noseći željezni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Čeli�ni konzolni željezni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Oja�ani betonski viseći željezni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Drveni željezni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonski željezni�ki most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Čeli�ni viseći cestovni most
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Čeli�ni noseći cestovni most
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Čeli�ni konzolni cestovni most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Oja�ani betonski viseći cestovni most
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Drveni cestovni most
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonski cestovni most
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Cijevni željezni�ki most
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Cijevni cestovni most
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Željezni�ki tunel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Cestovni tunel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Čeli�ni viseći željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Čeli�ni noseći željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Čeli�ni konzolni željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Oja�ani betonski viseći željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Drveni željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonski željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Čeli�ni viseći cestovni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Čeli�ni noseći cestovni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Čeli�ni konzolni cestovni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Oja�ani betonski viseći cestovni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Drveni cestovni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonski cestovni most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Cijevni željezni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Cijevni cestovni most
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Smeta objekt
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Odašilja�
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Svjetionik
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sjedište tvrtke
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Odašilja�
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Svjetionik
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sjedište tvrtke
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...smeta sjedište tvrtke
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Zemlja u posjedu tvrtke
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Zemlja u posjedu tvrtke
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Ovu zemlju nije moguće kupiti...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...već je u tvom vlasništvu!
 
@@ -2111,7 +2111,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Postaj
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Težina igre
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Spremi
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Spremi
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lagano
@@ -2184,8 +2184,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Boja:
 STR_LIVERY_CAPTION                                              :{WHITE}Nova boja
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Ime tvrtke
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Ime direktora
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Ime tvrtke
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Ime direktora
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Ime tvrtke
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Ime direktora
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Ime tvrtke nije moguće promijeniti...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Nije moguće promijeniti ime direktora...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Financije {BLACK}{COMPANYNUM}
@@ -2209,11 +2209,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Ukupno:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Grafikon prihoda
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Grafikon operativne dobiti
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bankovna bilanca
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Zajam
-STR_MAX_LOAN                                                    :{WHITE}Maks zajam:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maks zajam:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pozajmi {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Otplati {SKIP}{SKIP}{CURRENCY}
@@ -2222,7 +2222,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nije mog
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...nema zajma za otplatu
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} potrebno
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nije moguće otplatiti zajam...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Ne možeš dati novac koji je pozajmljen od banke...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Ne možeš dati novac koji je pozajmljen od banke...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Odaberi novo lice direktora
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Promijeni shemu boja za vozila tvrtke
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Promjeni ime direktora
@@ -2232,10 +2232,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Otplati
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Direktor)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Na poziciji od: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vozila:
-STR_TRAINS                                                      :{WHITE}{COMMA} vlak{P "" a ova}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} cestovn{P o a ih} vozil{P o a a}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} zrakoplov
-STR_SHIPS                                                       :{WHITE}{COMMA} brod{P "" a ova}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" a ova}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} cestovn{P o a ih} vozil{P o a a}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} zrakoplov
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} brod{P "" a ova}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ništa
 STR_FACE_CAPTION                                                :{WHITE}Izbor lica
 STR_FACE_MALE_BUTTON                                            :{BLACK}Muško
@@ -2249,7 +2249,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generira
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Klju�
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Pokaži klju�eve na grafikonima
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Klju� za grafikone tvrtke
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klikni ovdje za uklju�ivanje/isklju�ivanje tvrtke s grafikona
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klikni ovdje za uklju�ivanje/isklju�ivanje tvrtke s grafikona
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Dostavljenih jedinica tereta
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Ocjena u�inka tvrtke (najveća ocjena = 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Vrijednost tvrtki
@@ -2283,23 +2283,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Predsjednik
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Tajkun
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Izgradi sjedište tvrtke
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Izgradi središte tvrtke / pogledaj sjedište tvrtke
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Izgradi sjedište tvrtke negdje drugdje za 1% troška od cjelokupne vrijednosti tvrtke
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Izgradi sjedište tvrtke negdje drugdje za 1% troška od cjelokupne vrijednosti tvrtke
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nije moguće izgraditi sjedište tvrtke...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Pogledaj sjedište tvrtke
-STR_RELOCATE_HQ                                                 :{BLACK}Premjesti sjedište kompanije
-STR_COMPANY_JOIN                                                :{BLACK}Pridruži se
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Pridruži se i igraj kao ova tvrtka
-STR_COMPANY_PASSWORD                                            :{BLACK}Zaporka
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Zaštiti svoju tvrtku od neovlaštenog korištenja pomoću zaporke.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Postavi zaporku tvrtke
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Premjesti sjedište kompanije
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Pridruži se
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Pridruži se i igraj kao ova tvrtka
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Zaporka
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Zaštiti svoju tvrtku od neovlaštenog korištenja pomoću zaporke.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Postavi zaporku tvrtke
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nemoj spremiti upisanu zaporku
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Daj tvrtci novu zaporku
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Zaporka tvrtke
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Inicijalna zaporka tvrtke
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Uporabi zaporku ove tvrtke kao inicijalnu za nove tvrtke
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Inicijalna zaporka tvrtke
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Uporabi zaporku ove tvrtke kao inicijalnu za nove tvrtke
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Svjetska recesija!{}{}Financijski stru�njaci o�ekuju najgore zbog ekonomske krize!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Recesija završena!{}{}Obrat  u trgovanu daje samopouzdanje gospodarstvu jer ekonomija ja�a!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Namjesti veliku/malu veli�inu prozora
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Namjesti veliku/malu veli�inu prozora
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Vrijednost tvrtke: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kupi 25% udjela u tvrtci
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Prodaj 25% udjela u tvrtci
@@ -2309,7 +2309,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Nije mog
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Nije moguće prodati 25% udjela u ovoj tvrtci...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% u vlasništvu {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} je preuzeta od strane tvrtke {STRING}!
-STR_PROTECTED                                                   :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima...
+STR_ERROR_PROTECTED                                             :{WHITE}Ova tvrka još nije dovoljno stara da bi trgovala udjelima...
 
 STR_LIVERY_DEFAULT                                              :Standardna boja
 STR_LIVERY_STEAM                                                :Parna lokomotiva
@@ -2335,14 +2335,14 @@ STR_LIVERY_LARGE_PLANE                                          :Veliki zrakoplo
 STR_LIVERY_PASSENGER_TRAM                                       :Putni�ki tramvaj
 STR_LIVERY_FREIGHT_TRAM                                         :Teretni tramvaj
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Prikaži generalne sheme boja
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Prikaži sheme boja za vlak
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Prikaži sheme boja za cestovno vozilo
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Prikaži sheme boja za brod
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Prikaži sheme boja za zrakoplov
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Izaberi primarnu boju za odabranu shemu
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Odaberi sekundardnu boju za odabranu shemu
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Izaberi shemu boja za promjenu, ili višestruke sheme pomoću CTRL+klik. Klikni na kućicu kako bi odredio uporabu sheme
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Prikaži generalne sheme boja
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Prikaži sheme boja za vlak
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Prikaži sheme boja za cestovno vozilo
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Prikaži sheme boja za brod
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Prikaži sheme boja za zrakoplov
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Izaberi primarnu boju za odabranu shemu
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Odaberi sekundardnu boju za odabranu shemu
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Izaberi shemu boja za promjenu, ili višestruke sheme pomoću CTRL+klik. Klikni na kućicu kako bi odredio uporabu sheme
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (parni)
@@ -2647,9 +2647,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(ÄŒeaj bilo koj
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Promijeni zaustavno ponašanje ozna�ene naredbe
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Promijeni ukrcajno ponašanje ozna�ene naredbe
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Promijeni iskrcajno ponašanje ozna�ene naredbe
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Ubaci naprednu naredbu
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Ubaci naprednu naredbu
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Idi do najbližeg spremišta
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Idi do najbližeg hangara
 STR_ORDER_NEAREST_DEPOT                                         :najbliži
@@ -2659,9 +2659,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Servisiraj nepr
 STR_ORDER_TRAIN_DEPOT                                           :Spremište vlakova
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Spremište cestovnih vozila
 STR_ORDER_SHIP_DEPOT                                            :Spremište brodova
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Idi neprekidno
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servisiraj prema potrebi
@@ -2686,10 +2686,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je više od
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je više ili jednako
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je istinito
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :je lažno
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Sko�in na naredbu {COMMA}
-STR_CONDITIONAL_NUM                                             :Sko�i na naredbu {COMMA} kada {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Sko�i na naredbu {COMMA} kada {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Sko�in na naredbu {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Sko�i na naredbu {COMMA} kada {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Sko�i na naredbu {COMMA} kada {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nema putovanja
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Putovanje (bez rasporeda)
@@ -2712,18 +2712,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlakovi
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Presko�i
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Obriši
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Idi do
-STR_REFIT                                                       :{BLACK}Prenamijeni
-STR_REFIT_TIP                                                   :{BLACK}Odaberi vrstu tereta za prenamijenu u ovoj naredbi. CTRL+klik kako bi uklonio naputak za prenamjenu
-STR_REFIT_ORDER                                                 :(Prenamijeni u {STRING})
-STR_REFIT_STOP_ORDER                                            :(Prenamijeni u {STRING} i zaustavi se)
-STR_STOP_ORDER                                                  :(Stani)
-STR_TIMETABLE_VIEW                                              :{BLACK} Raspored
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Prebacivanje na pogled rasporeda
-STR_ORDER_VIEW                                                  :{BLACK}Naredbe
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prebaci na pregled naredbi
+STR_ORDER_REFIT                                                 :{BLACK}Prenamijeni
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Odaberi vrstu tereta za prenamijenu u ovoj naredbi. CTRL+klik kako bi uklonio naputak za prenamjenu
+STR_ORDER_REFIT_ORDER                                           :(Prenamijeni u {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Prenamijeni u {STRING} i zaustavi se)
+STR_ORDER_STOP_ORDER                                            :(Stani)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK} Raspored
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Prebacivanje na pogled rasporeda
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Naredbe
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Prebaci na pregled naredbi
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Naredbe)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Kraj naredbi - -
-STR_SERVICE                                                     :{BLACK}Servis
+STR_ORDER_SERVICE                                               :{BLACK}Servis
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrijednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2743,7 +2743,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vozilo n
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozilo koje dijeli ovu naredbu ne može doći do te stanice
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nije moguće ukloniti vozilo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Stražnja lokomotiva će uvijek pratiti svog prednjeg dvojnika
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ne može pronaći put do lokalnog spremišta
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servisni interval: {LTBLUE}{COMMA}dana{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servisni interval: {LTBLUE}{COMMA}%{BLACK} Zadnji servis: {LTBLUE}{DATE_LONG}
@@ -2763,8 +2763,8 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Raspored
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Promijeni koli�inu vremena koju bi ozna�ena naredba trebala uzeti
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Obriši vrijeme potrebno za ozna�enu naredbu
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Resetiraj broja� kašnjenja, kako bi vozilo stiglo na vrijeme
-STR_SERVICE_HINT                                                :{BLACK}Presko�i ovu narudžbu osim ako servis nije potreban
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cijena: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY} Snaga: {POWER}{}Trošak uporabe: {CURRENCY}/god{}Kapacitet: {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Presko�i ovu narudžbu osim ako servis nije potreban
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cijena: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY} Snaga: {POWER}{}Trošak uporabe: {CURRENCY}/god{}Kapacitet: {CARGO}
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Zaustavljen
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Nije moguće natjerati vlak da ignorira signale dok traje opasnost...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Slupan!
@@ -2772,27 +2772,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Slupan!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Vlak se sudario!{}{COMMA} poginu{P o la lih} u eksploziji nakon sudara
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nije moguće promijeniti smjer vlaka...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne mogu okreniti vozila koja se sastoje od više jedinica
-STR_CLEAR_TIME                                                  :{BLACK}Obriši vrijeme
-STR_RESET_LATENESS                                              :{BLACK}Poništi Broja� Kašnjenja
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Promijeni ime �vorišta
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Obriši vrijeme
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Poništi Broja� Kašnjenja
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Promijeni ime �vorišta
 
-STR_TRAIN_STOPPING                                              :{RED}Zaustavljam
-STR_TRAIN_STOPPING_VEL                                          :{RED}Zaustavljam, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Nekompatibilna vrsta tra�nica
-STR_TRAIN_NO_POWER                                              :{RED}Nema struje
-STR_TRAIN_START_NO_CATENARY                                     :Ovoj pruzi nedostaje vu�na užad, stoga vlak ne može krenuti
-STR_TRAIN_STUCK                                                 :{ORANGE}ÄŒekanje slobodne putanje
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Zaustavljam
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Zaustavljam, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Nekompatibilna vrsta tra�nica
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Nema struje
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Ovoj pruzi nedostaje vu�na užad, stoga vlak ne može krenuti
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}ÄŒekanje slobodne putanje
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Novi {STRING} je sada dostupan!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Novi {STRING} je sada dostupan! - {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Ne mogu prodati uništeno vozilo...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Ne mogu prenamijeniti uništeno vozilo...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Ne mogu prodati uništeno vozilo...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Ne mogu prenamijeniti uništeno vozilo...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Nije moguće rasporediti vozilo...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vozila mogu �ekati samo na postajama.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Ovo vozilo se ne zaustavlja na ovoj postaji.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Nije moguće rasporediti vozilo...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vozila mogu �ekati samo na postajama.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Ovo vozilo se ne zaustavlja na ovoj postaji.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Promijeni vrijeme
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Ovo vozilo vozi na vrijeme
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Ovo vozilo trenuta�no {STRING} kasni
@@ -2806,7 +2806,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Automats
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...mora biti zaustavljen unutar spremišta cestovnih vozila
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ne mogu pronaći lokalno spremište
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Natjeraj vozila da se okrene natrag
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Nosivost: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Nosivost: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o a a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2832,11 +2832,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Smjesti pluta�u koja može biti korištena kao pokazatelj puta
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Nije moguće staviti pluta�u ovdje...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Izgradi akvadukt
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ovdje nije moguće izgraditi akvadukt...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Ovdje nije moguće izgraditi akvadukt...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prenamijeni)
 STR_REFIT_TITLE                                                 :{GOLD}Odaberi vrstu tereta za prijevoz:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova nosivost: {GOLD}{CARGO}{}{BLACK}Cijena prenamjene: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(prenamjenjiv)
+STR_PURCHASE_INFO_REFITTABLE                                    :(prenamjenjiv)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Zra�ne luke
@@ -2849,7 +2849,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Izgradi
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Građani slave . . .{}Prvi zrakoplov je stigao u zra�nu luku {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Pad zrakoplova!{}{COMMA} poginulih u eksploziji na {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Avionska nesreća{}Avion je ostao bez goriva, {COMMA} poginulo u nesreći
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Raspored)
 
@@ -2862,13 +2862,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Urušavanje rudnika ugljena ostavilo je trag blizu grada {TOWN}a!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Poplave!{}Najmanje {COMMA} nestalih, pretpostavlja se poginulih nakon zna�ajnih poplava!
 
-STR_BRIBE_FAILED                                                :{WHITE}Tvoj pokušaj podmićivanja je
-STR_BRIBE_FAILED_2                                              :{WHITE}otkriven od strane regionalnog istražitelja
-STR_BUILD_DATE                                                  :{BLACK}Izgrađeno: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Tvoj pokušaj podmićivanja je
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}otkriven od strane regionalnog istražitelja
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Izgrađeno: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Klasa postaje: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Vrsta postaje: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Klasa postaje: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Vrsta postaje: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detaljna procjena rezultata
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalji
@@ -2888,28 +2888,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Novac:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Zajam:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Ukupno:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Broj vozila; ovo uklju�uje cestovna vozila, vlakove, brodove i avione
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Broj dijelova postaje. Svaki dio postaje (npr. željezni�ki kolodvor, autobusna postaja, aerodrom) se ra�una, �ak i ako su spojene kao jedna postaja
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Dobit vozila s najnižim prihodom (od svih vozila starijih od 2 godine)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Koli�ina gotovine uprihodovana u mjesecu s najvišom dobiti u zadnjih 12 kvartala
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Koli�ina gotovine uprihodovana u mjesecu s najvišom dobiti u zadnjih 12 kvartala
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Jedinice tereta dostavljene u zadnje �etiri �etvrtine
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Broj vrsta tereta dostavljenog u zadnjoj �etvrtini
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Koli�ina novca koji ova kompanija ima u banci
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Iznos novca koji je ova tvrtka pozajmila
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Ukupni broj bodova od mogućih bodova
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Broj vozila; ovo uklju�uje cestovna vozila, vlakove, brodove i avione
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Broj dijelova postaje. Svaki dio postaje (npr. željezni�ki kolodvor, autobusna postaja, aerodrom) se ra�una, �ak i ako su spojene kao jedna postaja
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Dobit vozila s najnižim prihodom (od svih vozila starijih od 2 godine)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Koli�ina gotovine uprihodovana u mjesecu s najvišom dobiti u zadnjih 12 kvartala
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Koli�ina gotovine uprihodovana u mjesecu s najvišom dobiti u zadnjih 12 kvartala
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Jedinice tereta dostavljene u zadnje �etiri �etvrtine
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Broj vrsta tereta dostavljenog u zadnjoj �etvrtini
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Koli�ina novca koji ova kompanija ima u banci
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Iznos novca koji je ova tvrtka pozajmila
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Ukupni broj bodova od mogućih bodova
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Postavke
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži postavke NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF postavke
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Potvrdi promjene
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Aktiviraj paletu
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Prilagodi paletu izabranog NewGRF-a.{}U�ini ovo kada grafike iz ovog NewGRF-a izgledaju ljubi�asto tijekom igre.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Postavi parametre
-STR_NEWGRF_FILENAME                                             :{BLACK}Datoteka: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 suma: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdi promjene
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Aktiviraj paletu
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Prilagodi paletu izabranog NewGRF-a.{}U�ini ovo kada grafike iz ovog NewGRF-a izgledaju ljubi�asto tijekom igre.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Postavi parametre
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Datoteka: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5 suma: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Spremate se napraviti izmjene na pokrenutoj igri; to može srušiti OpenTTD.{}Jeste li potpuno sigurni u to?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2932,34 +2932,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Pokušaj uporab
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sadrži neispravan grafi�ki znak. Svi neispravni grafi�ki znakovi bit će pokazani kao crveni upitnik (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sadrži mnoge Action 8 unose.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}U�itaj unaprijed odabrane postavke
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Spremi zadano postavljanje
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Spremi trenutni popis kao zadano postavljanje
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Upiši ime zadanog postavljanja
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Obriši zadano postavljanje
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Obriši trenutno izabrano zadano postavljanje
-STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodaj NewGRF datoteku u listu
-STR_NEWGRF_REMOVE                                               :{BLACK}Ukloni
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Ukloni odabranu NewGRF datoteku s popisa
-STR_NEWGRF_MOVEUP                                               :{BLACK}Pomakni gore
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Pomakni odabranu NewGRF datoteku gore na listi
-STR_NEWGRF_MOVEDOWN                                             :{BLACK} Pomakni dolje
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Popis instaliranih NewGRF datoteka. Kliknite na datoteku da bi promijenili njene parametre
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametri: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Unesite NewGRF  parametre
-STR_NEWGRF_NO_INFO                                              :{BLACK}Nema dostupnih informacija
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}U�itaj unaprijed odabrane postavke
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Spremi zadano postavljanje
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Spremi trenutni popis kao zadano postavljanje
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Upiši ime zadanog postavljanja
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Obriši zadano postavljanje
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Obriši trenutno izabrano zadano postavljanje
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Dodaj
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Dodaj NewGRF datoteku u listu
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Ukloni
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Ukloni odabranu NewGRF datoteku s popisa
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Pomakni gore
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Pomakni odabranu NewGRF datoteku gore na listi
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK} Pomakni dolje
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Popis instaliranih NewGRF datoteka. Kliknite na datoteku da bi promijenili njene parametre
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametri: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Unesite NewGRF  parametre
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Nema dostupnih informacija
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupne NewGRF datoteke
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Dodaj u selekciju
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Dodaj odabrane NewGRF datoteke u svoju konfiguraciju
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Ponovno skeniraj datoteke
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Osvježi listu dostupnih NewGRF datoteka
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Dodaj odabrane NewGRF datoteke u svoju konfiguraciju
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Ponovno skeniraj datoteke
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Osvježi listu dostupnih NewGRF datoteka
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ne mogu dodati datoteku: dupli GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Odgovarajuća datoteka nije pronađena
-STR_NEWGRF_DISABLED                                             :{RED}Onemogućeno
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Odgovarajuća datoteka nije pronađena
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Onemogućeno
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odgovarajuća datoteka nije pronađena (kompatibilni GRF podignut)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilni GRF(ovi) u�itani umjesto nepronađenih datoteka
@@ -2974,7 +2974,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Vlak'{VE
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' daje neto�ne informacije.
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informacija tereta/obnavljanja za '{1:ENGINE}' je razli�ita od kupovne liste nakon konstrukcije. Zbog toga bi automatsko obnavljanje/zamjena mogla biti neuspješna
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Igra je bila spremljena u verziji bez podrške za tramvaje. Zbog toga su svi tramvaji uklonjeni.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Igra je bila spremljena u verziji bez podrške za tramvaje. Zbog toga su svi tramvaji uklonjeni.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Proizvoljna valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Devizni te�aj: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3003,8 +3003,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} brod{P "" a ova}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} zrakoplova
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Dijeljene naredbe za {COMMA} vozil{P o a a}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Pokaži sva vozila koja dijele ovaj raspored.
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Dijeljene naredbe za {COMMA} vozil{P o a a}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Pokaži sva vozila koja dijele ovaj raspored.
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} �eka u željezni�kom hangaru
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} �eka u radioni
@@ -3111,39 +3111,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prenamij
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prenamijeni teretni brod za prijevoz neke druge vrste tereta
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prenamijeni zrakoplov za prijevoz neke druge vrste tereta
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Putuje prema hangaru {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Putuje prema hangaru {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servisiranje u hangaru {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisiranje u hangaru {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloniraj vozilo
-STR_CLONE_SHIP                                                  :{BLACK}Kloniraj brod
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj zrakoplov
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ovo će izgraditi kopiju vlaka uklju�ujući sve vagone. Control-klik će dijeliti naredbe
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ovo će izgraditi kopiju cestovnog vozila. Control-clik će dijeliti naredbe
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ovo će izgradi kopiju broda. Control-klik će dijeliti naredbe
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovo će izgraditi kopiju zrakoplova. Control-klik će dijeliti naredbe
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ovo će napraviti kopiju vlaka uklju�ujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. CTRL-klik će dijeliti naredbe
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ovo će napraviti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ovo će napraviti kopiju broda. Klikni na ovaj gumb i onda na brod unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ovo će napraviti kopiju zrakoplova. Klikni ovaj gumb i onda na zrakoplov unutar ili izvan hangara. Control+klik će dijeliti naredbe
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Kreće se prema spremištu vlakova grada {TOWN}a, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Kreće se prema cestovnom spremištu grada {TOWN}a, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Kreće se prema spremištu brodova grada {TOWN}a, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Putuje prema hangaru {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Putuje prema hangaru {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servisiranje u spremištu vlakova grada {TOWN}a, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servisiranje u cestovnom spremištu grada {TOWN}a, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servisiranje u spremištu brodova grada {TOWN}a, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Servisiranje u hangaru {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Servisiranje u hangaru {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kloniraj vlak
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloniraj vozilo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloniraj brod
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloniraj zrakoplov
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Ovo će izgraditi kopiju vlaka uklju�ujući sve vagone. Control-klik će dijeliti naredbe
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Ovo će izgraditi kopiju cestovnog vozila. Control-clik će dijeliti naredbe
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Ovo će izgradi kopiju broda. Control-klik će dijeliti naredbe
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Ovo će izgraditi kopiju zrakoplova. Control-klik će dijeliti naredbe
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ovo će napraviti kopiju vlaka uklju�ujući sve vagone. Kliknite na ovaj gumb i onda na vlak unutar ili izvan spremišta. CTRL-klik će dijeliti naredbe
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ovo će napraviti kopiju cestovnog vozila. Klikni na ovaj gumb i onda na cestovno vozilo unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ovo će napraviti kopiju broda. Klikni na ovaj gumb i onda na brod unutar ili izvan spremišta. CTRL+klik će dijeliti naredbe
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ovo će napraviti kopiju zrakoplova. Klikni ovaj gumb i onda na zrakoplov unutar ili izvan hangara. Control+klik će dijeliti naredbe
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova željezni�ka vozila
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova elektri�na pružna vozila
@@ -3213,28 +3213,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrira
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Upravo se spremaš prodati sva vozila u spremištu. Jesi li siguran?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Pogrešna vrsta spremišta
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Pogrešna vrsta spremišta
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Prodaj sve vlakove u spremištu
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Prodaj sva cestovna vozila u spremištu
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Prodaj sve brodove u spremištu
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Prodaj sve zrakoplove u hangaru
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Prodaj sve vlakove u spremištu
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Prodaj sva cestovna vozila u spremištu
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Prodaj sve brodove u spremištu
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Prodaj sve zrakoplove u hangaru
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Daje popis svih vlakova koji imaju trenutno spremište među svojim naredbama
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Daje popis svih cestovnih vozila koje imaju trenutno spremište među svojim naredbama
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Daje popis svih brodova koji imaju trenutno spremište među svojim naredbama
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Daje popis svih zrakoplova koji imaju bilo koji hangar ove zra�ne luke među svojim naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Daje popis svih vlakova koji imaju trenutno spremište među svojim naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Daje popis svih cestovnih vozila koje imaju trenutno spremište među svojim naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Daje popis svih brodova koji imaju trenutno spremište među svojim naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Daje popis svih zrakoplova koji imaju bilo koji hangar ove zra�ne luke među svojim naredbama
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Automatski zamijeni sve vlakove u spremištu
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Automatski zamijeni sva cestovna vozikla u spremištu
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automatski zamijeni sve brodove u spremištu
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automatski zamijeni sve zrakoplove u spremištu
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Automatski zamijeni sve vlakove u spremištu
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Automatski zamijeni sva cestovna vozikla u spremištu
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Automatski zamijeni sve brodove u spremištu
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Automatski zamijeni sve zrakoplove u spremištu
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamijeni {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Po�ni zamijenjivati vozila
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Prestani zamijenjivati vozila
-STR_NOT_REPLACING                                               :{BLACK}Ne zamijenjujem
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Niti jedno vozilo nije odabrano
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ne zamijenjujem
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Niti jedno vozilo nije odabrano
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izaberi vrstu motora koju želiš zamijeniti
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Odaberite novi tip lokomotive koji želite koristiti umjesto lijevo odabranog tipa lokomotive
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klikni za zaustavljanje zamjene lijevo odabranog tipa lokomotive
@@ -3246,26 +3246,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ukoliko
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zamjenjujem:{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Prebaci između prozora za izmjenu lokomotiva i vagona
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo nije dostupno
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo nije dostupno
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Brod nije dostupan
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Zrakoplov nije dostupan
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozilo nije dostupno
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozilo nije dostupno
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Brod nije dostupan
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Zrakoplov nije dostupan
 
-STR_ENGINES                                                     :Lokomotive
-STR_WAGONS                                                      :Vagoni
+STR_REPLACE_ENGINES                                             :Lokomotive
+STR_REPLACE_WAGONS                                              :Vagoni
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klikni za zaustavljanje svih vlakova u spremištu
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klikni za zaustavljanje svih cestovnih vozila u spremištu
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klikni za zaustavljanje svih brodova u spremištu
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klikni za zaustavljanje svih zrakoplova u hangaru
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klikni za zaustavljanje svih vlakova u spremištu
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klikni za zaustavljanje svih cestovnih vozila u spremištu
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klikni za zaustavljanje svih brodova u spremištu
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klikni za zaustavljanje svih zrakoplova u hangaru
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klikni za pokretanje svih vlakova u spremištu
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klikni za pokretanje svih cestovnih vozila u spremištu
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klikni za pokretanje svih brodova u spremištu
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klikni za pokretanje svih zrakoplova u hangaru
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klikni za pokretanje svih vlakova u spremištu
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klikni za pokretanje svih cestovnih vozila u spremištu
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klikni za pokretanje svih brodova u spremištu
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klikni za pokretanje svih zrakoplova u hangaru
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klikni za zaustavljanje svih vozila na popisu
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klikni za pokretanje svih vozila na popisu
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klikni za zaustavljanje svih vozila na popisu
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klikni za pokretanje svih vozila na popisu
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Popis znakova - {COMMA} znak{P "" a ova}
@@ -3274,14 +3274,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Naredba
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Pružna vozila
-STR_ELRAIL_VEHICLES                                             :Elektri�na pružna vozila
-STR_MONORAIL_VEHICLES                                           :Jednotra�na vozila
-STR_MAGLEV_VEHICLES                                             :Maglev željezni�ka vozila
+STR_REPLACE_RAIL_VEHICLES                                       :Pružna vozila
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektri�na pružna vozila
+STR_REPLACE_MONORAIL_VEHICLES                                   :Jednotra�na vozila
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev željezni�ka vozila
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cijena: {GOLD}{CURRENCY}{BLACK} Težina {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
@@ -3307,70 +3307,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Izradi
-STR_RANDOM                                                      :{BLACK}Nasumi�no
-STR_RANDOM_HELP                                                 :{BLACK}Promijeni slu�ajni slijed koji se koristi za kreiranje terena
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Izrada svijeta
-STR_RANDOM_SEED                                                 :{BLACK}Nasumi�ni slijed:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klikni za unos nasumi�nog slijeda
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Upiši nasumi�no sjeme
-STR_LAND_GENERATOR                                              :{BLACK}Izrađiva� zemljišta:
-STR_TREE_PLACER                                                 :{BLACK} Algoritam za drveće:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotacija visinske mape:
-STR_TERRAIN_TYPE                                                :{BLACK}Vrsta terena:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Razina mora:
-STR_SMOOTHNESS                                                  :{BLACK}Graduacija:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Visina linije snijega
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Broj gradova:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Broj industrija:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Pomakni visinu linije snijega za jedan gore
-STR_SNOW_LINE_DOWN                                              :{BLACK}Pomakni visinu linije snijega za jedan dolje
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Promijeni visinu linije snijega
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Promijeni po�etnu godinu
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Upozorenje o veli�ini
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Prekomjerna promjena veli�ine karte nije preporu�ena. Nastaviti sa kreiranjem?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Ime visinske karte:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Veli�ina: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Izradi
+STR_MAPGEN_RANDOM                                               :{BLACK}Nasumi�no
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Promijeni slu�ajni slijed koji se koristi za kreiranje terena
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Izrada svijeta
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Nasumi�ni slijed:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klikni za unos nasumi�nog slijeda
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Upiši nasumi�no sjeme
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Izrađiva� zemljišta:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK} Algoritam za drveće:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotacija visinske mape:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Vrsta terena:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Razina mora:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Graduacija:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Visina linije snijega
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Broj gradova:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Broj industrija:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Pomakni visinu linije snijega za jedan gore
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Pomakni visinu linije snijega za jedan dolje
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Promijeni visinu linije snijega
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Promijeni po�etnu godinu
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Upozorenje o veli�ini
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Prekomjerna promjena veli�ine karte nije preporu�ena. Nastaviti sa kreiranjem?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Ime visinske karte:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Veli�ina: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Izrada svijeta u toku...
 STR_GENERATION_ABORT                                            :{BLACK}Prekini
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Poništi izradu svijeta
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Da li zaista želiš prekinuti izradu?
-STR_PROGRESS                                                    :{WHITE}{NUM}% gotovo
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Izrada svijeta
-STR_TREE_GENERATION                                             :{BLACK}Generiranje drveća
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Nepomi�no generiranje
-STR_CLEARING_TILES                                              :{BLACK}Generiranje grubog i stjenovitog podru�ja
-STR_SETTINGUP_GAME                                              :{BLACK}Pripremam igru
-STR_PREPARING_TILELOOP                                          :{BLACK}Izvršavam tile-petlju
-STR_PREPARING_GAME                                              :{BLACK}Pripremam igru
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ova akcija je izmjenila težinu na proizvoljnu
-STR_SE_FLAT_WORLD                                               :{WHITE}Ravna zemlja
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Kreiraj ravan teren
-STR_SE_RANDOM_LAND                                              :{WHITE}Nasumi�ni teren
-STR_SE_NEW_WORLD                                                :{BLACK}Kreiraj novi scenarij
-STR_SE_CAPTION                                                  :{WHITE}Vrsta scenarija
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Snizi ravnu površinu za jedan korak
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Povisi ravnu površinu za jedan korak
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Promijeni visinu ravne površine
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Visina ravne površine:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% gotovo
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Izrada svijeta
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generiranje drveća
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Nepomi�no generiranje
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generiranje grubog i stjenovitog podru�ja
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Pripremam igru
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Izvršavam tile-petlju
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Pripremam igru
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Ova akcija je izmjenila težinu na proizvoljnu
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Ravna zemlja
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Kreiraj ravan teren
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Nasumi�ni teren
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Kreiraj novi scenarij
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Vrsta scenarija
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Snizi ravnu površinu za jedan korak
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Povisi ravnu površinu za jedan korak
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Promijeni visinu ravne površine
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Visina ravne površine:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centriraj malu mapu na trenutni položaj
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Rubovi Karte:
-STR_NORTHWEST                                                   :{BLACK}Sjeverozapad
-STR_NORTHEAST                                                   :{BLACK}Sjeveroistok
-STR_SOUTHEAST                                                   :{BLACK}Jugoistok
-STR_SOUTHWEST                                                   :{BLACK}Jugozapad
-STR_BORDER_FREEFORM                                             :{BLACK}Slobodni oblik
-STR_BORDER_WATER                                                :{BLACK}Voda
-STR_BORDER_RANDOM                                               :{BLACK}Nasumi�no
-STR_BORDER_RANDOMIZE                                            :{BLACK}Nasumi�no
-STR_BORDER_MANUAL                                               :{BLACK}Ru�no
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Rubovi Karte:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Sjeverozapad
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Sjeveroistok
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Jugoistok
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Jugozapad
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Slobodni oblik
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Voda
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Nasumi�no
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Nasumi�no
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Ru�no
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Mala
@@ -3395,21 +3395,21 @@ STR_MEASURE_AREA                                                :{BLACK}Podru�j
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dužina:{NUM}{}Visinska razlika:{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Podru�je:{NUM}x{NUM}Visinska razlika:{NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Prebaci novac: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ovo je gradska cesta
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...cesta je orijentirana u krivom smjeru
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opcije prozirnosti
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Namjesti prozirnost za znakove postaja. CTRL+klik za zaklju�avanje.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Namjesti prozirnost za drveće
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Namjesti prozirnost za kuće
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Namjesti prozirnost za industrije
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Namjesti prozirnost za građevine poput postaja, spremišta, �vorišta i vu�ne užadi
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Namjesti prozirnost za mostove
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Namjesti prozirnost za strukture poput svjetionika i antena, možda u budućnosti i vizualne efekte
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Aktiviraj prozirnost za viseću užad. CTRL+klik za zaklju�avanje.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Namjesti prozirnost za indikatore u�itavanja
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}U�ini objekte nevidljivima umjesto prozirnima
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Prebaci novac: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ovo je gradska cesta
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...cesta je orijentirana u krivom smjeru
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcije prozirnosti
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Namjesti prozirnost za znakove postaja. CTRL+klik za zaklju�avanje.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Namjesti prozirnost za drveće
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Namjesti prozirnost za kuće
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Namjesti prozirnost za industrije
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Namjesti prozirnost za građevine poput postaja, spremišta, �vorišta i vu�ne užadi
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Namjesti prozirnost za mostove
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Namjesti prozirnost za strukture poput svjetionika i antena, možda u budućnosti i vizualne efekte
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Aktiviraj prozirnost za viseću užad. CTRL+klik za zaklju�avanje.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Namjesti prozirnost za indikatore u�itavanja
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}U�ini objekte nevidljivima umjesto prozirnima
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3419,7 +3419,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Svi vlakovi
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Sva cestovna vozila
 STR_GROUP_ALL_SHIPS                                             :Svi brodovi
@@ -3428,24 +3428,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Negrupirani vla
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Negrupirana cestovna vozila
 STR_GROUP_DEFAULT_SHIPS                                         :Negrupirani brodovi
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Negrupirani zrakoplovi
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Dodaj dijeljena vozila
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Ukloni sva vozila
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Preimenuj grupu
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nije moguće kreirati grupu...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nije moguće obrisati ovu grupu...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nije moguće preimenovati ovu grupu...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nije moguće ukloniti sva vozila iz ove grupe...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nije moguće dodati vozila u ovu grupu
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nije moguće dodati dijeljena vozila u grupu...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nije moguće kreirati grupu...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nije moguće obrisati ovu grupu...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nije moguće preimenovati ovu grupu...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nije moguće ukloniti sva vozila iz ove grupe...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nije moguće dodati vozila u ovu grupu
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nije moguće dodati dijeljena vozila u grupu...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Groupe - klikni na grupu kako bi izlistao sva vozila ove grupe
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klikni za kreiranje grupe
-STR_GROUP_DELETE_TIP                                            :{BLACK}Obriši odabranu grupu
-STR_GROUP_RENAME_TIP                                            :{BLACK}Preimenuj odabranu grupu
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikni kako bi zaštitio ovu grupu od globalne automatske zamjene
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groupe - klikni na grupu kako bi izlistao sva vozila ove grupe
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikni za kreiranje grupe
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Obriši odabranu grupu
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Preimenuj odabranu grupu
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikni kako bi zaštitio ovu grupu od globalne automatske zamjene
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3506,35 +3506,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Ime mora biti jedinstveno
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Ime mora biti jedinstveno
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Idi do sljedećeg znaka
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Idi do prethodnog znaka
-STR_SIGN_OSKTITLE                                               :{BLACK}Unesi naziv znaka
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Idi do sljedećeg znaka
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Idi do prethodnog znaka
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Unesi naziv znaka
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Financiraj
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospekt
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Izgradi
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Izaberi prikladnu industriju s ovog popisa
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Financiraj
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospekt
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Izgradi
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Izaberi prikladnu industriju s ovog popisa
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Napredno
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Napredan odabir lica.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Napredan odabir lica.
 STR_FACE_SIMPLE                                                 :{BLACK}Jednostavno
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Jednostavan odabir lica.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Jednostavan odabir lica.
 STR_FACE_LOAD                                                   :{BLACK}U�itaj
-STR_FACE_LOAD_TIP                                               :{BLACK}U�itaj omiljeno lice
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}U�itaj omiljeno lice
 STR_FACE_LOAD_DONE                                              :{WHITE}Tvoje omiljeno lice je u�itano iz OpenTTD konfiguracijske datoteke.
 STR_FACE_FACECODE                                               :{BLACK}Broj igra�evog lica
-STR_FACE_FACECODE_TIP                                           :{BLACK}Pogledaj i/ili postavi broj igra�evog lica
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Pogledaj i/ili postavi broj igra�evog lica
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Pogledaj i/ili postavi broj igra�evog lica
 STR_FACE_FACECODE_SET                                           :{WHITE}Novi kod za broj igra�evog lica je postavljen.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Ne mogu postaviti broj igra�evog lica - mora biti numeri�ka vrijednost između 0 i 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Spremi
-STR_FACE_SAVE_TIP                                               :{BLACK}Izaberi omiljeno lice
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Izaberi omiljeno lice
 STR_FACE_SAVE_DONE                                              :{WHITE}Ovo lice bit će spremljeno kao tvoje omiljeno u OpenTTD konfiguracijsku datoteku.
 STR_FACE_EUROPEAN                                               :{BLACK}Europljanin
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Izaberi europska lica
@@ -3542,51 +3542,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikana
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Izaberi afri�ka lica
 STR_FACE_YES                                                    :Da
 STR_FACE_NO                                                     :Ne
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Uklju�i brkove ili naušnicu
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Uklju�i brkove ili naušnicu
 STR_FACE_HAIR                                                   :Kosa:
-STR_FACE_HAIR_TIP                                               :{BLACK}Promijeni kosu
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Promijeni kosu
 STR_FACE_EYEBROWS                                               :Obrve:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Promijeni obrve
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Promijeni obrve
 STR_FACE_EYECOLOUR                                              :Boja o�iju:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Promijeni boju o�iju
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Promijeni boju o�iju
 STR_FACE_GLASSES                                                :Nao�ale:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Omogući nao�ale
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Promijeni nao�ale
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Omogući nao�ale
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Promijeni nao�ale
 STR_FACE_NOSE                                                   :Nos:
-STR_FACE_NOSE_TIP                                               :{BLACK}Promijeni nos
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Promijeni nos
 STR_FACE_LIPS                                                   :Usne:
 STR_FACE_MOUSTACHE                                              :Brkovi:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Promijeni usne ili brkove
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Promijeni usne ili brkove
 STR_FACE_CHIN                                                   :Brada:
-STR_FACE_CHIN_TIP                                               :{BLACK}Promijeni bradu
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Promijeni bradu
 STR_FACE_JACKET                                                 :Jakna
-STR_FACE_JACKET_TIP                                             :{BLACK}Promijeni jaknu
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Promijeni jaknu
 STR_FACE_COLLAR                                                 :Kragna:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Promijeni kragnu
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Promijeni kragnu
 STR_FACE_TIE                                                    :Kravata:
 STR_FACE_EARRING                                                :Naušnica:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Promijeni kravatu ili naušnicu
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Promijeni kravatu ili naušnicu
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Izbornik signala
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Ovdje nije moguće konvertirati signale...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standardni signal (semafor){}Signali su nužni kako bi sprije�ili vlakove da se sudaraju na pružnim mrežama s više od jednog vlaka.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Ulazni signal (semafor){}Zeleno sve dok je jedan ili više zelenih izlaznih signala na narednom dijelu pruge. U protivnom pokazuje crveno.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Izlazni signal (semafor){}Ponaša se na isti na�in kao i normalni signali, ali je nužno potrefiti to�nu boju na ulaznim & kombo pre-signalima.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombo signal (semafor){}Kombo signal jednostavno radi kao ulazni i izlazni signal. Ovo omogućava izgradnju velike "šume" pre-signala.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Putni signal (semafor){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Standardne putne signale moguće je proći iz suprotnog smjera.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Jednosmjerni putni signal (semafor){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Jednosmjerne putne signale nije moguće proći iz suprotnog smjera.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standardni signal (elektri�ni){}Signali su nužni kako bi sprije�ili vlakove da se sudaraju na pružnim mrežama s više od jednog vlaka.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Ulazni signal (elektri�ni){}Zeleno sve dok je jedan ili više zelenih izlaznih signala na narednom dijelu pruge. U protivnom pokazuje crveno.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Izlazni signal (elektri�ni){}Ponaša se na isti na�in kao i normalni signali, ali je nužno potrefiti to�nu boju na ulaznim & kombo pre-signalima.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombo signal (elektri�ni){}Kombo signal jednostavno radi kao ulazni i izlazni signal. Ovo omogućava izgradnju velike "šume" pre-signala.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Putni signal (elektri�ni){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Standardne putne signale moguće je proći iz suprotnog smjera.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Jednosmjerni putni signal (elektri�ni){}Putni znak omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Jednosmjerne putne signale nije moguće proći iz suprotnog smjera.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Pretvaranje signala{}Kada je ozna�eno, klikanjem na bilo koji postojeći signal pretvara taj signal u odabrani tip i varijantu, CRTL+klik mijenja postojeću varijantu.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Gustoća signala prilikom izgradnje
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Smanji gustoću signala prilikom izgradnje
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Povećaj gustoću signala prilikom izgradnje
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Izbornik signala
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Ovdje nije moguće konvertirati signale...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standardni signal (semafor){}Signali su nužni kako bi sprije�ili vlakove da se sudaraju na pružnim mrežama s više od jednog vlaka.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Ulazni signal (semafor){}Zeleno sve dok je jedan ili više zelenih izlaznih signala na narednom dijelu pruge. U protivnom pokazuje crveno.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Izlazni signal (semafor){}Ponaša se na isti na�in kao i normalni signali, ali je nužno potrefiti to�nu boju na ulaznim & kombo pre-signalima.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombo signal (semafor){}Kombo signal jednostavno radi kao ulazni i izlazni signal. Ovo omogućava izgradnju velike "šume" pre-signala.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Putni signal (semafor){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Standardne putne signale moguće je proći iz suprotnog smjera.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Jednosmjerni putni signal (semafor){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Jednosmjerne putne signale nije moguće proći iz suprotnog smjera.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standardni signal (elektri�ni){}Signali su nužni kako bi sprije�ili vlakove da se sudaraju na pružnim mrežama s više od jednog vlaka.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Ulazni signal (elektri�ni){}Zeleno sve dok je jedan ili više zelenih izlaznih signala na narednom dijelu pruge. U protivnom pokazuje crveno.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Izlazni signal (elektri�ni){}Ponaša se na isti na�in kao i normalni signali, ali je nužno potrefiti to�nu boju na ulaznim & kombo pre-signalima.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombo signal (elektri�ni){}Kombo signal jednostavno radi kao ulazni i izlazni signal. Ovo omogućava izgradnju velike "šume" pre-signala.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Putni signal (elektri�ni){}Putni signal omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Standardne putne signale moguće je proći iz suprotnog smjera.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Jednosmjerni putni signal (elektri�ni){}Putni znak omogućava da više od jednog vlaka uđe istovremeno u signalni blok, ako vlak može rezervirati putanju do sigurnog zaustavnog mjesta. Jednosmjerne putne signale nije moguće proći iz suprotnog smjera.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Pretvaranje signala{}Kada je ozna�eno, klikanjem na bilo koji postojeći signal pretvara taj signal u odabrani tip i varijantu, CRTL+klik mijenja postojeću varijantu.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Gustoća signala prilikom izgradnje
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Smanji gustoću signala prilikom izgradnje
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Povećaj gustoću signala prilikom izgradnje
 ########
 
 ############ on screen keyboard
@@ -3598,35 +3598,35 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI postavke
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Prikaži postavke umjetne inteligencije
 STR_AI_DEBUG                                                    :{WHITE}Debugiranje UI
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Ime UI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Ime UI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Ponovno u�itaj UI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Ubij UI, ponovno u�itaj skriptu i ponovno pokreni UI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}UI prozor za debugiranje je dozvoljen samo serveru
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Ubij UI, ponovno u�itaj skriptu i ponovno pokreni UI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}UI prozor za debugiranje je dozvoljen samo serveru
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI konfiguracija
-STR_AI_CHANGE                                                   :{BLACK}Izaberi AI
-STR_AI_CONFIGURE                                                :{BLACK}Konfiguriraj
-STR_AI_CHANGE_TIP                                               :{BLACK}U�itaj drugi AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfiguriraj parametre izabranog AI
-STR_AI_LIST_TIP                                                 :{BLACK}Svi AI koji će biti u�itani u sljedeću igru
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Izaberi AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfiguriraj
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}U�itaj drugi AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfiguriraj parametre izabranog AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Svi AI koji će biti u�itani u sljedeću igru
 STR_AI_LIST_CAPTION                                             :{WHITE}Dostupni AI
-STR_AI_AILIST_TIP                                               :{BLACK}Klikni da odabereš UI
-STR_AI_ACCEPT                                                   :{BLACK}Prihvati
-STR_AI_ACCEPT_TIP                                               :{BLACK}Odaberi posvijetljeni UI
-STR_AI_CANCEL                                                   :{BLACK}Odustani
-STR_AI_CANCEL_TIP                                               :{BLACK}Nemoj mjenjati UI
-STR_AI_CLOSE                                                    :{BLACK}Zatvori
-STR_AI_RESET                                                    :{BLACK}Resetiraj
-STR_AI_HUMAN_PLAYER                                             :Ljudski igra�
-STR_AI_RANDOM_AI                                                :Nasumi�na UI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikni da odabereš UI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Prihvati
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Odaberi posvijetljeni UI
+STR_AI_LIST_CANCEL                                              :{BLACK}Odustani
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemoj mjenjati UI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zatvori
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetiraj
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Ljudski igra�
+STR_AI_CONFIG_RANDOM_AI                                         :Nasumi�na UI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parametri UI
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Verzija: {NUM}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Jedan od igra�a sa UI se srušio. Molimo vas da prijavite ovo autoru UI sa screenshotom AI Debug prozora
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Verzija: {NUM}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedan od igra�a sa UI se srušio. Molimo vas da prijavite ovo autoru UI sa screenshotom AI Debug prozora
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Ograni�enje buke u gradu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Proizvedeno buke: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Ograni�enje buke u gradu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Proizvedeno buke: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3640,21 +3640,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenarij
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Visinska mapa
 STR_CONTENT_TITLE                                               :{WHITE}Preuzimanje sadržaja
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Vrsta
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Vrsta sadržaja
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Vrsta sadržaja
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Naziv
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Naziv sadržaja
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Kliknite na liniju kako bi vidjeli detalje{}Kliknite na kućicu  kako bi ju ozna�ili za preuzimanje
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Naziv sadržaja
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Kliknite na liniju kako bi vidjeli detalje{}Kliknite na kućicu  kako bi ju ozna�ili za preuzimanje
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Izaberi sve
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Ozna�i sav sadržaj za preuzimanje
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Ozna�i sav sadržaj za preuzimanje
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Izaberi nadogradnje
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Ozna�i sav sadržaj koji je nadogradnja postojećem sadržaju kako bi ga preuzeo
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Ozna�i sav sadržaj koji je nadogradnja postojećem sadržaju kako bi ga preuzeo
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Odzna�i sve
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Ozna�i sav sadržaj koji se ne preuzima
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Ozna�i sav sadržaj koji se ne preuzima
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Unesi znak za filter
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Unesite klju�nu rije� kako bi filtrirali listu
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Unesite klju�nu rije� kako bi filtrirali listu
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Ime/Tag filter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Preuzmi
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Po�ni preuzimanje ozna�enog sadržaja
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Po�ni preuzimanje ozna�enog sadržaja
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Ukupna veli�ina preuzimanja: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMACIJA O SADRŽAJU
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Niste odabrali ovo za preuzimanje
@@ -3687,6 +3687,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nije mog
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Provjeri online sadržaj
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Provjeri novi i nadograđeni sadržaj za preuzimanje
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Pronađi nedostajeći sadržaj online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Provjeri može li se nedostajeći sadržaj pronaći online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Pronađi nedostajeći sadržaj online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Provjeri može li se nedostajeći sadržaj pronaći online
 ########
diff --git a/src/lang/czech.txt b/src/lang/czech.txt
index ef4e38776..696274fdf 100644
--- a/src/lang/czech.txt
+++ b/src/lang/czech.txt
@@ -226,7 +226,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mapa - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnosti hry
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Zpráva
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Zpráva od {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varování!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varování!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Tohle neumůžeš udělat...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Nemůžeš vy�istit tuto oblast...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Původní copyright: {COPYRIGHT} 1995 Chris Sawyer, všechna práva vyhrazena
@@ -234,9 +234,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Tým OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Konec
-STR_YES                                                         :{BLACK}Ano
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ano
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {STRING}?
 
 STR_JUST_NOTHING                                                :nic
 STR_COLOUR_DARK_BLUE                                            :Tmavomodrá
@@ -297,11 +297,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Poušť
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sníh
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Zpráva
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Původní
-STR_QUERY_CANCEL                                                :{BLACK}Zrušit
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Přejmenovat
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Původní
+STR_BUTTON_CANCEL                                               :{BLACK}Zrušit
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Přejmenovat
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -318,16 +318,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Náklad
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informace
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapacity
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Celkový náklad
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Celková kapacita tohoto vlaku:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Celková kapacita tohoto vlaku:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nová hra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Nahrát hru
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Více hrá�ů
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor scénáře
 
-STR_MAPSIZE                                                     :{BLACK}Velikost mapy:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Velikost mapy:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Možnosti hry
 
 STR_COMPANY_SOMEONE                                             :někdo{SKIP}{SKIP}
@@ -376,10 +376,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Ukon�it hru
 STR_FILE_MENU_EXIT                                              :Ukon�it program
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Opravdu chceš ukon�it tuto hru?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Konec hry
-STR_SORT_ORDER_TIP                                              :{BLACK}Vyber způsob řazeni (sestupně/vzestupně)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Vyber, podle �eho se má třídit
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vyber třídící podmínku
-STR_SORT_BY                                                     :{BLACK}Řadit podle
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Vyber způsob řazeni (sestupně/vzestupně)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Vyber, podle �eho se má třídit
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Vyber třídící podmínku
+STR_BUTTON_SORT_BY                                              :{BLACK}Řadit podle
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populace
@@ -411,24 +411,24 @@ STR_SORT_BY_RUNNING_COST                                        :provozních ná
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :výkonu/provozních nákladů
 STR_SORT_BY_CARGO_CAPACITY                                      :přepravní kapacity
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Ne�eká žádná komodita jakéhokoli druhu
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Ozna�it všechny druhy stanic
-STR_SELECT_ALL_TYPES                                            :{BLACK}Ozna�it všechny druhy komodit (v�etne žádného �ekajícího nákladu)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ukázat seznam dostupných variant pro tento typ vozidla.
-STR_MANAGE_LIST                                                 :{BLACK}Upravit seznam
-STR_MANAGE_LIST_TIP                                             :{BLACK}Poslat příkazy všem vozidlům v tomto seznamu
-STR_REPLACE_VEHICLES                                            :Vyměňování vozidel
-STR_SEND_FOR_SERVICING                                          :Provést údržbu
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupné vlaky
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupná vozidla
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupné lodě
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupná letadla
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Poslat do depa
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Poslat do depa
-STR_SEND_SHIP_TO_DEPOT                                          :Poslat do depa
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Poslat do hangáru
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Ne�eká žádná komodita jakéhokoli druhu
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Ozna�it všechny druhy stanic
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Ozna�it všechny druhy komodit (v�etne žádného �ekajícího nákladu)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Ukázat seznam dostupných variant pro tento typ vozidla.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Upravit seznam
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Poslat příkazy všem vozidlům v tomto seznamu
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vyměňování vozidel
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Provést údržbu
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Dostupné vlaky
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Dostupná vozidla
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Dostupné lodě
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Dostupná letadla
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Poslat do depa
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Poslat do depa
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Poslat do depa
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Poslat do hangáru
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -458,12 +458,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Možnost
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nelze změnit interval oprav...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zavřít okno
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titulek okna - tahej pro posun okna
-STR_STICKY_BUTTON                                               :{BLACK}Ozna�it toto okno, aby se nedalo zavřít klávesou pro zavření všech oken
-STR_RESIZE_BUTTON                                               :{BLACK}Velikost okna změníš uchopením a táhnutím zde
+STR_TOOLTIP_STICKY                                              :{BLACK}Ozna�it toto okno, aby se nedalo zavřít klávesou pro zavření všech oken
+STR_TOOLTIP_RESIZE                                              :{BLACK}Velikost okna změníš uchopením a táhnutím zde
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kliknutím sem se přesuneš do sou�asného výchozího ukládacího adresáře
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolice budov, atd.
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Snížit roh země
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Zvýšit roh země
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Snížit roh země
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvýšit roh země
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Posuvník - posouvá výpisem nahoru nebo dolů
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Posuvník - posouvá výpisem doleva nebo doprava
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Zobrazit na mapě reliéf krajiny
@@ -476,21 +476,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Zobrazov
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (minulý rok: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} {P rok roky let} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} {P rok roky let} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} {P rok roky let} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} {P rok roky let} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Vlak
-STR_VEHICLE_ROAD_VEHICLE                                        :Silni�ní vozidlo
-STR_VEHICLE_SHIP                                                :Lo�
-STR_VEHICLE_AIRCRAFT                                            :Letadlo
+STR_REPLACE_VEHICLE_TRAIN                                       :Vlak
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Silni�ní vozidlo
+STR_REPLACE_VEHICLE_SHIP                                        :Lo�
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Letadlo
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} zastarává
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} silně zastarává
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} silně zastarává a nutně potřebuje nahradit
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informace o uzemí
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Cena za vy�ištění: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Cena za vy�ištění: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Příjem za odklizení: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Příjem za odklizení: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Vlastník: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Majitel silnice: {LTBLUE}{STRING}
@@ -499,7 +499,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Majitel
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Místní správa: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nic
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Jméno
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -611,7 +611,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Skladba
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Hudební stopu odstraníš ze sou�asného programu (pouze u vlastního) kliknutím na ni
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Zapnout/vypnout náhodné opakování skladeb
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Ukaž skladbu ve výběrovém okně
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klepni na dotaci pro zobrazení města/průmyslu
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klepni na dotaci pro zobrazení města/průmyslu
 STR_INTRO_DIFFICULTY                                            :{BLACK}Obtížnost ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Poslední zpráva nebo �lánek
@@ -660,7 +660,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Zmenšit
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generovat náhodnou zemi
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Smazat krajinu
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Smazat krajinu
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Odstranit z mapy všechny objekty vlastněné hrá�i
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Odstranit z mapy všechny objekty vlastněné hrá�i
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Opravdu chceš odstranit všechny objekty vlastněné hrá�i?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generování krajiny
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generování měst
@@ -674,11 +674,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... moc
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... moc blízko k jinému městu
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... nepoužitelné místo
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... příliš mnoho měst
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nelze vybudovat více měst
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}... na mapě už není místo.
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nelze vybudovat více měst
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... na mapě už není místo.
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Zvetšit velikost města
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Rozšířit
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Město nebude stavět silnice. Můžete to změnit přes Pokro�ilé nastavení->Ekonomika->Města.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Město nebude stavět silnice. Můžete to změnit přes Pokro�ilé nastavení->Ekonomika->Města.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Náhodné město
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Vybuduj město na nahodné pozici
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Nemůžeš zde stavět {STRING} ...
@@ -692,13 +692,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Umístit
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Umístit maják
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Umístit vysíla�
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Vytvořit pouštní oblast{}Stiskem CTRL ji odstraníš
-STR_CREATE_LAKE                                                 :{BLACK}Vytvořit vodní plochu.{}Pokud není držen CTRL, vytvoří se na úrovni moře průplav; v opa�ném případě se zaplaví ostatní dílky
-STR_CREATE_RIVER                                                :{BLACK}Vytvořit řeky.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Vytvořit vodní plochu.{}Pokud není držen CTRL, vytvoří se na úrovni moře průplav; v opa�ném případě se zaplaví ostatní dílky
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Vytvořit řeky.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Smaž
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Smazat celé toto město
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Uložit mapu
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Otevřit mapu
-STR_MENU_LOAD_HEIGHTMAP                                         :Použít výškovou mapu
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Použít výškovou mapu
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Ukon�it editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Ukon�it
@@ -708,7 +708,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Uložit
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Hrát mapu
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Hrát z výškové mapy
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Za�ít novou hru s krajinou vytvořenou z výškové mapy
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Ur�ite chceš opustit toto mapu?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Ur�ite chceš opustit toto mapu?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... může být budováno jen ve městech s populací 1200 lidí a více
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Posunout startovní rok o rok zpět
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Posunout startovní rok o rok vpřed
@@ -716,21 +716,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... oba
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Malé
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Středni
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Velké
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Náhodná
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Náhodná
 STR_FOUND_TOWN_CITY                                             :{BLACK}Velkoměsto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Velkoměsta rostou rychleji než běžná města. V závislosti na nastavení jsou při založení větší
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Zvolte velikost města
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Velikost města:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Silni�ní síť města:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Zvolte rozvržení silni�ní sítě v tomto městě
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Původní
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Lepší silnice
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Mřížka 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Mřížka 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Náhodná
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Silni�ní síť města:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Zvolte rozvržení silni�ní sítě v tomto městě
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Původní
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Lepší silnice
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Mřížka 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Mřížka 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Náhodná
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Ukázat poslední zprávu nebo �lánek
 STR_NEWS_MESSAGES_OFF                                           :Vypnuto
 STR_NEWS_MESSAGES_SUMMARY                                       :Shrnutí
@@ -830,10 +830,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot úspěšně uložen jako '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screenshot neuložen!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Zakoupit pozemek pro budoucí užití
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Zakoupit pozemek pro budoucí užití
 STR_STATUSBAR_AUTOSAVE                                          :{RED}Automatické ukládání
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  UKL�D� SE HRA  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ukládání ještě běží,{}po�kej prosím, než doběhne!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Ukládání ještě běží,{}po�kej prosím, než doběhne!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Zvolit 'Ezy Street style music' program
 
 ############ start of townname region
@@ -896,7 +896,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Zvolit j
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Na celou obrazovku
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaškrtnutím této volby poběží OpenTTD na celé obrazovce
-STR_FULLSCREEN_FAILED                                           :{WHITE}Selhalo přepnutí na celou obrazovku
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Selhalo přepnutí na celou obrazovku
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozlišení obrazovky
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Zvolit rozlišení obrazovky
@@ -909,12 +909,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zvolte z
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} chybějící{P "" "" ch}/poškozen{P ý é ých} soubor{P "" y ů}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Další informace o základní sadě grafiky
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automatické uložení selhalo
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automatické uložení selhalo
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Míří do {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Míří do {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Bez příkazů
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Bez příkazů, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Míří do {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Míří do {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Bez příkazů
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Bez příkazů, {VELOCITY}
 
 STR_PASSENGERS                                                  :cestujících
 STR_BAGS                                                        :balíků
@@ -925,9 +925,9 @@ STR_CRATES                                                      :krabic
 STR_RES_OTHER                                                   :Jiné
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nemůžu sdílet seznam příkazů...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nemůžu kopírovat seznam příkazů...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Konec sdílených příkazů - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nemůžu sdílet seznam příkazů...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nemůžu kopírovat seznam příkazů...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Konec sdílených příkazů - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} nemůže najít cestu.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} se ztratil.
@@ -1196,15 +1196,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Výška
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :vypnuto
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Změnit hodnotu nastavení
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Změnit hodnotu nastavení
 
-STR_TEMPERATE_LANDSCAPE                                         :krajina mírného pásma
-STR_SUB_ARCTIC_LANDSCAPE                                        :subarktická krajina
-STR_SUB_TROPICAL_LANDSCAPE                                      :subtropická kraina
-STR_TOYLAND_LANDSCAPE                                           :Země hra�ek
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :krajina mírného pásma
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :subarktická krajina
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :subtropická kraina
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Země hra�ek
 
 STR_CHEATS                                                      :{WHITE}Cheaty
-STR_CHEATS_TIP                                                  :{BLACK}Zaškrtávací polí�ka ukazují, jestli jsi tento cheat už použil.
+STR_CHEATS_TOOLTIP                                              :{BLACK}Zaškrtávací polí�ka ukazují, jestli jsi tento cheat už použil.
 STR_CHEATS_WARNING                                              :{BLACK}Varování! Chystáš se podvést ostatní hrá�e. Pamatuj si, že tento podlý �in nebude nikdy zapomenut!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Navýšit peníze o {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Hrát jako spole�nost: {ORANGE}{COMMA}
@@ -1216,179 +1216,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Změnit
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Změnit datum: {ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povolit změnu produkce průmyslu: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Míří do {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Míří do {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Míří do {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Míří do {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Jet přes {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Jet bez zastávky přes {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Jet přes {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Jet bez zastávky přes {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Směrování {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Směrování {TOWN} �. {COMMA}
-STR_BUOYNAME_CITY                                               :Bójka {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Bójka {TOWN} �. {COMMA}
-STR_LANDINFO_WAYPOINT                                           :Směrování
+STR_FORMAT_WAYPOINT_NAME                                        :Směrování {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Směrování {TOWN} �. {COMMA}
+STR_FORMAT_BUOY_NAME                                            :Bójka {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Bójka {TOWN} �. {COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Směrování
 
-STR_WAYPOINT                                                    :{WHITE}Směrování
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vyber typ stavědla
+STR_WAYPOINT_CAPTION                                            :{WHITE}Směrování
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vyber typ stavědla
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Přejmenovat stavědlo
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nemohu přejmenovat stavědlo...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nemohu přejmenovat stavědlo...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Postavit na trati stavědlo
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Zde nelze postavit stavědlo...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Zde nelze zbourat stavědlo...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Zde nelze postavit stavědlo...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Zde nelze zbourat stavědlo...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Budovat koleje použitím režimu Autokoleje
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... v tomto scénáři není ani jedno město
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generování mapy zrušeno...{}...nebylo možné založit žádné město
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... v tomto scénáři není ani jedno město
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generování mapy zrušeno...{}...nebylo možné založit žádné město
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Hodně náhodných měst
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Pokryje krajinu mnoha náhodnými městy
-STR_MANY_RANDOM_INDUSTRIES                                      :Hodně náhodného průmyslu
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Pokryje krajinu náhodným průmyslem
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nemůžu generovat průmysl...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Hodně náhodných měst
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Pokryje krajinu mnoha náhodnými městy
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Hodně náhodného průmyslu
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Pokryje krajinu náhodným průmyslem
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nemůžu generovat průmysl...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Otevřít nástrojovou lištu na úpravu terénu, výsadbu stromů, atd.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Úpravy krajiny
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Srovnat terén
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Srovnat terén
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Různé stromy
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Umístit nahodné stromy
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umístit nahodné stromy
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Zde nemohu postavit průplav...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Zde nemohu postavit průplav...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Vytvořit průplav
-STR_LANDINFO_CANAL                                              :Průplav
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Průplav
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Zde nemohu postavit zdymadlo...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Zde nemohu postavit zdymadlo...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Stavět zdymadlo
-STR_LANDINFO_LOCK                                               :Zdymadlo
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Zdymadlo
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Zde nelze vytvořit řeku...
-STR_LANDINFO_RIVER                                              :Řeka
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Zde nelze vytvořit řeku...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Řeka
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... bójka je používána!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bójka je používána!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Souřadnice: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Souřadnice: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nemůžu odstranit �ást stanice...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Zde nemohu změnit typ kolejí...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nemůžu odstranit �ást stanice...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Zde nemohu změnit typ kolejí...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Změnit nebo vylepšit druh kolejí (na tento)
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Celý vlak prodáš lokomotivy na toto místo
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Celý vlak prodáš lokomotivy na toto místo
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Táhni a pusť
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Stavět stanice pomocí tahaní myši
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Vyber, který druh stanic se má zobrazit
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vyber typ stavěné stanice
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vyber, který druh stanic se má zobrazit
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vyber typ stavěné stanice
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Zrychlit běh hry
 STR_MESSAGE_HISTORY                                             :{WHITE}Historie zpráv
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Seznam předešlých zpráv
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Vypnout všechny
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Zapnout všechny
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Seznam předešlých zpráv
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Vypnout všechny
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Zapnout všechny
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Průmysl
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% přepraveno)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% přepraveno)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Názvy průmyslu - na průmysl se podíváš kliknutím na jeho jméno
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Průmysl
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% přepraveno)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% přepraveno)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Názvy průmyslu - na průmysl se podíváš kliknutím na jeho jméno
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... příliš blízko k jinému průmyslu
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... příliš blízko k jinému průmyslu
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Změnit produkci
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multiplayer
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Jméno hrá�e:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Podle tohoto jména tě ostatní hrá�i poznají
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Zadej své jméno
-STR_NETWORK_CONNECTION                                          :{BLACK}Připojení:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Vyber si mezi hrou na internetu nebo v místní síti
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Spustit server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Spustit vlastní server
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Název
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Název hry
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Jazyk, verze serveru, atd.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Hru vybereš kliknutím do seznamu
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Naposledy navštívený server:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Kliknutím vybereš server, kde jsi hrál(a) naposledy
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Najít server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Hledat server v síti
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Přidat server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Přidá server do seznamu, ve kterém se budou hledat běžící hry.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Vlož IP adresu serveru
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Hrá�ů
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Hrá�ů on-line / nejvíce{}Spole�ností on-line / nejvíce
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Rozměry mapy
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Rozměry mapy ve hře{}Kliknutím hry seřadíš podle plochy
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Sou�asné datum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Roků
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Po�et let,{}po které už hra běží
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HŘE
-STR_NETWORK_CLIENTS                                             :{SILVER}Klientů: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Prostředí: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost mapy: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verze hry na serveru: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serveru: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Po�áte�ní datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Sou�asné datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Chráněno heslem!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER JE OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER JE PLN�
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}NESOUHLAS� VERZE
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NESOUHLAS� GRAFIKY
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Přidat se
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Za�ít novou hru
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Jméno hry:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Jméno hry se zobrazí ostatním hrá�ům v nabídce síťové hry
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Zadej jméno této síťové hry
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Nastavit heslo
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Svoji hru si můžeš ochránit heslem, když nechceš, aby se ti do ni hlásili jiní lidé
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Vyber mapu:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ve které mapě si chceš zahrát?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :internet (zveřejnit)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i ů}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Nejvyšší po�et hrá�ů:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Zvol nejvyšší po�et hrá�ů. Může se jich připojit i méně.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} spole�nost{P "" i í}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maximální po�et spole�ností:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Omezit serverem po�et spole�ností
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} pozorovatel{P "" é ů}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maximální po�et pozorovatelů:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Omezit serverem pocet pozorovatelů
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Jazyk ve hře:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aby ostatní hrá�i věděli, jakým jazykem se bude ve hře mluvit.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Za�ít hru
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Hru po síti za�ít s náhodnou mapou nebo se scénářem
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Nahrát hru
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Pokra�ovat ve dříve uložené hře pro více hrá�ů (ujisti se, že se připojuješ na správného hrá�e)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
+
+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í
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Zadej své jméno
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Připojení:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Vyber si mezi hrou na internetu nebo v místní síti
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Spustit server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Spustit vlastní server
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Název
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Název hry
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Jazyk, verze serveru, atd.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Hru vybereš kliknutím do seznamu
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Naposledy navštívený server:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Kliknutím vybereš server, kde jsi hrál(a) naposledy
+
+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_ENTER_IP                                :{BLACK}Vlož IP adresu serveru
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Hrá�ů
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Hrá�ů on-line / nejvíce{}Spole�ností on-line / nejvíce
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Rozměry mapy
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Rozměry mapy ve hře{}Kliknutím hry seřadíš podle plochy
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Sou�asné datum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Roků
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Po�et let,{}po které už hra běží
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO O HŘE
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klientů: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Jazyk: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Prostředí: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Velikost mapy: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Verze hry na serveru: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adresa serveru: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Po�áte�ní datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Sou�asné datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Chráněno heslem!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER JE OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER JE PLN�
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}NESOUHLAS� VERZE
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NESOUHLAS� GRAFIKY
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Přidat se
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Za�ít novou hru
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Jméno hry:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Jméno hry se zobrazí ostatním hrá�ům v nabídce síťové hry
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Zadej jméno této síťové hry
+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_SELECT_MAP                             :{BLACK}Vyber mapu:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Ve které mapě si chceš zahrát?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :internet (zveřejnit)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i ů}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Nejvyšší po�et hrá�ů:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Zvol nejvyšší po�et hrá�ů. Může se jich připojit i méně.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} spole�nost{P "" i í}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maximální po�et spole�ností:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Omezit serverem po�et spole�ností
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} pozorovatel{P "" é ů}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maximální po�et pozorovatelů:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Omezit serverem pocet pozorovatelů
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Jazyk ve hře:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Aby ostatní hrá�i věděli, jakým jazykem se bude ve hře mluvit.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Za�ít hru
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Hru po síti za�ít s náhodnou mapou nebo se scénářem
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Nahrát hru
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Pokra�ovat ve dříve uložené hře pro více hrá�ů (ujisti se, že se připojuješ na správného hrá�e)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :jakýkoli
@@ -1429,33 +1429,33 @@ STR_NETWORK_LANG_GREEK                                          :ře�tina
 STR_NETWORK_LANG_LATVIAN                                        :lotyština
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Vstupní místnost do hry více hrá�ů
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Vstupní místnost do hry více hrá�ů
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Připravuji se na vstoupení: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Sou�asný seznam všech spole�ností v této hře. Bu� můžeš do jedné vstoupit, nebo můžeš založit novou.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nová spole�nost
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Založit novou spole�nost
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Navštívit hru
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Připojit se do hry jako pozorovatel
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Vstoupit do spole�nosti
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Pomoz vést tuto spole�nost
-STR_NETWORK_REFRESH                                             :{BLACK}Obnovit info
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Znovu na�te informace o serveru
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Připravuji se na vstoupení: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Sou�asný seznam všech spole�ností v této hře. Bu� můžeš do jedné vstoupit, nebo můžeš založit novou.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nová spole�nost
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Založit novou spole�nost
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Navštívit hru
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Připojit se do hry jako pozorovatel
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Vstoupit do spole�nosti
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Pomoz vést tuto spole�nost
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Obnovit info
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Znovu na�te informace o serveru
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO O SPOLEÄŒNOSTI
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO O SPOLEÄŒNOSTI
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Jméno spole�nosti: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Založeno: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Hodnota spole�nosti: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Stav na ú�tu: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Loňský hrubý zisk: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Výkon: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Jméno spole�nosti: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Založeno: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Hodnota spole�nosti: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Stav na ú�tu: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Loňský hrubý zisk: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Výkon: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozidla: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Hrá�i: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vozidla: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Hrá�i: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Připojování...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Připojování...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Připojování...
@@ -1471,49 +1471,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Přijím
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" i ů} před námi
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} staženo
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Odpojit se
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Odpojit se
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Napiš �ástku, kterou chceš poskytnout
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server je chráněný. Napiš heslo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spole�nost je chráněná. Napiš heslo
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Seznam hrá�ů
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Seznam hrá�ů
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Pozorovat
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nová spole�nost
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Žádná síťová zařízení nebyla nalezena (nebo je hra zkompilována bez ENABLE_NETWORK)
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Nenalezena žádná síťová hra
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Server neodpověděl na požadavek
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Není možno se připojit kvůli rozdílným grafikám
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Síť - synchronizace hry selhala
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Síť - spojení ztraceno
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Nemohu nahrát uloženou hru ze serveru
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Nemohu spustit server
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Nemohu se připojit
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}U spojení �. {NUM} byl překro�en �ekací limit
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Vznikla chyba v protokolu a naše spojení je přerušeno
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revize hry tohoto klienta neodpovídá revizi hry na serveru
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Špatné heslo
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Server je plný
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Jsi blokován serverem
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Byl jsi vyhozen ze hry
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Používání cheatů není na tomto serveru povoleno
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Žádná síťová zařízení nebyla nalezena (nebo je hra zkompilována bez ENABLE_NETWORK)
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Nenalezena žádná síťová hra
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Server neodpověděl na požadavek
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Není možno se připojit kvůli rozdílným grafikám
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Síť - synchronizace hry selhala
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Síť - spojení ztraceno
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Nemohu nahrát uloženou hru ze serveru
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Nemohu spustit server
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Nemohu se připojit
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}U spojení �. {NUM} byl překro�en �ekací limit
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Vznikla chyba v protokolu a naše spojení je přerušeno
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Revize hry tohoto klienta neodpovídá revizi hry na serveru
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Špatné heslo
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server je plný
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Jsi blokován serverem
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Byl jsi vyhozen ze hry
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Používání cheatů není na tomto serveru povoleno
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :všeobecná chyba
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :chyba v synchronizaci
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nemohu nahrát hru
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :spojení ztraceno
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :chyba v protokolu
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Nesouhlasí grafiky
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nevydáno povolení
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :přišel neplatný paket
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :špatná revize hry
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :jméno se už používá
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :špatné heslo
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :špatné ID spole�nosti v DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :vyhozen serverem
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :se pokoušel podvádět
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :na serveru je plno
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :všeobecná chyba
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :chyba v synchronizaci
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :nemohu nahrát hru
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :spojení ztraceno
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :chyba v protokolu
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Nesouhlasí grafiky
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nevydáno povolení
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :přišel neplatný paket
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :špatná revize hry
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :jméno se už používá
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :špatné heslo
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :špatné ID spole�nosti v DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :vyhozen serverem
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :se pokoušel podvádět
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :na serveru je plno
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1523,15 +1523,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Hra pozastavena
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Hra spuštěna (hrá� připojen)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Hra pozastavena (hrá�ovi se nepovedlo připojit)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :odpojování
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} jde hrát
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} se přidává ke spole�nosti �. {2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} se stává pozorovatelem
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} zakládá novou spole�nost (�. {2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} opouští hru ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} si mění jméno na {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} poslal(a) tvé spole�nosti {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Dal(a) jsi {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :odpojování
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} jde hrát
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} se přidává ke spole�nosti �. {2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} se stává pozorovatelem
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} zakládá novou spole�nost (�. {2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} opouští hru ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} si mění jméno na {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} poslal(a) tvé spole�nosti {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dal(a) jsi {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Tým] :
 STR_NETWORK_CHAT_COMPANY                                        :[Tým] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Tým] pro {STRING}: {WHITE}{STRING}
@@ -1541,8 +1541,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Osobní] pro {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[VÅ¡ichni] :
 STR_NETWORK_CHAT_ALL                                            :[VÅ¡ichni] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Zadej zprávu
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE}Server ukon�il relaci
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE}Server se restartuje...{}Po�kejte prosím...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Server ukon�il relaci
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Server se restartuje...{}Po�kejte prosím...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
@@ -1556,19 +1556,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Napsat spole�n
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Soukromá zpráva
 
 
-STR_NETWORK_SEND                                                :{BLACK}Poslat
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Poslat
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nebylo možné nahrát krajinu z PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... soubor nenalezen.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}... nelze převést formát obrázku. Je nutno použít 8- nebo 24bitové barvy.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}... něco se prostě pokazilo. Škoda. (Asi poškozený nebo nestandardní soubor.)
+STR_ERROR_PNGMAP                                                :{WHITE}Nebylo možné nahrát krajinu z PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... soubor nenalezen.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... nelze převést formát obrázku. Je nutno použít 8- nebo 24bitové barvy.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... něco se prostě pokazilo. Škoda. (Asi poškozený nebo nestandardní soubor.)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Nebylo možné nahrát krajinu z BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... nelze převést formát obrázku.
+STR_ERROR_BMPMAP                                                :{WHITE}Nebylo možné nahrát krajinu z BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... nelze převést formát obrázku.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Cena: {CURRENCY}
@@ -1582,13 +1582,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Odhadova
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Zde nelze zvednout terén...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Zde nelze snížit terén...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Zde nelze srovnat terén...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Kamení
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Hrbolatá země
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Prázdná země
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Travnatá země
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Pole
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Zasněžená země
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Poušť
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kamení
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Hrbolatá země
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Prázdná země
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Travnatá země
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Pole
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Zasněžená země
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Poušť
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Země skloněna nesprávným směrem
@@ -1596,11 +1596,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}NemožnÃ
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Úprava terénu by poškodila tunel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... již na úrovni moře
 STR_ERROR_TOO_HIGH                                              :{WHITE}... příliš vysoko
-STR_ALREADY_LEVELLED                                            :{WHITE}... už je plochý
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... už je plochý
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Žádné použitelné koleje
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... již vystavěno
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Musíš nejprve odstranit koleje
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Silnice je jednosměrná nebo zablokovaná
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Silnice je jednosměrná nebo zablokovaná
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Výstavba železnice
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Výstavba elektrifikované železnice
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Výstavba monorailu
@@ -1624,41 +1624,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Postavit
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Postavit železni�ní most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Postavit železni�ní tunel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Přepnout režim stavba/odstranění pro koleje a semafory
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Výběr mostů - staví se kliknutím na obrázek mostu
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Výběr mostů - staví se kliknutím na obrázek mostu
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Zvolit orientaci železni�ního depa
-STR_RAILROAD_TRACK                                              :Koleje
-STR_RAILROAD_TRAIN_DEPOT                                        :Železni�ní depo
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Koleje
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Železni�ní depo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... území vlastní jiná spole�nost
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Koleje s oby�ejným návěstidlem
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Koleje s vjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Koleje s odjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Koleje s cestovým (kombinovaným) návěstidlem
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Koleje s dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Koleje s jednosměrným dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Koleje s normálním a vjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Koleje s oby�ejným a odjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Koleje s oby�ejným a cestovým (kombinovaným) návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Koleje s oby�ejným a dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Koleje s oby�ejným a jednosměrným dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Koleje s vjezdovým a odjezdovým návěstidlem
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Koleje s vjezdovým a cestovým návěstidlem
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Koleje s vjezdovým a dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Koleje s vjezdovým a jednosměrným dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Koleje s odjezdovým a cestovým návěstidlem
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Koleje s odjezdovým a dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Koleje s odjezdovým a jednosměrným dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Koleje s cestovým (kombinovaným) a dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Koleje s cestovým (kombinovaným) a jednosměrným dokonalejším (PBS) návěstidlem
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Koleje s dokonalejším (PBS) a jednosměrným dokonalejším návěstidlem
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Je nejprve nutno odstranit stanici
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Postavit samostatnou stanici
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Spojování stanic
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Koleje s oby�ejným návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Koleje s vjezdovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Koleje s odjezdovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Koleje s cestovým (kombinovaným) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Koleje s dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Koleje s jednosměrným dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Koleje s normálním a vjezdovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Koleje s oby�ejným a odjezdovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Koleje s oby�ejným a cestovým (kombinovaným) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Koleje s oby�ejným a dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Koleje s oby�ejným a jednosměrným dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Koleje s vjezdovým a odjezdovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Koleje s vjezdovým a cestovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Koleje s vjezdovým a dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Koleje s vjezdovým a jednosměrným dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Koleje s odjezdovým a cestovým návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Koleje s odjezdovým a dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Koleje s odjezdovým a jednosměrným dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Koleje s cestovým (kombinovaným) a dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Koleje s cestovým (kombinovaným) a jednosměrným dokonalejším (PBS) návěstidlem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Koleje s dokonalejším (PBS) a jednosměrným dokonalejším návěstidlem
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Je nejprve nutno odstranit stanici
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Postavit samostatnou stanici
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Spojování stanic
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Musíš nejprve odstranit silnici
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Silnice je v rekonstrukci
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Silnice je v rekonstrukci
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba silnic
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba tramvajové tratě
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Zvolit silni�ní most
@@ -1694,14 +1694,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postavit
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Stavět nebo nestavět jednosměrné silnice
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Stavět nebo bourat silnici nebo zastávku
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Přepínání mezi výstavbou a bouráním tramvajové tratě
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Výběr orientace garáže
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Zvol směr tramvajového depa
-STR_ROAD_DESCRIPTION_ROAD                                       :Silnice
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Silnice s pouli�ním osvětlením
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Silnice s alejí
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garáž
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Železni�ní přejezd
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramvaj
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Výběr orientace garáže
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Zvol směr tramvajového depa
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Silnice
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Silnice s pouli�ním osvětlením
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Silnice s alejí
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garáž
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Železni�ní přejezd
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramvaj
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nelze odstranit autobusovou zastávku...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nelze odstranit nakládací rampu...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nelze zbourat tramvajovou stanici pro cestující...
@@ -1709,12 +1709,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nelze od
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Města
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Budova musí být nejprve zni�ena
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (velkoměsto)
@@ -1727,9 +1727,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Umístit
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Změnit jméno města
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Cestujících minulý měsíc: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Pošta za minulý měsíc: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Množství doru�eného nákladu potřebného pro rozvoj města:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{BLACK}Je potřeba {ORANGE}{STRING}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} dovezeno minulý měsíc
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Množství doru�eného nákladu potřebného pro rozvoj města:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{BLACK}Je potřeba {ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} dovezeno minulý měsíc
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Vysoký kancelářský blok
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kancelářský blok
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Malé bytovky
@@ -1766,7 +1766,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Dotace přidělena spole�nosti {STRING}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet trojnásobek normální ceny!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Dotace přidělena spole�nosti {STRING}.{}{}Doprava {STRING.gen} z {STATION} do {STATION} bude po jeden rok vynášet �tyřnásobek normální ceny!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Místní správa města {TOWN} zakazuje stavbu dalšího letiště v tomto městě.
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}Zastupitelstvo města {TOWN} odmítá vydat povolení na stavbu letiště kvůli hlukovým limitům
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}Zastupitelstvo města {TOWN} odmítá vydat povolení na stavbu letiště kvůli hlukovým limitům
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Chatky
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Domy
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Byty
@@ -1802,7 +1802,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}{TOWN} zažívá dopravní chaos!{}{}Program přestavby ulic sponzorovaný {STRING} přináší motoristům 6 měsíců utrpení!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (ve výstavbě)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (ve výstavbě)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglů
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Teepee
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Dům konvi�ka
@@ -1815,17 +1815,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Umístit nápis
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Stromy
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... strom už tu je
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Zde nemůžeš vysadit strom...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... příliš mnoho popisků
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Zde nemůžeš umístit nápis...
-STR_SIGN_DEFAULT                                                :Nápis
+STR_DEFAULT_SIGN_NAME                                           :Nápis
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Upravit text popisku
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nemůžeš změnit jméno nápisu...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nelze smazat zna�ku...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Zvol typ stromu na vysazení
-STR_TREE_NAME_TREES                                             :Stromy
-STR_TREE_NAME_RAINFOREST                                        :Tropický prales
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusy
+STR_LAI_TREE_NAME_TREES                                         :Stromy
+STR_LAI_TREE_NAME_RAINFOREST                                    :Tropický prales
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusy
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Výběr nádraží
@@ -1845,7 +1845,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Musíš
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Příliš blízko k jinému letišti
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Musíš nejprve zni�it letiště
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Přejmenovat stanici
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Přejmenovat stanici
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nemohu přejmenovat stanici...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Hodnocení
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Přijímá
@@ -1863,10 +1863,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Úžasné
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zobrazit všechny vlaky, které mají tuto stanici v jízdním řádu
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zobrazit všechna silni�ní vozidla, která mají tuto stanici v jízdním řádu
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Zobrazit všechna letadla, která mají tuto stanici v jízdním řádu
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Zobrazit všechny lodě, které mají tuto stanici v jízdním řádu
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Zobrazit všechny vlaky, které mají tuto stanici v jízdním řádu
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Zobrazit všechna silni�ní vozidla, která mají tuto stanici v jízdním řádu
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Zobrazit všechna letadla, která mají tuto stanici v jízdním řádu
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Zobrazit všechny lodě, které mají tuto stanici v jízdním řádu
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} už dále nepřijímá {STRING.acc}
@@ -1899,47 +1899,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Změnit
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Ukázat seznam přijímaného nákladu
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Jména stanic - kliknutím na jméno stanice se na ni přesune pohled
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Zvol velikost a typ letiště
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Nádraží
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangár
-STR_STATION_DESCRIPTION_AIRPORT                                 :Letiště
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Nákladová rampa
-STR_STATION_DESCRIPTION_BUS_STATION                             :Autobusová zastávka
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Dok
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Nádraží
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangár
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Letiště
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Nákladová rampa
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Autobusová zastávka
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Dok
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Zvýraznit oblast pokrytí
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nezvýrazňovat oblast pokrytí
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Zvýraznění oblasti pokrytí
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Přístav
-STR_STATION_DESCRIPTION_BUOY                                    :Bójka
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bójka
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... bójka v cestě
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... stanice je příliš rozlehlá
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... nejednolité stanice nejsou povoleny
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Podržením Ctrl můžeš ozna�it více položek
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... nejednolité stanice nejsou povoleny
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Podržením Ctrl můžeš ozna�it více položek
 
 STR_UNDEFINED                                                   :(nedefinovaný řetězec)
-STR_STAT_CLASS_DFLT                                             :Původní stanice
-STR_STAT_CLASS_WAYP                                             :Směrování
+STR_STATION_CLASS_DFLT                                          :Původní stanice
+STR_STATION_CLASS_WAYP                                          :Směrování
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientace lodního depa
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... musí být postaven na vodě
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Zde nemůžeš postavit lodní depo...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Zvolit orientaci lodního depa
-STR_WATER_DESCRIPTION_WATER                                     :Voda
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Pobřeží nebo břeh
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Lodní depo
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvadukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Voda
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Pobřeží nebo břeh
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Lodní depo
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... nemohu stavět na vodě
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Nejprve je třeba zni�it průplav
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Nejprve je třeba zni�it průplav
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Uložit hru
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Otevřít hru
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Uložit
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Smazat
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Pozorovatel, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Pozorovatel, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} voln{P ý é ých}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Nemohu �íst z jednotky
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Uložení hry selhalo{}{STRING}
@@ -1955,12 +1955,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Seznam j
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Zvolené jméno uložené hry
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Smazat ozna�enou uloženou hru
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Uložit sou�asnou hru se zvoleným jménem
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Vytvořit novou náhodnou hru
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Nahrát výškovou mapu
-STR_SAVE_OSKTITLE                                               :{BLACK}Zadej jméno pro uloženou hru
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Vytvořit novou náhodnou hru
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Nahrát výškovou mapu
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Zadej jméno pro uloženou hru
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} v cestÄ›
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} v cestÄ›
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Uhelný důl
 STR_INDUSTRY_NAME_POWER_STATION                                 :Elektrárna
@@ -2018,7 +2018,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Nastavit pohled na průmysl
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}{STRING} se staví poblíž města {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nový {STRING} se vysazuje poblíž města {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cena: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cena: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Tento druh průmyslu zde nemohu postavit...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... lesy lze vysadit jen nad sněhovou �áru
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} ohlašuje okamžité uzavření!
@@ -2036,16 +2036,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}V cestě je jiný tunel
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunel by kon�il mimo mapu
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunel by kon�il mimo mapu
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nemohu vyrovnat zemi na druhém konci tunelu
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Nutno nejprve zni�it tunel
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Nutno nejprve zni�it most
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Nelze za�ít a skon�it na stejném místě
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Nájezdy na most nejsou ve stejné výšce
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Most je pro terén moc nízký
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Nelze za�ít a skon�it na stejném místě
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Nájezdy na most nejsou ve stejné výšce
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je pro terén moc nízký
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Za�átek a konec musí být ve stejné výšce
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Místo nevhodné pro vjezd do tunelu
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Zavěšený, ocelový
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Trámový, ocelový
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Konzolový, ocelový
@@ -2056,30 +2056,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Potrubní, ocel
 STR_BRIDGE_TUBULAR_SILICON                                      :Potrubní, křemíkový
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Zde nelze postavit most...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Zde nelze postavit tunel...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Železni�ní tunel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Silni�ní tunel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ocelový zavěšený železni�ní most
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ocelový trámový železni�ní most
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ocelový konzolový železni�ní most
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Zpevněný betonový zavěšený železni�ní most
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Dřevěný železni�ní most
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonový železni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ocelový zavěšený silni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ocelový trámový silni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ocelový konzolový silni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Zpevněný betonový zavěšený silni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Dřevěný silni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonový silni�ní most
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Potrubní železni�ní most
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Potrubní silni�ní most
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Železni�ní tunel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Silni�ní tunel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ocelový zavěšený železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ocelový trámový železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ocelový konzolový železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Zpevněný betonový zavěšený železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Dřevěný železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonový železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ocelový zavěšený silni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ocelový trámový silni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ocelový konzolový silni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Zpevněný betonový zavěšený silni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Dřevěný silni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonový silni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Potrubní železni�ní most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Potrubní silni�ní most
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}V cestÄ› je objekt
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Vysíla�
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Maják
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Ředitelství spole�nosti
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Vysíla�
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Maják
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Ředitelství spole�nosti
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}... v cestě je ředitelství spole�nosti
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Půda vlastněna spole�ností
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Půda vlastněna spole�ností
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Nelze zakoupit tento pozemek...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... již ji vlastníš!
 
@@ -2127,7 +2127,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stanic
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Obtížnost
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Uložit
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Uložit
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lehká
@@ -2200,8 +2200,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Barevné
 STR_LIVERY_CAPTION                                              :{WHITE}Nové barevné schéma
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Spole�nost
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Prezident
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Jméno spole�nosti
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Jméno prezidenta
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Jméno spole�nosti
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Jméno prezidenta
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Nemohu změnit jméno spole�nosti.
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Nemohu změnit jméno prezidenta.
 STR_FINANCES_CAPTION                                            :{WHITE}Finance - {COMPANY} {BLACK}{COMPANYNUM}
@@ -2225,11 +2225,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Celkem:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf příjmu
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf provozního zisku
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Stav na ú�tu
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Půj�ka
-STR_MAX_LOAN                                                    :{WHITE}Max. půj�ka: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max. půj�ka: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Půj�it {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Vrátit {SKIP}{SKIP}{CURRENCY}
@@ -2238,7 +2238,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nemohu p
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... žádný dluh ke splacení
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... je potřeba {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nemohu zaplatit dluh.
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nemůžeš darovat peníze půj�ené z banky...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Nemůžeš darovat peníze půj�ené z banky...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Zvol nový obli�ej prezidenta
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Zvol nový nátěr vozidel spole�nosti
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Změnit jméno prezidenta
@@ -2248,10 +2248,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Splatit
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Prezident)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Založeno: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vozidla:
-STR_TRAINS                                                      :{WHITE}{COMMA} vlak{P "" y ů}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} silni�ní{P "" "" ch} vozid{P lo la el}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} letad{P lo la el}
-STR_SHIPS                                                       :{WHITE}{COMMA} lo{P � dě dí}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" y ů}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} silni�ní{P "" "" ch} vozid{P lo la el}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} letad{P lo la el}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lo{P � dě dí}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nic
 STR_FACE_CAPTION                                                :{WHITE}Volba tváře
 STR_FACE_MALE_BUTTON                                            :{BLACK}Mužská
@@ -2264,9 +2264,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Zvolit Å
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Vytvořit náhodnou novou tvář
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Legenda
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Zobrazit legendu ke grafům
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Zobrazit podrobné hodnocení výkonu
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Zobrazit podrobné hodnocení výkonu
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legenda ke grafům spole�ností
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klepni zde pro přepnuti zobrazení spole�nosti na grafu
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klepni zde pro přepnuti zobrazení spole�nosti na grafu
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Doru�eno jednotek zboží
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Hodnocení spole�ností (nejvyšší hodnocení je 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Hodnota spole�ností
@@ -2300,23 +2300,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Prezident
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnát
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Ředitelství
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Vybudovat ředitelství spole�nosti nebo ho ukázat
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Sídlo spole�nosti můžeš vystavit jinde za 1 % její hodnoty
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Sídlo spole�nosti můžeš vystavit jinde za 1 % její hodnoty
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nemohu postavit ředitelství spole�nosti
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Ředitelství
-STR_RELOCATE_HQ                                                 :{BLACK}Přesídlit
-STR_COMPANY_JOIN                                                :{BLACK}Přidat se
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Připojit se a hrát za tuto spole�nost
-STR_COMPANY_PASSWORD                                            :{BLACK}Heslo
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Heslo - zabrání neautorizovaným uživatelům v připojení se k tvé spole�nosti.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Nastav heslo spole�nosti.
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Přesídlit
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Přidat se
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Připojit se a hrát za tuto spole�nost
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Heslo
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Heslo - zabrání neautorizovaným uživatelům v připojení se k tvé spole�nosti.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Nastav heslo spole�nosti.
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukládat zadané heslo
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Změnit heslo spole�nosti
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Heslo spole�nosti
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Výchozí heslo spole�ností
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Použít toto heslo jako výchozí pro nově založené spole�nosti
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Výchozí heslo spole�ností
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Použít toto heslo jako výchozí pro nově založené spole�nosti
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Celosvětový hospodářský úpadek!{}{}Finan�ní experti se kvůli prudkému poklesu ekonomiky obávají nejhoršího!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Konec hospodářského úpadku!{}{}Posílení trhu zvýšilo u průmyslu důvěru!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Přepnout velké/malé okno
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Přepnout velké/malé okno
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Hodnota spole�nosti: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Koupit 25% podíl ve spole�nosti
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Prodat 25% podíl ve spole�nosti
@@ -2326,7 +2326,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Nemohu k
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Nemohu prodat podíl v této spole�nosti...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% vlastněno {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} byla převzata {STRING}!
-STR_PROTECTED                                                   :{WHITE}Tato spole�nost zatím neobchoduje s akciemi...
+STR_ERROR_PROTECTED                                             :{WHITE}Tato spole�nost zatím neobchoduje s akciemi...
 
 STR_LIVERY_DEFAULT                                              :Výchozí barva
 STR_LIVERY_STEAM                                                :Parní lokomotiva
@@ -2352,14 +2352,14 @@ STR_LIVERY_LARGE_PLANE                                          :Velké letadlo
 STR_LIVERY_PASSENGER_TRAM                                       :Tramvaj pro cestující
 STR_LIVERY_FREIGHT_TRAM                                         :Nákladní tramvaj
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Zobrazit všeobecná barevná schémata
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Zobrazit barevná schémata pro vlaky
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Zobrazit barevná schémata pro silni�ní vozidla
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Zobrazit barevná schémata pro lodě
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Zobrazit barevná schémata pro letadla
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Vybrat primární barvu ozna�eného schématu
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Vybrat sekundární barvu ozna�eného schématu
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Vyber, které barevné schéma chceš změnit (více ozna�íš s Ctrl). Schéma změníš kliknutím na tla�ítko
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Zobrazit všeobecná barevná schémata
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Zobrazit barevná schémata pro vlaky
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Zobrazit barevná schémata pro silni�ní vozidla
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Zobrazit barevná schémata pro lodě
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Zobrazit barevná schémata pro letadla
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Vybrat primární barvu ozna�eného schématu
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Vybrat sekundární barvu ozna�eného schématu
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Vyber, které barevné schéma chceš změnit (více ozna�íš s Ctrl). Schéma změníš kliknutím na tla�ítko
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (parní)
@@ -2673,9 +2673,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(nevykládat a
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Ovlivnit zastavení u vybraného příkazu
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Ovlivnit nakládání u vybraného příkazu
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ovlivnit vykládání u vybraného příkazu
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Vložit složitější příkaz
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Vložit složitější příkaz
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Jet do nejbližšího depa
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Jet do nejbližšího hangáru
 STR_ORDER_NEAREST_DEPOT                                         :nebližšího
@@ -2685,9 +2685,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Údržba bez za
 STR_ORDER_TRAIN_DEPOT                                           :železni�ním depu
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :silni�ním depu
 STR_ORDER_SHIP_DEPOT                                            :lodním depu
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} hangár
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} hangár
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Je� vždy
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servis v případě potřeby
@@ -2712,10 +2712,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je více než
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je více nebo rovno
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :není pravda
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Sko�it na příkaz {COMMA}
-STR_CONDITIONAL_NUM                                             :Sko�it na příkaz {COMMA}, když {STRING.small} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Sko�it na příkaz {COMMA}, když {STRING.small} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Sko�it na příkaz {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Sko�it na příkaz {COMMA}, když {STRING.small} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Sko�it na příkaz {COMMA}, když {STRING.small} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nikam nejet
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Jet do (mimo jízdní řád)
@@ -2738,18 +2738,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlaky lz
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Přesko�it
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Smazat
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Jet do
-STR_REFIT                                                       :{BLACK}Přestavět
-STR_REFIT_TIP                                                   :{BLACK}Vyber, na který druh nákladu přestavět. Ctrl+klik odstraní přestavbu z příkazu.
-STR_REFIT_ORDER                                                 :(Přestavět na {STRING})
-STR_REFIT_STOP_ORDER                                            :(Přestavět na {STRING} a zastavit)
-STR_STOP_ORDER                                                  :(Zastavit)
-STR_TIMETABLE_VIEW                                              :{BLACK}Jízdní řád
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Přepnout na jízdní řád
-STR_ORDER_VIEW                                                  :{BLACK}Příkazy
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Přepnout na zobrazení příkazů
+STR_ORDER_REFIT                                                 :{BLACK}Přestavět
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vyber, na který druh nákladu přestavět. Ctrl+klik odstraní přestavbu z příkazu.
+STR_ORDER_REFIT_ORDER                                           :(Přestavět na {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Přestavět na {STRING} a zastavit)
+STR_ORDER_STOP_ORDER                                            :(Zastavit)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Jízdní řád
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Přepnout na jízdní řád
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Příkazy
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Přepnout na zobrazení příkazů
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Příkazy)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Konec příkazů - -
-STR_SERVICE                                                     :{BLACK}Údržba
+STR_ORDER_SERVICE                                               :{BLACK}Údržba
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Koupeno: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2769,7 +2769,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}do této
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}do této stanice se prostředek sdílející tento příkaz nedostane
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nemohu přesunout vozidlo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadní stroj vždy doprovází svůj protějšek vepředu
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nemohu najít cestu do místního depa...
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval servisů: {LTBLUE}{COMMA} d{P en ny ní}{BLACK}   Naposledy v servisu: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Interval servisů: {LTBLUE}{COMMA}%{BLACK}   Naposledy v servisu: {LTBLUE}{DATE_LONG}
@@ -2789,10 +2789,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Jízdní
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Změnit �as pro splnění jízdního příkazu
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zrušit �as pro splnění jízdního příkazu
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Smazat zpoždění, takže vozidlo pojede na �as
-STR_SERVICE_HINT                                                :{BLACK}Přesko� tento cíl, pokud není potřeba pravidelná údržba
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rychlost: {VELOCITY}  Výkon: {POWER}{}Cena provozu: {CURRENCY} ro�ně{}Kapacita: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO}, {CARGO}{}Cena provozu: {CURRENCY} ro�ně
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO}{}Cena provozu: {CURRENCY} ro�ně
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Přesko� tento cíl, pokud není potřeba pravidelná údržba
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rychlost: {VELOCITY}  Výkon: {POWER}{}Cena provozu: {CURRENCY} ro�ně{}Kapacita: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO}, {CARGO}{}Cena provozu: {CURRENCY} ro�ně
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cena: {CURRENCY} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO}{}Cena provozu: {CURRENCY} ro�ně
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Stáří: {LTBLUE}{STRING}{BLACK}   Cena provozu: {LTBLUE}{CURRENCY} ro�ně
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_S} {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
@@ -2811,27 +2811,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Nehoda!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Železni�ní neštěstí!{}Při srážce {COMMA} {P �lověk lidé lidí} přiš{P el li lo} o život v plamenech.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nelze obrátit vlak...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nelze otá�et vozidla složená z více strojů
-STR_CLEAR_TIME                                                  :{BLACK}Smazat �as
-STR_RESET_LATENESS                                              :{BLACK}Zapomenout zpoždění
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Přejmenovat stavědlo
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Smazat �as
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Zapomenout zpoždění
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Přejmenovat stavědlo
 
-STR_TRAIN_STOPPING                                              :{RED}Zastavuje
-STR_TRAIN_STOPPING_VEL                                          :{RED}Zastavuje, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Neslu�itelné druhy kolejí
-STR_TRAIN_NO_POWER                                              :{RED}Bez proudu
-STR_TRAIN_START_NO_CATENARY                                     :Tato trať není elektrifikována, vlak nemůže odjet
-STR_TRAIN_STUCK                                                 :{ORANGE}Čekám na volnou cestu
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Zastavuje
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Zastavuje, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Neslu�itelné druhy kolejí
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Bez proudu
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Tato trať není elektrifikována, vlak nemůže odjet
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Čekám na volnou cestu
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nov{G á ý é} {STRING} k dispozici!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nov{G á ý é} {STRING} k dispozici!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Nelze prodat zni�ené vozidlo...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nelze přestavět zni�ené vozidlo...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Nelze prodat zni�ené vozidlo...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nelze přestavět zni�ené vozidlo...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Tomuto vozidlu nejde nastavit jízdní řád...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vozidla mohou �ekat jen ve stanicích.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Toto vozidlo v této stanici nestaví.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Tomuto vozidlu nejde nastavit jízdní řád...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vozidla mohou �ekat jen ve stanicích.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Toto vozidlo v této stanici nestaví.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Změnit �as
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Vozidlo jede na �as
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Vozidlo má {STRING} zpoždění
@@ -2845,7 +2845,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Automati
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... musí být zastaven v garáži
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nemohu najít místní garáž
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Oto� vozidlo
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapacita: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacita: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozid{P lo la el}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2871,11 +2871,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Umístit bójku použitelnou pro navádění
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Zde nelze umístit bójku...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postavit akvadukt
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tady není možné postavit akvadukt...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Tady není možné postavit akvadukt...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Přestavět)
 STR_REFIT_TITLE                                                 :{GOLD}Zvolit druh nákladu:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nová kapacita: {GOLD}{CARGO}{}{BLACK}Cena přestavby: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(lze přestavět)
+STR_PURCHASE_INFO_REFITTABLE                                    :(lze přestavět)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Letiště
@@ -2888,7 +2888,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postavit
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Obyvatelé oslavují...{}První letadlo přistálo v {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Pád letadla!{}{COMMA} {P �lověk lidé lidí} zahynul{P "" i o} v plamenech v {STATION}.
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Letecká havárie!{}Kvůli vy�erpání paliva {COMMA} {P �lověk lidé lidí} zemřel{P "" i o} v ohnivém pekle!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Jízdní řád)
 
@@ -2901,13 +2901,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Pokles terénu u uhelného dolu {TOWN} způsobil velké škody!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Záplavy!{}Po strašlivých záplavách je odhadem {COMMA} {P �lověk lidé lidí} pohřešov{P án áni aných} nebo mrt{P ev ví vých}!
 
-STR_BRIBE_FAILED                                                :{WHITE}Tvůj pokus o úplatek byl
-STR_BRIBE_FAILED_2                                              :{WHITE}odhalen místním vyšetřovatelem.
-STR_BUILD_DATE                                                  :{BLACK}Postaveno: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Tvůj pokus o úplatek byl
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}odhalen místním vyšetřovatelem.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Postaveno: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Třída stanice: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Druh stanice: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Třída stanice: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Druh stanice: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Podrobné hodnocení výkonu
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}PodrobnÄ›
@@ -2927,28 +2927,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Hotovost
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Dluh:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Celkem:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Po�et dopravních prostředků, tzn. silni�ních vozidel, vlaků, lodí a letadel
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Po�et sou�ástí stanic. Každá sou�ást stanice (napr. nádraží, autobusová zastávka, letiště) se zapo�ítává, i když patří jediné stanici
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Minimální hrubý zisk (= s provoz. náklady) vozidla s nejnižším příjmem (staršího 2 let)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Čistý zisk (= bez provoz. nakladu) v nejslabším měsíci za posledních 12 �tvrtletí
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Čistý zisk v měsíci s největším příjmem za posledních 12 �tvrtletí
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Po�et doru�ených jednotek nákladu za poslední rok (4Q)
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Po�et doru�ených druhu nákladu za poslední 3 měsíce (1Q)
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Sou�asná hotovost spole�nosti
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Má spole�nost velký dluh?
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Celkový po�et bodů z 1000 možných
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Po�et dopravních prostředků, tzn. silni�ních vozidel, vlaků, lodí a letadel
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Po�et sou�ástí stanic. Každá sou�ást stanice (napr. nádraží, autobusová zastávka, letiště) se zapo�ítává, i když patří jediné stanici
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Minimální hrubý zisk (= s provoz. náklady) vozidla s nejnižším příjmem (staršího 2 let)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Čistý zisk (= bez provoz. nakladu) v nejslabším měsíci za posledních 12 �tvrtletí
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Čistý zisk v měsíci s největším příjmem za posledních 12 �tvrtletí
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Po�et doru�ených jednotek nákladu za poslední rok (4Q)
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Po�et doru�ených druhu nákladu za poslední 3 měsíce (1Q)
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Sou�asná hotovost spole�nosti
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Má spole�nost velký dluh?
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Celkový po�et bodů z 1000 možných
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavení grafik
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Ukázat nastavení NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavení grafických souborů
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Potvrdit změny
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Přepnout paletu
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}U vybrané grafiky přepne paletu.{}Je to užite�né, když se ti ve hře zobrazuje růžově.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Nastavit parametry
-STR_NEWGRF_FILENAME                                             :{BLACK}Jméno souboru: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdit změny
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Přepnout paletu
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}U vybrané grafiky přepne paletu.{}Je to užite�né, když se ti ve hře zobrazuje růžově.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavit parametry
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Jméno souboru: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Právě se chystáš změnit nastavení grafik za běžící hry; může to shodit OpenTTD.{}Jsi si tím opravdu jist(a)?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2971,34 +2971,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Pokus o použit
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} obsahuje poškozený sprite. Všechny takové se zobrazí jako �ervený otazník (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje víc GRF akcí 8.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Nahrát vybranou předvolbu
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Uložit předvolbu
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Uložit tento seznam jako předvolbu
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Zadej název předvolby
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Smazat předvolbu
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Odstranit vybranou předvolbu
-STR_NEWGRF_ADD                                                  :{BLACK}Přidat
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Přidat grafiku do seznamu
-STR_NEWGRF_REMOVE                                               :{BLACK}Odebrat
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstranit ozna�enou grafiku ze seznamu
-STR_NEWGRF_MOVEUP                                               :{BLACK}Nahoru
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Posunout ozna�enou grafiku nahoru
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Dolů
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Posunout ozna�enou grafiku dolů
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Seznam grafik, které jsou nainstalovány. Kliknutím na jméno souboru můžeš nastavit parametry.
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametry: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Zadej parametry grafiky
-STR_NEWGRF_NO_INFO                                              :{BLACK}Není dostupná žádná informace
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Nahrát vybranou předvolbu
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Uložit předvolbu
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Uložit tento seznam jako předvolbu
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Zadej název předvolby
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Smazat předvolbu
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Odstranit vybranou předvolbu
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Přidat
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Přidat grafiku do seznamu
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Odebrat
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Odstranit ozna�enou grafiku ze seznamu
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Nahoru
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Posunout ozna�enou grafiku nahoru
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Dolů
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Posunout ozna�enou grafiku dolů
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Seznam grafik, které jsou nainstalovány. Kliknutím na jméno souboru můžeš nastavit parametry.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametry: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Zadej parametry grafiky
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Není dostupná žádná informace
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupné grafiky
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Přidat do výběru
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Přidat vybranou grafiku do tvého seznamu
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Na�íst soubory
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Znovu vytvořit seznam dostupných grafik
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Přidat vybranou grafiku do tvého seznamu
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Na�íst soubory
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Znovu vytvořit seznam dostupných grafik
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nelze přidat soubor: duplicitní GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Nenalezen odpovídající soubor
-STR_NEWGRF_DISABLED                                             :{RED}Vypnuto
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Nenalezen odpovídající soubor
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Vypnuto
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odpovídající soubor nebyl nalezen (na�etl se kompatibilní GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilní GRF se na�etly místo chybějících
@@ -3014,7 +3014,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}Grafika
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informace o nákladu/možnosti přestavby pro '{1:ENGINE}' se po nákupu změnily. To může způsobit problémy při automatické výměně vozidel.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' způsobil(a) nekone�nou smy�ku v callbacku produkce průmyslu.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Hra byla uložena ve verzi bez podpory tramvají. Všechny tramvaje se odstraní.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Hra byla uložena ve verzi bez podpory tramvají. Všechny tramvaje se odstraní.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastní měna
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz měny: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3025,16 +3025,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Přecho
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Přechod k euru: {ORANGE}nikdy
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Náhled: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Změnit parametry vlastní měny
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Snížit hodnotu vlastní měny oproti libře (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Zvýšit hodnotu vlastní měny oproti libře (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Ur�it směnný kurz vlastní měny oproti libře (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Ur�it oddělova� v zápisu měny
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Ur�it předponu pro vlastní měnu
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Ur�it příponu pro vlastní měnu
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Přejít na euro dříve
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Přejít na euro později
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Ur�it rok přechodu na euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 liber (£) ve vlastní měně
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Snížit hodnotu vlastní měny oproti libře (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zvýšit hodnotu vlastní měny oproti libře (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Ur�it směnný kurz vlastní měny oproti libře (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Ur�it oddělova� v zápisu měny
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Ur�it předponu pro vlastní měnu
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Ur�it příponu pro vlastní měnu
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Přejít na euro dříve
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Přejít na euro později
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Ur�it rok přechodu na euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 liber (£) ve vlastní měně
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3053,8 +3053,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} lo{P � dě dí}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} letad{P lo la el}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Sdílené příkazy {COMMA} vozid{P lo la el}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Zobrazit všechny prostředky se stejným jízdním řádem
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Sdílené příkazy {COMMA} vozid{P lo la el}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Zobrazit všechny prostředky se stejným jízdním řádem
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} �eká v depu
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} �eká v depu
@@ -3161,39 +3161,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Přestav
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Přestavět pro převážení jiného druhu nákladu
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Přestavět letadlo pro převážení jiného typu nákladu
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Jedu do železni�ního depa {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Jedu do železni�ního depa {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Míří do garáže {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Míří do garáže {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Jedu do depa {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Míří do depa {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Jedu do hangáru {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Jedu do hangáru {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Údržba v železni�ním depu {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Údržba v železni�ním depu {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Údržba v silni�ním depu {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Údržba v silni�ním depu {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Údržba v lodním depu {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Údržba v lodním depu {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Údržba v hangáru {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Údržba v hangáru {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klonovat vlak
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonovat vozidlo
-STR_CLONE_SHIP                                                  :{BLACK}Klonovat lo�
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonovat letadlo
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Vytvoří se kopie vlaku se všemi vagony. Se stisknutým Ctrl se budou sdílet příkazy.
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Vytvoří se kopie silni�ního vozidla. Se stisknutým Ctrl se budou sdílet příkazy.
-STR_CLONE_SHIP_INFO                                             :{BLACK}Vytvoří se kopie lodě. Se stisknutým Ctrl se budou sdílet příkazy.
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Vytvoří se kopie letadla. Se stisknutým Ctrl se budou sdílet příkazy.
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Vytvoří se kopie vlaku se všemi vagony. Klepni na toto tla�ítko a pak na vlak v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Vytvoří se kopie silni�ního vozidla. Klepni na toto tla�ítko a pak na vozidlo v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Vytvoří se kopie lodě. Klepni na toto tla�ítko a pak na lo� v nebo vně lodního depa. Se stisknutým Ctrl se budou sdílet příkazy.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Vytvoří se kopie letadla. Klepni na toto tla�ítko a pak na letadlo v nebo vně hangáru. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Jedu do železni�ního depa {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Jedu do železni�ního depa {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Míří do garáže {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Míří do garáže {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Jedu do depa {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Míří do depa {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Jedu do hangáru {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Jedu do hangáru {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Údržba v železni�ním depu {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Údržba v železni�ním depu {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Údržba v silni�ním depu {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Údržba v silni�ním depu {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Údržba v lodním depu {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Údržba v lodním depu {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Údržba v hangáru {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Údržba v hangáru {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klonovat vlak
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonovat vozidlo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonovat lo�
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonovat letadlo
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Vytvoří se kopie vlaku se všemi vagony. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Vytvoří se kopie silni�ního vozidla. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Vytvoří se kopie lodě. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Vytvoří se kopie letadla. Se stisknutým Ctrl se budou sdílet příkazy.
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Vytvoří se kopie vlaku se všemi vagony. Klepni na toto tla�ítko a pak na vlak v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Vytvoří se kopie silni�ního vozidla. Klepni na toto tla�ítko a pak na vozidlo v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Vytvoří se kopie lodě. Klepni na toto tla�ítko a pak na lo� v nebo vně lodního depa. Se stisknutým Ctrl se budou sdílet příkazy.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Vytvoří se kopie letadla. Klepni na toto tla�ítko a pak na letadlo v nebo vně hangáru. Se stisknutým Ctrl se budou sdílet příkazy.
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nové lokomotivy a vagony
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nové elektrické lokomotivy a vagony
@@ -3263,28 +3263,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Nastavit
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Chceš prodat všechna vozidla v depu. Jsi si jistý?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Nevhodný druh depa
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Nevhodný druh depa
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Prodat všechny vlaky v depu
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Prodat všechna silni�ní vozidla v depu
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Prodat všechny lodě v depu
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Prodat všechna letadla a vrtulníky v hangáru
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Prodat všechny vlaky v depu
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Prodat všechna silni�ní vozidla v depu
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Prodat všechny lodě v depu
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Prodat všechna letadla a vrtulníky v hangáru
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Ukázat seznam všech vlaků, které mají toto depo v jízdním řádu
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Ukázat seznam všech silni�ních vozidel, které mají toto depo v jízdním řádu
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Ukázat seznam všech lodí, které mají toto depo v jízdním řádu
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Ukázat seznam všech letadel a vrtulníků, které mají jakýkoliv z hangaru na tomto letišti v letovém plánu
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Ukázat seznam všech vlaků, které mají toto depo v jízdním řádu
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Ukázat seznam všech silni�ních vozidel, které mají toto depo v jízdním řádu
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Ukázat seznam všech lodí, které mají toto depo v jízdním řádu
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Ukázat seznam všech letadel a vrtulníků, které mají jakýkoliv z hangaru na tomto letišti v letovém plánu
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Nechat automaticky vyměňovat všechny vlaky přítomné v depu
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Nechat automaticky vyměňovat všechna silni�ní vozidla přítomné v depu
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Nechat automaticky vyměňovat všechny lodě přítomné v depu
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Nechat automaticky vyměňovat všechna letadla a vrtulníky přítomné v hangáru
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Nechat automaticky vyměňovat všechny vlaky přítomné v depu
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Nechat automaticky vyměňovat všechna silni�ní vozidla přítomné v depu
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Nechat automaticky vyměňovat všechny lodě přítomné v depu
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Nechat automaticky vyměňovat všechna letadla a vrtulníky přítomné v hangáru
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vyměňování {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Zapnout vyměňování
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Vypnout vyměňování
-STR_NOT_REPLACING                                               :{BLACK}(nevyměňuje se)
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Není ozna�eno žádné vozidlo
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}(nevyměňuje se)
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Není ozna�eno žádné vozidlo
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vyber typ lokomotivy na výměnu
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vyber typ nové lokomotivy, kterou chceš použít místo vybrané v levém seznamu
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Zmá�kni toto tla�ítko, když nechceš vyměňovat typ lokomotivy vybraný v levém seznamu
@@ -3296,26 +3296,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkce a
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Vyměňování: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Přepne mezi okny na výměnu lokomotiv a vagonů
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozidlo není dostupné
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vůz není dostupné
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Lo� není dostupná
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Letadlo není dostupné
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozidlo není dostupné
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vůz není dostupné
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Lo� není dostupná
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Letadlo není dostupné
 
-STR_ENGINES                                                     :lokomotivy
-STR_WAGONS                                                      :vagony
+STR_REPLACE_ENGINES                                             :lokomotivy
+STR_REPLACE_WAGONS                                              :vagony
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Stiskni pro zastavení vlaků v depu
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Stiskni pro zastavení silni�ních vozidel v depu
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Stiskni pro zastavení lodí v depu
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Stiskni pro zastavení letadel a vrtulníků v hangáru
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Stiskni pro zastavení vlaků v depu
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Stiskni pro zastavení silni�ních vozidel v depu
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Stiskni pro zastavení lodí v depu
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Stiskni pro zastavení letadel a vrtulníků v hangáru
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Stiskni pro hromadný odjezd všech vlaků v depu
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Stiskni pro hromadný odjezd všech silni�ních vozidel v depu
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Stiskni pro hromadný odjezd všech lodí v depu
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Stiskni pro hromadný odlet všech letadel a vrtulníků v hangáru
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Stiskni pro hromadný odjezd všech vlaků v depu
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Stiskni pro hromadný odjezd všech silni�ních vozidel v depu
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Stiskni pro hromadný odjezd všech lodí v depu
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Stiskni pro hromadný odlet všech letadel a vrtulníků v hangáru
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Kliknutím sem se zastaví všechna vozidla v seznamu
-STR_MASS_START_LIST_TIP                                         :{BLACK}Kliknutím sem se rozjedou všechna vozidla v seznamu
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Kliknutím sem se zastaví všechna vozidla v seznamu
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Kliknutím sem se rozjedou všechna vozidla v seznamu
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Seznam popisků - {COMMA} popis{P ek ky ků}
@@ -3324,14 +3324,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Kvůli s
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Železni�ní lokomotivy
-STR_ELRAIL_VEHICLES                                             :Elektrické lokomotivy
-STR_MONORAIL_VEHICLES                                           :Lokomotivy pro monorail
-STR_MAGLEV_VEHICLES                                             :Lokomotivy Maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Železni�ní lokomotivy
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrické lokomotivy
+STR_REPLACE_MONORAIL_VEHICLES                                   :Lokomotivy pro monorail
+STR_REPLACE_MAGLEV_VEHICLES                                     :Lokomotivy Maglev
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK} Výkon: {GOLD}{POWER}
@@ -3358,70 +3358,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Vytvořit
-STR_RANDOM                                                      :{BLACK}Nové �íslo
-STR_RANDOM_HELP                                                 :{BLACK}Vytvořit nový seed (�íslo) pro generátor terénu
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Tvorba krajiny
-STR_RANDOM_SEED                                                 :{BLACK}Náhodné �íslo:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Zde můžeš zadat seed
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Zadej náhodné �íslo
-STR_LAND_GENERATOR                                              :{BLACK}Generátor krajiny:
-STR_TREE_PLACER                                                 :{BLACK}Sázení stromů:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Oto�ení výškové mapy:
-STR_TERRAIN_TYPE                                                :{BLACK}Typ krajiny:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}ÄŒetnost jezer:
-STR_SMOOTHNESS                                                  :{BLACK}ÄŒlenitost krajiny:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Výška sněžné �áry:
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Množství měst:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Množství průmyslu:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Zvýšit sněžnou �áru o jednu úroveň
-STR_SNOW_LINE_DOWN                                              :{BLACK}Snížit sněžnou �áru o jednu úroveň
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Změnit výšku sněžne �áry
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Změnit po�áte�ní rok
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Varování kvůli velikosti
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Tak velká zmena velikosti zdrojové mapy není doporu�ena. Pokra�ovat s generováním?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Jméno výškové mapy:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Velikost: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Vytvořit
+STR_MAPGEN_RANDOM                                               :{BLACK}Nové �íslo
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Vytvořit nový seed (�íslo) pro generátor terénu
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Tvorba krajiny
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Náhodné �íslo:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Zde můžeš zadat seed
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Zadej náhodné �íslo
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generátor krajiny:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Sázení stromů:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Oto�ení výškové mapy:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Typ krajiny:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}ÄŒetnost jezer:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}ÄŒlenitost krajiny:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Výška sněžné �áry:
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Množství měst:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Množství průmyslu:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Zvýšit sněžnou �áru o jednu úroveň
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Snížit sněžnou �áru o jednu úroveň
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Změnit výšku sněžne �áry
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Změnit po�áte�ní rok
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Varování kvůli velikosti
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Tak velká zmena velikosti zdrojové mapy není doporu�ena. Pokra�ovat s generováním?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Jméno výškové mapy:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Velikost: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Vytvářím krajinu...
 STR_GENERATION_ABORT                                            :{BLACK}Přerušit
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Přerušit generování krajiny
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Opravdu chceš přerušit tento proces?
-STR_PROGRESS                                                    :{WHITE}Z {NUM} % hotovo
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Tvorba krajiny
-STR_TREE_GENERATION                                             :{BLACK}Výsadba stromů
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Výstavba nepřesunutelných objektů
-STR_CLEARING_TILES                                              :{BLACK}Tvorba �lenitého a kamenitého území
-STR_SETTINGUP_GAME                                              :{BLACK}Nastavování hry
-STR_PREPARING_TILELOOP                                          :{BLACK}Spouštění tile-loopu (cyklus na dílcích mapy)
-STR_PREPARING_GAME                                              :{BLACK}Připravování hry
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Tato akce změnila úroveň obtížnosti na 'vlastní'
-STR_SE_FLAT_WORLD                                               :{WHITE}Plochá krajina
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Vytvořit plochou krajinu
-STR_SE_RANDOM_LAND                                              :{WHITE}Náhodná krajina
-STR_SE_NEW_WORLD                                                :{BLACK}Vytvořit nový scénář
-STR_SE_CAPTION                                                  :{WHITE}Typ krajiny
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Snížit výšku ploché země o jednu úroveň
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Zvednout výšku ploché země o jednu úroveň
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Změnit výšku ploché země
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Výška ploché země:
+STR_GENERATION_PROGRESS                                         :{WHITE}Z {NUM} % hotovo
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Tvorba krajiny
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Výsadba stromů
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Výstavba nepřesunutelných objektů
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Tvorba �lenitého a kamenitého území
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Nastavování hry
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Spouštění tile-loopu (cyklus na dílcích mapy)
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Připravování hry
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Tato akce změnila úroveň obtížnosti na 'vlastní'
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Plochá krajina
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Vytvořit plochou krajinu
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Náhodná krajina
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Vytvořit nový scénář
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Typ krajiny
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Snížit výšku ploché země o jednu úroveň
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Zvednout výšku ploché země o jednu úroveň
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Změnit výšku ploché země
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Výška ploché země:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Vycentrovat malou mapu na tomto místě
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Okraje mapy:
-STR_NORTHWEST                                                   :{BLACK}Severozápad
-STR_NORTHEAST                                                   :{BLACK}Severovýchod
-STR_SOUTHEAST                                                   :{BLACK}Jihovýchod
-STR_SOUTHWEST                                                   :{BLACK}Jihozápad
-STR_BORDER_FREEFORM                                             :{BLACK}terén
-STR_BORDER_WATER                                                :{BLACK}voda
-STR_BORDER_RANDOM                                               :{BLACK}náhodně
-STR_BORDER_RANDOMIZE                                            :{BLACK}náhodně
-STR_BORDER_MANUAL                                               :{BLACK}vlastní
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Okraje mapy:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Severozápad
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Severovýchod
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Jihovýchod
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Jihozápad
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}terén
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}voda
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}náhodně
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}náhodně
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}vlastní
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Malé
@@ -3446,21 +3446,21 @@ STR_MEASURE_AREA                                                :{BLACK}Oblast:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Délka: {NUM}{}Výškový rozdíl: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Oblast: {NUM} x {NUM}{}Výškový rozdíl: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Podíl za převoz: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... tato silnice je ve vlastnictví obce
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... silnice je oto�ena jiným směrem
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Nastavení průhlednosti
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Změna průhlednosti jmen stanic. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Změna průhlednosti stromů. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Změna průhlednosti domů. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Změna průhlednosti továren. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Změna průhlednosti postavitelných objektů, jako stanic, dep a směrování. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Změna průhlednosti mostů. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Změna průhlednosti staveb jako majáků a vysíla�ů. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Změna průhlednosti elektrifikace. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Přepnout zobrazení ukazatelů naložení. Nastavení se zamkne Ctrl+kliknutím.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Objekty budou neviditelné, ne průhledné
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Podíl za převoz: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... tato silnice je ve vlastnictví obce
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... silnice je oto�ena jiným směrem
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Nastavení průhlednosti
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Změna průhlednosti jmen stanic. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Změna průhlednosti stromů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Změna průhlednosti domů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Změna průhlednosti továren. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Změna průhlednosti postavitelných objektů, jako stanic, dep a směrování. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Změna průhlednosti mostů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Změna průhlednosti staveb jako majáků a vysíla�ů. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Změna průhlednosti elektrifikace. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Přepnout zobrazení ukazatelů naložení. Nastavení se zamkne Ctrl+kliknutím.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Objekty budou neviditelné, ne průhledné
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3470,7 +3470,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :VÅ¡echny vlaky
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Všechna silni�ní vozidla
 STR_GROUP_ALL_SHIPS                                             :VÅ¡echny lodÄ›
@@ -3479,24 +3479,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Nezařazené vl
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nezařazená silni�ní vozidla
 STR_GROUP_DEFAULT_SHIPS                                         :Nezařazené lodě
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Nezařazená letadla
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Přidat sdílená vozidla
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Odstranit všechna vozidla
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Přejmenovat skupinu
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nelze vytvořit skupinu...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nelze vymazat skupinu...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nelze přejmenovat skupinu...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nelze odstranit všechna vozidla ze skupiny...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nelze přidat vozidlo do skupiny...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nelze přidat sdílená vozidla do skupiny...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nelze vytvořit skupinu...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nelze vymazat skupinu...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nelze přejmenovat skupinu...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nelze odstranit všechna vozidla ze skupiny...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nelze přidat vozidlo do skupiny...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nelze přidat sdílená vozidla do skupiny...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Skupiny - Kliknutím na skupinu se zobrazí seznam vozidel ve skupině
-STR_GROUP_CREATE_TIP                                            :{BLACK}Kliknutím vytvoříš skupinu
-STR_GROUP_DELETE_TIP                                            :{BLACK}Vymazat vybranou skupinu
-STR_GROUP_RENAME_TIP                                            :{BLACK}Přejmenovat vybranou skupinu
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliknutím nebude na tuto skupinu mít vliv automatická výměna vozidel
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Skupiny - Kliknutím na skupinu se zobrazí seznam vozidel ve skupině
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Kliknutím vytvoříš skupinu
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Vymazat vybranou skupinu
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Přejmenovat vybranou skupinu
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Kliknutím nebude na tuto skupinu mít vliv automatická výměna vozidel
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3557,35 +3557,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Jméno musí být unikátní
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Jméno musí být unikátní
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Na další návěstidlo
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Na předešlé návěstidlo
-STR_SIGN_OSKTITLE                                               :{BLACK}Zadej název pro zna�ku
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Na další návěstidlo
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Na předešlé návěstidlo
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Zadej název pro zna�ku
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Financovat
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Hledat
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Postavit
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Vyber si vhodnou továrnu ze seznamu
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Financovat
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Hledat
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Postavit
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Vyber si vhodnou továrnu ze seznamu
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}PodrobnÄ›
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Pokro�ilý výběr tváře.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Pokro�ilý výběr tváře.
 STR_FACE_SIMPLE                                                 :{BLACK}Jednodušše
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Základní výběr tváře.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Základní výběr tváře.
 STR_FACE_LOAD                                                   :{BLACK}Nahrát
-STR_FACE_LOAD_TIP                                               :{BLACK}Nahrát oblíbený obli�ej
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Nahrát oblíbený obli�ej
 STR_FACE_LOAD_DONE                                              :{WHITE}Tvůj oblíbený obli�ej se nahrál z konfigura�ního souboru.
 STR_FACE_FACECODE                                               :{BLACK}Číslo tváře
-STR_FACE_FACECODE_TIP                                           :{BLACK}Zobrazit a/nebo nastavit �íslo tváře
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Zobrazit a/nebo nastavit �íslo tváře
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Zobrazit a/nebo nastavit �íslo tváře
 STR_FACE_FACECODE_SET                                           :{WHITE}Nové �íslo obli�eje bylo nastaveno.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Nešlo nastavit �íslo tváře - musí jít o �íslo mezi 0 a 4 294 967 295!
 STR_FACE_SAVE                                                   :{BLACK}Uložit
-STR_FACE_SAVE_TIP                                               :{BLACK}Uložit oblíbený obli�ej
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Uložit oblíbený obli�ej
 STR_FACE_SAVE_DONE                                              :{WHITE}Tato tvář bude uložena jako tvá oblíbená do konfigura�ního souboru.
 STR_FACE_EUROPEAN                                               :{BLACK}Europoidní
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Vybrat europoidní tváře
@@ -3593,51 +3593,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Africká
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Vybrat africké tváře
 STR_FACE_YES                                                    :Ano
 STR_FACE_NO                                                     :Ne
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Povolit knír nebo náušnici
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Povolit knír nebo náušnici
 STR_FACE_HAIR                                                   :Vlasy:
-STR_FACE_HAIR_TIP                                               :{BLACK}Změnit vlasy
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Změnit vlasy
 STR_FACE_EYEBROWS                                               :Obo�í:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Změnit obo�í
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Změnit obo�í
 STR_FACE_EYECOLOUR                                              :Barva o�í:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Změnit barvu o�í
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Změnit barvu o�í
 STR_FACE_GLASSES                                                :Brýle:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Povolit brýle
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Změnit brýle
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Povolit brýle
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Změnit brýle
 STR_FACE_NOSE                                                   :Nos:
-STR_FACE_NOSE_TIP                                               :{BLACK}Změnit nos
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Změnit nos
 STR_FACE_LIPS                                                   :Rty:
 STR_FACE_MOUSTACHE                                              :Knír:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Změnit rty nebo knír
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Změnit rty nebo knír
 STR_FACE_CHIN                                                   :Brada:
-STR_FACE_CHIN_TIP                                               :{BLACK}Změnit bradu
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Změnit bradu
 STR_FACE_JACKET                                                 :Sako:
-STR_FACE_JACKET_TIP                                             :{BLACK}Změnit sako
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Změnit sako
 STR_FACE_COLLAR                                                 :Límec:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Změnit límec
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Změnit límec
 STR_FACE_TIE                                                    :Kravata:
 STR_FACE_EARRING                                                :Náušnice:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Změnit kravatu nebo náušnice
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Změnit kravatu nebo náušnice
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Výběr návěstidel
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Zde nelze změnit návěstidla...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Oby�ejné návěstidlo (semafor){}Návěstidla jsou nutná, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Vjezdové návěstidlo (semafor){}Svítí zeleně do té doby, kdy v následujícím úseku trati je alespoň jedno další svítící zeleně. Jinak svítí �erveně.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Výjezdové návěstidlo (semafor){}Chová se stejně jako oby�ejné, ale musí se aktivovat vjezdové a cestové návěstidlo.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Cestové návěstidlo (semafor){}Cestové (kombinované) slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" presignálů.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Dokonalejší (PBS) návěstidlo (semafor){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Dokonalejší návěstidla se dají projet zezadu.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Dokonalejší (PBS) jednosměrné návěstidlo (semafor){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Jednosměrná návěstidla se nedají projet zezadu.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Oby�ejné návěstidlo (elektrické){}Návěstidla jsou nutná, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Vjezdové návěstidlo (elektrické){}Svítí zeleně do té doby, kdy v následujícím úseku trati je alespoň jedno další svítící zeleně. Jinak svítí �erveně.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Výjezdové návěstidlo (elektrické){}Chová se stejně jako oby�ejné, ale musí se aktivovat vjezdové a cestové návěstidlo.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Cestové návěstidlo (elektrické){}Cestové (kombinované) návěstidlo slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" návěstidel.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Dokonalejší (PBS) návěstidlo (elektrické){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Dokonalejší návěstidla se dají projet zezadu.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Dokonalejší (PBS) jednosměrné návěstidlo (elektrické){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Jednosměrná návěstidla se nedají projet zezadu.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Přeměna návěstidel{}Když je přeměna zapnuta, návěstidlo se změní kliknutím. Kliknutím s Ctrl se přepne mezi variantami návěstidla.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Rozestup při stavbě návěstidel tažením
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Snížit rozestup mezi návěstidly
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Zvýšit rozestup mezi návěstidly
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Výběr návěstidel
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Zde nelze změnit návěstidla...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Oby�ejné návěstidlo (semafor){}Návěstidla jsou nutná, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Vjezdové návěstidlo (semafor){}Svítí zeleně do té doby, kdy v následujícím úseku trati je alespoň jedno další svítící zeleně. Jinak svítí �erveně.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Výjezdové návěstidlo (semafor){}Chová se stejně jako oby�ejné, ale musí se aktivovat vjezdové a cestové návěstidlo.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Cestové návěstidlo (semafor){}Cestové (kombinované) slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" presignálů.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Dokonalejší (PBS) návěstidlo (semafor){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Dokonalejší návěstidla se dají projet zezadu.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Dokonalejší (PBS) jednosměrné návěstidlo (semafor){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Jednosměrná návěstidla se nedají projet zezadu.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Oby�ejné návěstidlo (elektrické){}Návěstidla jsou nutná, aby nedocházelo ke srážkám vlaků na tratích, kde jezdí více než jeden vlak.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Vjezdové návěstidlo (elektrické){}Svítí zeleně do té doby, kdy v následujícím úseku trati je alespoň jedno další svítící zeleně. Jinak svítí �erveně.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Výjezdové návěstidlo (elektrické){}Chová se stejně jako oby�ejné, ale musí se aktivovat vjezdové a cestové návěstidlo.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Cestové návěstidlo (elektrické){}Cestové (kombinované) návěstidlo slouží zároveň jako vjezdové a odjezdové. Tím je možné postavit velké "řetězce" návěstidel.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Dokonalejší (PBS) návěstidlo (elektrické){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Dokonalejší návěstidla se dají projet zezadu.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Dokonalejší (PBS) jednosměrné návěstidlo (elektrické){}Dokonalejší návěstidlo umožňuje vjet několika vlakům najednou do stejného úseku trati, pokud jsou schopny rezervovat si cestu až do bezpe�ného místa na zastavení. Jednosměrná návěstidla se nedají projet zezadu.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Přeměna návěstidel{}Když je přeměna zapnuta, návěstidlo se změní kliknutím. Kliknutím s Ctrl se přepne mezi variantami návěstidla.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Rozestup při stavbě návěstidel tažením
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Snížit rozestup mezi návěstidly
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Zvýšit rozestup mezi návěstidly
 ########
 
 ############ on screen keyboard
@@ -3649,36 +3649,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~1234567890_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Nastavení AI
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Ukázat nastavení AI
 STR_AI_DEBUG                                                    :{WHITE}Ladění AI
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Název AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Název AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Obnovit AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Zni�it AI, znovu nahrát jeho skript a restartovat AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Okno na ladění AI je dostupné pouze na serveru
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Zni�it AI, znovu nahrát jeho skript a restartovat AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Okno na ladění AI je dostupné pouze na serveru
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Nastavení AI
-STR_AI_CHANGE                                                   :{BLACK}Vybrat AI
-STR_AI_CONFIGURE                                                :{BLACK}Nastavit
-STR_AI_CHANGE_TIP                                               :{BLACK}Nahrát jinou AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Nastavit parametry AI
-STR_AI_LIST_TIP                                                 :{BLACK}Všechny AI spuštěné v další hře
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Vybrat AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Nastavit
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Nahrát jinou AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Nastavit parametry AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Všechny AI spuštěné v další hře
 STR_AI_LIST_CAPTION                                             :{WHITE}Dostupné AI
-STR_AI_AILIST_TIP                                               :{BLACK}AI vybereš kliknutím
-STR_AI_ACCEPT                                                   :{BLACK}Potvrdit
-STR_AI_ACCEPT_TIP                                               :{BLACK}Vybrat ozna�enou AI
-STR_AI_CANCEL                                                   :{BLACK}Zrušit
-STR_AI_CANCEL_TIP                                               :{BLACK}Neměnit AI
-STR_AI_CLOSE                                                    :{BLACK}Zavřít
-STR_AI_RESET                                                    :{BLACK}Obnovit nastavení
-STR_AI_HUMAN_PLAYER                                             :Lidský hrá�
-STR_AI_RANDOM_AI                                                :Náhodná AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}AI vybereš kliknutím
+STR_AI_LIST_ACCEPT                                              :{BLACK}Potvrdit
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrat ozna�enou AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Zrušit
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Neměnit AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zavřít
+STR_AI_SETTINGS_RESET                                           :{BLACK}Obnovit nastavení
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Lidský hrá�
+STR_AI_CONFIG_RANDOM_AI                                         :Náhodná AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parametery AI
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Verze: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Některá z bežících AI skon�ila s chybou. Prosím oznamte toto autorovi AI spolu se screenshotem okna Ladění AI.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Verze: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Některá z bežících AI skon�ila s chybou. Prosím oznamte toto autorovi AI spolu se screenshotem okna Ladění AI.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Hlukový limit ve městě: {ORANGE}{COMMA}{BLACK}  max.: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Vytvářený hluk: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Hlukový limit ve městě: {ORANGE}{COMMA}{BLACK}  max.: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Vytvářený hluk: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3692,21 +3692,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scénář
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Výšková mapa
 STR_CONTENT_TITLE                                               :{WHITE}Stahování obsahu
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Druh
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Druh obsahu
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Druh obsahu
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Název
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Název obsahu
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Detaily zobrazíš kliknutím na řádek{}Ke stažení ho vybereš kliknutím na zaškrtávací polí�ko
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Název obsahu
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Detaily zobrazíš kliknutím na řádek{}Ke stažení ho vybereš kliknutím na zaškrtávací polí�ko
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Vybrat vše
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Ozna�it všechen obsah ke stáhnutí
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Ozna�it všechen obsah ke stáhnutí
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Vybrat vylepšené
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Ozna�it všechen vylepšený/aktualizovaný obsah ke stáhnutí
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Ozna�it všechen vylepšený/aktualizovaný obsah ke stáhnutí
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Odzna�it vše
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Nestahovat nic
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Nestahovat nic
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Vložte filtr
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Vložte klí�ové slovo pro filtr seznamu
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Vložte klí�ové slovo pro filtr seznamu
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtr na zna�ku/jméno:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Stáhnout
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Za�ít stahovat vybraný obsah
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Za�ít stahovat vybraný obsah
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Celková velikost dat: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMACE O OBSAHU
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Tohle nemáš vybráno ke stažení
@@ -3739,6 +3739,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nešlo r
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Nabídnout on-line obsah
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Ukázat, jaký nový nebo upravený obsah se dá stáhnout
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Hledat chybějící obsah on-line
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Pokusit se zjistit, jestli se dá chybějící obsah najít on-line
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Hledat chybějící obsah on-line
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Pokusit se zjistit, jestli se dá chybějící obsah najít on-line
 ########
diff --git a/src/lang/danish.txt b/src/lang/danish.txt
index 21a1e2984..e5a5c0104 100644
--- a/src/lang/danish.txt
+++ b/src/lang/danish.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kort - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spilvalg
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Besked
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Besked fra {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Advarsel!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Det kan du ikke....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kan ikke rydde området....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheder reserveret
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD teamet
 
 STR_QUIT_CAPTION                                                :{WHITE}Afslut
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nej
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nej
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {STRING}?
 
 STR_JUST_NOTHING                                                :Intet
 STR_COLOUR_DARK_BLUE                                            :Mørkeblå
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Ørken
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sne
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Besked
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Standard
-STR_QUERY_CANCEL                                                :{BLACK}Annuller
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Omdøb
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Standard
+STR_BUTTON_CANCEL                                               :{BLACK}Annuller
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Omdøb
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Last
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Information
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Lasteevner
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Samlet last
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Samlet last (lasteevne) på dette tog:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Samlet last (lasteevne) på dette tog:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nyt spil
 STR_INTRO_LOAD_GAME                                             :{BLACK}Hent spil
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Netværksspil
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scenarieeditor
 
-STR_MAPSIZE                                                     :{BLACK}Kortstørrelse:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kortstørrelse:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spilvalg
 
 STR_COMPANY_SOMEONE                                             :en eller anden{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Forlad spillet
 STR_FILE_MENU_EXIT                                              :Afslut
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Er du sikker på du vil forlade dette spil ?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Forlad spillet
-STR_SORT_ORDER_TIP                                              :{BLACK}Vælg sorteringsorden (faldende/stigende)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Vælg sorteringskriterie
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vælg filtreringskriterier
-STR_SORT_BY                                                     :{BLACK}Sortér på
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Vælg sorteringsorden (faldende/stigende)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Vælg sorteringskriterie
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Vælg filtreringskriterier
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortér på
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Indbyggertal
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :Driftsomkostnin
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Drivmiddel/omkostninger
 STR_SORT_BY_CARGO_CAPACITY                                      :Lasteevne
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Der venter ingen fragt af nogen type
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vælg alle faciliteter
-STR_SELECT_ALL_TYPES                                            :{BLACK}Vælg alle lasttyper (inklusiv fragttyper, der ikke venter)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se liste over tilgængelige designs for denne køretøjstype.
-STR_MANAGE_LIST                                                 :{BLACK}Administrer liste
-STR_MANAGE_LIST_TIP                                             :{BLACK}Send instruktioner til alle køretøjer i denne liste
-STR_REPLACE_VEHICLES                                            :Udskift køretøjer
-STR_SEND_FOR_SERVICING                                          :Send til eftersyn
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgængelige tog
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgæn. vejkøretøjer
-STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgængelige skibe
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgængelige fly
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Send til remise
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til værksted
-STR_SEND_SHIP_TO_DEPOT                                          :Send til skibsdok
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Der venter ingen fragt af nogen type
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Vælg alle faciliteter
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Vælg alle lasttyper (inklusiv fragttyper, der ikke venter)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Se liste over tilgængelige designs for denne køretøjstype.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Administrer liste
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instruktioner til alle køretøjer i denne liste
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Udskift køretøjer
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send til eftersyn
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Tilgængelige tog
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Tilgæn. vejkøretøjer
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Tilgængelige skibe
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Tilgængelige fly
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Send til remise
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Send til værksted
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Send til skibsdok
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Send til hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Valg
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan ikke ændre serviceinterval...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Luk vindue
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vinduestitel - træk her for at flytte vinduet
-STR_STICKY_BUTTON                                               :{BLACK}Marker dette vindue som ulukkeligt af 'Luk ALLE vinduer' tasten
-STR_RESIZE_BUTTON                                               :{BLACK}Klik og træk for at ændre vinduets størrelse
+STR_TOOLTIP_STICKY                                              :{BLACK}Marker dette vindue som ulukkeligt af 'Luk ALLE vinduer' tasten
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik og træk for at ændre vinduets størrelse
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik her for at gå til det nuværende standard gemme/hente bibliotek
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Nedriv bygninger osv. på et stykke land
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Sænk punkter i landskabet
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Hæv punkter i landskabet
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Sænk punkter i landskabet
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Hæv punkter i landskabet
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scrollbar - scroller listen op/ned
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scroll bar - flytter listen mod venstre/højre
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Vis landskabskonturer på kortet
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Vis/skju
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Afkast i år: {CURRENCY} (sidste år: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} år ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} år ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} år ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} år ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Tog
-STR_VEHICLE_ROAD_VEHICLE                                        :Vejkøretøj
-STR_VEHICLE_SHIP                                                :Skib
-STR_VEHICLE_AIRCRAFT                                            :Fly
+STR_REPLACE_VEHICLE_TRAIN                                       :Tog
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Vejkøretøj
+STR_REPLACE_VEHICLE_SHIP                                        :Skib
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fly
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} er gammel
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} er meget gammel
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} er meget gammel, og må udskiftes omgående
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Landområde-information
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Pris for at rydde: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Pris for at rydde: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Indtægt ved rydning: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Indtægt ved rydning: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Ejer: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Ejer af vej: {LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Ejer af
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokal myndighed: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Navn
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klik på
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klik på et musiknummer for at fjerne det fra programlisten (kun for Custom1/Custom2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Tilfældig afspilning til/fra
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Vis vinduet med musiknummervalg
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik på servicen for at centrere skærmen over industrien/byen
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik på servicen for at centrere skærmen over industrien/byen
 STR_INTRO_DIFFICULTY                                            :{BLACK}Sværhedsgrad ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Seneste besked/nyhedsrapport
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Forminds
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generer tilfældigt land
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Nulstil landskab
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Nulstil landskab
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Fjern alle spiller-ejede ejendomme fra kortet
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Fjern alle spiller-ejede ejendomme fra kortet
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Er du sikker på, at du vil fjerne alle spiller-ejede ejendomme?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landskabsgenerering
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Bygenerering
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...for t
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...for tæt på en anden by
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...upassende placering
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...for mange byer
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan ikke bygge nogen byer
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...der er ikke mere plads på kortet
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan ikke bygge nogen byer
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...der er ikke mere plads på kortet
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Forøg størrelsen af byen
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Udvid
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Byen vil ikke kunne bygge veje. Du kan tillade byer at bygge veje via Avancerede indstillinger->Økonomi->Byer.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Byen vil ikke kunne bygge veje. Du kan tillade byer at bygge veje via Avancerede indstillinger->Økonomi->Byer.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Tilfældig by
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Byg en by på en tilfældig placering
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan ikke bygge {STRING} her...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Placér
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Placér fyrtårn
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Placér sender
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definer ørkenområde.{}Hold CTRL nede for at fjerne det
-STR_CREATE_LAKE                                                 :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten bruges ved havniveau, da omgivelserne i stedet vil blive oversvømmet
-STR_CREATE_RIVER                                                :{BLACK}Placér floder.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definer vandområde.{}Lav en kanal, med mindre CTRL-tasten bruges ved havniveau, da omgivelserne i stedet vil blive oversvømmet
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Placér floder.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Slet
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Slet denne by fuldstændigt
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Gem scenarie
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Hent scenarie
-STR_MENU_LOAD_HEIGHTMAP                                         :Hent højdekort
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Hent højdekort
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Afslut editoren
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Afslut
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Gem scen
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Spil et scenarie
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spil højdekort
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Start et nyt spil med et højdekort som landskab
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Er du sikker på, at du vil afslutte dette scenarie ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Er du sikker på, at du vil afslutte dette scenarie ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kan kun bygges i byer med mindst 1200 indbyggere
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Flyt startdatoen 1 år tilbage
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Flyt startdatoen 1 år frem
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...begge
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Lille
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mellem
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Stor
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Tilfældig
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Tilfældig
 STR_FOUND_TOWN_CITY                                             :{BLACK}By
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Storbyer vokser hurtigere en almindelige byer{}Afhængig af indstillingerne kan de være større ved grundlæggelsen
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vælg bystørrelse
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Bystørrelse:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Byens vej-layout:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Vælg vej-layout for denne by
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originalt
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bedre veje
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 gitter
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 gitter
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Tilfældigt
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Byens vej-layout:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Vælg vej-layout for denne by
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalt
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bedre veje
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 gitter
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 gitter
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Tilfældigt
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Vis seneste besked eller nyhedsrapport
 STR_NEWS_MESSAGES_OFF                                           :Fra
 STR_NEWS_MESSAGES_SUMMARY                                       :Kortfattet
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Skærmbilledet blev gemt som '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Fejl under tagning af skærmbillede!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Køb land til senere brug
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Køb land til senere brug
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOGEM
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  GEMMER SPIL  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Gemmer stadig,{}vent venligst!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Gemmer stadig,{}vent venligst!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Vælg 'Ezy Street musik' program
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vælg sp
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fuld skærm
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Afkryds for at spille OpenTTD i fuld skærm
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fuldskærmstilstand fejlede
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fuldskærmstilstand fejlede
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skærmopløsning
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vælg ønsket skærmopløsning
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vælg de
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} forsvund{P en ne}/ødelagt{P "" e} fil{P "" er}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Yderligere information om basis-grafiksættet
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Fejl under autogem
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Fejl under autogem
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Retning mod {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Retning mod {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Ingen ordrer
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Ingen ordrer, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Retning mod {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Retning mod {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Ingen ordrer
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Ingen ordrer, {VELOCITY}
 
 STR_PASSENGERS                                                  :passagerer
 STR_BAGS                                                        :sække
@@ -857,9 +857,9 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :andet
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan ikke dele ordreliste...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke kopiere ordreliste...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delt ordreliste - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kan ikke dele ordreliste...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kan ikke kopiere ordreliste...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Slut på delt ordreliste - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} kan ikke finde en rute at fortsætte ad.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} er faret vild.
@@ -1128,15 +1128,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-stør
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :deaktiveret
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Skift indstillingsværdi
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Skift indstillingsværdi
 
-STR_TEMPERATE_LANDSCAPE                                         :Tempereret klima
-STR_SUB_ARCTIC_LANDSCAPE                                        :Arktisk klima
-STR_SUB_TROPICAL_LANDSCAPE                                      :Tropisk klima
-STR_TOYLAND_LANDSCAPE                                           :Legetøjsland
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Tempereret klima
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Arktisk klima
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Tropisk klima
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Legetøjsland
 
 STR_CHEATS                                                      :{WHITE}Snydefunktioner
-STR_CHEATS_TIP                                                  :{BLACK}Checkbokse viser, om du har brugt denne snydefunktion før
+STR_CHEATS_TOOLTIP                                              :{BLACK}Checkbokse viser, om du har brugt denne snydefunktion før
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Du er ved at forråde dine modstandere. Husk at dette vil blive husket i al evighed.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Forøg kassebeholdning med {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spiller som firmaet: {ORANGE}{COMMA}
@@ -1148,179 +1148,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Skift k
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ændre dato: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiver modifikation af produktion: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Retning mod {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Retning mod {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Retning mod {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Retning mod {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Kør uden stop via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Kør uden stop via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Kontrolsted {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolsted {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Bøje
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Bøje #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Kontrolsted
+STR_FORMAT_WAYPOINT_NAME                                        :Kontrolsted {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Kontrolsted {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Bøje
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bøje #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrolsted
 
-STR_WAYPOINT                                                    :{WHITE}Kontrolsted
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vælg udseende af kontrolsteder
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrolsted
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vælg udseende af kontrolsteder
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Omdøb kontrolsted
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan ikke omdøbe kontrolsted...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan ikke omdøbe kontrolsted...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Ændre jernbane til kontrolsted
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kan ikke bygge kontrolsted for tog her...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan ikke fjerne kontrolsted for tog her...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan ikke bygge kontrolsted for tog her...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan ikke fjerne kontrolsted for tog her...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Byg jernbane med auto-jernbane-værktøj
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...der er ingen byer i dette scenarie
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kortgenerering afbrudt...{}...ingen brugbare lokaliteter til byer
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...der er ingen byer i dette scenarie
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kortgenerering afbrudt...{}...ingen brugbare lokaliteter til byer
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mange tilfældige byer
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Dæk kortet med tilfældigt placerede byer
-STR_MANY_RANDOM_INDUSTRIES                                      :Mange tilfældige industrier
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Dæk kortet med tilfældigt placerede industrier
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kan ikke lave industrier...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Mange tilfældige byer
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Dæk kortet med tilfældigt placerede byer
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Mange tilfældige industrier
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Dæk kortet med tilfældigt placerede industrier
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan ikke lave industrier...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Åbn landskabsværktøjslinjen for at hæve/sænke terræn, plante træer, osv.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landskabsværktøjer
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Udjævn land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Udjævn land
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Træer af tilfældig type
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Placer træer af tilfældig type
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Placer træer af tilfældig type
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kan ikke bygge en kanal her...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kan ikke bygge en kanal her...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Byg kanaler.
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikke bygge en sluse her...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kan ikke bygge en sluse her...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Byg sluser
-STR_LANDINFO_LOCK                                               :Sluse
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sluse
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kan ikke placere floder her...
-STR_LANDINFO_RIVER                                              :Flod
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kan ikke placere floder her...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Flod
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... bøjen er i brug!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bøjen er i brug!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ikke fjerne en del af en station...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan ikke konvertere jernbanetype her...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan ikke fjerne en del af en station...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan ikke konvertere jernbanetype her...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konverter/opgrader typen af jernbane
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Træk lokomotivet her for at sælge hele toget
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Træk lokomotivet her for at sælge hele toget
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Træk & slip
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Byg en station vha. træk & slip
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Vælg hvilken stationstype, der skal vises
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vælg hvilken stationstype du vil bygge
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vælg hvilken stationstype, der skal vises
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vælg hvilken stationstype du vil bygge
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Kør spillet hurtigere
 STR_MESSAGE_HISTORY                                             :{WHITE}Tidligere beskeder
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En liste over seneste nyheder
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Slå alle fra
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Slå alle til
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}En liste over seneste nyheder
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Slå alle fra
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Slå alle til
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transporteret)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporteret)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinavne - klik på navn for at centrere visningen over en industri
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrier
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transporteret)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporteret)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industrinavne - klik på navn for at centrere visningen over en industri
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for tæt på en anden industribygning
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...for tæt på en anden industribygning
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Skift produktion
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Netværksspil
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spiller navn:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Dette er det navn, som andre spillere vil kende dig ved
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Indtast dit navn
-STR_NETWORK_CONNECTION                                          :{BLACK}Forbindelse:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Vælg mellem et internet baseret eller et lokalnet baseret spil
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Start server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start en ny server
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Navn
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Spillets navn
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Sprog, server version, osv.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klik på et spil fra listen for at vælge det
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Den senest tilsluttede server:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klik for at vælge den server du spillede på sidst
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Find server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Søg netværket for en server
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Tilføj server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Tilføjer en server til listen, som altid vil blive tjekket for kørerende spil.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv adressen på en server
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / maks. klienter{}Selskaber online / maks. selskaber
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kortstørrelse
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kortstørrelse for spillet{}Klik for at sortere efter område
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dato
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuel dato
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Ã…r
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Antallet af år{}spillet varer
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPIL INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Sprog: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klima: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Størrelse: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start dato: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Beskyttet af kodeord!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEREN ER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEREN ER FULD
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}Din og serverens version passer ikke sammen
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ULIGHED
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Tilslut dig et spil
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start et nyt netværksspil
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spillets navn:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Navnet vil blive vist til andre spillere i menuen, hvor man vælger netværksspil
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Skriv et navn for netværksspillet
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Sæt kodeord
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Beskyt dit spil med et kodeord hvis du ikke vil have fremmede med
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Vælg et kort:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Hvilket kort vil du spille?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (bekendtgør spillet)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" er}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maksimalt antal tilladte klienter:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Vælg det maksimale antal klienter. Det er ikke nødvendigt at fylde dem alle
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma{P "" er}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks. selskaber:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begræns serveren til et bestemt antal selskaber
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskuer{P "" e}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks. tilskuere:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begræns serveren til et bestemt antal tilskurere
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Talt sprog:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Andre spillere vil vide hvilket sprog, der bliver talt på serveren
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Start spillet
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Start et nyt netværksspil med et tilfældigt kort eller et scenarie
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Hent et spil
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Fortsæt et tidligere gemt spil med flere spillere (sørg for at tilslutte som den rette spiller)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Netværksspil
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Indtast dit navn
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Forbindelse:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Vælg mellem et internet baseret eller et lokalnet baseret spil
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start en ny server
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Navn
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Spillets navn
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Sprog, server version, osv.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klik på et spil fra listen for at vælge det
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Den senest tilsluttede server:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klik for at vælge den server du spillede på sidst
+
+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_ENTER_IP                                :{BLACK}Skriv adressen på en server
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klienter
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klienter online / maks. klienter{}Selskaber online / maks. selskaber
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kortstørrelse
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kortstørrelse for spillet{}Klik for at sortere efter område
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dato
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Aktuel dato
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Ã…r
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Antallet af år{}spillet varer
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPIL INFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Sprog: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Klima: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Størrelse: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Server version: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serveradresse: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Nuværende dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Beskyttet af kodeord!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVEREN ER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVEREN ER FULD
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}Din og serverens version passer ikke sammen
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF ULIGHED
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Tilslut dig et spil
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start et nyt netværksspil
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spillets navn:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Navnet vil blive vist til andre spillere i menuen, hvor man vælger netværksspil
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Skriv et navn for netværksspillet
+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_SELECT_MAP                             :{BLACK}Vælg et kort:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Hvilket kort vil du spille?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (bekendtgør spillet)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" er}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maksimalt antal tilladte klienter:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Vælg det maksimale antal klienter. Det er ikke nødvendigt at fylde dem alle
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma{P "" er}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maks. selskaber:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Begræns serveren til et bestemt antal selskaber
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskuer{P "" e}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maks. tilskuere:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Begræns serveren til et bestemt antal tilskurere
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Talt sprog:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Andre spillere vil vide hvilket sprog, der bliver talt på serveren
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start spillet
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Start et nyt netværksspil med et tilfældigt kort eller et scenarie
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Hent et spil
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Fortsæt et tidligere gemt spil med flere spillere (sørg for at tilslutte som den rette spiller)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Hvilket som helst
@@ -1361,33 +1361,33 @@ STR_NETWORK_LANG_GREEK                                          :Græsk
 STR_NETWORK_LANG_LATVIAN                                        :Lettisk
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Netværksspils lobby
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Netværksspils lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Forbereder tilslutning: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En liste over alle selskaber i spillet lige nu. Du kan enten tilslutte dig et eller starte et nyt, hvis der er plads til flere selskaber
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nyt selskab
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Opret et nyt selskab
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Tilskuer spil
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Se et spil som tilskuer
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Tilslut dig selskab
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Hjælp med at bestyrre dette selskab
-STR_NETWORK_REFRESH                                             :{BLACK}Genopfrisk server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Genopfrisk serverens info
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Forbereder tilslutning: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}En liste over alle selskaber i spillet lige nu. Du kan enten tilslutte dig et eller starte et nyt, hvis der er plads til flere selskaber
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nyt selskab
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Opret et nyt selskab
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Tilskuer spil
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Se et spil som tilskuer
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Tilslut dig selskab
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hjælp med at bestyrre dette selskab
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Genopfrisk server
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Genopfrisk serverens info
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}SELSKABSINFO
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}SELSKABSINFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Selskabsnavn: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grundlagt: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Virksomhedens værdi: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuværende beholdning: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Sidste års indtægt: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Præstation: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Selskabsnavn: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Grundlagt: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Virksomhedens værdi: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Nuværende beholdning: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Sidste års indtægt: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Præstation: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Køretøjer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spillere: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Køretøjer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spillere: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Tilslutter...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Tilslutter...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Tilslutter..
@@ -1403,49 +1403,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter s
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} foran dig
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} hentet indtil videre
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Afbryd forbindelse
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Afbryd forbindelse
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv beløbet du vil give
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveren er beskyttet. Indtast kodeord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Selskabet er beskyttet. Indtast kodeord
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klient liste
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klient liste
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Tilslut som tilskuer
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nyt firma
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ingen netværksheder fundet eller kompilet uden ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kunne ikke finde nogen netværksspil
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Serveren besvarede ikke denne forspørgsel
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kunne ikke tilslutte grundet NewGRF ulighed
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Netværks synkroniseringsfejl
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Netværksforbindelse mistet
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunne ikke hente gemt spil
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kunne ikke starte serveren
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kunne ikke forbinde
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Forbindelsen #{NUM} svarer ikke
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Der opstod en protokol-fejl og forbindelse blev lukket
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revisionen af denne klient passer ikke sammen med serverens revision
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Forkert kodeord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Serveren er fuld
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Du har forbud mod at bruge denne server
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Du blev smidt ud af spillet
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Snyderi er ikke tilladt på denne server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Ingen netværksheder fundet eller kompilet uden ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Kunne ikke finde nogen netværksspil
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Serveren besvarede ikke denne forspørgsel
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Kunne ikke tilslutte grundet NewGRF ulighed
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Netværks synkroniseringsfejl
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Netværksforbindelse mistet
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Kunne ikke hente gemt spil
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Kunne ikke starte serveren
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Kunne ikke forbinde
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Forbindelsen #{NUM} svarer ikke
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Der opstod en protokol-fejl og forbindelse blev lukket
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Revisionen af denne klient passer ikke sammen med serverens revision
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Forkert kodeord
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Serveren er fuld
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Du har forbud mod at bruge denne server
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Du blev smidt ud af spillet
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Snyderi er ikke tilladt på denne server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :generel fejl
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniseringsfejl
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kunne ikke hente kortet
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :forbindelsen blev afbrudt
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokol fejl
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF ulighed
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikke autoriseret
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :modtog en underlig pakke
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :forkert revision
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :navnet er allerede i brug
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :forkert spil kodeord
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :forkert firma-id i DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :smidt ud af serveren
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :prøvede at snyde
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serveren er fuld
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :generel fejl
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :synkroniseringsfejl
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :kunne ikke hente kortet
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :forbindelsen blev afbrudt
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokol fejl
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF ulighed
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ikke autoriseret
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :modtog en underlig pakke
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :forkert revision
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :navnet er allerede i brug
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :forkert spil kodeord
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :forkert firma-id i DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :smidt ud af serveren
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :prøvede at snyde
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serveren er fuld
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1455,15 +1455,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spil på pause
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spil ikke længere på pause (klient tilsluttet)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spil ikke længere på pause (klient kunne ikke tilsluttes)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :forlader
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} har tilsluttet sig spillet
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} har tilsluttet sig firmaet #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} har tilsluttet sig som tilskuer
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} har startet et nyt firma (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} har forladt spillet ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} har ændret sit navn til {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gav dit firma {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Du gav {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :forlader
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} har tilsluttet sig spillet
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} har tilsluttet sig firmaet #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} har tilsluttet sig som tilskuer
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} har startet et nyt firma (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} har forladt spillet ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} har ændret sit navn til {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gav dit firma {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Du gav {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Hold] :
 STR_NETWORK_CHAT_COMPANY                                        :[Hold] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Hold] Til {STRING}: {WHITE}{STRING}
@@ -1473,8 +1473,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privat] Til {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Alle] :
 STR_NETWORK_CHAT_ALL                                            :[Alle] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Skriv tekst i netværks-chat
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Serveren har lukket ned for dette spil
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Serveren genstarter...{}Vent venligst...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Serveren har lukket ned for dette spil
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Serveren genstarter...{}Vent venligst...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
@@ -1488,19 +1488,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Tal til selskab
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privat besked
 
 
-STR_NETWORK_SEND                                                :{BLACK}Send
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Send
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kan ikke hente landskab fra PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...filen blev ikke fundet.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan ikke konvertere billedtype. Der skal bruges 8 eller 24-bit PNG.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...noget gik galt. Undskyld (Måske en ødelagt fil)
+STR_ERROR_PNGMAP                                                :{WHITE}Kan ikke hente landskab fra PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...filen blev ikke fundet.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...kan ikke konvertere billedtype. Der skal bruges 8 eller 24-bit PNG.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...noget gik galt. Undskyld (Måske en ødelagt fil)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kan ikke hente landskab fra BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kunne ikke konvertere billedtypen.
+STR_ERROR_BMPMAP                                                :{WHITE}Kan ikke hente landskab fra BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...kunne ikke konvertere billedtypen.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Pris: {CURRENCY}
@@ -1514,13 +1514,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Anslået
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan ikke hæve landet her...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kan ikke sænke landet her...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan ikke hæve landet her...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Klipper
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Barskt land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Bart land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Græs
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Marker
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snedækket land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Ørken
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Klipper
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Barskt land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bart land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Græs
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Marker
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snedækket land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Landet hælder i den forkerte retning
@@ -1528,11 +1528,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Umulig s
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Udgravning ville skade en tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Allerede ved havoverfladen
 STR_ERROR_TOO_HIGH                                              :{WHITE}For højt
-STR_ALREADY_LEVELLED                                            :{WHITE}... allerede fladt
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... allerede fladt
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Ingen brugbar jernbane
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...allerede bygget
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Det er nødvendigt at fjerne jernbaneskinnerne først
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Vejen er ensrettet eller blokeret
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Vejen er ensrettet eller blokeret
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Jernbanekonstruktion
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrisk jernbanekonstruktion
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Monorailkonstruktion
@@ -1556,44 +1556,44 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Byg sign
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Byg bro
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Byg tunnel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Skift mellem bygning/fjernelse af jernbaneskinner og signaler
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Valg af bro - klik på den valgte bro for at bygge den
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Valg af bro - klik på den valgte bro for at bygge den
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Vælg orientering af remise
-STR_RAILROAD_TRACK                                              :Jernbaneskinner
-STR_RAILROAD_TRAIN_DEPOT                                        :Remise
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbaneskinner
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Remise
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...området ejes af et andet selskab
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbane med blok signaler
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Jernbane med præ-signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbane med exit-signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbane med kombi-signaler
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Jernbane med avancerede signaler
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Jernbane med ensrettede avancerede signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Jernbanespor med normale og præ-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Jernbanespor med normale og exit-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Jernbanespor med normale og kombi-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Jernbane med normale og avancerede signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Jernbanespor med normale og ensrettede avancerede signaler
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Jernbanespor med præ- og exit-signaler
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Jernbanespor med præ- og kombi-signaler
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Jernbanespor med præ- og avancerede signaler
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Jernbanespor med præ- og ensrettede avancerede signaler
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Jernbanespor med exit- og kombi-signaler
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Jernbanespor med exit- og avancerede signaler
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Jernbanespor med exit- og ensrettede avancerede signaler
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Jernbanespor med kombi- og avancerede signaler
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Jernbanespor med kombi- og ensrettede avancerede signaler
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Jernbanespor med avancerede og ensrettede avancerede signaler
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Jernbanestation skal fjernes først
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Jernbane rutepunktet skal fjernes først
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Byg en separat station
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Byg et separat rutepunkt
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Sammenkæd station
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Forbind rutepunkt
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbane med blok signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Jernbane med præ-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Jernbane med exit-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Jernbane med kombi-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Jernbane med avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Jernbane med ensrettede avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Jernbanespor med normale og præ-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Jernbanespor med normale og exit-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Jernbanespor med normale og kombi-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Jernbane med normale og avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Jernbanespor med normale og ensrettede avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Jernbanespor med præ- og exit-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Jernbanespor med præ- og kombi-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Jernbanespor med præ- og avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Jernbanespor med præ- og ensrettede avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Jernbanespor med exit- og kombi-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Jernbanespor med exit- og avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Jernbanespor med exit- og ensrettede avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Jernbanespor med kombi- og avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Jernbanespor med kombi- og ensrettede avancerede signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Jernbanespor med avancerede og ensrettede avancerede signaler
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Jernbanestation skal fjernes først
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Jernbane rutepunktet skal fjernes først
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Byg en separat station
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Byg et separat rutepunkt
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Sammenkæd station
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Forbind rutepunkt
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Det er nødvendigt at fjerne vejen først
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vejarbejde i gang
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vejarbejde i gang
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Vejkonstruktion
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Sporvejskonstruktion
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Vælg vejbro
@@ -1629,14 +1629,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Byg spor
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktiver/Deaktiver ensrettede veje
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Skift mellem bygning/fjernelse af veje
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Skift mellem bygning/fjernelse af sporveje
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Vælg retning for værksted
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Vælg retning af sporvognsremise
-STR_ROAD_DESCRIPTION_ROAD                                       :Vej
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Vej med gadelygter
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Vej med vejtræer
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Værksted
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Jernbaneoverskæring
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Sporvej
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vælg retning for værksted
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vælg retning af sporvognsremise
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Vej
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Vej med gadelygter
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Vej med vejtræer
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Værksted
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Jernbaneoverskæring
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Sporvej
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan ikke fjerne rutebilstation...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan ikke fjerne fragtcentral...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan ikke fjerne passager-sporvognsstation
@@ -1644,12 +1644,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kan ikke
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Byer
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Det er nødvendigt at nedrive bygningen først
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (by)
@@ -1662,9 +1662,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrer
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Ændre navnet på byen
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passagerer sidste måned: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post sidste måned: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Nødvendig godsmængde for at byen kan vokse:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} krævet
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} leveret seneste måned
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Nødvendig godsmængde for at byen kan vokse:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} krævet
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} leveret seneste måned
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høj kontorbygning
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kontorbygning
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Lille lejlighedskompleks
@@ -1701,7 +1701,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give tredobbelt udbytte i de næste 12 måneder!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Tilskudsordning tildelt {STRING}!{}{}{STRING} fragt fra {STATION} til {STATION} vil give firedobbelt udbytte i de næste 12 måneder!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} lokale myndigheder nægter at tillade, at endnu en lufthavn bygges i byen
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN}s lokale myndigheder afviser tilladelse til lufthavn pga. støjgener
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN}s lokale myndigheder afviser tilladelse til lufthavn pga. støjgener
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Hytter
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Huse
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Lejligheder
@@ -1737,7 +1737,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Trafikkaos i byen {TOWN}!{}{}Vejfornyelse betalt af {STRING} forårsager 6 måneders kaos i trafikken!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (under konstruktion)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (under konstruktion)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tepottehus
@@ -1750,17 +1750,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Placer skilt
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Træer
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...der er allerede træer her
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan ikke plante træer her...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...for mange skilte
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan ikke placere skilt her...
-STR_SIGN_DEFAULT                                                :Skilt
+STR_DEFAULT_SIGN_NAME                                           :Skilt
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Ændre skiltets tekst
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan ikke ændre navnet på skiltet...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan ikke slette skilt...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vælg typen af træer der skal plantes
-STR_TREE_NAME_TREES                                             :Træer
-STR_TREE_NAME_RAINFOREST                                        :Regnskov
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusplanter
+STR_LAI_TREE_NAME_TREES                                         :Træer
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regnskov
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusplanter
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Valg af banegård
@@ -1782,7 +1782,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Det er n
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}For tæt på en anden lufthavn
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Det er nødvendigt at rive lufthavnen ned først
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Omdøb stationen/fragtcentralen
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Omdøb stationen/fragtcentralen
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan ikke omdøbe stationen...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Bedømmelse
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepterer
@@ -1800,10 +1800,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Enestående
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle toge, som har denne station i deres ruteplan
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Vis alle fly, som har denne lufthavn i deres ruteplan
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Vis alle skibe, som har denne station i deres ruteplan
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Vis alle toge, som har denne station i deres ruteplan
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Vis alle køretøjer, som har denne station i deres ruteplan
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Vis alle fly, som har denne lufthavn i deres ruteplan
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Vis alle skibe, som har denne station i deres ruteplan
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} accepterer ikke længere {STRING}
@@ -1839,47 +1839,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Ændre s
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Vis liste over accepteret last
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stationsnavne - klik på et navn for at centrere skærmen over stationen
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vælg lufthavnens størrelse/type
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Banegård
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Flyhangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lufthavn
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Fragtcentral
-STR_STATION_DESCRIPTION_BUS_STATION                             :Rutebilstation
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Havn
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Banegård
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Flyhangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lufthavn
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Fragtcentral
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Rutebilstation
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Havn
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Marker dækningsområdet af den foreslåede placering
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Marker ikke dækningsområdet af den foreslåede placering
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Vis dækningsområde
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Havn
-STR_STATION_DESCRIPTION_BUOY                                    :Bøje
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bøje
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...der er en bøje i vejen
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stationen er for spredt
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ikke-uniforme stationer er slået fra
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold Ctrl nede for at vælge mere end en ting
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...ikke-uniforme stationer er slået fra
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hold Ctrl nede for at vælge mere end en ting
 
 STR_UNDEFINED                                                   :(udefineret tekststring)
-STR_STAT_CLASS_DFLT                                             :Standard station
-STR_STAT_CLASS_WAYP                                             :Kontrolsteder
+STR_STATION_CLASS_DFLT                                          :Standard station
+STR_STATION_CLASS_WAYP                                          :Kontrolsteder
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Retning af skibsdok
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...skal bygges på vand
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kan ikke bygge en skibsdok her...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Vælg retning af skibsdok
-STR_WATER_DESCRIPTION_WATER                                     :Vand
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kyst eller flodbred
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Skibsdok
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvædukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vand
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kyst eller flodbred
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Skibsdok
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvædukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...kan ikke bygge på vand
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal må fjernes først
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Kanal må fjernes først
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Gem spil
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Hent spil
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Gem
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Slet
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Tilskuer, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Tilskuer, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} fri
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan ikke læse drevet
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Fejl under gemning af spil{}{STRING}
@@ -1895,12 +1895,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Liste ov
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nuværende gemte spils navn
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Slet det valgte gemte spil
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Gem det nuværende spil, med det valgte navn
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generer nyt tilfældigt spil
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Hent højdekort
-STR_SAVE_OSKTITLE                                               :{BLACK}Skriv et navn til det gemte spil
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generer nyt tilfældigt spil
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Hent højdekort
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Skriv et navn til det gemte spil
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} i vejen
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} i vejen
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kulmine
 STR_INDUSTRY_NAME_POWER_STATION                                 :Kraftværk
@@ -1958,7 +1958,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrer skærmen over industriens lokalitet
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Ny {STRING} under opførelse tæt på {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Ny {STRING} bliver plantet tæt på {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Pris: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Pris: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan ikke bygge denne industritype her...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...skov kan kun plantes over snelinjen
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} rapporterer om øjeblikkelig nedlukning!
@@ -1976,16 +1976,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}En anden tunnel er i vejen
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnellen ville slutte uden for kortet
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnellen ville slutte uden for kortet
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Det er umuligt at lave en udgravning til tunnelen i den anden ende
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Det er nødvendigt at rive tunnelen ned først
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Det er nødvendigt at rive broen ned først
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kan ikke starte og slutte på samme position
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Brohoveder er ikke i samme niveau
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Broen er for lav til terrænet
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan ikke starte og slutte på samme position
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Brohoveder er ikke i samme niveau
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Broen er for lav til terrænet
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start- og slutposition skal være på linje
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Dette sted er ikke brugbart til starten af en tunnel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hængebro, stål
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Bjælkebro, stål
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Frithængende bro, stål
@@ -1996,30 +1996,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Rørformet bro,
 STR_BRIDGE_TUBULAR_SILICON                                      :Rørformet bro, silicium
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kan ikke bygge en bro her...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan ikke bygge en tunnel her...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Jernbanetunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Jernbanehængebro af stål
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Jernbanebjælkebro af stål
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Frithængende jernbanebro af stål
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Forstærket jernbanehængebro af beton
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Jernbanebro af træ
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Jernbanebro af beton
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Hængebro af stål
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Bjælkebro af stål
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Frithængende bro af stål
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Forstærket hængebro af beton
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Bro af træ
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Bro af beton
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Rørformet jernbanebro
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Rørformet bro
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Jernbanetunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Jernbanehængebro af stål
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Jernbanebjælkebro af stål
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Frithængende jernbanebro af stål
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Forstærket jernbanehængebro af beton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Jernbanebro af træ
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Jernbanebro af beton
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Hængebro af stål
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Bjælkebro af stål
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Frithængende bro af stål
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Forstærket hængebro af beton
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Bro af træ
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Bro af beton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Rørformet jernbanebro
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Rørformet bro
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Der er et objekt i vejen
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Sender
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fyrtårn
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Selskabets hovedkontor
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Sender
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fyrtårn
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Selskabets hovedkontor
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...selskabets hovedkontor i vejen
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Land ejet af selskabet
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Land ejet af selskabet
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Kan ikke købe dette landområde...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...du ejer det allerede!
 
@@ -2067,7 +2067,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Statio
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Sværhedsgrad
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Gem
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Gem
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Nem
@@ -2140,8 +2140,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Farvetema
 STR_LIVERY_CAPTION                                              :{WHITE}Nyt farvetema
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Selskabsnavn
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Direktørnavn
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Selskabsnavn
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Direktørens navn
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Selskabsnavn
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Direktørens navn
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan ikke ændre selskabets navn...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kan ikke ændre direktørens navn...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanser {BLACK}{COMPANYNUM}
@@ -2165,11 +2165,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf over indkomst
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf over afkast
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bank balance
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}LÃ¥n
-STR_MAX_LOAN                                                    :{WHITE}Maks. lån: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maks. lån: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}LÃ¥n {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Tilbagebetal {SKIP}{SKIP}{CURRENCY}
@@ -2178,7 +2178,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan ikke
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...ingen lån at tilbagebetale
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} krævet
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan ikke tilbagebetale lån...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Du kan ikke forære penge væk, som du har lånt i banken...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Du kan ikke forære penge væk, som du har lånt i banken...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Vælg nyt ansigt til direktøren
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Ændrer selskabets farve på køretøjer
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Ændrer direktørens navn
@@ -2188,10 +2188,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Tilbageb
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Direktør)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Indviet: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Køretøjer:
-STR_TRAINS                                                      :{WHITE}{COMMA} tog{P "" e}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} køretøj{P "" er}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} fly
-STR_SHIPS                                                       :{WHITE}{COMMA} skib{P "" e}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tog{P "" e}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} køretøj{P "" er}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} fly
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} skib{P "" e}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ingen
 STR_FACE_CAPTION                                                :{WHITE}Ansigtsvalg
 STR_FACE_MALE_BUTTON                                            :{BLACK}Mand
@@ -2204,9 +2204,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Vælg kv
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generer nyt tilfældigt ansigt
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Nøgle
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Viser nøglen til grafen
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Vis detaljeret præstationsoversigt
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Vis detaljeret præstationsoversigt
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Nøgle til selskabsgraf
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klik her for at vise/skjule selskabets graf
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik her for at vise/skjule selskabets graf
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Afleveret last
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Selskabets præstationsrang (maksimal rang=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Selskabsværdier
@@ -2240,23 +2240,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Præsident
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Matador
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Byg HK
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Byg selskabets hovedkvarter / centrer over hovedkvarteret
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Flyt selskabets hovedkvarter for 1% af selskabsværdien
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Flyt selskabets hovedkvarter for 1% af selskabsværdien
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan ikke bygge selskabets hovedkvarter...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Vis HK
-STR_RELOCATE_HQ                                                 :{BLACK}Flyt hovedkvarter
-STR_COMPANY_JOIN                                                :{BLACK}Tilslut dig
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Tilslut dig og spil som dette firma
-STR_COMPANY_PASSWORD                                            :{BLACK}Kodeord
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Beskyt dit selskab med et kodeord for at undgå, at fremmede slutter sig til spillet.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Sæt selskabets kodeord
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Flyt hovedkvarter
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Tilslut dig
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Tilslut dig og spil som dette firma
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Kodeord
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Beskyt dit selskab med et kodeord for at undgå, at fremmede slutter sig til spillet.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Sæt selskabets kodeord
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Gem ikke den indtastede adgangskode
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Giv firmaet den nye adgangskode
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Firma-adgangskode
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standard firma-adgangskode
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Brug denne firma-adgangskode som standard for nye firmaer
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standard firma-adgangskode
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Brug denne firma-adgangskode som standard for nye firmaer
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Lavkonjuktur over hele verden!{}{}Vismændende frygter det værste, økonomien skrumper!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Økonomisk krise overvundet!{}{}Stigning i forbrug giver industrien selvtilliden tilbage, produktionen øges!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Skift mellem stort/lille vindue
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Skift mellem stort/lille vindue
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Selskabsværdi: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Køb 25% aktier i selskabet
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sælg 25% aktier i selskabet
@@ -2266,7 +2266,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan ikke
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan ikke sælge 25% aktier i dette selskab...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% ejes af {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} er blevet overtaget af {STRING}!
-STR_PROTECTED                                                   :{WHITE}Dette selskab sælger ikke aktier endnu...
+STR_ERROR_PROTECTED                                             :{WHITE}Dette selskab sælger ikke aktier endnu...
 
 STR_LIVERY_DEFAULT                                              :Standardfarver
 STR_LIVERY_STEAM                                                :Damplokomotiv
@@ -2292,14 +2292,14 @@ STR_LIVERY_LARGE_PLANE                                          :Stort fly
 STR_LIVERY_PASSENGER_TRAM                                       :Passager-sporvogn
 STR_LIVERY_FREIGHT_TRAM                                         :Fragt-sporvogn
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Vis generelle farveskemaer
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Vis farveskemaer for tog
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Vis farveskemaer for køretøjer
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Vis farveskemaer for skibe
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Vis farveskemaer for fly
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Vælg den primære farve for det valgte farveskema
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Vælg den sekundære farve for det valgte farveskema
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Vælg et farveskema, som skal ændres, eller flere farveskemaer vha. CTRL+klik. Klik på boksen for at slå brug af farveskemaet til/fra
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Vis generelle farveskemaer
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Vis farveskemaer for tog
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Vis farveskemaer for køretøjer
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Vis farveskemaer for skibe
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Vis farveskemaer for fly
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Vælg den primære farve for det valgte farveskema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Vælg den sekundære farve for det valgte farveskema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Vælg et farveskema, som skal ændres, eller flere farveskemaer vha. CTRL+klik. Klik på boksen for at slå brug af farveskemaet til/fra
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Damp)
@@ -2607,9 +2607,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Los ikke og ve
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Ændr standseregel for den valgte ordre
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Ændr lasteregel for den valgte ordre
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ændr losseregel for den valgte ordre
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Indsæt en avanceret ordre
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Indsæt en avanceret ordre
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Gå til nærmeste depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Flyv til nærmeste hangar
 STR_ORDER_NEAREST_DEPOT                                         :det nærmeste
@@ -2619,9 +2619,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Servicer uden s
 STR_ORDER_TRAIN_DEPOT                                           :Remise
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Værksted
 STR_ORDER_SHIP_DEPOT                                            :Skibsdok
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Altid benyt
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service hvis nødvendigt
@@ -2646,10 +2646,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :er større end
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :er større eller lig med
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er sand
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er falsk
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Spring til ordre {COMMA}
-STR_CONDITIONAL_NUM                                             :Spring til ordre {COMMA} når {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Spring til ordre {COMMA} når {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Spring til ordre {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Spring til ordre {COMMA} når {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Spring til ordre {COMMA} når {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Rejs ikke
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Rejs (ikke iflg. køreplan)
@@ -2672,18 +2672,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Tog kan
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Spring over
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Slet
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}GÃ¥ til
-STR_REFIT                                                       :{BLACK}Ombyg
-STR_REFIT_TIP                                                   :{BLACK}Vælg hvilken lasttype, der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
-STR_REFIT_ORDER                                                 :(Ombyg til {STRING})
-STR_REFIT_STOP_ORDER                                            :(Ombyg til {STRING} og stop)
-STR_STOP_ORDER                                                  :(Stop)
-STR_TIMETABLE_VIEW                                              :{BLACK}Køreplan
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Skift til køreplan-visning
-STR_ORDER_VIEW                                                  :{BLACK}Ordrer
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skift til ordrevisning
+STR_ORDER_REFIT                                                 :{BLACK}Ombyg
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vælg hvilken lasttype, der skal ombygges til i denne ordre. CTRL-klik for at fjerne ombygningsinstruktion
+STR_ORDER_REFIT_ORDER                                           :(Ombyg til {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Ombyg til {STRING} og stop)
+STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Køreplan
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Skift til køreplan-visning
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordrer
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Skift til ordrevisning
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordrer)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slut på ordrer - -
-STR_SERVICE                                                     :{BLACK}Service
+STR_ORDER_SERVICE                                               :{BLACK}Service
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Værdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Værdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2703,7 +2703,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}køretø
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}et køretøj, der deler denne ordre, kan ikke køre til den station
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan ikke flytte køretøjet...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Det bagerste lokomotiv vil altid følge dets forende
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan ikke finde en route til et lokalt depot
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Serviceinterval: {LTBLUE}{COMMA}dage{BLACK}   Sidste service: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Serviceinterval: {LTBLUE}{COMMA}%{BLACK}   Sidste service: {LTBLUE}{DATE_LONG}
@@ -2723,10 +2723,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Kørepla
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ændre hvor lang tid den markerede ordre skal tage
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nulstil tiden for den markerede ordre
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nulstil forsinkelses-tæller, så transportmidlet kommer til tiden
-STR_SERVICE_HINT                                                :{BLACK}Spring denne ordre over medmindre der er behov for service
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Pris: {CURRENCY} Vægt: {WEIGHT_S}{}Hastighed: {VELOCITY}  Styrke: {POWER}{}Driftsomkostninger: {CURRENCY}/år{}Kapacitet: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Pris: {CURRENCY} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO}, {CARGO}{}Driftsomkostninger: {CURRENCY}/Ã¥r
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Pris: {CURRENCY} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO}{}Driftsomkostninger: {CURRENCY}/Ã¥r
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Spring denne ordre over medmindre der er behov for service
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Pris: {CURRENCY} Vægt: {WEIGHT_S}{}Hastighed: {VELOCITY}  Styrke: {POWER}{}Driftsomkostninger: {CURRENCY}/år{}Kapacitet: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Pris: {CURRENCY} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO}, {CARGO}{}Driftsomkostninger: {CURRENCY}/Ã¥r
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Pris: {CURRENCY} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO}{}Driftsomkostninger: {CURRENCY}/Ã¥r
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftsomkostninger: {LTBLUE}{CURRENCY}/Ã¥r
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Maks. hast.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vægt: {LTBLUE}{WEIGHT_S} {BLACK}Effekt: {LTBLUE}{POWER}{BLACK} Maks. hast.: {LTBLUE}{VELOCITY}
@@ -2746,28 +2746,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikke vende retningen af toget...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke vende køretøjet om...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke vende et køretøj, der består af flere enheder
-STR_CLEAR_TIME                                                  :{BLACK}Nulstil tid
-STR_RESET_LATENESS                                              :{BLACK}Nulstil forsinkelse
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Omdøb kontrolsted
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Ændre navnet på bøjen
-
-STR_TRAIN_STOPPING                                              :{RED}Stopper
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stopper, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Skinnetyperne passer ikke sammen
-STR_TRAIN_NO_POWER                                              :{RED}Ingen strøm
-STR_TRAIN_START_NO_CATENARY                                     :Toget kan ikke kører, fordi sporet ikke har køreledninger
-STR_TRAIN_STUCK                                                 :{ORANGE}Afventer fri passage
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nulstil tid
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nulstil forsinkelse
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Omdøb kontrolsted
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Ændre navnet på bøjen
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stopper
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stopper, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Skinnetyperne passer ikke sammen
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ingen strøm
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Toget kan ikke kører, fordi sporet ikke har køreledninger
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Afventer fri passage
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Ny {STRING} er nu tilgængelig!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Ny {STRING} er nu tilgængelig!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kan ikke sælge ødelagt køretøj...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kan ikke ombygge ødelagt køretøj...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kan ikke sælge ødelagt køretøj...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kan ikke ombygge ødelagt køretøj...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kan ikke lave køreplan for transportmiddel...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Transportmidler kan kun vente ved stationer.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Dette transportmiddel stopper ikke ved denne station.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan ikke lave køreplan for transportmiddel...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Transportmidler kan kun vente ved stationer.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Dette transportmiddel stopper ikke ved denne station.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ændre tid
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Dette transportmiddel kommer til tiden
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Dette transportmiddel er nu {STRING} forsinket
@@ -2781,7 +2781,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Udfyld a
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...skal være stoppet inde i et værksted først
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikke finde lokalt værksted
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Tving køretøjet til at vende
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapacitet: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacitet: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} køretøj{P "" er}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2808,11 +2808,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Positionsbøje, kan bruges som yderligere navigationspunkt
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikke placere en bøje her...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Byg akvædukt
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan ikke bygge akvædukt her...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan ikke bygge akvædukt her...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ombyg)
 STR_REFIT_TITLE                                                 :{GOLD}Vælg den lasttype der skal transporteres:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapacitet: {GOLD}{CARGO}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(kan ombygges)
+STR_PURCHASE_INFO_REFITTABLE                                    :(kan ombygges)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lufthavne
@@ -2825,7 +2825,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Byg en l
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Indbyggerne fester . . .{}Første fly ankommer til {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Flystyrt!{}{COMMA} dør i flammerne ved {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Flystyrt!{}Fly løb tør for brændstof, {COMMA} døde i ildhelvede!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Køreplan)
 
@@ -2838,13 +2838,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Sammenstyrtning af kulmine efterlader et spor af katastrofe ved {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Oversvømmelse!{}Mindst {COMMA} savnet og antages omkommet efter pludselig oversvømmelse!
 
-STR_BRIBE_FAILED                                                :{WHITE}Dit forsøg på bestikkelse er blevet
-STR_BRIBE_FAILED_2                                              :{WHITE}opdaget af en inspektør.
-STR_BUILD_DATE                                                  :{BLACK}Produceret: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Dit forsøg på bestikkelse er blevet
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}opdaget af en inspektør.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Produceret: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stationsklasse: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stationstype: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stationsklasse: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stationstype: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Præstationsoversigt
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalje
@@ -2864,28 +2864,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Penge:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}LÃ¥n:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Antal af køretøjer; dette inkludere vejkøretøjer, tog, skibe og fly
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antallet af stationer. Alle dele af en station (f.eks. banegård, rutebilstation, lufthavn) tæller med, selvom de er sammensat som én station
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Afkast for køretøjet med laveste indkomst (af alle køretøjer ældre end 2 år)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Indkomst i måneden med det laveste afkast i de sidste 12 kvartaler
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Indkomst i måneden med det højeste afkast i de sidste 12 kvartaler
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Antal enheder fragtet i de sidste 4 kvartaler
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Antallet af lasttyper fragtet i sidste kvartal
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Kapital denne virksomhed har i banken
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Mængden af penge dette firma har lånt
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Samlet point ud af mulige points
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Antal af køretøjer; dette inkludere vejkøretøjer, tog, skibe og fly
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Antallet af stationer. Alle dele af en station (f.eks. banegård, rutebilstation, lufthavn) tæller med, selvom de er sammensat som én station
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Afkast for køretøjet med laveste indkomst (af alle køretøjer ældre end 2 år)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Indkomst i måneden med det laveste afkast i de sidste 12 kvartaler
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Indkomst i måneden med det højeste afkast i de sidste 12 kvartaler
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Antal enheder fragtet i de sidste 4 kvartaler
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Antallet af lasttyper fragtet i sidste kvartal
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Kapital denne virksomhed har i banken
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Mængden af penge dette firma har lånt
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Samlet point ud af mulige points
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF indstillinger
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Vis NewGRF-indstillinger
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF indstillinger
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Anvend ændringer
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Slå palette til/fra
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Slå palette til/fra i den valgte NewGRF.{}Gør dette når grafik fra denne NewGRF ser lyserøde ud i spillet
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Indstil parameter
-STR_NEWGRF_FILENAME                                             :{BLACK}Filnavn: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palette: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Anvend ændringer
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Slå palette til/fra
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Slå palette til/fra i den valgte NewGRF.{}Gør dette når grafik fra denne NewGRF ser lyserøde ud i spillet
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Indstil parameter
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Filnavn: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er ved at ændre et igangværende spil; dette kan få OpenTTD til at gå ned.{}Er du helt sikker på at du vil fortsætte?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2908,34 +2908,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøg på bru
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} indeholder en ødelagt sprite. Alle ødelagte sprites vil blive vist som et rødt spørgsmålstegm (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Indeholder flere "Action 8" poster.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Indlæs den valgte indstilling
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Gem indstilling
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Gem den aktuelle liste som indstilling
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Indtast navn til indstilling
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Slet indstilling
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Slet den for tiden valgte indstilling
-STR_NEWGRF_ADD                                                  :{BLACK}Tilføj
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Tilføj et NewGRF sæt til listen
-STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjern det valgte NewGRF sæt fra listen
-STR_NEWGRF_MOVEUP                                               :{BLACK}Flyt op
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flyt det valgte NewGRF sæt op i listen
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flyt ned
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flyt det valgte NewGRF sæt ned i listen
-STR_NEWGRF_FILE_TIP                                             :{BLACK}En liste over de NewGRF sæt der er installeret. Klik på et sæt for at ændre dets parameter
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameter: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Indtast NewGRF-parameter
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen information tilgængelig
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Indlæs den valgte indstilling
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Gem indstilling
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Gem den aktuelle liste som indstilling
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Indtast navn til indstilling
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Slet indstilling
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Slet den for tiden valgte indstilling
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Tilføj
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Tilføj et NewGRF sæt til listen
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Fjern
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Fjern det valgte NewGRF sæt fra listen
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Flyt op
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Flyt det valgte NewGRF sæt op i listen
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Flyt ned
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flyt det valgte NewGRF sæt ned i listen
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}En liste over de NewGRF sæt der er installeret. Klik på et sæt for at ændre dets parameter
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameter: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Indtast NewGRF-parameter
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ingen information tilgængelig
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tilgængelige NewGRF sæt
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Tilføj til udvalg
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Tilføj det valgte NewGRF sæt til din konfiguration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Genfind filer
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Opdater listen over tilgængelige NewGRF sæt
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Tilføj det valgte NewGRF sæt til din konfiguration
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Genfind filer
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Opdater listen over tilgængelige NewGRF sæt
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan ikke tilføje sæt: dobbelt GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Tilsvarende fil blev ikke fundet
-STR_NEWGRF_DISABLED                                             :{RED}Deaktiveret
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Tilsvarende fil blev ikke fundet
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Deaktiveret
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Tilsvarende fil ikke fundet (kompatibel GRF indlæst)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatible GRF fil(er) indlæst i stedet for manglende fil(er)
@@ -2951,7 +2951,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Gods-/ombygningsinformation for '{1:ENGINE}' afviger fra indkøbslisten efter konstruktion. Dette kan medføre, at autofornyelse ikke fungerer korrekt.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' forårsagede en uendelig løkke i produktions-callback'en.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spillet er gemt i en version uden sporveje. Alle sporveje er blevet fjernet.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spillet er gemt i en version uden sporveje. Alle sporveje er blevet fjernet.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Brugerdefineret møntfod
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurs: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2962,16 +2962,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Skift t
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Skift til Euro: {ORANGE}aldrig
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Eksempel: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Skift brugerdefineret møntfods parametre
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Reducer beløb i din valuta for et pund (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Forøg beløb i din valuta for et pund (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Sæt vekselkursen i din valuta for et pund (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Sæt separatortegn for din valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Sæt præfiks-streng for din valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Sæt suffiks-streng for din valuta
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Skift til euro tidligere
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Skift til euro senere
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Sæt årstal for skift til euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 pund (£) i din valuta
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Reducer beløb i din valuta for et pund (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Forøg beløb i din valuta for et pund (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Sæt vekselkursen i din valuta for et pund (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Sæt separatortegn for din valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Sæt præfiks-streng for din valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Sæt suffiks-streng for din valuta
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Skift til euro tidligere
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Skift til euro senere
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Sæt årstal for skift til euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 pund (£) i din valuta
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2990,8 +2990,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skibe
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Fly
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delte ordrer af {COMMA} transportmid{P del ler}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle transportmidler, der deler denne ruteplan
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Delte ordrer af {COMMA} transportmid{P del ler}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Vis alle transportmidler, der deler denne ruteplan
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} venter i remisen
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} venter på værkstedet
@@ -3098,39 +3098,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ombyg ve
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Ombyg skibet til at sejle med en anden slags last
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Ombyg flyet til at flyve med en anden slags last
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kører til {TOWN} remise
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kører til {TOWN} remise, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Kører til {TOWN} værksted
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Kører til {TOWN} værksted, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Sejler til {TOWN} skibsdok
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Sejler til {TOWN} skibsdok, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Flyver til {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service i {TOWN} remise
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service i {TOWN} remise, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service på {TOWN} værksted
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service på {TOWN} værksted, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service i {TOWN} skibsdok
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service i {TOWN} skibsdok, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service i {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service i {STATION} hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon køretøj
-STR_CLONE_SHIP                                                  :{BLACK}Klon skib
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. CTRL-klik vil dele ordrer
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil bygge en kopi af vejkøretøjet. CTRL-klik vil dele ordrer
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil bygge en kopi af skibet. CTRL-klik vil dele ordrer
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil bygge en kopi af et fly. CTRL-klik vil dele ordrer
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. Klik på denne knap, så på et tog indeni eller udenfor remisen. CTRL-klik vil dele ordrer
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil bygge en kopi af køretøjet. Klik på denne knap, så på et køretøj indeni eller udenfor værkstedet. CTRL-klik vil dele ordrer
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil bygge en kopi af skibet. Klik på denne knap så, på et skib indeni eller udenfor dokken. CTRL-klik vil dele ordrer
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil bygge en kopi af et fly. Klik på denne knap, så på et fly indeni eller udenfor hangaren. CTRL-klik vil dele ordrer
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Kører til {TOWN} remise
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Kører til {TOWN} remise, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Kører til {TOWN} værksted
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Kører til {TOWN} værksted, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Sejler til {TOWN} skibsdok
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Sejler til {TOWN} skibsdok, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Flyver til {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Flyver til {STATION} hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Service i {TOWN} remise
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Service i {TOWN} remise, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Service på {TOWN} værksted
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Service på {TOWN} værksted, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Service i {TOWN} skibsdok
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service i {TOWN} skibsdok, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service i {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service i {STATION} hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klon tog
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klon køretøj
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klon skib
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klon fly
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. CTRL-klik vil dele ordrer
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Dette vil bygge en kopi af vejkøretøjet. CTRL-klik vil dele ordrer
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Dette vil bygge en kopi af skibet. CTRL-klik vil dele ordrer
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Dette vil bygge en kopi af et fly. CTRL-klik vil dele ordrer
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Dette vil bygge en kopi af toget inklusiv alle vogne. Klik på denne knap, så på et tog indeni eller udenfor remisen. CTRL-klik vil dele ordrer
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Dette vil bygge en kopi af køretøjet. Klik på denne knap, så på et køretøj indeni eller udenfor værkstedet. CTRL-klik vil dele ordrer
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Dette vil bygge en kopi af skibet. Klik på denne knap så, på et skib indeni eller udenfor dokken. CTRL-klik vil dele ordrer
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Dette vil bygge en kopi af et fly. Klik på denne knap, så på et fly indeni eller udenfor hangaren. CTRL-klik vil dele ordrer
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye jernbanekøretøjer
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nyt elektrisk lokomotiv
@@ -3200,28 +3200,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrer
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Du er ved at sælge alle køretøjer i depotet. Er du sikker?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Forkert depottype
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Forkert depottype
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sælg alle toge i remisen
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Sælg alle køretøjer i værkstedet
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sælg alle skibe i dokken
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sælg alle fly i hangaren
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Sælg alle toge i remisen
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Sælg alle køretøjer i værkstedet
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Sælg alle skibe i dokken
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Sælg alle fly i hangaren
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Vis en liste over alle tog med denne remise i ordrelisten
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Vis liste over alle køretøjer med dette værksted i ordrelisten
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Vis liste over alle skibe med denne skibsdok i ordrelisten
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Vis liste over alle fly med en hangar ved denne lufthavn i ordrelisten
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Vis en liste over alle tog med denne remise i ordrelisten
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Vis liste over alle køretøjer med dette værksted i ordrelisten
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Vis liste over alle skibe med denne skibsdok i ordrelisten
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Vis liste over alle fly med en hangar ved denne lufthavn i ordrelisten
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Udskift automatisk all toge i remisen
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Udskift automatisk alle køretøjer i værkstedet
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Udskift automatisk alle skibe i dokken
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Udskift automatisk alle fly i hangaren
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Udskift automatisk all toge i remisen
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Udskift automatisk alle køretøjer i værkstedet
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Udskift automatisk alle skibe i dokken
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Udskift automatisk alle fly i hangaren
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Udskift {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start udskiftning
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop udskiftning
-STR_NOT_REPLACING                                               :{BLACK}Udskifter ikke
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Intet køretøj valgt
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Udskifter ikke
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Intet køretøj valgt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vælg en køretøjstype, som du ønsker udskiftet
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vælg en køretøjstype, som du ønker benyttet i stedet for den type, du  har valgt i venste side
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Tryk for at stoppe udskiftningen at den køretøjstype, som du har valgt til venstre
@@ -3233,26 +3233,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}FÃ¥ auto
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Udskifter: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skift imellem lokomotiv- og vogn-udskiftningsvindue
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Tog er ikke tilgængeligt
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vejkøretøj er ikke tilgængeligt
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skib er ikke tilgængeligt
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Fly er ikke tilgængelig
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Tog er ikke tilgængeligt
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vejkøretøj er ikke tilgængeligt
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Skib er ikke tilgængeligt
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Fly er ikke tilgængelig
 
-STR_ENGINES                                                     :Lokomotiver
-STR_WAGONS                                                      :Vogne
+STR_REPLACE_ENGINES                                             :Lokomotiver
+STR_REPLACE_WAGONS                                              :Vogne
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klik for at stoppe alle toge i remisen
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klik for at stoppe alle køretøjer i værkstedet
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klik for at stoppe alle skibe i dokken
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klik for at stoppe alle fly i hangaren
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klik for at stoppe alle toge i remisen
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klik for at stoppe alle køretøjer i værkstedet
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klik for at stoppe alle skibe i dokken
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klik for at stoppe alle fly i hangaren
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klik for at starte alle toge i remisen
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klik for at starte alle køretøjer i værkstedet
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klik for at starte alle skibe i dokken
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klik for at starte alle fly i hangaren
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klik for at starte alle toge i remisen
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klik for at starte alle køretøjer i værkstedet
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klik for at starte alle skibe i dokken
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klik for at starte alle fly i hangaren
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klik for at stoppe alle køretøjer i listen
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klik for at starte alle køretøjer i listen
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klik for at stoppe alle køretøjer i listen
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klik for at starte alle køretøjer i listen
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste over skilte - {COMMA} Skilt{P "" e}
@@ -3261,14 +3261,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Ombygnin
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Jernbane
-STR_ELRAIL_VEHICLES                                             :Eltog
-STR_MONORAIL_VEHICLES                                           :Monorail
-STR_MAGLEV_VEHICLES                                             :Magnetskinnetog
+STR_REPLACE_RAIL_VEHICLES                                       :Jernbane
+STR_REPLACE_ELRAIL_VEHICLES                                     :Eltog
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorail
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magnetskinnetog
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Pris: {GOLD}{CURRENCY}{BLACK} Vægt: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighed: {GOLD}{VELOCITY}{BLACK} Styrke: {GOLD}{POWER}
@@ -3295,70 +3295,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generer
-STR_RANDOM                                                      :{BLACK}Tilfældig
-STR_RANDOM_HELP                                                 :{BLACK}Ændre den tilfældige værdi ved brug i terrængeneratoren
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Verdensgenerering
-STR_RANDOM_SEED                                                 :{BLACK}Tilfældig
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klik for at angive tilfældighed
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Skriv startværdi til tilfældige tal
-STR_LAND_GENERATOR                                              :{BLACK}Terrængenerator:
-STR_TREE_PLACER                                                 :{BLACK}Træalgoritme:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Højdekortets rotation:
-STR_TERRAIN_TYPE                                                :{BLACK}Terræntype:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Havniveau
-STR_SMOOTHNESS                                                  :{BLACK}Blødhed:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Snegrænse
-STR_DATE                                                        :{BLACK}Dato:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Antal byer:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Antal industrier:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Flyt snegrænsen een op
-STR_SNOW_LINE_DOWN                                              :{BLACK}Flyt snegrænsen een ned
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ændre snegrænsen
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Ændre startår
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skalerings advarsel
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}At ændre størrelsen på kildebilledet anbefales ikke. Fortsæt genereringen?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Højdekortets navn:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Størrelse: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generer
+STR_MAPGEN_RANDOM                                               :{BLACK}Tilfældig
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Ændre den tilfældige værdi ved brug i terrængeneratoren
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Verdensgenerering
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Tilfældig
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klik for at angive tilfældighed
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Skriv startværdi til tilfældige tal
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Terrængenerator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Træalgoritme:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Højdekortets rotation:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terræntype:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Havniveau
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Blødhed:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Snegrænse
+STR_MAPGEN_DATE                                                 :{BLACK}Dato:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Antal byer:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Antal industrier:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Flyt snegrænsen een op
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Flyt snegrænsen een ned
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ændre snegrænsen
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Ændre startår
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalerings advarsel
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}At ændre størrelsen på kildebilledet anbefales ikke. Fortsæt genereringen?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Højdekortets navn:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Størrelse: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Genererer verden...
 STR_GENERATION_ABORT                                            :{BLACK}Afbryd
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Afbryd Kortgenereringen
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Vil du virkelig afbryde kortgenereringen?
-STR_PROGRESS                                                    :{WHITE}{NUM}% færdig
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Verdensgenerering
-STR_TREE_GENERATION                                             :{BLACK}Trægenerering
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Ikke-flytbar generering
-STR_CLEARING_TILES                                              :{BLACK}Generer råt og stenet område
-STR_SETTINGUP_GAME                                              :{BLACK}Klargør spil
-STR_PREPARING_TILELOOP                                          :{BLACK}Kører flise-løkken
-STR_PREPARING_GAME                                              :{BLACK}Forbereder spil
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Denne handling ændrer sværhedsgraden til speciel
-STR_SE_FLAT_WORLD                                               :{WHITE}Fladt land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generer fladt landskab
-STR_SE_RANDOM_LAND                                              :{WHITE}Tilfældigt land
-STR_SE_NEW_WORLD                                                :{BLACK}Opret nyt scenarie
-STR_SE_CAPTION                                                  :{WHITE}Scenarietype
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Sæt højden af fladt landskab en ned
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Sæt højden af fladt landskab en op
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ændre højden af fladt landskab
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Højde af fladt landskab:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% færdig
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Verdensgenerering
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Trægenerering
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Ikke-flytbar generering
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generer råt og stenet område
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Klargør spil
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Kører flise-løkken
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Forbereder spil
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Denne handling ændrer sværhedsgraden til speciel
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Fladt land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generer fladt landskab
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Tilfældigt land
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Opret nyt scenarie
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenarietype
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Sæt højden af fladt landskab en ned
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Sæt højden af fladt landskab en op
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Ændre højden af fladt landskab
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Højde af fladt landskab:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrer det lille kort ved den nuværende position
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kortkanter:
-STR_NORTHWEST                                                   :{BLACK}Nordvest
-STR_NORTHEAST                                                   :{BLACK}Nordøst
-STR_SOUTHEAST                                                   :{BLACK}Sydøst
-STR_SOUTHWEST                                                   :{BLACK}Sydvest
-STR_BORDER_FREEFORM                                             :{BLACK}Fri udformning
-STR_BORDER_WATER                                                :{BLACK}Vand
-STR_BORDER_RANDOM                                               :{BLACK}Tilfældige
-STR_BORDER_RANDOMIZE                                            :{BLACK}Tilfældige
-STR_BORDER_MANUAL                                               :{BLACK}Manuelle
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kortkanter:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordvest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordøst
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sydøst
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sydvest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Fri udformning
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vand
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Tilfældige
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Tilfældige
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuelle
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Lille
@@ -3383,21 +3383,21 @@ STR_MEASURE_AREA                                                :{BLACK}Areal: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Længde: {NUM}{}Højdeforskel: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Areal: {NUM} x {NUM}{}Højdeforskel: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Værdi af overført gods: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...denne vej er ejet af en by
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vejen peger i den forkerte retning
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Gennemsigtighedsvalg
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Skift gennemsigtighed for stationsskilte. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Skift gennemsigtighed for træer. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Skift gennemsigtighed for huse. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Skift gennemsigtighed for industrier. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Skift gennemsigtighed for konstruktioner som stationer, værksteder, kontrolsteder og køreledninger. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Skift gennemsigtighed for broer. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Skift gennemsigtighed for strukturer som fyrtårne og antenner. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Slå transparens til/fra for køreledninger. CTRL+klik for at låse.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Slå gennemsigtighed til/fra for laste-indikatorer. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gør objekter usynlige i stedet for gennemsigtige
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Værdi af overført gods: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...denne vej er ejet af en by
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...vejen peger i den forkerte retning
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Gennemsigtighedsvalg
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Skift gennemsigtighed for stationsskilte. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Skift gennemsigtighed for træer. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Skift gennemsigtighed for huse. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Skift gennemsigtighed for industrier. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Skift gennemsigtighed for konstruktioner som stationer, værksteder, kontrolsteder og køreledninger. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Skift gennemsigtighed for broer. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Skift gennemsigtighed for strukturer som fyrtårne og antenner. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Slå transparens til/fra for køreledninger. CTRL+klik for at låse.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Slå gennemsigtighed til/fra for laste-indikatorer. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Gør objekter usynlige i stedet for gennemsigtige
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3407,7 +3407,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alle toge
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alle vejkøretøjer
 STR_GROUP_ALL_SHIPS                                             :Alle skibe
@@ -3416,24 +3416,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ikke-grupperede
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ikke-grupperede vejkøretøjer
 STR_GROUP_DEFAULT_SHIPS                                         :Ikke-grupperede skibe
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ikke-grupperede fly
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Tilføj delte køretøjer
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Fjern alle køretøjer
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Omdøb en gruppe
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kan ikke oprette gruppe...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kan ikke slette denne gruppe...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kan ikke omdøbe gruppe...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kan ikke fjerne alle køretøjer fra denne gruppe...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kan ikke tilføje køretøjet til denne gruppe...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kan ikke tilføje delte køretøjer til gruppe...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kan ikke oprette gruppe...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kan ikke slette denne gruppe...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kan ikke omdøbe gruppe...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kan ikke fjerne alle køretøjer fra denne gruppe...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kan ikke tilføje køretøjet til denne gruppe...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kan ikke tilføje delte køretøjer til gruppe...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupper - klik på en gruppe for at vise alle køretøjer i gruppen
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klik for at oprette en gruppe
-STR_GROUP_DELETE_TIP                                            :{BLACK}Slet den valgte gruppe
-STR_GROUP_RENAME_TIP                                            :{BLACK}Omdøb den valgte gruppe
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klik for at beskytte denne gruppe mod global auto-udskiftning
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupper - klik på en gruppe for at vise alle køretøjer i gruppen
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klik for at oprette en gruppe
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Slet den valgte gruppe
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Omdøb den valgte gruppe
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klik for at beskytte denne gruppe mod global auto-udskiftning
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3494,35 +3494,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Navnet skal være unikt
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Navnet skal være unikt
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Gå til næste skilt
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}GÃ¥ til forrige skilt
-STR_SIGN_OSKTITLE                                               :{BLACK}Indtast et navn for skiltet
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Gå til næste skilt
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}GÃ¥ til forrige skilt
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Indtast et navn for skiltet
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finansiér
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Efterforsk
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Byg
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Vælg passende industri fra denne liste
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finansiér
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Efterforsk
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Byg
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Vælg passende industri fra denne liste
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avanceret
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Avanceret valg af ansigt.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Avanceret valg af ansigt.
 STR_FACE_SIMPLE                                                 :{BLACK}Simpel
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Simpelt valg af ansigt.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Simpelt valg af ansigt.
 STR_FACE_LOAD                                                   :{BLACK}Hent
-STR_FACE_LOAD_TIP                                               :{BLACK}Hent favoritansigt
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Hent favoritansigt
 STR_FACE_LOAD_DONE                                              :{WHITE}Dit favoritansigt er hentet fra OpenTTD-konfigurationsfilen.
 STR_FACE_FACECODE                                               :{BLACK}Spiller ansigtsnr.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Vis og/eller indstil spillers ansigtsnummer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Vis og/eller indstil spillers ansigtsnummer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Vis og/eller indstil spillers ansigtsnummer
 STR_FACE_FACECODE_SET                                           :{WHITE}Ny ansigtsnummer-kode er indstillet.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kunne ikke indstille spillers ansigtsnummer - skal være et nummer mellem 0 og 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Gem
-STR_FACE_SAVE_TIP                                               :{BLACK}Gem favoritansigt
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Gem favoritansigt
 STR_FACE_SAVE_DONE                                              :{WHITE}Dette ansigt bliver gemt som din favorit i OpenTTD konfigurationsfilen.
 STR_FACE_EUROPEAN                                               :{BLACK}Europæisk
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Vælg europæiske ansigter
@@ -3530,51 +3530,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikans
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Vælg afrikanske ansigter
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nej
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Slå overskæg eller ørering til
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Slå overskæg eller ørering til
 STR_FACE_HAIR                                                   :HÃ¥r:
-STR_FACE_HAIR_TIP                                               :{BLACK}Ændre hår
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Ændre hår
 STR_FACE_EYEBROWS                                               :Øjenbryn:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Ændre øjenbryn
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Ændre øjenbryn
 STR_FACE_EYECOLOUR                                              :Øjenfarve:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Ændre øjenfarve
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Ændre øjenfarve
 STR_FACE_GLASSES                                                :Briller:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Slå briller til
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Ændre briller
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Slå briller til
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Ændre briller
 STR_FACE_NOSE                                                   :Næse:
-STR_FACE_NOSE_TIP                                               :{BLACK}Ændre næse
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Ændre næse
 STR_FACE_LIPS                                                   :Læber:
 STR_FACE_MOUSTACHE                                              :Overskæg:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Ændre læber eller overskæg
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Ændre læber eller overskæg
 STR_FACE_CHIN                                                   :Hage:
-STR_FACE_CHIN_TIP                                               :{BLACK}Ændre hage
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Ændre hage
 STR_FACE_JACKET                                                 :Jakke:
-STR_FACE_JACKET_TIP                                             :{BLACK}Ændre jakke
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Ændre jakke
 STR_FACE_COLLAR                                                 :Krave:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Ændre krave
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Ændre krave
 STR_FACE_TIE                                                    :Slips:
 STR_FACE_EARRING                                                :Ørering:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Ændre slips eller ørering
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Ændre slips eller ørering
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signalvalg
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan ikke konvertere signaler her...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standardsignal (semafor){}Signaler er nødvendige for at undgå sammenstød mellem tog på jernbanenetværk med mere end et tog.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Indgangssignal (semafor){}Grønt så længe der er et eller flere grønne udgangssignaler fra den efterfølgende sporsektion. Ellers vises rødt.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Udgangssignal (semafor){}Fungerer som et normalt signal men er nødvendigt for at vise den korrekte farve ved indgangs- og kombisignaler.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombisignal (semafor){}Kombisignalet fungerer både som indgangs- og udgangssignal. Dette muliggør opbygning af store forgreninger af signaler.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Avanceret signal (semafor){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Avancerede signaler kan passeres fra bagsiden.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Ensrettet avanceret signal (semafor){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Ensrettede avancerede signaler kan ikke passeres fra bagsiden.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standardsignal (electrisk){}Signaler er nødvendige for at undgå sammenstød mellem tog på jernbanenetværk med mere end et tog.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Indgangssignal (elektrisk){}Grønt så længe der er et eller flere grønne udgangssignaler fra den efterfølgende sporsektion. Ellers vises rødt.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Udgangssignal (elektrisk){}Fungerer som et normalt signal, men er nødvendigt for at vise den korrekte farve ved indgangs- og kombisignaler.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombisignal (elektrisk){}Kombisignalet fungerer både som indgangs- og udgangssignal. Dette muliggør opbygning af store forgreninger af signaler.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Avanceret signal (elektrisk){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Avancerede signaler kan passeres fra bagsiden.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Ensrettet avanceret signal (elektrisk){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Ensrettede avancerede signaler kan ikke passeres fra bagsiden.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signalkonvertering{}Når denne er valgt, vil klik på et eksisterende signal konvertere det til den valgte signaltype og -variant. CTRL-klik vil skifte den eksisterende signalvariant.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Træk-og-slip signaltæthed
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Formindsk træk-og-slip signaltæthed
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Forøg træk-og-slip signaltæthed
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalvalg
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan ikke konvertere signaler her...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standardsignal (semafor){}Signaler er nødvendige for at undgå sammenstød mellem tog på jernbanenetværk med mere end et tog.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Indgangssignal (semafor){}Grønt så længe der er et eller flere grønne udgangssignaler fra den efterfølgende sporsektion. Ellers vises rødt.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Udgangssignal (semafor){}Fungerer som et normalt signal men er nødvendigt for at vise den korrekte farve ved indgangs- og kombisignaler.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombisignal (semafor){}Kombisignalet fungerer både som indgangs- og udgangssignal. Dette muliggør opbygning af store forgreninger af signaler.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Avanceret signal (semafor){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Avancerede signaler kan passeres fra bagsiden.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Ensrettet avanceret signal (semafor){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Ensrettede avancerede signaler kan ikke passeres fra bagsiden.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standardsignal (electrisk){}Signaler er nødvendige for at undgå sammenstød mellem tog på jernbanenetværk med mere end et tog.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Indgangssignal (elektrisk){}Grønt så længe der er et eller flere grønne udgangssignaler fra den efterfølgende sporsektion. Ellers vises rødt.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Udgangssignal (elektrisk){}Fungerer som et normalt signal, men er nødvendigt for at vise den korrekte farve ved indgangs- og kombisignaler.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombisignal (elektrisk){}Kombisignalet fungerer både som indgangs- og udgangssignal. Dette muliggør opbygning af store forgreninger af signaler.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Avanceret signal (elektrisk){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Avancerede signaler kan passeres fra bagsiden.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Ensrettet avanceret signal (elektrisk){}Et avanceret signal tillader, at mere en et tog ad gangen kan køre inden for en signalblok, hvis toget kan reservere en rute til et sikkert sted at stoppe. Ensrettede avancerede signaler kan ikke passeres fra bagsiden.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signalkonvertering{}Når denne er valgt, vil klik på et eksisterende signal konvertere det til den valgte signaltype og -variant. CTRL-klik vil skifte den eksisterende signalvariant.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Træk-og-slip signaltæthed
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Formindsk træk-og-slip signaltæthed
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Forøg træk-og-slip signaltæthed
 ########
 
 ############ on screen keyboard
@@ -3586,37 +3586,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Computerspiller-indstillinger
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Vis indstillinger for computerstyrede spillere
 STR_AI_DEBUG                                                    :{WHITE}Computerspiller-debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Navn på computerspilleren
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Navn på computerspilleren
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Genindlæs computerspiller
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Stop computerspilleren, genindlæs scriptet og genstart computerspilleren
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Computerspiller-debugvindue er kun tilgængeligt på serveren
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Stop computerspilleren, genindlæs scriptet og genstart computerspilleren
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Computerspiller-debugvindue er kun tilgængeligt på serveren
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Computerspiller-konfiguration
-STR_AI_CHANGE                                                   :{BLACK}Vælg computerspiller
-STR_AI_CONFIGURE                                                :{BLACK}Konfigurer computerspiller
-STR_AI_CHANGE_TIP                                               :{BLACK}Indlæs en anden computerspiller
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfigurer parametre for computerspiller
-STR_AI_LIST_TIP                                                 :{BLACK}Alle computerstyrede spillere der vil blive indlæst i næste spil
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Vælg computerspiller
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurer computerspiller
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Indlæs en anden computerspiller
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigurer parametre for computerspiller
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alle computerstyrede spillere der vil blive indlæst i næste spil
 STR_AI_LIST_CAPTION                                             :{WHITE}Tilgængelige computerspillere
-STR_AI_AILIST_TIP                                               :{BLACK}Klik for at vælge en computerstyret spiller
-STR_AI_ACCEPT                                                   :{BLACK}Accepter
-STR_AI_ACCEPT_TIP                                               :{BLACK}Vælg markeret computerstyret spiller
-STR_AI_CANCEL                                                   :{BLACK}Afbryd
-STR_AI_CANCEL_TIP                                               :{BLACK}Skift ikke computerstyret spiller
-STR_AI_CLOSE                                                    :{BLACK}Luk
-STR_AI_RESET                                                    :{BLACK}Nulstil
-STR_AI_HUMAN_PLAYER                                             :Menneskelig spiller
-STR_AI_RANDOM_AI                                                :Tilfældig computerspiller
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klik for at vælge en computerstyret spiller
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accepter
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vælg markeret computerstyret spiller
+STR_AI_LIST_CANCEL                                              :{BLACK}Afbryd
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Skift ikke computerstyret spiller
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Luk
+STR_AI_SETTINGS_RESET                                           :{BLACK}Nulstil
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Menneskelig spiller
+STR_AI_CONFIG_RANDOM_AI                                         :Tilfældig computerspiller
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Computerspiller-parametre
-STR_AI_AUTHOR                                                   :{BLACK}Skaber: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Version: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet.
-STR_AI_NO_AI_FOUND                                              :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Contet' systemet.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Skaber: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet.
+STR_ERROR_AI_NO_AI_FOUND                                        :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Contet' systemet.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Støjgrænse i byen: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Genereret støj: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Støjgrænse i byen: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Genereret støj: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3630,21 +3630,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenarie
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Højdekort
 STR_CONTENT_TITLE                                               :{WHITE}Download af indhold
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Indholdstype
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Indholdstype
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Navn
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Navn på indhold
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klik på en linje for at se alle detaljer{}Vælg den vha. afkrydsning til download
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Navn på indhold
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klik på en linje for at se alle detaljer{}Vælg den vha. afkrydsning til download
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Vælg alle
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Vælg alt indhold til download
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Vælg alt indhold til download
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Vælg opdateringer
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Vælg alt indhold, der er opdateringer til eksisterende indhold, til download
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Vælg alt indhold, der er opdateringer til eksisterende indhold, til download
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Fravælg alle
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Fravælg alt indhold fra download
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Fravælg alt indhold fra download
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Indtast filter-udtryk
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Indtast nøgleord til at filtrere listen efter
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Indtast nøgleord til at filtrere listen efter
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag/navngiv filter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Download
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Download det valgte indhold
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Download det valgte indhold
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total størrelse af download: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INDHOLDSINFO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Du har ikke valgt denne til download
@@ -3677,6 +3677,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kunne ik
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Tjek onlineindhold
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tjek for nyt og opdateret indhold til download
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Find manglende indhold online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Tjek om det manglende indhold kan findes online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Find manglende indhold online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Tjek om det manglende indhold kan findes online
 ########
diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt
index 16f270c05..12b0d263d 100644
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@@ -118,7 +118,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} toffee
 STR_QUANTITY_BATTERIES                                          :{COMMA} batterij{P "" en}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} plastic
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} blikje{P "" s} frisdrank
-STR_CARGO_N_A                                                   :NVT.{SKIP}
+STR_QUANTITY_N_A                                                :NVT.{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -208,26 +208,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Selecteer sorteerrichting (aflopend/oplopend)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecteer sorteringscriteria
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Kies filter criteria
-STR_SORT_BY                                                     :{BLACK}Sorteer op
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selecteer sorteerrichting (aflopend/oplopend)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selecteer sorteringscriteria
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Kies filter criteria
+STR_BUTTON_SORT_BY                                              :{BLACK}Sorteer op
 STR_BUTTON_LOCATION                                             :{BLACK}Locatie
-STR_QUERY_RENAME                                                :{BLACK}Hernoem
+STR_BUTTON_RENAME                                               :{BLACK}Hernoem
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Sluit venster
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vensternaam - sleep om venster te verplaatsen
-STR_STICKY_BUTTON                                               :{BLACK}Markeer dit venster als niet-sluitbaar door de 'Sluit alle vensters'-knop
-STR_RESIZE_BUTTON                                               :{BLACK}Klik en sleep om dit venster van grootte te veranderen
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Schakel tussen groot/klein venster
+STR_TOOLTIP_STICKY                                              :{BLACK}Markeer dit venster als niet-sluitbaar door de 'Sluit alle vensters'-knop
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik en sleep om dit venster van grootte te veranderen
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Schakel tussen groot/klein venster
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scrollbalk - scroll door de lijst
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Schuifbalk - verschuift de lijst naar links/rechts
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Sloop gebouwen etc. op een stuk land
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Standaard
-STR_QUERY_CANCEL                                                :{BLACK}Annuleren
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Standaard
+STR_BUTTON_CANCEL                                               :{BLACK}Annuleren
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -316,7 +316,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Plaats b
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Scenario opslaan
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Scenario openen
-STR_MENU_LOAD_HEIGHTMAP                                         :Laad hoogtekaart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Laad hoogtekaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sluit editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Afsluiten
@@ -504,11 +504,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Schakel grafiek voor vrachttype aan/uit
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Toon gedetaileerde prestatiewaarderingen
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Toon gedetaileerde prestatiewaarderingen
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legenda voor bedrijfsgrafieken
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klik hier om dit bedrijf weer te geven of te verbergen op de grafiek
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik hier om dit bedrijf weer te geven of te verbergen op de grafiek
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Bedrijfscompetitietabel
@@ -543,16 +543,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Geld:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Lening:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totaal:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Aantal voertuigen. Dit is inclusief wegvoertuigen, treinen, schepen en vliegtuigen.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Aantal stationsonderdelen. Elke deel van een station (b.v. trein station, bushalte, vliegveld) wordt geteld, zelfs als deze zijn verbonden met een station.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}De winst van de voertuigen met het laagste inkomen (van alle voertuigen ouder dan 2 jaar)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Het hoeveelheid aan geld dat is verdient in de maand met de laagste winst van de afgelopen 12 kwartalen
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Het hoeveelheid aan geld dat is verdient in de maand met de hoogste winst van de afgelopen 12 kwartalen
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Het aantal eenheden aan goederen dat is bezorgd in de afgelopen vier kwartalen.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Typen goederen dat zijn bezorgd in het laatste kwartaal.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Hoeveelheid contant geld
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}De hoeveelheid geld die dit bedrijf leent
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Totaal aantal punten uit de mogelijke punten
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Aantal voertuigen. Dit is inclusief wegvoertuigen, treinen, schepen en vliegtuigen.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Aantal stationsonderdelen. Elke deel van een station (b.v. trein station, bushalte, vliegveld) wordt geteld, zelfs als deze zijn verbonden met een station.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}De winst van de voertuigen met het laagste inkomen (van alle voertuigen ouder dan 2 jaar)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Het hoeveelheid aan geld dat is verdient in de maand met de laagste winst van de afgelopen 12 kwartalen
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Het hoeveelheid aan geld dat is verdient in de maand met de hoogste winst van de afgelopen 12 kwartalen
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Het aantal eenheden aan goederen dat is bezorgd in de afgelopen vier kwartalen.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Typen goederen dat zijn bezorgd in het laatste kwartaal.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Hoeveelheid contant geld
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}De hoeveelheid geld die dit bedrijf leent
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Totaal aantal punten uit de mogelijke punten
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jazz jukebox
@@ -670,8 +670,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Plaatsna
 STR_SMALLMAP_CENTER                                             :{BLACK}Centreer de kleine kaart op huidige positie
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Alles uitschakelen
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Alles inschakelen
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Alles uitschakelen
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Alles inschakelen
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Laat laatste (nieuws)bericht zien
@@ -682,8 +682,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SPEL
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Berichtgeschiedenis
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Een lijst met recente nieuwsberichten
-STR_NEWS_MESSAGE                                                :{STRING} - {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Een lijst met recente nieuwsberichten
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING} - {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Bericht
@@ -917,32 +917,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selectee
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ontbrekend/corrupt bestand{P "" en}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Aanvullende informatie over de basis graphics set
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Modus volledigscherm is mislukt
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Modus volledigscherm is mislukt
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Aangepaste valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wisselkoers: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Verlaag de wisselkoers van jouw munteenheid ten opzicht van de Pond (£) met één
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Verhoog de wisselkoers van jouw munteenheid ten opzicht van de Pond (£) met één
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Stel de wisselkoers in van jouw munteenheid ten opzichte van de Pond (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Verlaag de wisselkoers van jouw munteenheid ten opzicht van de Pond (£) met één
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Verhoog de wisselkoers van jouw munteenheid ten opzicht van de Pond (£) met één
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Stel de wisselkoers in van jouw munteenheid ten opzichte van de Pond (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Scheidingsteken: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Stel het scheidings tekens in voor jouw munteenheid
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Stel het scheidings tekens in voor jouw munteenheid
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Voorvoegsel: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Stel het voorloopteken in voor jouw munteenheid
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Stel het voorloopteken in voor jouw munteenheid
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Achtervoegsel: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Stel het eindteken in voor jouw munteenheid
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Stel het eindteken in voor jouw munteenheid
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Overgaan op de Euro: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Overgaan op de Euro: {ORANGE}nooit
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Stel het jaar in waarop de Euro wordt geïntroduceerd
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Eerder naar de Euro
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Later naar de Euro
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Stel het jaar in waarop de Euro wordt geïntroduceerd
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Eerder naar de Euro
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Later naar de Euro
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Voorbeeld: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pound (£) in jouw munteenheid
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pound (£) in jouw munteenheid
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Verander aangepaste valuta optie
 
 # Difficulty level window
@@ -956,7 +956,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Aangepas
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Bekijk topscore lijst
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Opslaan
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Opslaan
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Maximaal aantal tegenstanders: {ORANGE}{COMMA}
@@ -1022,7 +1022,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Tolerant
 STR_CITY_APPROVAL_TOLERANT                                      :Neutraal
 STR_CITY_APPROVAL_HOSTILE                                       :Negatief
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Deze actie past de moeilijkheidsgraad aan naar custom
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Deze actie past de moeilijkheidsgraad aan naar custom
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Geavanceerde instellingen
@@ -1271,7 +1271,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Niet
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}X-grootte van de kaart: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-grootte van de kaart: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Verander waarde
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Verander waarde
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1313,9 +1313,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Verlaat
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Afsluiten
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Weet je zeker dat je dit spel wilt verlaten en terug wilt keren naar {STRING}?
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nee
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Weet je zeker dat je dit spel wilt verlaten en terug wilt keren naar {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nee
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1331,11 +1331,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Verlaat spel
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Weet je zeker dat je dit spel wilt afsluiten?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Weet je zeker dat je dit scenario wilt sluiten?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Weet je zeker dat je dit scenario wilt sluiten?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Cheats
-STR_CHEATS_TIP                                                  :{BLACK}Keuzevakjes geven aan of je deze cheat al ooit gebruikt hebt.
+STR_CHEATS_TOOLTIP                                              :{BLACK}Keuzevakjes geven aan of je deze cheat al ooit gebruikt hebt.
 STR_CHEATS_WARNING                                              :{BLACK}Waarschuwing! Je staat op het punt je concurrenten te verraden. Bedenk dat zo'n schande eeuwig wordt onthouden.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Verhoog geld met {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spelen als bedrijf: {ORANGE}{COMMA}
@@ -1344,24 +1344,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bouwen in gepauzeerde toestand: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jet vliegtuigen storten niet (vaak) neer op kleine vliegvelden: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Verander klimaat: {ORANGE}{STRING}
-STR_TEMPERATE_LANDSCAPE                                         :gematigd landschap
-STR_SUB_ARCTIC_LANDSCAPE                                        :subarctisch landschap
-STR_SUB_TROPICAL_LANDSCAPE                                      :subtropisch landschap
-STR_TOYLAND_LANDSCAPE                                           :Speelgoedlandschap
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :gematigd landschap
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :subarctisch landschap
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :subtropisch landschap
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Speelgoedlandschap
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Verander datum: {ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Sta aanpassen productiewaarden toe: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nieuw kleurenschema
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Laat de algemene kleurschema's zien
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Laat trein kleurschema's zien
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Laat wegvoertuig kleurschema's zien
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Laat schip kleurschema's zien
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Laat de vliegtuig kleurschema's zien
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Kies de hoofdkleur voor het geselecteerde schema
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Kies de tweede kleur voor het geselecteerde schema
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Kies een kleurschema om te wijzigen, of meerdere schema's met Ctrl+klik. Klik in het venster het gebruik van het kleurschema te kiezen
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Laat de algemene kleurschema's zien
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Laat trein kleurschema's zien
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Laat wegvoertuig kleurschema's zien
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Laat schip kleurschema's zien
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Laat de vliegtuig kleurschema's zien
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Kies de hoofdkleur voor het geselecteerde schema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Kies de tweede kleur voor het geselecteerde schema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Kies een kleurschema om te wijzigen, of meerdere schema's met Ctrl+klik. Klik in het venster het gebruik van het kleurschema te kiezen
 
 STR_LIVERY_DEFAULT                                              :Standaard Logo
 STR_LIVERY_STEAM                                                :Stoom Locomotief
@@ -1399,19 +1399,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Selectee
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nieuw gezicht
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Genereer willekeurig nieuw gezicht
 STR_FACE_ADVANCED                                               :{BLACK}Geavanceerd
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Geavanceerde gezichtskeuze
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Geavanceerde gezichtskeuze
 STR_FACE_SIMPLE                                                 :{BLACK}Eenvoudig
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Eenvoudige gezichtskeuze.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Eenvoudige gezichtskeuze.
 STR_FACE_LOAD                                                   :{BLACK}Laden
-STR_FACE_LOAD_TIP                                               :{BLACK}Laad favoriet gezicht
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Laad favoriet gezicht
 STR_FACE_LOAD_DONE                                              :{WHITE}Je favoriete gezicht op geladen van het OpenTTD configuratie bestand.
 STR_FACE_FACECODE                                               :{BLACK}Speler gezichtsnummer.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Bekijk en/of bewaar spelers gezichtsnummer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Bekijk en/of bewaar spelers gezichtsnummer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Bekijken en/of bewaar gezichtnummer
 STR_FACE_FACECODE_SET                                           :{WHITE}Nieuw gezicht nummercode is opgeslagen.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kon gezichtsnummer niet bewaren - het moet een nummer zijn tussen 0 en 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Opslaan
-STR_FACE_SAVE_TIP                                               :{BLACK}Sla favoriet gezicht op
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Sla favoriet gezicht op
 STR_FACE_SAVE_DONE                                              :{WHITE}Dit gezicht wordt zal worden opgeslagen als jouw favoriet in het OpenTTD configuratie bestand.
 STR_FACE_EUROPEAN                                               :{BLACK}Europeaan
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Kies europeaans gezicht
@@ -1419,120 +1419,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Africaan
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Kies africaans gezicht
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nee
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Activeer snor of oorbel
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Activeer snor of oorbel
 STR_FACE_HAIR                                                   :Haar:
-STR_FACE_HAIR_TIP                                               :{BLACK}Verander haar
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Verander haar
 STR_FACE_EYEBROWS                                               :Wenkbrauwen:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Verander wenkbrauwen
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Verander wenkbrauwen
 STR_FACE_EYECOLOUR                                              :Kleur ogen
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Verander kleur ogen
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Verander kleur ogen
 STR_FACE_GLASSES                                                :Bril:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Brillen aan
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Verander bril
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Brillen aan
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Verander bril
 STR_FACE_NOSE                                                   :Neus:
-STR_FACE_NOSE_TIP                                               :{BLACK}Verander neus
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Verander neus
 STR_FACE_LIPS                                                   :Lippen:
 STR_FACE_MOUSTACHE                                              :Snor:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Verander lippen of snor
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Verander lippen of snor
 STR_FACE_CHIN                                                   :Kin:
-STR_FACE_CHIN_TIP                                               :{BLACK}Verander kin
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Verander kin
 STR_FACE_JACKET                                                 :Jas:
-STR_FACE_JACKET_TIP                                             :{BLACK}Verander jas
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Verander jas
 STR_FACE_COLLAR                                                 :Kraag:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Verander kraag
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Verander kraag
 STR_FACE_TIE                                                    :Stropdas:
 STR_FACE_EARRING                                                :Oorbel:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Verander das of oorbel
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Verander das of oorbel
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Netwerkspel
-STR_NETWORK_CONNECTION                                          :{BLACK}Verbinding:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Kies tussen een internet spel of een lokaal netwerk spel
-STR_NETWORK_LAN                                                 :Netwerk
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spelernaam:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Dit is de naam waarmee andere spelers je herkennen
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Naam
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Naam van het spel
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Spelers
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spelers online / spelers maximaal{}Bedrijven online / bedrijven maximaal
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kaart grootte
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kaart grootte van het spel{}Klik om te sorteren per gebied
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Huidige datum
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jaren
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Aantal jaren{}het spel draait
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Taal, serverversie, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klik op een spel uit de lijst om deze te selecteren
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}De server waarmee je het laatste verbonden was:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klik om de server te selecteren waar je het laatste op hebt gespeeld
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPEL INFORMATIE
-STR_NETWORK_CLIENTS                                             :{SILVER}Spelers: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Taal: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klimaat: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgrootte: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server versie: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server adres: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Huidige datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Beveiligd met wachtwoord!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ANDERE VERSIE
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NIET GELIJK
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Meespelen
-STR_NETWORK_REFRESH                                             :{BLACK}Ververs server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Ververs de informatie over deze server
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Server zoeken
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Zoeken naar een netwerkserver
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Voeg server toe
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Voegt een server toe aan de lijst die altijd gecontroleerd zal worden op draaiende spellen.
-STR_NETWORK_START_SERVER                                        :{BLACK}Start server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start eigen server
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Vul je naam in
-STR_NETWORK_ENTER_IP                                            :{BLACK}IP adres van de server invoeren
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Netwerkspel
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Verbinding:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Kies tussen een internet spel of een lokaal netwerk spel
+STR_NETWORK_SERVER_LIST_LAN                                     :Netwerk
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spelernaam:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dit is de naam waarmee andere spelers je herkennen
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Naam
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Naam van het spel
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Spelers
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Spelers online / spelers maximaal{}Bedrijven online / bedrijven maximaal
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kaart grootte
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kaart grootte van het spel{}Klik om te sorteren per gebied
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Huidige datum
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Jaren
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Aantal jaren{}het spel draait
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Taal, serverversie, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klik op een spel uit de lijst om deze te selecteren
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}De server waarmee je het laatste verbonden was:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klik om de server te selecteren waar je het laatste op hebt gespeeld
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPEL INFORMATIE
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Spelers: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Taal: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Klimaat: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kaartgrootte: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Server versie: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Server adres: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Huidige datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Beveiligd met wachtwoord!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER VOL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}ANDERE VERSIE
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF NIET GELIJK
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Meespelen
+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}Zoeken naar een netwerkserver
+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
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start eigen server
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Vul je naam in
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}IP adres van de server invoeren
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start nieuw spel
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spelnaam:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}De spelnaam wordt weergegeven aan andere spelers in het multiplayer spelselectie menu
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Zet wachtwoord
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Bescherm je spel met een wachtwoord als je niet wil dat andere mensen meespelen
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selecteer een kaart:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Op welke kaart wil je spelen?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Genereer willekeurig nieuw spel
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (adverteren)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} speler{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maximaal aantal spelers:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Kies een maximaal aantal toegestane spelers. Niet alle posities hoeven gebruikt te worden.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} bedr{P ijf ijven}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max bedrijven:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Beperk de server tot een bepaald aantal bedrijven
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} toeschouwer{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max toeschouwers:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Beperk de server tot een bepaald aantal toeschouwers
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Gesproken taal:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Andere spelers zullen weten welke taal er wordt gesproken op de server.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Start spel
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Start een nieuw netwerkspel van een willekeurige kaart, of scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Laad spel
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Hervat een eerder opgeslagen netwerkspel (ben er zeker van dat je verbind als de juiste speler)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Geef de naam van het netwerk spel
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start nieuw spel
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spelnaam:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}De spelnaam wordt weergegeven aan andere spelers in het multiplayer spelselectie menu
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Zet wachtwoord
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Bescherm je spel met een wachtwoord als je niet wil dat andere mensen meespelen
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Selecteer een kaart:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Op welke kaart wil je spelen?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Genereer willekeurig nieuw spel
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (adverteren)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} speler{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maximaal aantal spelers:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Kies een maximaal aantal toegestane spelers. Niet alle posities hoeven gebruikt te worden.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} bedr{P ijf ijven}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max bedrijven:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Beperk de server tot een bepaald aantal bedrijven
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} toeschouwer{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max toeschouwers:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Beperk de server tot een bepaald aantal toeschouwers
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Gesproken taal:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Andere spelers zullen weten welke taal er wordt gesproken op de server.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start spel
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Start een nieuw netwerkspel van een willekeurige kaart, of scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Laad spel
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Hervat een eerder opgeslagen netwerkspel (ben er zeker van dat je verbind als de juiste speler)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Geef de naam van het netwerk spel
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1575,32 +1575,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Lets
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer lobby
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Klaar om deel te nemen: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Een lijst met alle bedrijven die momenteel in dit spel bestaan. Je kan meedoen met een bestaand bedrijf of een nieuw bedrijf beginnen.
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}BEDRIJFSINFORMATIE
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Bedrijfsnaam: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Begonnen in: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Bedrijfswaarde: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Huidige kas: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inkomen vorig jaar: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestatie: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Voertuigen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spelers: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nieuw bedrijf
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Start een nieuw bedrijf
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Bekijk spel
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Bekijk het spel als een toeschouwer
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Dit bedrijf
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Help met het beheren van dit bedrijf
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Multiplayer lobby
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Klaar om deel te nemen: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Een lijst met alle bedrijven die momenteel in dit spel bestaan. Je kan meedoen met een bestaand bedrijf of een nieuw bedrijf beginnen.
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}BEDRIJFSINFORMATIE
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Bedrijfsnaam: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Begonnen in: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Bedrijfswaarde: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Huidige kas: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Inkomen vorig jaar: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Prestatie: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Voertuigen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spelers: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nieuw bedrijf
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Start een nieuw bedrijf
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Bekijk spel
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Bekijk het spel als een toeschouwer
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Dit bedrijf
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Help met het beheren van dit bedrijf
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Verbinden...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Verbinden...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Verbinden...
@@ -1616,13 +1616,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Ophalen
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} speler{P "" s} voor ons
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} opgehaald
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Verbreek verbinding
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Verbreek verbinding
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is beveiligd. Voer wachtwoord in.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Bedrijf is beveiligd. Voer wachtwoord in.
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Spelerslijst
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spelerslijst
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Kijk toe
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nieuw bedrijf
 
@@ -1644,18 +1644,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Geef de
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Sla het ingegeven wachtwoord niet op
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Geef het bedrijf het nieuwe wachtwoord
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Bedrijfswachtwoord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standaard bedrijfswachtwoord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Gebruik dit bedrijfswachtwoord als standaard voor nieuwe bedrijven
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standaard bedrijfswachtwoord
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Gebruik dit bedrijfswachtwoord als standaard voor nieuwe bedrijven
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Doe mee
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Doe mee en speel als dit bedrijf
-STR_COMPANY_PASSWORD                                            :{BLACK}Wachtwoord
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Bescherm het bedrijf met een wachtwoord zodat niet geautoriseerde personen niet mee kunnen doen.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Geef bedrijfswachtwoord op
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Doe mee
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Doe mee en speel als dit bedrijf
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Wachtwoord
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Bescherm het bedrijf met een wachtwoord zodat niet geautoriseerde personen niet mee kunnen doen.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Geef bedrijfswachtwoord op
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Verstuur
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Verstuur
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Prive] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Iedereen] :
@@ -1668,40 +1668,40 @@ STR_NETWORK_CHAT_ALL                                            :[Iedereen] {STR
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Heef de tekst voor de netwerk-chat
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Geen netwerkapparaten gevonden of gecompileerd zonder ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kon geen enkel netwerkspel vinden
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}De server beantwoorde het verzoek niet
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kan geen verbinding maken, je hebt niet dezelfde NewGRF files als de server
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Netwerkspel synchronisatie mislukt.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Netwerkspel verbinding kwijt
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kon server-opgeslagen spel niet laden
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kan server niet starten
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kan geen verbinding maken
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Verbinding #{NUM} duurde te lang
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Er is een protocolfout gemaakt en onze verbinding is gesloten
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}De revisie van deze client komt niet overeen met de revisie van de server
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Ongeldig wachtwoord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}De server is vol
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Je bent verbannen van deze server
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Je bent van de server geschopt
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Vals spelen is niet toegestaan op deze server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Geen netwerkapparaten gevonden of gecompileerd zonder ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Kon geen enkel netwerkspel vinden
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}De server beantwoorde het verzoek niet
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Kan geen verbinding maken, je hebt niet dezelfde NewGRF files als de server
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Netwerkspel synchronisatie mislukt.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Netwerkspel verbinding kwijt
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Kon server-opgeslagen spel niet laden
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Kan server niet starten
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Kan geen verbinding maken
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Verbinding #{NUM} duurde te lang
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Er is een protocolfout gemaakt en onze verbinding is gesloten
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}De revisie van deze client komt niet overeen met de revisie van de server
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Ongeldig wachtwoord
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}De server is vol
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Je bent verbannen van deze server
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Je bent van de server geschopt
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Vals spelen is niet toegestaan op deze server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :algemene fout
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desynchronisatie fout
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kan kaart niet laden
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :verbinding verbroken
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol fout
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Niet gelijke NewGRF instelling
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :niet toegestaan
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :raar pakket ontvangen
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :foute revisie
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :naam al in gebruik
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :fout spel-wachtwoord
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :verkeerde bedrijfs-id in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :geschopt door server
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :probeerde vals te spelen
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server is vol
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemene fout
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desynchronisatie fout
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :kan kaart niet laden
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :verbinding verbroken
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protocol fout
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Niet gelijke NewGRF instelling
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :niet toegestaan
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :raar pakket ontvangen
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :foute revisie
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :naam al in gebruik
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :fout spel-wachtwoord
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :verkeerde bedrijfs-id in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :geschopt door server
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :probeerde vals te spelen
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server is vol
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1713,36 +1713,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spel gepauzeerd
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spel hervat (client verbonden)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spel hervat (client kon geen verbinding maken)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :vertrekt
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} heeft zich bij het spel gevoegd
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} heeft zich gevoegd bij bedrijf #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} kijkt nu toe
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} heeft een nieuw bedrijf opgericht (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} heeft het spel verlaten ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} heeft zijn/haar naam gewijzigd naar {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gaf je bedrijf {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Je gaf {2:CURRENCY} aan {1:STRING}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} De server heeft de sessie gestopt.
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} De server wordt opnieuw gestart...{}Wacht aub...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :vertrekt
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} heeft zich bij het spel gevoegd
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} heeft zich gevoegd bij bedrijf #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} kijkt nu toe
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} heeft een nieuw bedrijf opgericht (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} heeft het spel verlaten ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} heeft zijn/haar naam gewijzigd naar {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gaf je bedrijf {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Je gaf {2:CURRENCY} aan {1:STRING}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} De server heeft de sessie gestopt.
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} De server wordt opnieuw gestart...{}Wacht aub...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Download extra content
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type van de gegevens
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Type van de gegevens
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Naam
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Naam van de gegevens
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klik op een lijn voor details{}Gebruik het selectievak om te selecteren voor downloaden
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Naam van de gegevens
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klik op een lijn voor details{}Gebruik het selectievak om te selecteren voor downloaden
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Selecteer alles
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Laat alle content downloaden
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Laat alle content downloaden
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Selecteer updates
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Markeer alle updates voor bestaande content om te downloaden
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Markeer alle updates voor bestaande content om te downloaden
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Deselecteer alles
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Laat alle content niet downloaden
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Laat alle content niet downloaden
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Geef het filter op
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Geef een woord waarop gefilters kan worden in de lijst
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Geef een woord waarop gefilters kan worden in de lijst
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag/naam filter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Download
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Start downloaden van geselecteerde gegevens
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Start downloaden van geselecteerde gegevens
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Totale download grootte: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}GEGEVENS INFO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Je hebt gekozen dit niet te downloaden
@@ -1786,17 +1786,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... best
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kon binnengehaald bestand niet uitpakken
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Doorzichtigheidsopties
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Wissel doorzichtigheid voor stationsnamen. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Wissel doorzichtigheid voor bomen. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Wissel doorzichtigheid voor huizen. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Wissel doorzichtigheid voor industrieën. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Wissel doorzichtigheid voor gebouwen zoals stations, depots en controleposten. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Wissel doorzichtigheid voor bruggen. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Wissel doorzichtigheid voor structuren zoals vuurtoren en antennes. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Doorzichtigheid voor bovenleiding. Ctrl+klik voor onthouden.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Wissel doorzichtigheid voor laad indicatoren. Ctrl+Klik om vast te zetten.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Zet object op onzichtbaar in plaats van doorzichtig
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Doorzichtigheidsopties
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Wissel doorzichtigheid voor stationsnamen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Wissel doorzichtigheid voor bomen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Wissel doorzichtigheid voor huizen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Wissel doorzichtigheid voor industrieën. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Wissel doorzichtigheid voor gebouwen zoals stations, depots en controleposten. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Wissel doorzichtigheid voor bruggen. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Wissel doorzichtigheid voor structuren zoals vuurtoren en antennes. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Doorzichtigheid voor bovenleiding. Ctrl+klik voor onthouden.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Wissel doorzichtigheid voor laad indicatoren. Ctrl+Klik om vast te zetten.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Zet object op onzichtbaar in plaats van doorzichtig
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Dekkingsgebied markeren
@@ -1808,11 +1808,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Acceptee
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Bied aan: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Station samenvoegen
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Bouw een losstaand station
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Station samenvoegen
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Bouw een losstaand station
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Controlepost samenvoegen
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Bouw een losstaande controlepost
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Controlepost samenvoegen
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Bouw een losstaande controlepost
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Spoorwegconstructie
@@ -1836,8 +1836,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Treindep
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecteer richting van treindepot
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Controlepost
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selecteer controlepost type
+STR_WAYPOINT_CAPTION                                            :{WHITE}Controlepost
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Selecteer controlepost type
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Station selectie
@@ -1850,36 +1850,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Selectee
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Slepen
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bouw een station door te slepen
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecteer een stationtype
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecteer het type station om te bouwen
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Selecteer een stationtype
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Selecteer het type station om te bouwen
 
-STR_STAT_CLASS_DFLT                                             :Standaard station
-STR_STAT_CLASS_WAYP                                             :Controleposten
+STR_STATION_CLASS_DFLT                                          :Standaard station
+STR_STATION_CLASS_WAYP                                          :Controleposten
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Sein keuze
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standaard sein (semafoor){}Seinen zijn nodig om te voorkomen dat treinen botsen bij een netwerk met meer dan een trein.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Beginsein (semafoor){}Groen zolang als er een of meer groene uitgangsseinen zijn volgend na dit sein. Anders is deze rood.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Uitgangssein (semafoor){}Gedraagt zich hetzelfde als een gewoon sein, maar is nodig om ingangs- en combinatie-seinen te sturen.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combinatiesein (semafoor){}Het combinatiesein gedraagt zicht als zowel Ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Pbs seinen (semafoor){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Pbs seinen kunnen van achteren worden gepasseerd.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Eenrichtings pbs seinen (semafoor){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings pbs seinen kunnen niet van achteren worden gepasseerd.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standaard sein (elektrisch){}Seinen zijn nodig om te voorkomen dat treinen botsen bij netwerken met meer dan een trein.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Ingangssein (electric){}Groen wanneer er meer dan een groen exit-sein is in het volgende traject. Anders is deze rood.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Uitgangssein (elektrisch){}Gedraagt zich hetzelfde als een standaard sein, maar is nodig om ingangs- & combinatie-seinen aan te sturen.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combinatiesein (electric){}Het combinatiesein gedraagt zicht als zowel ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Pbs seinen (elektrisch){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Pbs seinen kunnen van achteren worden gepasseerd.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Eenrichtings pbs seinen (elektrisch){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings pbs seinen kunnen niet van achteren worden gepasseerd.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Sein ombouwen{}Wanneer geselecteerd, door te klikken op een bestaand seintype, zal het sein worden omgebouwd naar het geselecteerde seintype en varianten, Ctrl+klik schakelt tussen de bestaande varianten.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Sleep-sein dichtheid
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Verklein sleep-sein dichtheid
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Vergroot sleep-sein dichtheid
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Sein keuze
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standaard sein (semafoor){}Seinen zijn nodig om te voorkomen dat treinen botsen bij een netwerk met meer dan een trein.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Beginsein (semafoor){}Groen zolang als er een of meer groene uitgangsseinen zijn volgend na dit sein. Anders is deze rood.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Uitgangssein (semafoor){}Gedraagt zich hetzelfde als een gewoon sein, maar is nodig om ingangs- en combinatie-seinen te sturen.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combinatiesein (semafoor){}Het combinatiesein gedraagt zicht als zowel Ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Pbs seinen (semafoor){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Pbs seinen kunnen van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Eenrichtings pbs seinen (semafoor){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings pbs seinen kunnen niet van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standaard sein (elektrisch){}Seinen zijn nodig om te voorkomen dat treinen botsen bij netwerken met meer dan een trein.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Ingangssein (electric){}Groen wanneer er meer dan een groen exit-sein is in het volgende traject. Anders is deze rood.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Uitgangssein (elektrisch){}Gedraagt zich hetzelfde als een standaard sein, maar is nodig om ingangs- & combinatie-seinen aan te sturen.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combinatiesein (electric){}Het combinatiesein gedraagt zicht als zowel ingangs- als uitgangs-sein. Zo kun je grote netwerken van beginseinen maken.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Pbs seinen (elektrisch){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Pbs seinen kunnen van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Eenrichtings pbs seinen (elektrisch){}Een pbs sein laat het toe meer dan een trein op een seinblok tegelijk, als de trein een route kan reserveren naar een veilige stopplaats. Eenrichtings pbs seinen kunnen niet van achteren worden gepasseerd.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Sein ombouwen{}Wanneer geselecteerd, door te klikken op een bestaand seintype, zal het sein worden omgebouwd naar het geselecteerde seintype en varianten, Ctrl+klik schakelt tussen de bestaande varianten.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Sleep-sein dichtheid
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Verklein sleep-sein dichtheid
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Vergroot sleep-sein dichtheid
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Kies spoorbrug
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Kies brug
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brugkeuze - klik op de gewenste brug om die te bouwen
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brugkeuze - klik op de gewenste brug om die te bouwen
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hangbrug, Staal
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Vlak, Staal
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Cantilever, Staal
@@ -1913,9 +1913,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Schakela
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Garage richting
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Selecteer richting van garage
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecteer richting van garage
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Tramdepot richting
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Selecteer richting van tramdepot
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecteer richting van tramdepot
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bushalte richting
@@ -1936,8 +1936,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Bouw dok
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Bouw dok
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plaats boei, kan gebruikt worden voor extra tussenstops
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bouw aquaduct
-STR_CREATE_LAKE                                                 :{BLACK}Definieer water gebied.{}Maak een kanaal, tenzij Ctrl wordt vastgehouden op zee niveau, dan zal de omgeving overstromen
-STR_CREATE_RIVER                                                :{BLACK}Maak rivier.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definieer water gebied.{}Maak een kanaal, tenzij Ctrl wordt vastgehouden op zee niveau, dan zal de omgeving overstromen
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Maak rivier.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Dok richting
@@ -1969,20 +1969,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Grote vl
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Centraal vliegveld
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopter vliegveld
 
-STR_STATION_NOISE                                               :{BLACK}Genereert geluid: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Genereert geluid: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreinvorming
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Verlaag een hoek van het land
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Verhoog een hoek van het land
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Landhoogte gelijk maken
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Koop land voor toekomstig gebruik
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Verlaag een hoek van het land
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Verhoog een hoek van het land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Landhoogte gelijk maken
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Koop land voor toekomstig gebruik
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Bomen
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Kies een boom om te planten
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Willekeurige boomsoorten
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plant bomen van willekeurig type
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plant bomen van willekeurig type
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Willekeurige bomen
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Verspreid bomen willekeurig over de kaart
 
@@ -1995,9 +1995,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Plaats r
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Vergroot het stuk land om te verhogen/verlagen
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Verklein het stuk land om te verhogen/verlagen
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Genereer willekeurig land
-STR_SE_NEW_WORLD                                                :{BLACK}Maak nieuw scenario aan
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Maak nieuw scenario aan
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Verwijder landschap
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Verwijderd alle eigendommen van een speler van de kaart
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Verwijderd alle eigendommen van een speler van de kaart
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Verwijder landschap
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Weet je zeker dat je alle eigendommen van een speler van de kaart wilt verwijderen?
@@ -2008,41 +2008,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nieuw do
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Bouw nieuw dorp
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Willekeurige dorp
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Bouw dorp op willekeurige locatie
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Veel willekeurige steden
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Bedek de kaart met willekeurig geplaatste steden
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Veel willekeurige steden
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Bedek de kaart met willekeurig geplaatste steden
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Stadsgrootte:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Klein
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Middelmatig
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Groot
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Willekeurig
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Willekeurig
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Kies dorpsgrootte
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Steden groeien sneller dan gewone dorpen{}Afhankelijk van instellingen, zijn ze groter als ze gemaakt worden
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Wegpatroon
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selecteer het wegpatroon voor deze stad
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Origineel
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Verbeterd
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 raster
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 raster
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Willekeurig
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Wegpatroon
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selecteer het wegpatroon voor deze stad
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Origineel
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Verbeterd
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 raster
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 raster
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Willekeurig
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Betaal nieuwe industrie
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Kies de aangewezen industrie van de lijst
-STR_MANY_RANDOM_INDUSTRIES                                      :Veel willekeurige industrieën
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Bedek de kaart met willekeurig geplaatste industrieën
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kosten: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Onderzoek
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bouw
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Investeer
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Kies de aangewezen industrie van de lijst
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Veel willekeurige industrieën
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Bedek de kaart met willekeurig geplaatste industrieën
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kosten: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Onderzoek
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bouw
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Investeer
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Landinformatie
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Sloopkosten: {LTBLUE}niet mogelijk
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Sloopkosten: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Omzet na verwijdering: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Omzet na verwijdering: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :(geen)
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigenaar: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Weg eigenaar: {LTBLUE}{STRING}
@@ -2050,104 +2050,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Tramspoo
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Spoor eigenaar: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Gemeente: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Geen
-STR_LANDINFO_COORDS                                             :{BLACK}Coördinaten: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Bouwjaar: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stationklasse: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Station type: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coördinaten: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Bouwjaar: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stationklasse: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Station type: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Geaccepteerde goederen: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rotsen
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Ruw land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Onbegroeid land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gras
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Akkers
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Sneeuw
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Woestijn
-
-STR_RAILROAD_TRACK                                              :Spoor
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Spoor met normale seinen
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Spoor met begin-seinen
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Spoor met uitgangseinen
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Spoor met combinatieseinen
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Spoor met pbs-seinen
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Spoor met eenrichtings-pbs seinen
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Spoor met normale en begin-seinen
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Spoor met nromale en uitgangs-signalen
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Spoor met normale en combinatie-signalen
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Treinrails met normale en pbs-seinen
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Treinrails met normale en eenrichtings pbs-seinen
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Spoor met begin- en uitgangs- signalen
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Spoor met begin- en combinatie- signalen
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Treinrails met begin- en pbs-seinen
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Treinrails met begin- en eenrichtings pbs- seinen
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Spoor met uitgangs- en combinatie- signalen
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Treinrails met uitgangs- en pbs-seinen
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Treinrails met begin- en eenrichtings pbs seinen
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Treinrails met combinatie- en pbs- seinen
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Treinrails met combinatie- en eenrichtings pbs seinen
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Treinrails met pbs en eenrichtings pbs seinen
-STR_RAILROAD_TRAIN_DEPOT                                        :Treindepot
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Weg
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Weg met straatlantaarns
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Weg met bomenrij
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garage
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Gelijke weg/spoorweg kruising
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramspoor
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rotsen
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Ruw land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Onbegroeid land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Akkers
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Sneeuw
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Woestijn
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Spoor
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Spoor met normale seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Spoor met begin-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Spoor met uitgangseinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Spoor met combinatieseinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Spoor met pbs-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Spoor met eenrichtings-pbs seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Spoor met normale en begin-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Spoor met nromale en uitgangs-signalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Spoor met normale en combinatie-signalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Treinrails met normale en pbs-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Treinrails met normale en eenrichtings pbs-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Spoor met begin- en uitgangs- signalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Spoor met begin- en combinatie- signalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Treinrails met begin- en pbs-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Treinrails met begin- en eenrichtings pbs- seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Spoor met uitgangs- en combinatie- signalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Treinrails met uitgangs- en pbs-seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Treinrails met begin- en eenrichtings pbs seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Treinrails met combinatie- en pbs- seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Treinrails met combinatie- en eenrichtings pbs seinen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Treinrails met pbs en eenrichtings pbs seinen
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Treindepot
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Weg
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Weg met straatlantaarns
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Weg met bomenrij
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garage
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Gelijke weg/spoorweg kruising
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramspoor
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (in aanbouw)
-
-STR_TREE_NAME_TREES                                             :Bomen
-STR_TREE_NAME_RAINFOREST                                        :Tropisch bos
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactus planten
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Treinstation
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Vliegveld
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Truck laadgebied
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bushalte
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Haven
-STR_STATION_DESCRIPTION_BUOY                                    :Boei
-STR_LANDINFO_WAYPOINT                                           :Controlepost
-
-STR_WATER_DESCRIPTION_WATER                                     :Water
-STR_LANDINFO_CANAL                                              :Kanaal
-STR_LANDINFO_LOCK                                               :Sluis
-STR_LANDINFO_RIVER                                              :Rivier
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kust of rivierbed
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Dok
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (in aanbouw)
+
+STR_LAI_TREE_NAME_TREES                                         :Bomen
+STR_LAI_TREE_NAME_RAINFOREST                                    :Tropisch bos
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactus planten
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Treinstation
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Vliegveld
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Truck laadgebied
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bushalte
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Haven
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boei
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Controlepost
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Water
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanaal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sluis
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rivier
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kust of rivierbed
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Dok
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Spoortunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Weg tunnel
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Spoortunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Weg tunnel
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Stalen hangende spoorweg brug
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Stalen spoor brug
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Stalen cantilever spoorweg brug
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Gewapend betonnen hangende spoorweg brug
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Houten spoorweg brug
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonnen spoorweg brug
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Kokervormige spoorweg brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Stalen hangende spoorweg brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Stalen spoor brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Stalen cantilever spoorweg brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Gewapend betonnen hangende spoorweg brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Houten spoorweg brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonnen spoorweg brug
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Kokervormige spoorweg brug
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Stalen hangende weg brug
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Stalen vlakke weg brug
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Stalen cantilever weg brug
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Gewapend betonnen hangende weg brug
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Houten weg brug
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonnen weg brug
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Kokervormige weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Stalen hangende weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Stalen vlakke weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Stalen cantilever weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Gewapend betonnen hangende weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Houten weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonnen weg brug
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Kokervormige weg brug
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aquaduct
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aquaduct
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Zender
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Vuurtoren
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Bedrijfshoofdkwartier
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Door een bedrijf opgekocht terrein
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Zender
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Vuurtoren
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Bedrijfshoofdkwartier
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Door een bedrijf opgekocht terrein
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Over OpenTTD
@@ -2160,7 +2160,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spel Ops
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Spel Laden
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Scenario opslaan
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Scenario openen
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Laad Hoogtekaart
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Laad Hoogtekaart
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik hier om naar de standaard bewaar/laadmap te gaan
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} vrij
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lijst van schijven, mappen, en opgeslagen spellen
@@ -2170,119 +2170,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Verwijde
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Opslaan
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Sla het huidige spel op onder de gekozen naam
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Typ een naam voor het op te slaan spel
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Typ een naam voor het op te slaan spel
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Wereld maken
-STR_MAPSIZE                                                     :{BLACK}Mapgrootte:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Aantal steden:
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Aantal Industrieën:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Hoogte van sneeuwlijn:
-STR_SNOW_LINE_UP                                                :{BLACK}Verschuif de sneeuwlijn één omhoog
-STR_SNOW_LINE_DOWN                                              :{BLACK}Verschuif de sneeuwlijn één naar beneden
-STR_RANDOM_SEED                                                 :{BLACK}Willekeurig getal:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klik voor een willekeurig getal
-STR_RANDOM                                                      :{BLACK}Willekeurig maken
-STR_RANDOM_HELP                                                 :{BLACK}Wijzig het willekeurige getal voor terrein creatie
-STR_LAND_GENERATOR                                              :{BLACK}Land generator:
-STR_TREE_PLACER                                                 :{BLACK}Bos algoritme:
-STR_TERRAIN_TYPE                                                :{BLACK}Terreintype:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Zee niveau:
-STR_SMOOTHNESS                                                  :{BLACK}Gladheid:
-STR_GENERATE                                                    :{WHITE}Maak aan
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Wereld maken
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Mapgrootte:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Aantal steden:
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Aantal Industrieën:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Hoogte van sneeuwlijn:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Verschuif de sneeuwlijn één omhoog
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Verschuif de sneeuwlijn één naar beneden
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Willekeurig getal:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klik voor een willekeurig getal
+STR_MAPGEN_RANDOM                                               :{BLACK}Willekeurig maken
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Wijzig het willekeurige getal voor terrein creatie
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Land generator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Bos algoritme:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terreintype:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Zee niveau:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Gladheid:
+STR_MAPGEN_GENERATE                                             :{WHITE}Maak aan
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Mapranden:
-STR_NORTHWEST                                                   :{BLACK}Noordwest
-STR_NORTHEAST                                                   :{BLACK}Noordoost
-STR_SOUTHEAST                                                   :{BLACK}Zuidoost
-STR_SOUTHWEST                                                   :{BLACK}Zuidwest
-STR_BORDER_FREEFORM                                             :{BLACK}Vrij vormen
-STR_BORDER_WATER                                                :{BLACK}Water
-STR_BORDER_RANDOM                                               :{BLACK}Willekeurig
-STR_BORDER_RANDOMIZE                                            :{BLACK}Willekeurig
-STR_BORDER_MANUAL                                               :{BLACK}Handmatig
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Aantal graden hoogtekaart:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Hoogtekaart naam:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Grootte: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Geef een willekeurige seed op
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Verander hoogte van sneeuwlijn
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Verander begin jaar
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Mapranden:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Noordwest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Noordoost
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Zuidoost
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Zuidwest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Vrij vormen
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Water
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Willekeurig
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Willekeurig
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Handmatig
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Aantal graden hoogtekaart:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Hoogtekaart naam:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Grootte: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Geef een willekeurige seed op
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Verander hoogte van sneeuwlijn
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Verander begin jaar
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Scenariotype
-STR_SE_FLAT_WORLD                                               :{WHITE}Vlak land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Genereer een vlakke kaart
-STR_SE_RANDOM_LAND                                              :{WHITE}Willekeurig land
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Hoogte van platte grond:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Maak de hoogte van plat land een lager
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Maak de hoogte van plat land een hoger
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenariotype
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Vlak land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Genereer een vlakke kaart
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Willekeurig land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Hoogte van platte grond:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Maak de hoogte van plat land een lager
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Maak de hoogte van plat land een hoger
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Verander hoogte van vlak land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Verander hoogte van vlak land
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Wereld creëren
 STR_GENERATION_ABORT                                            :{BLACK}Stop
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Stop Wereld Generatie
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Weet je zeker dat je de actie wilt stoppen?
-STR_PROGRESS                                                    :{WHITE}{NUM}% compleet
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Wereld maken
-STR_TREE_GENERATION                                             :{BLACK}Bos plaatsing
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Onverplaatsbare generatie
-STR_CLEARING_TILES                                              :{BLACK}Ruig en
-STR_SETTINGUP_GAME                                              :{BLACK}Spel aan het configureren
-STR_PREPARING_TILELOOP                                          :{BLACK}Bezig met vlakken
-STR_PREPARING_GAME                                              :{BLACK}Voorbereiden spel
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% compleet
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Wereld maken
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Bos plaatsing
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Onverplaatsbare generatie
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Ruig en
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Spel aan het configureren
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Bezig met vlakken
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Voorbereiden spel
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF instellingen
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Laad de geselecteerd voorkeursinstelling
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Bewaar voorkeursinstelling
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Bewaar de huidige lijst als voorkeursinstelling
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Kies een naam voor deze voorkeursinstelling
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Verwijder voorkeursinstelling
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Verwijder de geselecteerde voorkeursinstelling
-STR_NEWGRF_ADD                                                  :{BLACK}Toevoegen
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Voeg een NewGRF bestand toe aan te lijst
-STR_NEWGRF_REMOVE                                               :{BLACK}Verwijderen
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Verwijder de geselecteerde NewGRF bestanden van de lijst
-STR_NEWGRF_MOVEUP                                               :{BLACK}Naar Boven
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Verplaats het geselecteerde NewGRF bestand naar boven
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Naar Beneden
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Verplaats het geselecteerde NewGRF bestand naar beneden
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Een lijst van de NewGRF bestanden die zijn geïnstalleerd. Klik op een bestand om de parameters te wijzigen
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Stel parameters in
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Palet omzetten
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Verander het palet van het geselecteerd NewGRF bestand.{}Gebruik deze mogelijkheid wanneer de afbeeldingen er paars uit zien in het spel, van dit NewGRF bestand
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Wijzigingen doorvoeren
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Zoek ontbrekende inhoud online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Controleer of de ontbrekende inhoud online te vinden is
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Bestandsnaam: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palet: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameters: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Geen informatie beschikbaar
-STR_NEWGRF_NOT_FOUND                                            :{RED}Bestand niet gevonden
-STR_NEWGRF_DISABLED                                             :{RED}Uitgeschakeld
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF parameters ingeven
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Laad de geselecteerd voorkeursinstelling
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Bewaar voorkeursinstelling
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Bewaar de huidige lijst als voorkeursinstelling
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Kies een naam voor deze voorkeursinstelling
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Verwijder voorkeursinstelling
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Verwijder de geselecteerde voorkeursinstelling
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Toevoegen
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Voeg een NewGRF bestand toe aan te lijst
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Verwijderen
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Verwijder de geselecteerde NewGRF bestanden van de lijst
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Naar Boven
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Verplaats het geselecteerde NewGRF bestand naar boven
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naar Beneden
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Verplaats het geselecteerde NewGRF bestand naar beneden
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Een lijst van de NewGRF bestanden die zijn geïnstalleerd. Klik op een bestand om de parameters te wijzigen
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stel parameters in
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palet omzetten
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Verander het palet van het geselecteerd NewGRF bestand.{}Gebruik deze mogelijkheid wanneer de afbeeldingen er paars uit zien in het spel, van dit NewGRF bestand
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Wijzigingen doorvoeren
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Zoek ontbrekende inhoud online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Controleer of de ontbrekende inhoud online te vinden is
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Bestandsnaam: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palet: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameters: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Geen informatie beschikbaar
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Bestand niet gevonden
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Uitgeschakeld
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF parameters ingeven
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Beschikbare NewGRF bestanden
 STR_NEWGRF_ADD_FILE                                             :{BLACK}voeg toe aan selectie
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Voeg het geselecteerde NewGRF bestand toe aan je configuratie
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Bestanden opnieuw lezen
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Werk de lijst van beschikbare NewGRF bestanden bij
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Voeg het geselecteerde NewGRF bestand toe aan je configuratie
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Bestanden opnieuw lezen
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Werk de lijst van beschikbare NewGRF bestanden bij
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2306,7 +2306,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Bevat meerdere 'Action 8' elementen.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Waarschuwing!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Waarschuwing!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Je staat op het punt om wijzigingen te maken aan een lopend spel; dit dan OpenTTD laten crashen.{}Weet je het heel zeker?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan bestand niet toevoegen: identieke GRF ID
@@ -2331,10 +2331,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Bordenli
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Wijzig tekst van bord
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Ga naar volgende bord
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Ga naar vorige bord
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ga naar volgende bord
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ga naar vorige bord
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Geef een naam voor dit bord
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Geef een naam voor dit bord
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Steden
@@ -2348,10 +2348,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Bevolking: {ORANGE}{COMMA}{BLACK}  Huizen: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passagiers afgelopen maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post afgelopen maand: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Vracht nodig voor groei dorp:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} nodig
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} afgelopen maand afgeleverd
-STR_NOISE_IN_TOWN                                               :{BLACK}Geluidslimiet in stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Vracht nodig voor groei dorp:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} nodig
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} afgelopen maand afgeleverd
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Geluidslimiet in stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centreer het scherm op de locatie van de stad
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Gemeente
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Geef informatie over de gemeente weer
@@ -2398,18 +2398,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Geen
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Bestaande subsidies:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} van {STATION} naar {STATION}{YELLOW} ({COMPANY}{YELLOW}, tot {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik op de dienst om de plaats/industrie te centreren
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik op de dienst om de plaats/industrie te centreren
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stationsnamen - klik op naam om het scherm te centreren op het station
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Houd Ctrl ingedrukt om meer items te kiezen
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Houd Ctrl ingedrukt om meer items te kiezen
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Stations
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Geen -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Kies alle faciliteiten
-STR_SELECT_ALL_TYPES                                            :{BLACK}Kies alle vrachttypen (inclusief niet wachtende vracht)
-STR_NO_WAITING_CARGO                                            :{BLACK}Er wacht geen vracht van enig type
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Kies alle faciliteiten
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Kies alle vrachttypen (inclusief niet wachtende vracht)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Er wacht geen vracht van enig type
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2440,18 +2440,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Uitstekend
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centreer het scherm op de locatie van het station
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Hernoem station
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Geef alle wegvoertuigen weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Geef alle treinen weer die dit station in hun opdrachtenlijst hebben
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Geef alle wegvoertuigen weer die dit station in hun opdrachtenlijst hebben
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Geef alle vliegtuigen weer die dit station in hun opdrachtenlijst hebben
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Geef alle schepen weer die dit station in hun opdrachtenlijst hebben
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Hernoem station/laadgebied
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Hernoem station/laadgebied
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centreer scherm op de locatie van de controlepost
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Verander naam controlepost
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Verander naam controlepost
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centreer hoofdscherm op boeilocatie
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Verander boei naam
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Verander boei naam
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Naam controlepost aanpassen
 
@@ -2477,7 +2477,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totaal:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Banksaldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lening
-STR_MAX_LOAN                                                    :{WHITE}Max lening: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max lening: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Leen {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Vergroot lening. Ctrl+Klik om zoveel als mogelijk te lenen.
@@ -2491,10 +2491,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Opgericht: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kleurenschema:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Voertuigen:
-STR_TRAINS                                                      :{WHITE}{COMMA} trein{P "" en}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} wegvoertuig{P "" en}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} vliegtuig{P "" en}
-STR_SHIPS                                                       :{WHITE}{COMMA} sch{P ip epen}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} trein{P "" en}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} wegvoertuig{P "" en}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} vliegtuig{P "" en}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} sch{P ip epen}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Geen
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Bedrijfswaarde: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% eigendom van {COMPANY})
@@ -2502,8 +2502,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bouw HQ
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Bekijk HQ
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bouw bedrijfshoofdkwartier / bekijk bedrijfshoofdkwartier
-STR_RELOCATE_HQ                                                 :{BLACK}Verplaats HQ
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Herbouw bedrijfshoofdkwartier ergens anders voor 1% van de bedrijfswaarde
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Verplaats HQ
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Herbouw bedrijfshoofdkwartier ergens anders voor 1% van de bedrijfswaarde
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nieuw gezicht
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Kies nieuw gezicht voor directeur
@@ -2519,17 +2519,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Verkoop
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Koop een aandeel van 25% in dit bedrijf
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Verkoop een aandeel van 25% in dit bedrijf
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Bedrijfsnaam
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Naam van directeur
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Bedrijfsnaam
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Naam van directeur
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}We zoeken voor een transportbedrijf dat ons bedrijf over kan nemen.{}{}Wil je {COMPANY} kopen voor {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrielijst
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% vervoerd)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% vervoerd)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrie namen - klik op naam om scherm te centreren op industrie
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrielijst
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% vervoerd)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% vervoerd)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industrie namen - klik op naam om scherm te centreren op industrie
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2565,26 +2565,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Vliegtui
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Winst dit jaar: {CURRENCY} (vorig jaar: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Beschikbare railvoertuigen
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Beschikbare wegvoertuigen
-STR_AVAILABLE_SHIPS                                             :{BLACK}Beschikbare schepen
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Beschikbare vliegtuigen
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Bekijk een lijst van beschikbare ontwerpen voor dit type voertuig.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Beschikbare railvoertuigen
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Beschikbare wegvoertuigen
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Beschikbare schepen
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Beschikbare vliegtuigen
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Bekijk een lijst van beschikbare ontwerpen voor dit type voertuig.
 
-STR_MANAGE_LIST                                                 :{BLACK}Beheer lijst
-STR_MANAGE_LIST_TIP                                             :{BLACK}Stuur instructies naar alle voertuigen in de lijst
-STR_REPLACE_VEHICLES                                            :Vervang voertuigen
-STR_SEND_FOR_SERVICING                                          :Stuur voor onderhoud
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Beheer lijst
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Stuur instructies naar alle voertuigen in de lijst
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vervang voertuigen
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Stuur voor onderhoud
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Stuur naar depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stuur naar garage
-STR_SEND_SHIP_TO_DEPOT                                          :Stuur naar dok
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stuur naar hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Stuur naar depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Stuur naar garage
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Stuur naar dok
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Stuur naar hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klik om alle voertuigen in de lijst te stoppen
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klik om alle voertuigen in de lijst te starten
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klik om alle voertuigen in de lijst te stoppen
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klik om alle voertuigen in de lijst te starten
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gedeelde orders van {COMMA} voertuig{P "" en}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Gedeelde orders van {COMMA} voertuig{P "" en}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Alle treinen
@@ -2597,11 +2597,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Niet gegroepeer
 STR_GROUP_DEFAULT_SHIPS                                         :Niet gegroepeerde schepen
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Niet gegroepeerde vliegtuigen
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Groepen - Klik op een groep voor een lijst van alle voertuigen in deze groep
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klik om een groep te maken
-STR_GROUP_DELETE_TIP                                            :{BLACK}Verwijder de geselecteerde groep
-STR_GROUP_RENAME_TIP                                            :{BLACK}Hernoem de geselecteerde groep
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klik om deze groep te beschermen tegen globaal automatisch vervangen
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groepen - Klik op een groep voor een lijst van alle voertuigen in deze groep
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klik om een groep te maken
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Verwijder de geselecteerde groep
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Hernoem de geselecteerde groep
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klik om deze groep te beschermen tegen globaal automatisch vervangen
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Toevoegen gedeelde voertuigen
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Verwijder alle voertuigen
@@ -2624,7 +2624,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Snelheid
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Snelheid: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Onderhoudskosten: {GOLD}{CURRENCY}/jr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capaciteit: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(ombouwbaar)
+STR_PURCHASE_INFO_REFITTABLE                                    :(ombouwbaar)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Ontworpen: {GOLD}{NUM}{BLACK} Levensduur: {GOLD}{COMMA} jaar
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Betrouwbaarheid: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
@@ -2688,17 +2688,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Sleep we
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Sleep schip hier om het te verkopen
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Sleep vliegtuig hier om het te verkopen
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Sleep locomotief hierheen om de hele trein te verkopen
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Sleep locomotief hierheen om de hele trein te verkopen
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Verkoop alle treinen in het depot
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Verkoop alle wegvoertuigen in de garage
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Verkoop alle schepen in het dok
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Verkoop alle vliegtuigen in de hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Verkoop alle treinen in het depot
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Verkoop alle wegvoertuigen in de garage
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Verkoop alle schepen in het dok
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Verkoop alle vliegtuigen in de hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Vervang automatisch alle treinen in het depot
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Vervang automatisch alle wegvoertuigen in de garage
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Vervang automatisch alle schepen in het dok
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Vervang automatisch alle vliegtuigen in de hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Vervang automatisch alle treinen in het depot
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Vervang automatisch alle wegvoertuigen in de garage
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Vervang automatisch alle schepen in het dok
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Vervang automatisch alle vliegtuigen in de hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nieuwe railvoertuigen
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nieuwe wegvoertuigen
@@ -2710,35 +2710,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Bouw nie
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Bouw nieuw schip
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Bouw nieuw vliegtuig
 
-STR_CLONE_TRAIN                                                 :{BLACK}Kloon trein
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloon wegvoertuig
-STR_CLONE_SHIP                                                  :{BLACK}Kloon schip
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloon vliegtuig
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kloon trein
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloon wegvoertuig
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloon schip
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloon vliegtuig
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Hierdoor wordt een kopie gebouwd van een trein inclusief wagons. Klik op deze knop en dan op een trein binnen of buiten het depot. Ctrl+klik deelt de orders
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Hierdoor wordt een kopie gebouwd van een wegvoertuig. Klik op deze knop en dan op een wegvoertuig binnen of buiten de garage. Ctrl+klik deelt de orders
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Hierdoor wordt een kopie gebouwd van een schip. Klik op deze knop en dan op een schip binnen of buiten het dok. Ctrl+klik deelt de orders
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Hierdoor wordt een kopie gebouwd van een vliegtuig. Klik op deze knop en dan op een vliegtuig binnen of buiten de hangar. Ctrl+klik deelt de orders
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Hierdoor wordt een kopie gebouwd van een trein inclusief wagons. Klik op deze knop en dan op een trein binnen of buiten het depot. Ctrl+klik deelt de orders
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Hierdoor wordt een kopie gebouwd van een wegvoertuig. Klik op deze knop en dan op een wegvoertuig binnen of buiten de garage. Ctrl+klik deelt de orders
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Hierdoor wordt een kopie gebouwd van een schip. Klik op deze knop en dan op een schip binnen of buiten het dok. Ctrl+klik deelt de orders
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Hierdoor wordt een kopie gebouwd van een vliegtuig. Klik op deze knop en dan op een vliegtuig binnen of buiten de hangar. Ctrl+klik deelt de orders
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centreer het scherm op de locatie van het treindepot
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centreer het scherm op de locatie van de garage
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centreer het scherm op de locatie van het dok
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centreer het scherm op de locatie van de hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Geef een lijst van alle treinen met dit depot in hun orders
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Geef een lijst van alle wegvoertuigen met deze garage in hun orders
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Geef een lijst van alle schepen met dit dok in hun orders
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Geef een lijst van alle vliegtuigen met een hangar van dit vliegveld in hun orders
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Geef een lijst van alle treinen met dit depot in hun orders
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Geef een lijst van alle wegvoertuigen met deze garage in hun orders
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Geef een lijst van alle schepen met dit dok in hun orders
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Geef een lijst van alle vliegtuigen met een hangar van dit vliegveld in hun orders
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klik om alle treinen in het depot te stoppen
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klik om alle wegvoertuigen in de garage te stoppen
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klik om alle schepen in het dok te stoppen
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klik om alle vliegtuigen in de hangar te stoppen
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klik om alle treinen in het depot te stoppen
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klik om alle wegvoertuigen in de garage te stoppen
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klik om alle schepen in het dok te stoppen
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klik om alle vliegtuigen in de hangar te stoppen
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klik om alle treinen in het depot te starten
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klik om alle wegvoertuigen in de garage te starten
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klik om alle schepen in het dok te starten
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klik om alle vliegtuigen in de hangar te starten
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klik om alle treinen in het depot te starten
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klik om alle wegvoertuigen in de garage te starten
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klik om alle schepen in het dok te starten
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klik om alle vliegtuigen in de hangar te starten
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Je staat op het punt alle voertuigen in het depot te verkopen. Weet je het zeker?
 
@@ -2752,38 +2752,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :schip
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :monorail locomotief
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :zweef locomotief
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Prijs: {CURRENCY} Gewicht: {WEIGHT_S}{}Snelheid: {VELOCITY}  Kracht: {POWER}{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}, {CARGO}{}Gebruikskosten: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}{}Gebruikeskosten: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Prijs: {CURRENCY} Gewicht: {WEIGHT_S}{}Snelheid: {VELOCITY}  Kracht: {POWER}{}Brandstofprijs: {CURRENCY}/jr{}Capaciteit: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}, {CARGO}{}Gebruikskosten: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kosten: {CURRENCY} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO}{}Gebruikeskosten: {CURRENCY}/yr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vervang {STRING}
-STR_VEHICLE_TRAIN                                               :Trein
-STR_VEHICLE_ROAD_VEHICLE                                        :Wegvoertuig
-STR_VEHICLE_SHIP                                                :Schip
-STR_VEHICLE_AIRCRAFT                                            :Vliegtuig
+STR_REPLACE_VEHICLE_TRAIN                                       :Trein
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Wegvoertuig
+STR_REPLACE_VEHICLE_SHIP                                        :Schip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Vliegtuig
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selecteer het type locomotief om te vervangen
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selecteer een nieuw type locomotief die je wil gebruiken om het links geselecteerde type locomotief te vervangen
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start het vervangen
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Klik op deze knop als je de aan de linkerkant geselecteerde locomotief wil vervangen met die aan de rechterkant
-STR_NOT_REPLACING                                               :{BLACK}Niet aan het vervangen
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Geen voertuig geselecteerd
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Niet aan het vervangen
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Geen voertuig geselecteerd
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop het vervangen
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klik op deze knop als je de aan de linkerkant geselecteerde locomotief niet wil vervangen
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Aan het vervangen: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Wissel tussen motor- en wagonvervangvensters
-STR_ENGINES                                                     :Motoren
-STR_WAGONS                                                      :Wagons
+STR_REPLACE_ENGINES                                             :Motoren
+STR_REPLACE_WAGONS                                              :Wagons
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecteer een railtype waar je locomotieven voor wilt selecteren
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Dit geeft weer waarmee de aan de linkerkant geselecteerde locomotief mee vervangen wordt
-STR_RAIL_VEHICLES                                               :Railvoertuigen
-STR_ELRAIL_VEHICLES                                             :Elektrische railvoertuigen
-STR_MONORAIL_VEHICLES                                           :Monorail railvoertuigen
-STR_MAGLEV_VEHICLES                                             :Zweef railvoertuigen
+STR_REPLACE_RAIL_VEHICLES                                       :Railvoertuigen
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrische railvoertuigen
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorail railvoertuigen
+STR_REPLACE_MAGLEV_VEHICLES                                     :Zweef railvoertuigen
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wagons verwijderen: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}De te vervangen trein behoudt zijn lengte door wagons weg te halen (startend aan de voorkant), als het vervangen de trein langer zou maken
@@ -2801,10 +2801,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Stuur we
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Stuur schip naar dok. Ctrl+klik voor alleen onderhoud
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Stuur vliegtuig naar hangar. Ctrl+klik voor alleen onderhoud
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Hierdoor wordt een kopie gebouwd van deze trein inclusief wagons. Ctrl+klik deelt de orders
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Hierdoor wordt een kopie gebouwd van dit wegvoertuig. Ctrl+klik deelt de orders
-STR_CLONE_SHIP_INFO                                             :{BLACK}Hierdoor wordt een kopie gebouwd van dit schip. Ctrl+klik deelt de orders
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Hierdoor wordt een kopie gebouwd van dit vliegtuig. Ctrl+klik deelt de orders
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Hierdoor wordt een kopie gebouwd van deze trein inclusief wagons. Ctrl+klik deelt de orders
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Hierdoor wordt een kopie gebouwd van dit wegvoertuig. Ctrl+klik deelt de orders
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Hierdoor wordt een kopie gebouwd van dit schip. Ctrl+klik deelt de orders
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Hierdoor wordt een kopie gebouwd van dit vliegtuig. Ctrl+klik deelt de orders
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forceer trein verder te rijden zonder te wachten op een groen signaal
 
@@ -2837,36 +2837,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Vertrek
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Gecrasht!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Motorpech
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Gestopt
-STR_TRAIN_STOPPING                                              :{RED}Gestopt
-STR_TRAIN_STOPPING_VEL                                          :{RED}Aan het stoppen, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Geen stroom
-STR_TRAIN_STUCK                                                 :{ORANGE}Wacht op vrije route
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Op weg naar {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Op weg naar {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Geen orders
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Geen orders, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Op weg naar {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Op weg naar {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Op weg naar {TOWN} Treindepot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Op weg naar {TOWN} Treindepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Op weg naar {TOWN} Garage
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Op weg naar {TOWN} Garage, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Op weg naar {TOWN} Dok
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Op weg naar {TOWN} Dok, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Op weg naar {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Op weg naar {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Onderhoud bij {TOWN} Treindepot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Onderhoud bij {TOWN} Treindepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Onderhoud bij {TOWN} Garage
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Onderhoud bij {TOWN} Garage, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Onderhoud bij {TOWN} Dok
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Onderhoud bij {TOWN} Dok, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Onderhoud bij {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Onderhoud bij {STATION} Hangar, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Gestopt
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Aan het stoppen, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Geen stroom
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Wacht op vrije route
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Op weg naar {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Op weg naar {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Geen orders
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Geen orders, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Op weg naar {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Op weg naar {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Op weg naar {TOWN} Treindepot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Op weg naar {TOWN} Treindepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Op weg naar {TOWN} Garage
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Op weg naar {TOWN} Garage, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Op weg naar {TOWN} Dok
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Op weg naar {TOWN} Dok, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Op weg naar {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Op weg naar {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Onderhoud bij {TOWN} Treindepot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Onderhoud bij {TOWN} Treindepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Onderhoud bij {TOWN} Garage
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Onderhoud bij {TOWN} Garage, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Onderhoud bij {TOWN} Dok
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Onderhoud bij {TOWN} Dok, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Onderhoud bij {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Onderhoud bij {STATION} Hangar, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
@@ -2879,8 +2879,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Hernoem
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Leeftijd: {LTBLUE}{STRING}{BLACK}   Gebruikskosten: {LTBLUE}{CURRENCY}/yr
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} ja{P ar ren} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ja{P ar ren} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ja{P ar ren} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ja{P ar ren} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. snelheid: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Kracht: {LTBLUE}{POWER}{BLACK} Max. snelheid: {LTBLUE}{VELOCITY}
@@ -2894,7 +2894,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacite
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capaciteit: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capaciteit: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Geldoverdracht: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Geldoverdracht: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Interval tussen onderhoud: {LTBLUE}{COMMA}dagen{BLACK}   Laatste onderhoud: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Service interval: {LTBLUE}{COMMA}%{BLACK}   Laatste service: {LTBLUE}{DATE_LONG}
@@ -2910,9 +2910,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Hernoem
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Waarde: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totale lading (capaciteit) van deze trein:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Totale lading (capaciteit) van deze trein:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Leeg
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} van {STATION}
@@ -2927,7 +2927,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Laat de
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Totale lading
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Laat totale capaciteit van trein zien, gescheiden door goederentype
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capaciteit: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capaciteit: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ombouwen)
@@ -2951,15 +2951,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Bouw vli
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Orders)
-STR_TIMETABLE_VIEW                                              :{BLACK}Dienstregeling
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Schakel naar de dienstregeling
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Dienstregeling
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Schakel naar de dienstregeling
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Orderlijst - klik op een order om deze te selecteren. Ctrl+klik gaat naar het station
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Einde van orders - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Einde gedeelde orders - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Einde gedeelde orders - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2983,14 +2983,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transfer
 STR_ORDER_DROP_NO_UNLOADING                                     :Niet ontladen
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Verander het ontlaad-gedrag van de geselecteerde order
 
-STR_REFIT                                                       :{BLACK}Ombouwen
-STR_REFIT_TIP                                                   :{BLACK}Kies naar welk type vracht ombouwen in deze order. Ctrl+klik om ombouw instructie te verwijderen
+STR_ORDER_REFIT                                                 :{BLACK}Ombouwen
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Kies naar welk type vracht ombouwen in deze order. Ctrl+klik om ombouw instructie te verwijderen
 
-STR_SERVICE                                                     :{BLACK}Onderhoud
+STR_ORDER_SERVICE                                               :{BLACK}Onderhoud
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ga altijd
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Onderhoud wanneer nodig
 STR_ORDER_DROP_HALT_DEPOT                                       :Stop
-STR_SERVICE_HINT                                                :{BLACK}Sla deze order over tenzij onderhoud nodig is
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sla deze order over tenzij onderhoud nodig is
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Voertuig info voor basis springen wanneer
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Laad percentage
@@ -3011,7 +3011,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is waar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is niet waar
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}De waarde waartegen het voertuig wordt vergeleken
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Geef waarde voor de vergelijking
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sla over
@@ -3025,13 +3025,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ga naar dichtst
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ga naar dichtstbijzijnde hangar
 STR_ORDER_CONDITIONAL                                           :Conditionele order sprong
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Voeg een nieuwe order in voor de geselecteerde order, of voeg het toe aan de eind van de lijst
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Voeg een geavanceerde order toe
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Voeg een geavanceerde order toe
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Toon alle voertuigen met dezelfde gedeelde orders
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Toon alle voertuigen met dezelfde gedeelde orders
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Ga via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ga non-stop via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ga via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ga non-stop via {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Onderhoud bij
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Onderhoud non-stop bij
@@ -3041,15 +3041,15 @@ STR_ORDER_NEAREST_HANGAR                                        :de dichtstbijzi
 STR_ORDER_TRAIN_DEPOT                                           :Treindepot
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Garage
 STR_ORDER_SHIP_DEPOT                                            :Dok
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
-STR_REFIT_ORDER                                                 :(Ombouwen naar {STRING})
-STR_REFIT_STOP_ORDER                                            :(Ombouwen naar {STRING} en stop)
-STR_STOP_ORDER                                                  :(Stop)
+STR_ORDER_REFIT_ORDER                                           :(Ombouwen naar {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Ombouwen naar {STRING} en stop)
+STR_ORDER_STOP_ORDER                                            :(Stop)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Volledig laden)
 STR_ORDER_FULL_LOAD_ANY                                         :(Volledig laden één soort vracht)
@@ -3070,16 +3070,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[vlak bij einde
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[midden]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[einde]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Spring naar order {COMMA}
-STR_CONDITIONAL_NUM                                             :Spring naar order {COMMA} als {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Spring naar order {COMMA} als {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Spring naar order {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Spring naar order {COMMA} als {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Spring naar order {COMMA} als {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Ongeldige Order)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Dienstregeling)
-STR_ORDER_VIEW                                                  :{BLACK}Orders
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Ga naar het order scherm
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Orders
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Ga naar het order scherm
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Dienstregeling - klik op een opdracht om het te selecteren
 
@@ -3101,10 +3101,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Dit voer
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Verander de tijd
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Verander de hoeveelheid tijd die de geselecteerde opdracht mag innemen
 
-STR_CLEAR_TIME                                                  :{BLACK}Reset de tijd
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Reset de tijd
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Verwijder de hoeveelheid tijd die de geselecteerde opdracht mag innemen
 
-STR_RESET_LATENESS                                              :{BLACK}Reset teller
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset teller
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset de teller zodat het voertuig toch op tijd is
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto aanvullen
@@ -3112,42 +3112,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Vul de d
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}AI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Naam computerspeler
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Naam computerspeler
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Herlaad computerspeler
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Verwijder computerspeler, herlaad het script en herstart computerspeler
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Verwijder computerspeler, herlaad het script en herstart computerspeler
 
-STR_AI_NO_AI_FOUND                                              :Geen geschikte AI gevonden. {} Deze AI is een 'dummy' en voert niets uit.{}Verschillende AI's kunnen worden gedownload via het 'Online Content' systeem.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Een van de draaiende AI's is gecrashed. Meldt dit bij de schrijver van deze AI met een schermprint van het AI Debugscherm.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}computerspeler Debug venster is alleen beschikbaar voor de server
+STR_ERROR_AI_NO_AI_FOUND                                        :Geen geschikte AI gevonden. {} Deze AI is een 'dummy' en voert niets uit.{}Verschillende AI's kunnen worden gedownload via het 'Online Content' systeem.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Een van de draaiende AI's is gecrashed. Meldt dit bij de schrijver van deze AI met een schermprint van het AI Debugscherm.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}computerspeler Debug venster is alleen beschikbaar voor de server
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Configuratie
-STR_AI_LIST_TIP                                                 :{BLACK}Alle AI's die in het volgende spel geladen zullen worden
-STR_AI_HUMAN_PLAYER                                             :Menselijke speler
-STR_AI_RANDOM_AI                                                :Willekeurige AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alle AI's die in het volgende spel geladen zullen worden
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Menselijke speler
+STR_AI_CONFIG_RANDOM_AI                                         :Willekeurige AI
 
-STR_AI_CHANGE                                                   :{BLACK}Selecteer AI
-STR_AI_CHANGE_TIP                                               :{BLACK}Laad andere AI
-STR_AI_CONFIGURE                                                :{BLACK}Configureer
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configureer de parameters van de AI
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecteer AI
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Laad andere AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configureer
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configureer de parameters van de AI
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Beschikbare AI's
-STR_AI_AILIST_TIP                                               :{BLACK}Klik om een AI te selecteren
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klik om een AI te selecteren
 
-STR_AI_AUTHOR                                                   :{BLACK}Maker: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versie: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Maker: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versie: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Accepteer
-STR_AI_ACCEPT_TIP                                               :{BLACK}Selecteer gemarkeerde AI
-STR_AI_CANCEL                                                   :{BLACK}Annuleren
-STR_AI_CANCEL_TIP                                               :{BLACK}Verander AI niet
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accepteer
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecteer gemarkeerde AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Annuleren
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Verander AI niet
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parameters
-STR_AI_CLOSE                                                    :{BLACK}Sluit
-STR_AI_RESET                                                    :{BLACK}Herstel
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sluit
+STR_AI_SETTINGS_RESET                                           :{BLACK}Herstel
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3168,8 +3168,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Verwacht
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Verwachte inkomsten: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automatisch opslaan mislukt
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Opslaan van spel is nog bezig,{}Wacht tot dit voltooid is!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automatisch opslaan mislukt
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan niet lezen van schijf
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Opslaan Spel Mislukt{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Kan bestand niet verwijderen
@@ -3180,22 +3180,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Opgeslagen spel
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Bestand is niet leesbaar
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Bestand is niet schrijfbaar
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Data integriteits controle mislukt
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spel was opgeslagen in een versie zonder tram ondersteuning. Alle trams zijn verwijderd.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spel was opgeslagen in een versie zonder tram ondersteuning. Alle trams zijn verwijderd.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Map maken afgebroken...{}... geen geschikte dorplokaties
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... er is geen stad in dit scenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Map maken afgebroken...{}... geen geschikte dorplokaties
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... er is geen stad in dit scenario
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kan landschap uit PNG niet laden...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... bestand niet gevonden.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}... kon plaatje niet omzetten. 8 óf 24-bit PNG benodigd.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}... er ging iets fout. Sorry. (waarschijnlijk corrupt bestand)
+STR_ERROR_PNGMAP                                                :{WHITE}Kan landschap uit PNG niet laden...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... bestand niet gevonden.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... kon plaatje niet omzetten. 8 óf 24-bit PNG benodigd.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... er ging iets fout. Sorry. (waarschijnlijk corrupt bestand)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kan het landschap uit de BMP niet laden...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... kan dit type foto niet omzetten.
+STR_ERROR_BMPMAP                                                :{WHITE}Kan het landschap uit de BMP niet laden...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... kan dit type foto niet omzetten.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Schaal waarschuwing
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Het aanpassen van de grootte van een bronkaar is niet aan te bevelen. Toch doorgaan?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Schaal waarschuwing
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Het aanpassen van de grootte van een bronkaar is niet aan te bevelen. Toch doorgaan?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot succesvol opgeslagen als '{STRING}'
@@ -3218,15 +3218,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... loca
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... reeds gebouwd
 STR_ERROR_OWNED_BY                                              :{WHITE}... is eigendom van {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... gebied is van ander bedrijf
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Naam moet uniek zijn
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} in de weg
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Naam moet uniek zijn
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} in de weg
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}De gemeenteraad van {TOWN} staat dit niet toe
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}De gemeenteraad van {TOWN} staat bouwen van nog een vliegveld niet toe
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} lokale autoriteiten weigeren toestemming te geven voor vliegveld wegens zorgen om geluid
-STR_BRIBE_FAILED                                                :{WHITE}Je poging tot omkopen is
-STR_BRIBE_FAILED_2                                              :{WHITE}ontdekt door een regionale onderzoeker
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokale autoriteiten weigeren toestemming te geven voor vliegveld wegens zorgen om geluid
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Je poging tot omkopen is
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}ontdekt door een regionale onderzoeker
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan het land hier niet verhogen...
@@ -3235,7 +3235,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan land
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Graafwerkzaamheden zouden tunnel beschadigen
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Reeds op zeeniveau
 STR_ERROR_TOO_HIGH                                              :{WHITE}Te hoog
-STR_ALREADY_LEVELLED                                            :{WHITE}... is al plat
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... is al plat
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan bedrijfsnaam niet veranderen...
@@ -3246,29 +3246,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan geen
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... geen lening om terug te betalen
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... {CURRENCY} benodigd
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan geen lening terugbetalen
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan geen geld weggeven dat van de bank geleend is...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan geen geld weggeven dat van de bank geleend is...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Kan bedrijf niet kopen...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan bedrijfshoofdkwartier niet bouwen
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan geen 25% aandeel in dit bedrijf kopen...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan geen 25% aandeel in dit bedrijf verkopen...
-STR_PROTECTED                                                   :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
+STR_ERROR_PROTECTED                                             :{WHITE}Dit bedrijf verhandelt nog geen aandelen...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan geen enkele plaats bouwen
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan geen enkele plaats bouwen
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Kan dorp niet hernoemen...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Kan hier geen nieuw dorp bouwen...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... te dicht bij de rand van de kaart
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... te dicht bij een ander dorp
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... te veel dorpen
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}... er is geen ruimte meer op de kaart
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Het dorps bouwd geen wegen. Het bouwen van wegen kan aangezet worden via Geavanceerde Instellingen->Economie->Dorpen.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Er wordt aan de weg gewerkt
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... er is geen ruimte meer op de kaart
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Het dorps bouwd geen wegen. Het bouwen van wegen kan aangezet worden via Geavanceerde Instellingen->Economie->Dorpen.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Er wordt aan de weg gewerkt
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kan geen industrieën genereren
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan geen industrieën genereren
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan {STRING} hier niet bouwen...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan dit type industrie hier niet bouwen...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... te dicht bij een andere industrie
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... te dicht bij een andere industrie
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}... plaats eerst dorp
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... slechts één per dorp toegestaan
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... kan alleen in dorpen met bevolking van meer dan 1200 worden gebouwd
@@ -3289,7 +3289,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan vlie
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Voegt meer dan één bestaand (laad)station samen
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... station te verspreid
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... niet uniforme stations uit
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... niet uniforme stations uit
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Te veel (laad)stations
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Te veel treinstationsonderdelen
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Te veel bushaltes
@@ -3299,12 +3299,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Te dicht
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Te dicht bij een andere haven
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Te dicht bij een ander vliegveld
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan station niet hernoemen...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... deze weg is van een stad
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... weg is in de verkeerde richting
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... deze weg is van een stad
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... weg is in de verkeerde richting
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan deel van station niet weghalen...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Treinstation moet eerst verwijderd worden
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan deel van station niet weghalen...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Treinstation moet eerst verwijderd worden
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan busstation niet verwijderen...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan vrachtwagenstation niet verwijderen...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan passagiers tram station niet verwijderen...
@@ -3322,14 +3322,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Verwijde
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Voegt meer dan één bestaande controlepost samen
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Te dicht bij een andere controlepost
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kan hier geen trein controlepost bouwen...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan hier geen trein controlepost bouwen...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan boei hier niet plaatsen...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan naam controlepost niet aanpassen...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan naam controlepost niet aanpassen...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan hier trein controlepost niet weghalen...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Controlepost moet eerst verwijderd worden
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan hier trein controlepost niet weghalen...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Controlepost moet eerst verwijderd worden
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... boei in de weg
-STR_BUOY_IS_IN_USE                                              :{WHITE}... boei is in gebruik!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... boei is in gebruik!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Kan hier geen treindepot bouwen...
@@ -3346,14 +3346,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Treinen
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Trein te lang
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan de richting van het voertuig niet omdraaien...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan voertuigen bestaande uit meerdere eenheden niet omdraaien
-STR_INCOMPATIBLE_RAIL_TYPES                                     :spoortypes niet verenigbaar
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :spoortypes niet verenigbaar
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan voertuig niet verplaatsen...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}De achterste locomotief zal altijd het voorste deel volgen
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan geen route naar lokale depot vinden
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan geen lokaal depot vinden
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Verkeerd depot type
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Verkeerd depot type
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} is te lang na het vervangen
@@ -3364,14 +3364,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(onvoldoende ge
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Onmogelijke spoorcombinatie
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Geen bruikbaar spoor
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Bestaand spoor moet eerst weggehaald worden
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Eenrichtingsverkeer of de weg is geblokkeerd
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Eenrichtingsverkeer of de weg is geblokkeerd
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Kan hier geen seinen plaatsen...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Kan hier geen spoor leggen...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Kan hier geen spoor weghalen...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Kan hier geen seinen weghalen...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan sein hier niet ombouwen...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan sein hier niet ombouwen...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan railtype hier niet veranderen...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan railtype hier niet veranderen...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Moet weg eerst weghalen
@@ -3382,13 +3382,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Kan hier
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Kan de tramrails hier niet verwijderen...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kan hier geen kanaal bouwen...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan hier geen sluis bouwen...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kan hier geen rivier plaatsen...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kan hier geen kanaal bouwen...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kan hier geen sluis bouwen...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kan hier geen rivier plaatsen...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... moet op water gebouwd worden
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... kan niet op water bouwen
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Het kanaal moet eerst verwijderd worden
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan hier geen aquaduct bouwen...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Het kanaal moet eerst verwijderd worden
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan hier geen aquaduct bouwen...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}.... er staat hier al een boom
@@ -3397,9 +3397,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan hier
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kan hier geen brug bouwen...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Brug moet eerst afgebroken worden
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kan niet beginnen en eindigen op dezelfde plaats
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Begin van bruggen niet op hetzelfde niveau
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Brug is de laag voor dit terrein
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan niet beginnen en eindigen op dezelfde plaats
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Begin van bruggen niet op hetzelfde niveau
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Brug is de laag voor dit terrein
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Begin en einde moeten op een lijn staan
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... uiteinden van brug moeten beiden op land zijn
 
@@ -3408,7 +3408,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan hier
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Locatie ongeschikt voor ingang tunnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Tunnel moet eerst afgebroken worden
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Andere tunnel in de weg
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnel eindigt buiten de kaart
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnel eindigt buiten de kaart
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Kan geen land uitgraven voor andere uiteinde tunnel
 
 # Unmovable related errors
@@ -3418,12 +3418,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Kan dit
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... het is al van jou!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kan groep niet maken...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kan deze groep niet verwijderen...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kan deze groep niet hernoemen...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kan niet alle voertuigen van deze groep verwijderen...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kan niet alle voertuigen aan deze groep toevoegen...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kan niet alle gedeelde voertuigen aan deze groep toevoegen...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kan groep niet maken...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kan deze groep niet verwijderen...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kan deze groep niet hernoemen...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kan niet alle voertuigen van deze groep verwijderen...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kan niet alle voertuigen aan deze groep toevoegen...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kan niet alle gedeelde voertuigen aan deze groep toevoegen...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Trein in de weg
@@ -3466,21 +3466,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Kan wegv
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Kan schip niet verkopen...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Kan vliegtuig niet verkopen...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Railvoertuig is niet beschikbaar
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Wegvoertuig is niet beschikbaar
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Schip is niet beschikbaar
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Vliegtuig is niet beschikbaar
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Railvoertuig is niet beschikbaar
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Wegvoertuig is niet beschikbaar
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Schip is niet beschikbaar
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Vliegtuig is niet beschikbaar
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Te veel voertuigen in het spel
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan onderhoudsinterval niet aanpassen...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kan verwoest voertuig niet verkopen...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kan vernietigd voortuig niet aanpassen...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kan verwoest voertuig niet verkopen...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kan vernietigd voortuig niet aanpassen...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan trein niet het signaal laten passeren bij gevaar...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan de richting van de trein niet omdraaien...
-STR_TRAIN_START_NO_CATENARY                                     :Er is geen bovenleiding, de trein kan niet starten
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Er is geen bovenleiding, de trein kan niet starten
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Kan het wegvoertuig hier niet laten omkeren...
 
@@ -3499,14 +3499,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... voer
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... voertuig kan niet naar dat station
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... een voertuig die deze order deelt kan niet naar dat station
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan orderlijst niet delen...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan orderlijst niet kopiëren...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kan orderlijst niet delen...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kan orderlijst niet kopiëren...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... te ver van vorige bestemming
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kan geen dienstregeling opzetten voor dit voertuig...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Voertuigen kunnen alleen wachten op stations.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Dit voertuig stopt niet op dit station
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan geen dienstregeling opzetten voor dit voertuig...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Voertuigen kunnen alleen wachten op stations.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Dit voertuig stopt niet op dit station
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... te veel borden
@@ -3896,35 +3896,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Boei
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boei #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Boei
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boei #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Bedrijf {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Groep {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Controlepost
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Controlepost #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Controlepost
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Controlepost #{COMMA}
 
 STR_UNKNOWN_STATION                                             :onbekend station
-STR_SIGN_DEFAULT                                                :Bord
+STR_DEFAULT_SIGN_NAME                                           :Bord
 STR_COMPANY_SOMEONE                                             :iemand{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Toeschouwer, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Toeschouwer, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3942,7 +3942,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3956,25 +3956,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 8910f0834..124204914 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -118,7 +118,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} of tof
 STR_QUANTITY_BATTERIES                                          :{COMMA} batter{P y ies}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} of plastic
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} fizzy drink{P "" s}
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -208,26 +208,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Select sorting order (descending/ascending)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Select sorting criteria
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Select filtering criteria
-STR_SORT_BY                                                     :{BLACK}Sort by
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Select sorting order (descending/ascending)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Select sorting criteria
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Select filtering criteria
+STR_BUTTON_SORT_BY                                              :{BLACK}Sort by
 STR_BUTTON_LOCATION                                             :{BLACK}Location
-STR_QUERY_RENAME                                                :{BLACK}Rename
+STR_BUTTON_RENAME                                               :{BLACK}Rename
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Close window
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Window title - drag this to move window
-STR_STICKY_BUTTON                                               :{BLACK}Mark this window as uncloseable by the 'Close All Windows' key
-STR_RESIZE_BUTTON                                               :{BLACK}Click and drag to resize this window
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Toggle large/small window size
+STR_TOOLTIP_STICKY                                              :{BLACK}Mark this window as uncloseable by the 'Close All Windows' key
+STR_TOOLTIP_RESIZE                                              :{BLACK}Click and drag to resize this window
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Toggle large/small window size
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scroll bar - scrolls list up/down
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scroll bar - scrolls list left/right
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolish buildings etc. on a square of land
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Default
-STR_QUERY_CANCEL                                                :{BLACK}Cancel
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Default
+STR_BUTTON_CANCEL                                               :{BLACK}Cancel
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -316,7 +316,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Place si
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Save scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Load scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Load heightmap
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Load heightmap
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Quit editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Quit
@@ -504,11 +504,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Toggle graph for cargo type on/off
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Show detailed performance ratings
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Show detailed performance ratings
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Key to company graphs
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Click here to toggle company's entry on graph on/off
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Click here to toggle company's entry on graph on/off
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Company League Table
@@ -543,16 +543,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Money:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Loan:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Number of vehicles; this includes road vehicles, trains, ships and aircraft
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Number of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected as one station
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}The profit of the vehicle with the lowest income (of all vehicles older than 2 years)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Amount of cash made in the month with the lowest profit of the last 12 quarters
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Amount of cash made in the month with the highest profit of the last 12 quarters
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Units of cargo delivered in the last four quarters
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Number of types of cargo delivered in the last quarter
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Amount of money this company has in the bank
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}The amount of money this company has taken on loan
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total points out of possible points
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Number of vehicles; this includes road vehicles, trains, ships and aircraft
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Number of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected as one station
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}The profit of the vehicle with the lowest income (of all vehicles older than 2 years)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Amount of cash made in the month with the lowest profit of the last 12 quarters
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Amount of cash made in the month with the highest profit of the last 12 quarters
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Units of cargo delivered in the last four quarters
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Number of types of cargo delivered in the last quarter
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Amount of money this company has in the bank
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}The amount of money this company has taken on loan
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total points out of possible points
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jazz Jukebox
@@ -670,8 +670,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Toggle t
 STR_SMALLMAP_CENTER                                             :{BLACK}Center the smallmap on the current position
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Disable all
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Enable all
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Disable all
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Enable all
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Show last message or news report
@@ -682,8 +682,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SAVI
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Message History
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}A list of the recent news messages
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING5}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}A list of the recent news messages
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING5}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Message
@@ -917,32 +917,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Select t
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} missing/corrupted file{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Additional information about the base graphics set
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fullscreen mode failed
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fullscreen mode failed
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Decrease the amount of your currency for one Pound (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Increase the amount of your currency for one Pound (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Set the exchange rate of your currency for one Pound (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Decrease the amount of your currency for one Pound (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Increase the amount of your currency for one Pound (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Set the exchange rate of your currency for one Pound (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator: {ORANGE}{2:RAW_STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Set the separator for your currency
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Set the separator for your currency
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix: {ORANGE}{3:RAW_STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Set the prefix string for your currency
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Set the prefix string for your currency
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix: {ORANGE}{4:RAW_STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Set the suffix string for your currency
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Set the suffix string for your currency
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Switch to Euro: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Switch to Euro: {ORANGE}never
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Set the year to switch to Euro
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Switch to Euro earlier
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Switch to Euro later
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Set the year to switch to Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Switch to Euro earlier
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Switch to Euro later
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Preview: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pound (£) in your currency
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pound (£) in your currency
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Change custom currency parameter
 
 # Difficulty level window
@@ -956,7 +956,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Custom
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Show hi-score chart
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Save
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Save
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Maximum no. competitors: {ORANGE}{COMMA}
@@ -1022,7 +1022,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permissive
 STR_CITY_APPROVAL_TOLERANT                                      :Tolerant
 STR_CITY_APPROVAL_HOSTILE                                       :Hostile
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}This action changed the difficulty level to custom
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}This action changed the difficulty level to custom
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Advanced Settings
@@ -1271,7 +1271,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Not
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}X-size of map: {ORANGE}{STRING1}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-size of map: {ORANGE}{STRING1}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Change setting value
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Change setting value
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1313,9 +1313,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quit 'Op
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Quit
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
-STR_YES                                                         :{BLACK}Yes
-STR_NO                                                          :{BLACK}No
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Yes
+STR_QUIT_NO                                                     :{BLACK}No
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1331,11 +1331,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandon Game
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Are you sure you want to abandon this game?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Are you sure you want to abandon this scenario?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Are you sure you want to abandon this scenario?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Cheats
-STR_CHEATS_TIP                                                  :{BLACK}Checkboxes indicate if you have used this cheat before
+STR_CHEATS_TOOLTIP                                              :{BLACK}Checkboxes indicate if you have used this cheat before
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Playing as company: {ORANGE}{COMMA}
@@ -1344,24 +1344,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnels
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Build while in pause mode: {ORANGE}{STRING1}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jetplanes will not crash (frequently) on small airports: {ORANGE}{STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Switch climate: {ORANGE}{STRING}
-STR_TEMPERATE_LANDSCAPE                                         :Temperate landscape
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-arctic landscape
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropical landscape
-STR_TOYLAND_LANDSCAPE                                           :Toyland landscape
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Temperate landscape
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub-arctic landscape
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub-tropical landscape
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Toyland landscape
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Change date: {ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable modifying production values: {ORANGE}{STRING1}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}New Colour Scheme
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Show general colour schemes
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Show train colour schemes
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Show road vehicle colour schemes
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Show ship colour schemes
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Show aircraft colour schemes
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Choose the primary colour for the selected scheme
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Choose the secondary colour for the selected scheme
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Select a colour scheme to change, or multiple schemes with Ctrl+Click. Click on the box to toggle use of the scheme
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Show general colour schemes
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Show train colour schemes
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Show road vehicle colour schemes
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Show ship colour schemes
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Show aircraft colour schemes
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Choose the primary colour for the selected scheme
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Choose the secondary colour for the selected scheme
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Select a colour scheme to change, or multiple schemes with Ctrl+Click. Click on the box to toggle use of the scheme
 
 STR_LIVERY_DEFAULT                                              :Standard Livery
 STR_LIVERY_STEAM                                                :Steam Engine
@@ -1399,19 +1399,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Select f
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}New Face
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generate random new face
 STR_FACE_ADVANCED                                               :{BLACK}Advanced
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Advanced face selection.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Advanced face selection.
 STR_FACE_SIMPLE                                                 :{BLACK}Simple
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Simple face selection.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Simple face selection.
 STR_FACE_LOAD                                                   :{BLACK}Load
-STR_FACE_LOAD_TIP                                               :{BLACK}Load favourite face
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Load favourite face
 STR_FACE_LOAD_DONE                                              :{WHITE}Your favourite face has been loaded from the OpenTTD config file.
 STR_FACE_FACECODE                                               :{BLACK}Player face no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}View and/or set player face number
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}View and/or set player face number
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}View and/or set player face number
 STR_FACE_FACECODE_SET                                           :{WHITE}New face number code has been set.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Couldn't set player face number - must be numeric between 0 and 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Save
-STR_FACE_SAVE_TIP                                               :{BLACK}Save favourite face
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Save favourite face
 STR_FACE_SAVE_DONE                                              :{WHITE}This face will be saved as your favourite in the OpenTTD config file.
 STR_FACE_EUROPEAN                                               :{BLACK}European
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Select european faces
@@ -1419,120 +1419,120 @@ STR_FACE_AFRICAN                                                :{BLACK}African
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Select african faces
 STR_FACE_YES                                                    :Yes
 STR_FACE_NO                                                     :No
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Enable moustache or earring
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Enable moustache or earring
 STR_FACE_HAIR                                                   :Hair:
-STR_FACE_HAIR_TIP                                               :{BLACK}Change hair
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Change hair
 STR_FACE_EYEBROWS                                               :Eyebrows:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Change eyebrows
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Change eyebrows
 STR_FACE_EYECOLOUR                                              :Eye colour:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Change eyecolour
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Change eyecolour
 STR_FACE_GLASSES                                                :Glasses:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Enable glasses
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Change glasses
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Enable glasses
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Change glasses
 STR_FACE_NOSE                                                   :Nose:
-STR_FACE_NOSE_TIP                                               :{BLACK}Change nose
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Change nose
 STR_FACE_LIPS                                                   :Lips:
 STR_FACE_MOUSTACHE                                              :Moustache:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Change lips or moustache
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Change lips or moustache
 STR_FACE_CHIN                                                   :Chin:
-STR_FACE_CHIN_TIP                                               :{BLACK}Change chin
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Change chin
 STR_FACE_JACKET                                                 :Jacket:
-STR_FACE_JACKET_TIP                                             :{BLACK}Change jacket
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Change jacket
 STR_FACE_COLLAR                                                 :Collar:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Change collar
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Change collar
 STR_FACE_TIE                                                    :Tie:
 STR_FACE_EARRING                                                :Earring:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Change tie or earring
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Change tie or earring
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multiplayer
-STR_NETWORK_CONNECTION                                          :{BLACK}Connection:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choose between an internet game or a Local Area Network (LAN) game
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Player name:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}This is the name other players will identify you by
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Name
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Name of the game
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max{}Companies online / companies max
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Map size
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Map size of the game{}Click to sort by area
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Date
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Current date
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Years
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Number of years{}the game is running
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Language, server version, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Click a game from the list to select it
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}The server you joined last time:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Click to select the server you played last time
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Language: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version: {WHITE}{RAW_STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address: {WHITE}{RAW_STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start date: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSION MISMATCH
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MISMATCH
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Join game
-STR_NETWORK_REFRESH                                             :{BLACK}Refresh server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refresh the server info
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Find server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Search network for a server
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Add server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adds a server to the list which will always be checked for running games.
-STR_NETWORK_START_SERVER                                        :{BLACK}Start server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start your own server
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Enter your name
-STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the address of the host
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Connection:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Choose between an internet game or a Local Area Network (LAN) game
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+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
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Name
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Name of the game
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clients
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clients online / clients max{}Companies online / companies max
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Map size
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Map size of the game{}Click to sort by area
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Date
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Current date
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Years
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Number of years{}the game is running
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Language, server version, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Click a game from the list to select it
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}The server you joined last time:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Click to select the server you played last time
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}GAME INFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Language: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tileset: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Map size: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Server version: {WHITE}{RAW_STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Server address: {WHITE}{RAW_STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start date: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Current date: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Password protected!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER FULL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSION MISMATCH
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF MISMATCH
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Join game
+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
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start your own server
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Enter your name
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Enter the address of the host
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start new multiplayer game
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Game name:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}The game name will be displayed to other players in the multiplayer game selection menu
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Set password
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protect your game with a password if you don't want it to be publicly accessible
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Select a map:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Which map do you want to play?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generate random new game
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertise)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max clients:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Choose the maximum number of clients. Not all slots need to be filled
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P y ies}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max companies:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limit the server to a certain amount of companies
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max spectators:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limit the server to a certain amount of spectators
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Language spoken:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Other players will know which language is spoken on the server
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Start Game
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Start a new network game from a random map, or scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Load Game
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Resume an earlier saved multiplayer game (be sure to connect as the correct player)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Enter a name for the network game
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start new multiplayer game
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Game name:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}The game name will be displayed to other players in the multiplayer game selection menu
+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_SELECT_MAP                             :{BLACK}Select a map:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Which map do you want to play?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generate random new game
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (advertise)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max clients:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Choose the maximum number of clients. Not all slots need to be filled
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P y ies}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max companies:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limit the server to a certain amount of companies
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max spectators:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limit the server to a certain amount of spectators
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Language spoken:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Other players will know which language is spoken on the server
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start Game
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Start a new network game from a random map, or scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Load Game
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Resume an earlier saved multiplayer game (be sure to connect as the correct player)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Enter a name for the network game
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1575,32 +1575,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Latvian
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer game lobby
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparing to join: {ORANGE}{RAW_STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}A list of all companies currently in this game. You can either join one or start a new one if there is a free company slot
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name: {WHITE}{RAW_STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Company value: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Players: {WHITE}{RAW_STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}New company
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Create a new company
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Spectate game
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Watch the game as a spectator
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Join company
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Help manage this company
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Multiplayer game lobby
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparing to join: {ORANGE}{RAW_STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}A list of all companies currently in this game. You can either join one or start a new one if there is a free company slot
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}COMPANY INFO
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Company name: {WHITE}{RAW_STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguration: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Company value: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Current balance: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Last year's income: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performance: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Players: {WHITE}{RAW_STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}New company
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Create a new company
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Spectate game
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Watch the game as a spectator
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Join company
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Help manage this company
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Connecting...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Connecting...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connecting..
@@ -1616,13 +1616,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} in front of you
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} downloaded so far
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconnect
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Client list
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client list
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New company
 
@@ -1644,18 +1644,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter th
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Give the company the new password
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Company password
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Default company password
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Use this company password as default for new companies
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Default company password
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Use this company password as default for new companies
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Join
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Join and play as this company
-STR_COMPANY_PASSWORD                                            :{BLACK}Password
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Password-protect your company to prevent unauthorised users from joining.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Set company password
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Join
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Join and play as this company
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Password
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Password-protect your company to prevent unauthorised users from joining.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Set company password
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Send
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Send
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Private] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
@@ -1668,40 +1668,40 @@ STR_NETWORK_CHAT_ALL                                            :[All] {RAW_STRI
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Enter text for network chat
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}No network devices found or compiled without ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Could not find any network games
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}The server didn't answer the request
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Could not connect due to NewGRF mismatch
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Network-Game synchronisation failed
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Network-Game connection lost
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Could not load savegame
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Could not start the server
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Could not connect
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Connection #{NUM} timed out
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}A protocol error was detected and the connection was closed
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}The revision of this client does not match the server's revision
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Wrong password
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}The server is full
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}You are banned from this server
-STR_NETWORK_ERR_KICKED                                          :{WHITE}You were kicked out of the game
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Cheating is not allowed on this server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}No network devices found or compiled without ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Could not find any network games
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}The server didn't answer the request
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Could not connect due to NewGRF mismatch
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Network-Game synchronisation failed
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Network-Game connection lost
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Could not load savegame
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Could not start the server
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Could not connect
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Connection #{NUM} timed out
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}A protocol error was detected and the connection was closed
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}The revision of this client does not match the server's revision
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Wrong password
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}The server is full
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}You are banned from this server
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}You were kicked out of the game
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheating is not allowed on this server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :general error
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync error
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :could not load map
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection lost
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol error
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF mismatch
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :not authorized
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :received strange packet
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :wrong revision
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :name already in use
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :wrong password
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :wrong company in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :kicked by server
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :was trying to use a cheat
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server full
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desync error
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :could not load map
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connection lost
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protocol error
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF mismatch
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :not authorized
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :received strange packet
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :wrong revision
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :name already in use
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :wrong password
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :wrong company in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :kicked by server
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :was trying to use a cheat
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server full
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1713,36 +1713,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Game paused (co
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Game unpaused (client connected)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Game unpaused (client failed to connect)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :leaving
-STR_NETWORK_CLIENT_JOINED                                       :*** {RAW_STRING} has joined the game
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {RAW_STRING} has joined company #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {RAW_STRING} has joined spectators
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {RAW_STRING} has started a new company (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {RAW_STRING} has left the game ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {RAW_STRING} has changed his/her name to {RAW_STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {RAW_STRING} gave your company {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** You gave {1:RAW_STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} The server closed the session
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} The server is restarting...{}Please wait...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :leaving
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {RAW_STRING} has joined the game
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {RAW_STRING} has joined company #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {RAW_STRING} has joined spectators
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {RAW_STRING} has started a new company (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {RAW_STRING} has left the game ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {RAW_STRING} has changed his/her name to {RAW_STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {RAW_STRING} gave your company {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** You gave {1:RAW_STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} The server closed the session
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} The server is restarting...{}Please wait...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Content downloading
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type of the content
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Type of the content
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Name
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Name of the content
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Click on a line to see the details{}Click on the checkbox to select it for downloading
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Name of the content
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Click on a line to see the details{}Click on the checkbox to select it for downloading
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Select all
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Mark all content to be downloaded
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Mark all content to be downloaded
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Select upgrades
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Mark all content that is an upgrade for existing content to be downloaded
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Mark all content that is an upgrade for existing content to be downloaded
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Unselect all
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Mark all content to be not downloaded
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Mark all content to be not downloaded
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Enter filter string
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Enter a keyword to filter the list for
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Enter a keyword to filter the list for
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag/name filter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Download
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Start downloading the selected content
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Start downloading the selected content
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total download size: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}CONTENT INFO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}You have not selected this to be downloaded
@@ -1786,17 +1786,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... file
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Could not decompress the downloaded file
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Transparency Options
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Toggle transparency for trees. Ctrl+Click to lock.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Toggle transparency for houses. Ctrl+Click to lock.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Toggle transparency for industries. Ctrl+Click to lock.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Toggle transparency for buildables like stations, depots and waypoints. Ctrl+Click to lock.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Toggle transparency for bridges. Ctrl+Click to lock.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Toggle transparency for structures like lighthouses and antennas. Ctrl+Click to lock.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Toggle transparency for catenary. Ctrl+Click to lock.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Toggle transparency for loading indicators. Ctrl+Click to lock.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Set objects invisible instead of transparent
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Toggle transparency for trees. Ctrl+Click to lock.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Toggle transparency for houses. Ctrl+Click to lock.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Toggle transparency for industries. Ctrl+Click to lock.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Toggle transparency for buildables like stations, depots and waypoints. Ctrl+Click to lock.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Toggle transparency for bridges. Ctrl+Click to lock.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Toggle transparency for structures like lighthouses and antennas. Ctrl+Click to lock.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Toggle transparency for catenary. Ctrl+Click to lock.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Toggle transparency for loading indicators. Ctrl+Click to lock.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Set objects invisible instead of transparent
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Coverage area highlight
@@ -1808,11 +1808,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepts:
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Supplies: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Join station
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Build a separate station
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Join station
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Build a separate station
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Join waypoint
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Build a separate waypoint
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Join waypoint
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Build a separate waypoint
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Railway Construction
@@ -1836,8 +1836,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Train De
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Select railway depot orientation
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Waypoint
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Select waypoint type
+STR_WAYPOINT_CAPTION                                            :{WHITE}Waypoint
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Select waypoint type
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Rail Station Selection
@@ -1850,36 +1850,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Select l
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Build a station using drag & drop
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Select a station class to display
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Select the station type to build
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Select a station class to display
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Select the station type to build
 
-STR_STAT_CLASS_DFLT                                             :Default station
-STR_STAT_CLASS_WAYP                                             :Waypoints
+STR_STATION_CLASS_DFLT                                          :Default station
+STR_STATION_CLASS_WAYP                                          :Waypoints
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Signal Selection
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Block Signal (semaphore){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Entry-Signal (semaphore){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Exit-Signal (semaphore){}Behaves in the same way as a block signal but is necessary to trigger the correct colour on entry & combo pre-signals.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combo-Signal (semaphore){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}One-way Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Block Signal (electric){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Entry-Signal (electric){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Exit-Signal (electric){}Behaves in the same way as a block signal but is necessary to trigger the correct colour on entry & combo pre-signals.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combo-Signal (electric){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}One-way Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signal Convert{}When selected, clicking an existing signal will convert it to the selected signal type and variant, Ctrl+Click will toggle the existing variant.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Dragging signal density
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Decrease dragging signal density
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Increase dragging signal density
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signal Selection
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Block Signal (semaphore){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Entry-Signal (semaphore){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Exit-Signal (semaphore){}Behaves in the same way as a block signal but is necessary to trigger the correct colour on entry & combo pre-signals.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combo-Signal (semaphore){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}One-way Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Block Signal (electric){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Entry-Signal (electric){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Exit-Signal (electric){}Behaves in the same way as a block signal but is necessary to trigger the correct colour on entry & combo pre-signals.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combo-Signal (electric){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}One-way Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signal Convert{}When selected, clicking an existing signal will convert it to the selected signal type and variant, Ctrl+Click will toggle the existing variant.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dragging signal density
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Decrease dragging signal density
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Increase dragging signal density
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Select Rail Bridge
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Select Road Bridge
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Bridge selection - click on your prefered bridge to build it
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Bridge selection - click on your prefered bridge to build it
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspension, Steel
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Girder, Steel
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Cantilever, Steel
@@ -1913,9 +1913,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Toggle b
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Road Depot Orientation
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Select road vehicle depot orientation
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Select road vehicle depot orientation
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Tram Depot Orientation
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Select tram vehicle depot orientation
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Select tram vehicle depot orientation
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Station Orientation
@@ -1936,8 +1936,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Build sh
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Build ship dock
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Place a buoy which can be used as a waypoint
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Build aqueduct
-STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}Make a canal, unless Ctrl is held down at sea level, when it will flood the surroundings instead
-STR_CREATE_RIVER                                                :{BLACK}Place rivers.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Define water area.{}Make a canal, unless Ctrl is held down at sea level, when it will flood the surroundings instead
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Place rivers.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Ship Depot Orientation
@@ -1969,20 +1969,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Large ai
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Hub airports
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helicopter airports
 
-STR_STATION_NOISE                                               :{BLACK}Noise generated: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Noise generated: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landscaping
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Lower a corner of land
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Raise a corner of land
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Level land
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Purchase land for future use
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Lower a corner of land
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Raise a corner of land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Level land
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Purchase land for future use
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Trees
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trees of random type
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Place trees of random type
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Place trees of random type
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Random Trees
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Plant trees randomly over landscape
 
@@ -1995,9 +1995,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Place tr
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Increase area of land to lower/raise
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Decrease area of land to lower/raise
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generate random land
-STR_SE_NEW_WORLD                                                :{BLACK}Create new scenario
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Create new scenario
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Reset landscape
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Remove all player-owned property from the map
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Remove all player-owned property from the map
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Reset Landscape
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Are you sure you want to remove all player-owned property?
@@ -2008,41 +2008,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}New Town
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Construct new town
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Random Town
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Build town in random location
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Many random towns
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Cover the map with randomly placed towns
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Many random towns
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cover the map with randomly placed towns
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Town size:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Small
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Medium
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Large
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Random
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Random
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select town size
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Town road layout:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Select road layout used for this town
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Better roads
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 grid
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 grid
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Random
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Select road layout used for this town
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Better roads
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 grid
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 grid
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Random
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Fund new industry
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Choose the appropriate industry from this list
-STR_MANY_RANDOM_INDUSTRIES                                      :Many random industries
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Cover the map with randomly placed industries
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cost: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospect
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Build
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fund
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Choose the appropriate industry from this list
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Many random industries
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Cover the map with randomly placed industries
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cost: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospect
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Build
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fund
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Land Area Information
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Cost to clear: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Revenue when cleared: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Revenue when cleared: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Owner: {LTBLUE}{STRING1}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Road owner: {LTBLUE}{STRING1}
@@ -2050,104 +2050,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Tramway
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Railroad owner: {LTBLUE}{STRING1}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Local authority: {LTBLUE}{STRING1}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :None
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM}x{NUM} ({RAW_STRING})
-STR_BUILD_DATE                                                  :{BLACK}Built: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Station class: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Station type: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{RAW_STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordinates: {LTBLUE}{NUM}x{NUM}x{NUM} ({RAW_STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Built: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Station class: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Station type: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{RAW_STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Cargo accepted: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rocks
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Rough land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Bare land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Grass
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Fields
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snow-covered land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Desert
-
-STR_RAILROAD_TRACK                                              :Railway track
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Railway track with block signals
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Railway track with pre-signals
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Railway track with exit-signals
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Railway track with combo-signals
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Railway track with path signals
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Railway track with one-way path signals
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Railway track with block and pre-signals
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Railway track with block and exit-signals
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Railway track with block and combo-signals
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Railway track with block and path signals
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Railway track with block and one-way path signals
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Railway track with pre- and exit-signals
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Railway track with pre- and combo-signals
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Railway track with pre- and path signals
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Railway track with pre- and one-way path signals
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Railway track with exit- and combo-signals
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Railway track with exit- and path signals
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Railway track with exit- and one-way path signals
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Railway track with combo- and path signals
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Railway track with combo- and one-way path signals
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Railway track with path and one-way path signals
-STR_RAILROAD_TRAIN_DEPOT                                        :Railway train depot
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Road
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Road with streetlights
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Tree-lined road
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Road vehicle depot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Road/rail level crossing
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramway
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rocks
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Rough land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bare land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Grass
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Fields
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snow-covered land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Desert
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Railway track
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Railway track with block signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Railway track with pre-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Railway track with exit-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Railway track with combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Railway track with path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Railway track with one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Railway track with block and pre-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Railway track with block and exit-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Railway track with block and combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Railway track with block and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Railway track with block and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Railway track with pre- and exit-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Railway track with pre- and combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Railway track with pre- and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Railway track with pre- and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Railway track with exit- and combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Railway track with exit- and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Railway track with exit- and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Railway track with combo- and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Railway track with combo- and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Railway track with path and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Railway train depot
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Road
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Road with streetlights
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Tree-lined road
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Road vehicle depot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Road/rail level crossing
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramway
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (under construction)
-
-STR_TREE_NAME_TREES                                             :Trees
-STR_TREE_NAME_RAINFOREST                                        :Rainforest
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactus plants
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Railway station
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Aircraft hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Airport
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Lorry loading area
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bus station
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Ship dock
-STR_STATION_DESCRIPTION_BUOY                                    :Buoy
-STR_LANDINFO_WAYPOINT                                           :Waypoint
-
-STR_WATER_DESCRIPTION_WATER                                     :Water
-STR_LANDINFO_CANAL                                              :Canal
-STR_LANDINFO_LOCK                                               :Lock
-STR_LANDINFO_RIVER                                              :River
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Coast or riverbank
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Ship depot
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (under construction)
+
+STR_LAI_TREE_NAME_TREES                                         :Trees
+STR_LAI_TREE_NAME_RAINFOREST                                    :Rainforest
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactus plants
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Railway station
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Aircraft hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Airport
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lorry loading area
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bus station
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Ship dock
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Buoy
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Waypoint
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Water
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Lock
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :River
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Coast or riverbank
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Ship depot
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Railway tunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Road tunnel
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Railway tunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Road tunnel
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Steel suspension rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Steel girder rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Steel cantilever rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Reinforced concrete suspension rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Wooden rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Concrete rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Tubular rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Steel suspension rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Steel girder rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Steel cantilever rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Reinforced concrete suspension rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Wooden rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Concrete rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Tubular rail bridge
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Steel suspension road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Steel girder road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Steel cantilever road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Reinforced concrete suspension road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Wooden road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Concrete road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Tubular road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Steel suspension road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Steel girder road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Steel cantilever road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Reinforced concrete suspension road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Wooden road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Concrete road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Tubular road bridge
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aqueduct
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqueduct
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmitter
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Lighthouse
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Company headquarters
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Company-owned land
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmitter
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Lighthouse
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Company headquarters
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Company-owned land
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}About OpenTTD
@@ -2160,7 +2160,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Save Gam
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Load Game
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Save Scenario
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Load Scenario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Load Heightmap
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Load Heightmap
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Click here to jump to the current default save/load directory
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} free
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}List of drives, directories and saved-game files
@@ -2170,119 +2170,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Delete t
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Save
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Save the current game, using the selected name
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Enter a name for the savegame
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Enter a name for the savegame
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}World Generation
-STR_MAPSIZE                                                     :{BLACK}Map size:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}No. of towns:
-STR_DATE                                                        :{BLACK}Date:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. of industries:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Snow line height:
-STR_SNOW_LINE_UP                                                :{BLACK}Move the snow line height one up
-STR_SNOW_LINE_DOWN                                              :{BLACK}Move the snow line height one down
-STR_RANDOM_SEED                                                 :{BLACK}Random seed:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Click to enter a random seed
-STR_RANDOM                                                      :{BLACK}Randomise
-STR_RANDOM_HELP                                                 :{BLACK}Change the random seed used for Terrain Generation
-STR_LAND_GENERATOR                                              :{BLACK}Land generator:
-STR_TREE_PLACER                                                 :{BLACK}Tree algorithm:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrain type:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Sea level:
-STR_SMOOTHNESS                                                  :{BLACK}Smoothness:
-STR_GENERATE                                                    :{WHITE}Generate
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}World Generation
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Map size:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}No. of towns:
+STR_MAPGEN_DATE                                                 :{BLACK}Date:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}No. of industries:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Snow line height:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Move the snow line height one up
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Move the snow line height one down
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Random seed:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Click to enter a random seed
+STR_MAPGEN_RANDOM                                               :{BLACK}Randomise
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Change the random seed used for Terrain Generation
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Land generator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Tree algorithm:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrain type:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Sea level:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Smoothness:
+STR_MAPGEN_GENERATE                                             :{WHITE}Generate
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Map edges:
-STR_NORTHWEST                                                   :{BLACK}Northwest
-STR_NORTHEAST                                                   :{BLACK}Northeast
-STR_SOUTHEAST                                                   :{BLACK}Southeast
-STR_SOUTHWEST                                                   :{BLACK}Southwest
-STR_BORDER_FREEFORM                                             :{BLACK}Freeform
-STR_BORDER_WATER                                                :{BLACK}Water
-STR_BORDER_RANDOM                                               :{BLACK}Random
-STR_BORDER_RANDOMIZE                                            :{BLACK}Random
-STR_BORDER_MANUAL                                               :{BLACK}Manual
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Heightmap rotation:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Heightmap name:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Size: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Enter a random seed
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Change snow line height
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Change starting year
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Map edges:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Northwest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Northeast
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Southeast
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Southwest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Freeform
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Water
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Random
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Random
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Heightmap rotation:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Heightmap name:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Size: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Enter a random seed
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Change snow line height
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Change starting year
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Scenario Type
-STR_SE_FLAT_WORLD                                               :{WHITE}Flat land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generate a flat land
-STR_SE_RANDOM_LAND                                              :{WHITE}Random land
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Height of flat land:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Move the height of flat land one down
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Move the height of flat land one up
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenario Type
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Flat land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generate a flat land
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Random land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Height of flat land:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Move the height of flat land one down
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Move the height of flat land one up
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Change height of flat land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Change height of flat land
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Generating World...
 STR_GENERATION_ABORT                                            :{BLACK}Abort
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Abort World Generation
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Do you really want to abort the generation?
-STR_PROGRESS                                                    :{WHITE}{NUM}% complete
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}World generation
-STR_TREE_GENERATION                                             :{BLACK}Tree generation
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Unmovable generation
-STR_CLEARING_TILES                                              :{BLACK}Rough and rocky area generation
-STR_SETTINGUP_GAME                                              :{BLACK}Setting up game
-STR_PREPARING_TILELOOP                                          :{BLACK}Running tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Preparing game
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% complete
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}World generation
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Tree generation
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Unmovable generation
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Rough and rocky area generation
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Setting up game
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Running tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparing game
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF Settings
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Load the selected preset
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Save preset
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Save the current list as a preset
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Enter name for preset
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Delete preset
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Delete the currently selected preset
-STR_NEWGRF_ADD                                                  :{BLACK}Add
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Add a NewGRF file to the list
-STR_NEWGRF_REMOVE                                               :{BLACK}Remove
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Remove the selected NewGRF file from the list
-STR_NEWGRF_MOVEUP                                               :{BLACK}Move Up
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move the selected NewGRF file up the list
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Move Down
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move the selected NewGRF file down the list
-STR_NEWGRF_FILE_TIP                                             :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Set parameters
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Toggle palette
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Apply changes
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Find missing content online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Check whether the missing content can be found online
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Filename: {SILVER}{RAW_STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{RAW_STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{RAW_STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palette: {SILVER}{RAW_STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameters: {SILVER}{STRING1}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}No information available
-STR_NEWGRF_NOT_FOUND                                            :{RED}Matching file not found
-STR_NEWGRF_DISABLED                                             :{RED}Disabled
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Enter NewGRF parameters
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Load the selected preset
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Save preset
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Save the current list as a preset
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Enter name for preset
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Delete preset
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Delete the currently selected preset
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Add
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Add a NewGRF file to the list
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Remove
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Remove the selected NewGRF file from the list
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Move Up
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Move the selected NewGRF file up the list
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Down
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Apply changes
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Find missing content online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Check whether the missing content can be found online
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Filename: {SILVER}{RAW_STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{RAW_STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{RAW_STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{RAW_STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameters: {SILVER}{STRING1}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}No information available
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Matching file not found
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabled
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enter NewGRF parameters
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Available NewGRF files
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Add to selection
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Add the selected NewGRF file to your configuration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Rescan files
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Update the list of available NewGRF files
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Add the selected NewGRF file to your configuration
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Rescan files
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Update the list of available NewGRF files
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{RAW_STRING}
@@ -2306,7 +2306,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{RAW_ST
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Caution!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}You are about to make changes to a running game; this can crash OpenTTD.{}Are you absolutely sure about this?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Can't add file: duplicate GRF ID
@@ -2331,10 +2331,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign Lis
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edit sign text
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Go to next sign
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Go to previous sign
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Go to next sign
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Go to previous sign
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Enter a name for the sign
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Enter a name for the sign
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Towns
@@ -2348,10 +2348,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Houses: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passengers last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Mail last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Cargo needed for town growth:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} required
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} delivered last month
-STR_NOISE_IN_TOWN                                               :{BLACK}Noise limit in town: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Cargo needed for town growth:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} required
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} delivered last month
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Noise limit in town: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centre the main view on town location
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Local authority
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Show information on local authority
@@ -2398,18 +2398,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}None
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Services already subsidised:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}{YELLOW}, until {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Click on service to centre view on industry/town
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click on service to centre view on industry/town
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Station names - click on name to centre view on station
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold down Ctrl to select more than one item
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hold down Ctrl to select more than one item
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Station{P "" s}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- None -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Select all facilities
-STR_SELECT_ALL_TYPES                                            :{BLACK}Select all cargo types (including no waiting cargo)
-STR_NO_WAITING_CARGO                                            :{BLACK}No cargo of any type is waiting
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Select all facilities
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Select all cargo types (including no waiting cargo)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}No cargo of any type is waiting
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2440,18 +2440,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Outstanding
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centre main view on station location
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Change name of station
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Show all trains which have this station on their schedule
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Show all road vehicles which have this station on their schedule
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Show all aircraft which have this station on their schedule
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Show all ships which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Show all trains which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Show all road vehicles which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Show all aircraft which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Show all ships which have this station on their schedule
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Rename station/loading area
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Rename station/loading area
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centre main view on waypoint location
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Change waypoint name
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Change waypoint name
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centre main view on buoy location
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Change buoy name
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Change buoy name
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Edit waypoint name
 
@@ -2477,7 +2477,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bank Balance
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Loan
-STR_MAX_LOAN                                                    :{WHITE}Max Loan: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max Loan: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Borrow {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Increase size of loan. Ctrl+Click borrows as much as possible
@@ -2491,10 +2491,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurated: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Colour Scheme:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehicles:
-STR_TRAINS                                                      :{WHITE}{COMMA} train{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} road vehicle{P "" s}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aircraft
-STR_SHIPS                                                       :{WHITE}{COMMA} ship{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} train{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} road vehicle{P "" s}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aircraft
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} ship{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}None
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Company value: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% owned by {COMPANY})
@@ -2502,8 +2502,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Build HQ
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}View HQ
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Build company headquarters / view company headquarters
-STR_RELOCATE_HQ                                                 :{BLACK}Relocate HQ
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Rebuild company headquarters elsewhere for 1% cost of company value
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Relocate HQ
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Rebuild company headquarters elsewhere for 1% cost of company value
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}New Face
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Select new face for manager
@@ -2519,17 +2519,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sell 25%
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Buy 25% share in this company
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sell 25% share in this company
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Company Name
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Manager's Name
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Company Name
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Manager's Name
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}We are looking for a transport company to take-over our company.{}{}Do you want to purchase {COMPANY} for {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industry names - click on name to centre view on industry
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industry names - click on name to centre view on industry
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2565,26 +2565,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aircraft
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Profit this year: {CURRENCY} (last year: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Available Trains
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Available Vehicles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Available Ships
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Available Aircraft
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}See a list of available engine designs for this vehicle type.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Available Trains
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Available Vehicles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Available Ships
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Available Aircraft
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}See a list of available engine designs for this vehicle type.
 
-STR_MANAGE_LIST                                                 :{BLACK}Manage list
-STR_MANAGE_LIST_TIP                                             :{BLACK}Send instructions to all vehicles in this list
-STR_REPLACE_VEHICLES                                            :Replace vehicles
-STR_SEND_FOR_SERVICING                                          :Send for Servicing
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Manage list
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instructions to all vehicles in this list
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Replace vehicles
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send for Servicing
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Send to Depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send to Depot
-STR_SEND_SHIP_TO_DEPOT                                          :Send to Depot
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send to Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Send to Depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Send to Depot
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Send to Depot
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Send to Hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Click to stop all the vehicles in the list
-STR_MASS_START_LIST_TIP                                         :{BLACK}Click to start all the vehicles in the list
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Click to stop all the vehicles in the list
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Click to start all the vehicles in the list
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :All trains
@@ -2597,11 +2597,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ungrouped road
 STR_GROUP_DEFAULT_SHIPS                                         :Ungrouped ships
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ungrouped aircraft
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Groups - click on a group to list all vehicles of this group
-STR_GROUP_CREATE_TIP                                            :{BLACK}Click to create a group
-STR_GROUP_DELETE_TIP                                            :{BLACK}Delete the selected group
-STR_GROUP_RENAME_TIP                                            :{BLACK}Rename the selected group
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Click to protect this group from global autoreplace
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groups - click on a group to list all vehicles of this group
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Click to create a group
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Delete the selected group
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Rename the selected group
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Click to protect this group from global autoreplace
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Add shared vehicles
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Remove all vehicles
@@ -2624,7 +2624,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Speed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Running Cost: {GOLD}{CURRENCY}/yr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacity: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(refittable)
+STR_PURCHASE_INFO_REFITTABLE                                    :(refittable)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Designed: {GOLD}{NUM}{BLACK} Life: {GOLD}{COMMA} years
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Reliability: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
@@ -2688,17 +2688,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Drag roa
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Drag ship to here to sell it
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Drag aircraft to here to sell it
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Drag train engine here to sell the whole train
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Drag train engine here to sell the whole train
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sell all trains in the depot
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Sell all road vehicles in the depot
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sell all ships in the depot
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sell all aircraft in the hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Sell all trains in the depot
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Sell all road vehicles in the depot
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Sell all ships in the depot
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Sell all aircraft in the hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autoreplace all trains in the depot
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autoreplace all road vehicles in the depot
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autoreplace all ships in the depot
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autoreplace all aircraft in the hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autoreplace all trains in the depot
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autoreplace all road vehicles in the depot
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autoreplace all ships in the depot
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autoreplace all aircraft in the hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}New Vehicles
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}New Vehicles
@@ -2710,35 +2710,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Build ne
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Build new ship
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Build new aircraft
 
-STR_CLONE_TRAIN                                                 :{BLACK}Clone Train
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clone Vehicle
-STR_CLONE_SHIP                                                  :{BLACK}Clone Ship
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clone Aircraft
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clone Train
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clone Vehicle
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clone Ship
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clone Aircraft
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}This will build a copy of a train including all cars. Click this button and then on a train inside or outside the depot. Ctrl+Click share the orders
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}This will build a copy of a road vehicle. Click this button and then on a road vehicle inside or outside the depot. Ctrl+Click will will share the orders
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}This will build a copy of a ship. Click this button and then on a ship inside or outside the depot. Ctrl+Click will share the orders
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}This will build a copy of an aircraft. Click this button and then on an aircraft inside or outside the hangar. Ctrl+Click will share the orders
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}This will build a copy of a train including all cars. Click this button and then on a train inside or outside the depot. Ctrl+Click share the orders
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}This will build a copy of a road vehicle. Click this button and then on a road vehicle inside or outside the depot. Ctrl+Click will will share the orders
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}This will build a copy of a ship. Click this button and then on a ship inside or outside the depot. Ctrl+Click will share the orders
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}This will build a copy of an aircraft. Click this button and then on an aircraft inside or outside the hangar. Ctrl+Click will share the orders
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centre main view on train depot location
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centre main view on road vehicle depot location
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centre main view on ship depot location
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centre main view on hangar location
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Get a list of all trains with the current depot in their orders
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Get a list of all road vehicles with the current depot in their orders
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Get a list of all ships with the current depot in their orders
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Get a list of all aircraft with any hangar at this airport in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Get a list of all trains with the current depot in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Get a list of all road vehicles with the current depot in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Get a list of all ships with the current depot in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Get a list of all aircraft with any hangar at this airport in their orders
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Click to stop all the trains inside the depot
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Click to stop all the road vehicles inside the depot
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Click to stop all the ships inside the depot
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Click to stop all the aircraft inside the hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Click to stop all the trains inside the depot
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Click to stop all the road vehicles inside the depot
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Click to stop all the ships inside the depot
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Click to stop all the aircraft inside the hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Click to start all the trains inside the depot
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Click to start all the road vehicles inside the depot
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Click to start all the ships inside the depot
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Click to start all the aircraft inside the hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Click to start all the trains inside the depot
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Click to start all the road vehicles inside the depot
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Click to start all the ships inside the depot
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Click to start all the aircraft inside the hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}You are about to sell all the vehicles in the depot. Are you sure?
 
@@ -2752,38 +2752,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :ship
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :monorail locomotive
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev locomotive
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}, {CARGO}{}Running Cost: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}, {CARGO}{}Running Cost: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Replace {STRING}
-STR_VEHICLE_TRAIN                                               :Train
-STR_VEHICLE_ROAD_VEHICLE                                        :Road Vehicle
-STR_VEHICLE_SHIP                                                :Ship
-STR_VEHICLE_AIRCRAFT                                            :Aircraft
+STR_REPLACE_VEHICLE_TRAIN                                       :Train
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Road Vehicle
+STR_REPLACE_VEHICLE_SHIP                                        :Ship
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aircraft
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Select the engine type to replace
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Select the new engine type you would like to use in place of the left selected engine type
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start Replacing Vehicles
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Press to begin replacement of the left selected engine type with the right selected engine type
-STR_NOT_REPLACING                                               :{BLACK}Not replacing
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}No vehicle selected
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Not replacing
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}No vehicle selected
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop Replacing Vehicles
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Press to stop the replacement of the engine type selected on the left
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Replacing: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Switch between engine and wagon replacement windows
-STR_ENGINES                                                     :Engines
-STR_WAGONS                                                      :Wagons
+STR_REPLACE_ENGINES                                             :Engines
+STR_REPLACE_WAGONS                                              :Wagons
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Choose the railtype you want to replace engines for
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Displays which engine the left selected engine is being replaced with, if any
-STR_RAIL_VEHICLES                                               :Rail Vehicles
-STR_ELRAIL_VEHICLES                                             :Electrified Rail Vehicles
-STR_MONORAIL_VEHICLES                                           :Monorail Vehicles
-STR_MAGLEV_VEHICLES                                             :Maglev Vehicles
+STR_REPLACE_RAIL_VEHICLES                                       :Rail Vehicles
+STR_REPLACE_ELRAIL_VEHICLES                                     :Electrified Rail Vehicles
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorail Vehicles
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev Vehicles
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Wagon removal: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Make autoreplace keep the length of a train the same by removing wagons (starting at the front), if replacing the engine would make the train longer.
@@ -2801,10 +2801,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Send veh
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Send ship to depot. Ctrl+Click will only service
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Send aircraft to hangar. Ctrl+Click will only service
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}This will build a copy of the train including all cars. Ctrl+Click will share the orders
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}This will build a copy of the road vehicle. Ctrl+Click will share the orders
-STR_CLONE_SHIP_INFO                                             :{BLACK}This will build a copy of the ship. Ctrl+Click will share the orders
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}This will build a copy of the aircraft. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}This will build a copy of the train including all cars. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}This will build a copy of the road vehicle. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}This will build a copy of the ship. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}This will build a copy of the aircraft. Ctrl+Click will share the orders
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Force train to proceed without waiting for signal to clear it
 
@@ -2837,36 +2837,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Leaving
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Crashed!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Broken down
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stopped
-STR_TRAIN_STOPPING                                              :{RED}Stopping
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stopping, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}No power
-STR_TRAIN_STUCK                                                 :{ORANGE}Waiting for free path
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Heading for {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Heading for {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}No orders
-STR_NO_ORDERS_VEL                                               :{LTBLUE}No orders, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Heading for {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Heading for {TOWN} Train Depot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Heading for {TOWN} Train Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Heading for {TOWN} Road Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Heading for {TOWN} Road Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Heading for {TOWN} Ship Depot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Heading for {TOWN} Ship Depot, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Heading for {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service at {TOWN} Train Depot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service at {TOWN} Train Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service at {TOWN} Road Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service at {TOWN} Road Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service at {TOWN} Ship Depot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service at {TOWN} Ship Depot, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service at {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service at {STATION} Hangar, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stopping
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stopping, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}No power
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Waiting for free path
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Heading for {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Heading for {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}No orders
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}No orders, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Heading for {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Heading for {TOWN} Train Depot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Heading for {TOWN} Train Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Heading for {TOWN} Road Depot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Heading for {TOWN} Road Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Heading for {TOWN} Ship Depot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Heading for {TOWN} Ship Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Heading for {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Service at {TOWN} Train Depot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Service at {TOWN} Train Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Service at {TOWN} Road Depot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Service at {TOWN} Road Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Service at {TOWN} Ship Depot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service at {TOWN} Ship Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service at {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service at {STATION} Hangar, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
@@ -2879,8 +2879,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Name air
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Age: {LTBLUE}{STRING2}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} year{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} year{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} year{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} year{P "" s} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Weight: {LTBLUE}{WEIGHT_S} {BLACK}Power: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY}
@@ -2894,7 +2894,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacity
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacity: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacity: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
@@ -2910,9 +2910,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Name air
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Value: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total cargo capacity of this train:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Total cargo capacity of this train:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Empty
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} from {STATION}
@@ -2927,7 +2927,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Show cap
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Total Cargo
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Show total capacity of train, split by cargo type
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacity: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacity: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Refit)
@@ -2951,15 +2951,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Refit ai
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Orders)
-STR_TIMETABLE_VIEW                                              :{BLACK}Timetable
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Switch to the timetable view
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Timetable
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Switch to the timetable view
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Orders list - click on an order to highlight it. Ctrl+Click scrolls to the station
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING4} {STRING2}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING4} {STRING2}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - End of Orders - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - End of Shared Orders - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - End of Shared Orders - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2983,14 +2983,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transfer
 STR_ORDER_DROP_NO_UNLOADING                                     :No unloading
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Change the unloading behaviour of the highlighted order
 
-STR_REFIT                                                       :{BLACK}Refit
-STR_REFIT_TIP                                                   :{BLACK}Select what cargo type to refit to in this order. Ctrl+Click to remove refit instruction
+STR_ORDER_REFIT                                                 :{BLACK}Refit
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Select what cargo type to refit to in this order. Ctrl+Click to remove refit instruction
 
-STR_SERVICE                                                     :{BLACK}Service
+STR_ORDER_SERVICE                                               :{BLACK}Service
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Always go
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service if needed
 STR_ORDER_DROP_HALT_DEPOT                                       :Stop
-STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Skip this order unless a service is needed
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Vehicle data to base jumping on
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Load percentage
@@ -3011,7 +3011,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is true
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is false
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}The value to compare the vehicle data against
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Enter value to compare against
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Skip
@@ -3025,13 +3025,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Go to nearest d
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Go to nearest hangar
 STR_ORDER_CONDITIONAL                                           :Conditional order jump
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insert a new order before the highlighted order, or add to end of list
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Insert an advanced order
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Insert an advanced order
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Show all vehicles that share this schedule
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Show all vehicles that share this schedule
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Go via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Go non-stop via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Go via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Go non-stop via {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Service at
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Service non-stop at
@@ -3041,15 +3041,15 @@ STR_ORDER_NEAREST_HANGAR                                        :the nearest Han
 STR_ORDER_TRAIN_DEPOT                                           :Train Depot
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Road Vehicle Depot
 STR_ORDER_SHIP_DEPOT                                            :Ship Depot
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
-STR_REFIT_ORDER                                                 :(Refit to {STRING})
-STR_REFIT_STOP_ORDER                                            :(Refit to {STRING} and stop)
-STR_STOP_ORDER                                                  :(Stop)
+STR_ORDER_REFIT_ORDER                                           :(Refit to {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Refit to {STRING} and stop)
+STR_ORDER_STOP_ORDER                                            :(Stop)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Full load)
 STR_ORDER_FULL_LOAD_ANY                                         :(Full load any cargo)
@@ -3070,16 +3070,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[near end]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[middle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[far end]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Jump to order {COMMA}
-STR_CONDITIONAL_NUM                                             :Jump to order {COMMA} when {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Jump to order {COMMA} when {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Jump to order {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Jump to order {COMMA} when {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Jump to order {COMMA} when {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Invalid Order)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
-STR_ORDER_VIEW                                                  :{BLACK}Orders
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Switch to the order view
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Orders
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Switch to the order view
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetable - click on an order to highlight it.
 
@@ -3101,10 +3101,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}This veh
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Change Time
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Change the amount of time that the highlighted order should take
 
-STR_CLEAR_TIME                                                  :{BLACK}Clear Time
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Clear Time
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clear the amount of time for the highlighted order
 
-STR_RESET_LATENESS                                              :{BLACK}Reset Late Counter
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset Late Counter
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autofill
@@ -3112,42 +3112,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fill the
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}AI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Name of the AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Name of the AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Reload AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Kill the AI, reload the script, and restart the AI
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Kill the AI, reload the script, and restart the AI
 
-STR_AI_NO_AI_FOUND                                              :No suitable AI found to load.{}This AI is a dummy AI and won't do anything.{}You can download several AIs via the 'Online Content' system.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}One of the running AIs crashed. Please report this to the AI author with a screenshot of the AI Debug Window.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI Debug window is only available for the server
+STR_ERROR_AI_NO_AI_FOUND                                        :No suitable AI found to load.{}This AI is a dummy AI and won't do anything.{}You can download several AIs via the 'Online Content' system.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}One of the running AIs crashed. Please report this to the AI author with a screenshot of the AI Debug Window.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI Debug window is only available for the server
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Configuration
-STR_AI_LIST_TIP                                                 :{BLACK}All AIs that will be loaded in the next game
-STR_AI_HUMAN_PLAYER                                             :Human player
-STR_AI_RANDOM_AI                                                :Random AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}All AIs that will be loaded in the next game
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Human player
+STR_AI_CONFIG_RANDOM_AI                                         :Random AI
 
-STR_AI_CHANGE                                                   :{BLACK}Select AI
-STR_AI_CHANGE_TIP                                               :{BLACK}Load another AI
-STR_AI_CONFIGURE                                                :{BLACK}Configure
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configure the parameters of the AI
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Select AI
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Load another AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configure
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configure the parameters of the AI
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Available AIs
-STR_AI_AILIST_TIP                                               :{BLACK}Click to select an AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Click to select an AI
 
-STR_AI_AUTHOR                                                   :{BLACK}Author: {RAW_STRING}
-STR_AI_VERSION                                                  :{BLACK}Version: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {RAW_STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Author: {RAW_STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {RAW_STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Accept
-STR_AI_ACCEPT_TIP                                               :{BLACK}Select highlighted AI
-STR_AI_CANCEL                                                   :{BLACK}Cancel
-STR_AI_CANCEL_TIP                                               :{BLACK}Don't change AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accept
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select highlighted AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancel
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Don't change AI
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parameters
-STR_AI_CLOSE                                                    :{BLACK}Close
-STR_AI_RESET                                                    :{BLACK}Reset
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Close
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3168,8 +3168,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Estimate
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Estimated Income: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Saving still in progress,{}please wait until it is finished!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autosave failed
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Saving still in progress,{}please wait until it is finished!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autosave failed
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Unable to read drive
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Game Save Failed{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Unable to delete file
@@ -3180,22 +3180,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Savegame is mad
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :File not readable
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :File not writeable
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Data integrity check failed
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Game was saved in version without tram support. All trams have been removed.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Game was saved in version without tram support. All trams have been removed.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Map generation aborted...{}... no suitable town locations
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... there is no town in this scenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Map generation aborted...{}... no suitable town locations
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... there is no town in this scenario
 
-STR_PNGMAP_ERROR                                                :{WHITE}Can't load landscape from PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... file not found.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}... could not convert image type. 8 or 24-bit PNG image needed.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}... something just went wrong. Sorry. (probably corrupted file)
+STR_ERROR_PNGMAP                                                :{WHITE}Can't load landscape from PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... file not found.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... could not convert image type. 8 or 24-bit PNG image needed.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... something just went wrong. Sorry. (probably corrupted file)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Can't load landscape from BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... could not convert image type.
+STR_ERROR_BMPMAP                                                :{WHITE}Can't load landscape from BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... could not convert image type.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Scale warning
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Scale warning
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot successfully saved as '{RAW_STRING}'
@@ -3218,15 +3218,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... site
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... already built
 STR_ERROR_OWNED_BY                                              :{WHITE}... owned by {STRING2}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... area is owned by another company
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Name must be unique
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} in the way
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Name must be unique
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} in the way
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} local authority refuses to allow this
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} local authority refuses to allow another airport to be built in this town
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} local authority refuses permission for airport due to noise concerns
-STR_BRIBE_FAILED                                                :{WHITE}Your attempted bribe has been
-STR_BRIBE_FAILED_2                                              :{WHITE}discovered by a regional investigator
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} local authority refuses permission for airport due to noise concerns
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Your attempted bribe has been
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}discovered by a regional investigator
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Can't raise land here...
@@ -3235,7 +3235,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Can't le
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Excavation would damage tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... already at sea level
 STR_ERROR_TOO_HIGH                                              :{WHITE}... too high
-STR_ALREADY_LEVELLED                                            :{WHITE}... already flat
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... already flat
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Can't change company name...
@@ -3246,29 +3246,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Can't bo
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... no loan to repay
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... {CURRENCY} required
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Can't repay loan...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Can't give away money that is loaned from the bank...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Can't give away money that is loaned from the bank...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Can't buy company...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Can't build company headquarters...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Can't buy 25% share in this company...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Can't sell 25% share in this company...
-STR_PROTECTED                                                   :{WHITE}This company is not old enough to trade shares yet...
+STR_ERROR_PROTECTED                                             :{WHITE}This company is not old enough to trade shares yet...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Can't build any towns
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Can't build any towns
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Can't rename town...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Can't build town here...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... too close to edge of map
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... too close to another town
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... too many towns
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}... there is no more space on the map
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}The town will not build roads. You can enable building of roads via Advanced Settings->Economy->Towns.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Road works in progress
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... there is no more space on the map
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}The town will not build roads. You can enable building of roads via Advanced Settings->Economy->Towns.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Road works in progress
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Can't generate industries...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Can't generate industries...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Can't build {STRING} here...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Can't construct this industry type here...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... too close to another industry
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... too close to another industry
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}... must build town first
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... only one allowed per town
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... can only be built in towns with a population of at least 1200
@@ -3289,7 +3289,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Can't bu
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Adjoins more than one existing station/loading area
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... station too spread out
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... nonuniform stations disabled
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... nonuniform stations disabled
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Too many stations/loading areas
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Too many railway station parts
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Too many bus stops
@@ -3299,12 +3299,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Too clos
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Too close to another dock
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Too close to another airport
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Can't rename station...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... this is a town owned road
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... road facing in the wrong direction
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... this is a town owned road
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... road facing in the wrong direction
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Must remove railway station first
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Can't remove part of station...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Must remove railway station first
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Can't remove bus station...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Can't remove lorry station...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Can't remove passenger tram station...
@@ -3322,14 +3322,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Must dem
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Adjoins more than one existing waypoint
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Too close to another waypoint
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Can't build train waypoint here...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Can't build train waypoint here...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Can't place buoy here...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Can't change waypoint name...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Can't change waypoint name...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Can't remove train waypoint here...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Must remove rail waypoint first
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Can't remove train waypoint here...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Must remove rail waypoint first
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... buoy in the way
-STR_BUOY_IS_IN_USE                                              :{WHITE}... buoy is in use!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... buoy is in use!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Can't build train depot here...
@@ -3346,14 +3346,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Trains c
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Train too long
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Can't reverse direction of vehicle...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Can't reverse direction of vehicles consisting of multiple units...
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Incompatible rail types
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Incompatible rail types
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Can't move vehicle...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}The rear engine will always follow its front counterpart
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Unable to find route to local depot
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Unable to find local depot
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Wrong depot type
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Wrong depot type
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} is too long after replacement
@@ -3364,14 +3364,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(money limit)
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Impossible track combination
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}No suitable railway track
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Must remove railway track first
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Road is one way or blocked
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Road is one way or blocked
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Can't build signals here...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Can't build railway track here...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Can't remove railway track from here...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Can't remove signals from here...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Can't convert signals here...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Can't convert signals here...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Can't convert railtype here...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Can't convert railtype here...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Must remove road first
@@ -3382,13 +3382,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Can't re
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Can't remove tramway from here...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Can't build canals here...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Can't build locks here...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Can't place rivers here...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Can't build canals here...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Can't build locks here...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Can't place rivers here...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... must be built on water
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... can't build on water
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Must demolish canal first
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Can't build aqueduct here...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Must demolish canal first
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Can't build aqueduct here...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... tree already here
@@ -3397,9 +3397,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Can't pl
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Can't build bridge here...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Must demolish bridge first
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Can't start and end in the same spot
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Bridge heads not at the same level
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Bridge is too low for the terrain
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Can't start and end in the same spot
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Bridge heads not at the same level
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Bridge is too low for the terrain
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start and end must be in line
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... ends of bridge must both be on land
 
@@ -3408,7 +3408,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Can't bu
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Site unsuitable for tunnel entrance
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Must demolish tunnel first
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Another tunnel in the way
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnel would end out of the map
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnel would end out of the map
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Unable to excavate land for other end of tunnel
 
 # Unmovable related errors
@@ -3418,12 +3418,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Can't pu
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... you already own it!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Can't create group...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Can't delete this group...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Can't rename group...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Can't remove all vehicles from this group...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Can't add the vehicle to this group...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Can't add shared vehicles to group...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Can't create group...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Can't delete this group...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Can't rename group...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Can't remove all vehicles from this group...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Can't add the vehicle to this group...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Can't add shared vehicles to group...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Train in the way
@@ -3466,21 +3466,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Can't se
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Can't sell ship...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Can't sell aircraft...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehicle is not available
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehicle is not available
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Ship is not available
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aircraft is not available
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehicle is not available
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehicle is not available
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Ship is not available
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aircraft is not available
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Too many vehicles in game
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Can't change servicing interval...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Can't sell destroyed vehicle...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Can't refit destroyed vehicle...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Can't sell destroyed vehicle...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Can't refit destroyed vehicle...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Can't make train pass signal at danger...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Can't reverse direction of train...
-STR_TRAIN_START_NO_CATENARY                                     :This track lacks catenary, so the train can't start
+STR_ERROR_TRAIN_START_NO_CATENARY                               :This track lacks catenary, so the train can't start
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Can't make road vehicle turn around...
 
@@ -3499,14 +3499,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... vehi
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... vehicle can't go to that station
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... a vehicle sharing this order can't go to that station
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Can't share order list...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Can't copy order list...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Can't share order list...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Can't copy order list...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... too far from previous destination
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Can't timetable vehicle...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vehicles can only wait at stations.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}This vehicle is not stopping at this station.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Can't timetable vehicle...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vehicles can only wait at stations.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}This vehicle is not stopping at this station.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... too many signs
@@ -3896,35 +3896,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:RAW_STRING}-{0:RAW_STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Buoy
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Buoy #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Buoy
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Buoy #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Company {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Group {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Waypoint
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Waypoint #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Waypoint
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Waypoint #{COMMA}
 
 STR_UNKNOWN_STATION                                             :unknown station
-STR_SIGN_DEFAULT                                                :Sign
+STR_DEFAULT_SIGN_NAME                                           :Sign
 STR_COMPANY_SOMEONE                                             :someone{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING1}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spectator, {SKIP}{STRING1}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING1}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Spectator, {SKIP}{STRING1}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3942,7 +3942,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3956,25 +3956,25 @@ STR_JUST_RAW_STRING                                             :{RAW_STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{RAW_STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt
index b2d5ba95c..6c55d9ad1 100644
--- a/src/lang/english_US.txt
+++ b/src/lang/english_US.txt
@@ -453,11 +453,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Toggle graph for cargo type on/off
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Show detailed performance ratings
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Show detailed performance ratings
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Key to company graphs
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Click here to toggle company's entry on graph on/off
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Click here to toggle company's entry on graph on/off
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Company League Table
@@ -492,16 +492,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Money:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Loan:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Number of vehicles; this includes road vehicles, trains, ships and aircraft
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Number of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected to one station.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}The profit of the vehicle with the lowest income (of all vehicles older than 2 years)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Amount of cash made in the month with the lowest profit of the past 12 quarters
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Amount of cash made in the month with the highest profit of the past 12 quarters
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Units of cargo delivered in the past four quarters.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Number of types of cargo delivered in the past quarter.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Amount of money this company has in the bank
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}The amount of money this company has taken on loan
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total points out of possible points
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Number of vehicles; this includes road vehicles, trains, ships and aircraft
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Number of station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected to one station.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}The profit of the vehicle with the lowest income (of all vehicles older than 2 years)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Amount of cash made in the month with the lowest profit of the past 12 quarters
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Amount of cash made in the month with the highest profit of the past 12 quarters
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Units of cargo delivered in the past four quarters.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Number of types of cargo delivered in the past quarter.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Amount of money this company has in the bank
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}The amount of money this company has taken on loan
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total points out of possible points
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jazz Jukebox
@@ -629,8 +629,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SAVI
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Message History
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}A list of the recent news messages
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}A list of the recent news messages
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Message
@@ -851,7 +851,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Select t
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullscreen
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Check this box to play OpenTTD fullscreen mode
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fullscreen mode failed
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fullscreen mode failed
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Screen resolution
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Select the screen resolution to use
@@ -904,7 +904,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quit 'Op
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Cheats
-STR_CHEATS_TIP                                                  :{BLACK}Checkboxes indicate if you have used this cheat before
+STR_CHEATS_TOOLTIP                                              :{BLACK}Checkboxes indicate if you have used this cheat before
 STR_CHEATS_WARNING                                              :{BLACK}Warning! You are about to betray your fellow competitors. Keep in mind that such a disgrace will be remembered for eternity.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Increase money by {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Playing as company: {ORANGE}{COMMA}
@@ -919,14 +919,14 @@ STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Enable
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}New Color Scheme
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Show general color schemes
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Show train color schemes
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Show road vehicle color schemes
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Show ship color schemes
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Show aircraft color schemes
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Choose the primary color for the selected scheme
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Choose the secondary color for the selected scheme
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Select a color scheme to change, or multiple schemes with Ctrl+Click. Click on the box to toggle use of the scheme
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Show general color schemes
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Show train color schemes
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Show road vehicle color schemes
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Show ship color schemes
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Show aircraft color schemes
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Choose the primary color for the selected scheme
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Choose the secondary color for the selected scheme
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Select a color scheme to change, or multiple schemes with Ctrl+Click. Click on the box to toggle use of the scheme
 
 STR_LIVERY_DEFAULT                                              :Standard Livery
 STR_LIVERY_STEAM                                                :Steam Engine
@@ -964,19 +964,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Select f
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}New Face
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generate random new face
 STR_FACE_ADVANCED                                               :{BLACK}Advanced
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Advanced face selection.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Advanced face selection.
 STR_FACE_SIMPLE                                                 :{BLACK}Simple
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Simple face selection.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Simple face selection.
 STR_FACE_LOAD                                                   :{BLACK}Load
-STR_FACE_LOAD_TIP                                               :{BLACK}Load favorite face
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Load favorite face
 STR_FACE_LOAD_DONE                                              :{WHITE}Your favorite face has been loaded from the OpenTTD config file.
 STR_FACE_FACECODE                                               :{BLACK}Player face no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}View and/or set player face number
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}View and/or set player face number
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}View and/or set player face number
 STR_FACE_FACECODE_SET                                           :{WHITE}New face number code has been set.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Couldn't set player face number - must be numeric between 0 and 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Save
-STR_FACE_SAVE_TIP                                               :{BLACK}Save favorite face
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Save favorite face
 STR_FACE_SAVE_DONE                                              :{WHITE}This face will be saved as your favorite in the OpenTTD config file.
 STR_FACE_EUROPEAN                                               :{BLACK}European
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Select European faces
@@ -984,49 +984,49 @@ STR_FACE_AFRICAN                                                :{BLACK}African
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Select African faces
 STR_FACE_YES                                                    :Yes
 STR_FACE_NO                                                     :No
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Enable mustache or earring
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Enable mustache or earring
 STR_FACE_HAIR                                                   :Hair:
-STR_FACE_HAIR_TIP                                               :{BLACK}Change hair
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Change hair
 STR_FACE_EYEBROWS                                               :Eyebrows:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Change eyebrows
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Change eyebrows
 STR_FACE_EYECOLOUR                                              :Eye color:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Change eyecolor
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Change eyecolor
 STR_FACE_GLASSES                                                :Glasses:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Enable glasses
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Change glasses
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Enable glasses
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Change glasses
 STR_FACE_NOSE                                                   :Nose:
-STR_FACE_NOSE_TIP                                               :{BLACK}Change nose
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Change nose
 STR_FACE_LIPS                                                   :Lips:
 STR_FACE_MOUSTACHE                                              :Mustache:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Change lips or mustache
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Change lips or mustache
 STR_FACE_CHIN                                                   :Chin:
-STR_FACE_CHIN_TIP                                               :{BLACK}Change chin
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Change chin
 STR_FACE_JACKET                                                 :Jacket:
-STR_FACE_JACKET_TIP                                             :{BLACK}Change jacket
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Change jacket
 STR_FACE_COLLAR                                                 :Collar:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Change collar
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Change collar
 STR_FACE_TIE                                                    :Tie:
 STR_FACE_EARRING                                                :Earring:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Change tie or earring
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Change tie or earring
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Content downloading
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type of the content
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Type of the content
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Name
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Name of the content
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Click on a line to see the details{}Click on the checkbox to select it for downloading
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Name of the content
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Click on a line to see the details{}Click on the checkbox to select it for downloading
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Select all
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Mark all content to be downloaded
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Mark all content to be downloaded
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Select upgrades
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Mark all content that is an upgrade for existing content to be downloaded
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Mark all content that is an upgrade for existing content to be downloaded
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Unselect all
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Mark all content to be not downloaded
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Mark all content to be not downloaded
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Enter filter string
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Enter a keyword to filter the list for
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Enter a keyword to filter the list for
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag/name filter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Download
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Start downloading the selected content
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Start downloading the selected content
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total download size: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}CONTENT INFO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}You have not selected this to be downloaded
@@ -1063,17 +1063,17 @@ STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Download
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} of {BYTES} downloaded ({NUM} %)
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Transparency Options
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Toggle transparency for trees. Ctrl+Click to lock.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Toggle transparency for houses. Ctrl+Click to lock.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Toggle transparency for industries. Ctrl+Click to lock.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Toggle transparency for buildables like stations, depots and waypoints. Ctrl+Click to lock.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Toggle transparency for bridges. Ctrl+Click to lock.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Toggle transparency for structures like lighthouses and antennas. Ctrl+Click to lock.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Toggle transparency for catenary. Ctrl+Click to lock.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Toggle transparency for loading indicators. Ctrl+Click to lock.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Set objects invisible instead of transparent
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Toggle transparency for trees. Ctrl+Click to lock.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Toggle transparency for houses. Ctrl+Click to lock.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Toggle transparency for industries. Ctrl+Click to lock.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Toggle transparency for buildables like stations, depots and waypoints. Ctrl+Click to lock.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Toggle transparency for bridges. Ctrl+Click to lock.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Toggle transparency for structures like lighthouses and antennas. Ctrl+Click to lock.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Toggle transparency for catenary. Ctrl+Click to lock.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Toggle transparency for loading indicators. Ctrl+Click to lock.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Set objects invisible instead of transparent
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Coverage area highlight
@@ -1111,28 +1111,28 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Select l
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Build a station with drag & drop
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Select a station class to display
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Select the station type to build
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Select a station class to display
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Select the station type to build
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Signal Selection
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Can't convert signals here...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Block Signal (semaphore){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Entry-Signal (semaphore){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Exit-Signal (semaphore){}Behaves in the same way as a block signal but is necessary to trigger the correct color on entry & combo pre-signals.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combo-Signal (semaphore){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}One-way Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Block Signal (electric){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Entry-Signal (electric){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Exit-Signal (electric){}Behaves in the same way as a block signal but is necessary to trigger the correct color on entry & combo pre-signals.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combo-Signal (electric){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}One-way Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signal Convert{}When selected, clicking an existing signal will convert it to the selected signal type and variant, Ctrl+Click will toggle the existing variant.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Dragging signal density
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Decrease dragging signal density
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Increase dragging signal density
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signal Selection
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Can't convert signals here...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Block Signal (semaphore){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Entry-Signal (semaphore){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Exit-Signal (semaphore){}Behaves in the same way as a block signal but is necessary to trigger the correct color on entry & combo pre-signals.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combo-Signal (semaphore){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}One-way Path Signal (semaphore){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Block Signal (electric){}This is the most basic type of signal, allowing only one train to be in the same block at the same time.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Entry-Signal (electric){}Green as long as there is one or more green exit-signal from the following section of track. Otherwise it shows red.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Exit-Signal (electric){}Behaves in the same way as a block signal but is necessary to trigger the correct color on entry & combo pre-signals.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combo-Signal (electric){}The combo signal simply acts as both an entry and exit signal. This allows you to build large "trees" of presignals.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. Standard path signals can be passed from the back side.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}One-way Path Signal (electric){}A path signal allows more than one train to enter a signal block at the same time, if the train can reserve a path to a safe stopping point. One-way path signals can't be passed from the back side.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signal Convert{}When selected, clicking an existing signal will convert it to the selected signal type and variant, Ctrl+Click will toggle the existing variant.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dragging signal density
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Decrease dragging signal density
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Increase dragging signal density
 
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Road Construction
@@ -1157,9 +1157,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Toggle b
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Road Depot Orientation
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Select road vehicle depot orientation
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Select road vehicle depot orientation
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Streetcar Depot Orientation
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Select streetcar depot orientation
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Select streetcar depot orientation
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Bus Station Orientation
@@ -1223,40 +1223,40 @@ STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} en-route from {STATION})
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepts: {WHITE}
 
-STR_NO_WAITING_CARGO                                            :{BLACK}No cargo of any type is waiting
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Select all facilities
-STR_SELECT_ALL_TYPES                                            :{BLACK}Select all cargo types (including no waiting cargo)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}See a list of available engine designs for this vehicle type.
-STR_MANAGE_LIST                                                 :{BLACK}Manage list
-STR_MANAGE_LIST_TIP                                             :{BLACK}Send instructions to all vehicles in this list
-STR_REPLACE_VEHICLES                                            :Replace vehicles
-STR_SEND_FOR_SERVICING                                          :Send for Servicing
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}No cargo of any type is waiting
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Select all facilities
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Select all cargo types (including no waiting cargo)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}See a list of available engine designs for this vehicle type.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Manage list
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instructions to all vehicles in this list
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Replace vehicles
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send for Servicing
 
 STR_ERROR_OWNED_BY                                              :{WHITE}...owned by {STRING}
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Cargo
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Information
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Capacities
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Total Cargo
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total cargo (capacity) of this train:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Total cargo (capacity) of this train:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
-STR_MAPSIZE                                                     :{BLACK}Map size:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Map size:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 STR_COMPANY_SOMEONE                                             :someone{SKIP}{SKIP}
 
 STR_ABOUT_OPENTTD                                               :{WHITE}OpenTTD
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Are you sure you want to quit this game ?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Quit Game
-STR_SORT_ORDER_TIP                                              :{BLACK}Select sorting order (descending/ascending)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Select sorting criteria
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Select filtering criteria
-STR_SORT_BY                                                     :{BLACK}Sort by
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Select sorting order (descending/ascending)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Select sorting criteria
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Select filtering criteria
+STR_BUTTON_SORT_BY                                              :{BLACK}Sort by
 
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Message
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Message from {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Caution!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Caution!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Can't do this....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Can't clear this area....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -1264,45 +1264,45 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}Quit
-STR_YES                                                         :{BLACK}Yes
-STR_NO                                                          :{BLACK}No
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Yes
+STR_QUIT_NO                                                     :{BLACK}No
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}?
 
 STR_JUST_NOTHING                                                :Nothing
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Too many vehicles in game
 STR_BUTTON_LOCATION                                             :{BLACK}Location
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Default
-STR_QUERY_CANCEL                                                :{BLACK}Cancel
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Rename
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Default
+STR_BUTTON_CANCEL                                               :{BLACK}Cancel
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Rename
 
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Can't change servicing interval...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Close window
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Window title - drag this to move window
-STR_STICKY_BUTTON                                               :{BLACK}Mark this window as uncloseable for the 'Close All Windows' key
-STR_RESIZE_BUTTON                                               :{BLACK}Click and drag to resize this window
+STR_TOOLTIP_STICKY                                              :{BLACK}Mark this window as uncloseable for the 'Close All Windows' key
+STR_TOOLTIP_RESIZE                                              :{BLACK}Click and drag to resize this window
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Click here to jump to the current default save/load directory
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolish buildings etc. on a square of land
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Lower a corner of land
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Raise a corner of land
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Lower a corner of land
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Raise a corner of land
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scroll bar - scrolls list up/down
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scroll bar - scrolls list left/right
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Profit this year: {CURRENCY} (last year: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} year{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} year{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} year{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} year{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Train
-STR_VEHICLE_ROAD_VEHICLE                                        :Road vehicle
-STR_VEHICLE_SHIP                                                :Ship
-STR_VEHICLE_AIRCRAFT                                            :Aircraft
+STR_REPLACE_VEHICLE_TRAIN                                       :Train
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Road vehicle
+STR_REPLACE_VEHICLE_SHIP                                        :Ship
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aircraft
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Land Area Information
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Cost to clear: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Cost to clear: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Revenue when cleared: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Revenue when cleared: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Owner: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Road owner: {LTBLUE}{STRING}
@@ -1311,11 +1311,11 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Railroad
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Local authority: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :None
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Name
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Cargo accepted: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Click on service to center view on industry/town
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click on service to center view on industry/town
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...too far from previous destination
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
@@ -1326,7 +1326,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Decrease
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generate random land
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Reset landscape
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Reset Landscape
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Remove all player-owned property from the map
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Remove all player-owned property from the map
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Are you sure you want to remove all player-owned property?
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Town Generation
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}New Town
@@ -1336,11 +1336,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...too c
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...too close to another town
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...site unsuitable
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...too many towns
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Can't build any towns
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...there is no more space on the map
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Can't build any towns
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...there is no more space on the map
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Increase size of town
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expand
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}The town will not build roads. You can enable building of roads via Advanced Settings->Economy->Towns.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}The town will not build roads. You can enable building of roads via Advanced Settings->Economy->Towns.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Random Town
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Build town in random location
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Can't build {STRING} here...
@@ -1354,20 +1354,20 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Place ro
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Place lighthouse
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Place transmitter
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Define desert area.{}Press and hold Ctrl to remove it
-STR_CREATE_LAKE                                                 :{BLACK}Define water area.{}Make a canal. If Ctrl is held down at sea level, it will flood the surroundings instead
-STR_CREATE_RIVER                                                :{BLACK}Place rivers.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Define water area.{}Make a canal. If Ctrl is held down at sea level, it will flood the surroundings instead
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Place rivers.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Delete
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Delete this town completely
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Save scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Load scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Load heightmap
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Load heightmap
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Quit editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Quit
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Save scenario, load scenario, abandon scenario editor, quit
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Load Scenario
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Save Scenario
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Are you sure you want to quit this scenario ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Are you sure you want to quit this scenario ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...can only be built in towns with a population of at least 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Move the starting date backward 1 year
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Move the starting date forward 1 year
@@ -1375,19 +1375,19 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...ends
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Small
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Medium
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Large
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Random
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Random
 STR_FOUND_TOWN_CITY                                             :{BLACK}City
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Select town size
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Town size:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Town road layout:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Select road layout used for this town
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Better roads
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 grid
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 grid
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Random
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Town road layout:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Select road layout used for this town
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Better roads
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 grid
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 grid
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Random
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Fund new industry
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...can only be built in rainforest areas
@@ -1396,15 +1396,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...can o
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot successfully saved as '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screenshot failed!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Purchase land for future use
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Saving still in progress,{}please wait until it is finished!
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Purchase land for future use
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Saving still in progress,{}please wait until it is finished!
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autosave failed
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autosave failed
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Heading for {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Heading for {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}No orders
-STR_NO_ORDERS_VEL                                               :{LTBLUE}No orders, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Heading for {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Heading for {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}No orders
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}No orders, {VELOCITY}
 
 STR_PASSENGERS                                                  :passengers
 STR_BAGS                                                        :bags
@@ -1415,9 +1415,9 @@ STR_CRATES                                                      :crates
 STR_RES_OTHER                                                   :other
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Can't share order list...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Can't copy order list...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - End of Shared Orders - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Can't share order list...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Can't copy order list...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - End of Shared Orders - -
 
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} is too long after replacement
 STR_ERROR_AUTOREPLACE_NOTHING_TO_DO                             :{WHITE}No autoreplace/renew rules applied.
@@ -1670,170 +1670,170 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-size
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :disabled
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Change setting value
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Change setting value
 
-STR_TEMPERATE_LANDSCAPE                                         :Temperate landscape
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-arctic landscape
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropical landscape
-STR_TOYLAND_LANDSCAPE                                           :Toyland landscape
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Temperate landscape
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub-arctic landscape
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub-tropical landscape
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Toyland landscape
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Heading for {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Heading for {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Go via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Go non-stop via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Go via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Go non-stop via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Buoy
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Buoy #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Waypoint
+STR_FORMAT_WAYPOINT_NAME                                        :Waypoint {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Waypoint {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Buoy
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Buoy #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Waypoint
 
-STR_WAYPOINT                                                    :{WHITE}Waypoint
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Select waypoint type
+STR_WAYPOINT_CAPTION                                            :{WHITE}Waypoint
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Select waypoint type
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Edit waypoint name
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Can't change waypoint name...
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Can't build train waypoint here...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Can't remove train waypoint here...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Can't change waypoint name...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Can't build train waypoint here...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Can't remove train waypoint here...
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...there is no town in this scenario
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Map generation aborted...{}...no suitable town locations
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...there is no town in this scenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Map generation aborted...{}...no suitable town locations
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Many random towns
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Cover the map with randomly placed towns
-STR_MANY_RANDOM_INDUSTRIES                                      :Many random industries
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Cover the map with randomly placed industries
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Can't generate industries...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Many random towns
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cover the map with randomly placed towns
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Many random industries
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Cover the map with randomly placed industries
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Can't generate industries...
 
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landscaping
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Level land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Level land
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trees of random type
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Place trees of random type
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Place trees of random type
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Can't build canals here...
-STR_LANDINFO_CANAL                                              :Canal
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Can't build canals here...
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Can't build locks here...
-STR_LANDINFO_LOCK                                               :Lock
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Can't build locks here...
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Lock
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Can't place rivers here...
-STR_LANDINFO_RIVER                                              :River
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Can't place rivers here...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :River
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... buoy is in use!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... buoy is in use!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Co-ordinates: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Co-ordinates: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Can't remove part of station...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Can't convert railtype here...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Can't remove part of station...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Can't convert railtype here...
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Drag train engine here to sell the whole train
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Drag train engine here to sell the whole train
 
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Disable all
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Enable all
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Disable all
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Enable all
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industry names - click on name to center view on industry
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transported)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transported)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industry names - click on name to center view on industry
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...too close to another industry
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...too close to another industry
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Change production
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multiplayer
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Player name:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}This is the name other players will identify you by
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Enter your name
-STR_NETWORK_CONNECTION                                          :{BLACK}Connection:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choose between an internet game or a local area nework game
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Start server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start an own server
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Name
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Name of the game
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Language, server version, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Click a game from the list to select it
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}The server you joined last time:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Click to select the server you played last time
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Find server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Search network for a server
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Add server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adds a server to the list which will always be checked for running games.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Enter the IP address of the server
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients online / clients max
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Map size
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Map size of the game{}Click to sort by area
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Date
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Current date
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Years
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Number of years{}the game is running
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}GAME INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Language: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Map size: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Server version: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Server address: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start date: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Current date: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Password protected!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSION MISMATCH
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MISMATCH
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Join game
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start new game
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Game name:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}The game name will be displayed to other players in the multiplayer game selection menu
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Enter a name for the network game
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Set password
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protect your game with a password if you don't want other people to join it
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Select a map:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Which map do you want to play?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertize)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max clients:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Choose a maximum number of clients. Not all slots need to be filled.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P y ies}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max companies:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limit the server to a certain number of companies
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max spectators:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limit the server to a certain number of spectators
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Language spoken:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Other players will know which language is spoken on the server.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Start Game
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Start a new network game from a random map, or scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Load Game
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Resume an earlier saved multiplayer game (be sure to connect as the correct player)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Enter your name
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Connection:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Choose between an internet game or a local area nework game
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start an own server
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Name
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Name of the game
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Language, server version, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Click a game from the list to select it
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}The server you joined last time:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Click to select the server you played last time
+
+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_ENTER_IP                                :{BLACK}Enter the IP address of the server
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clients
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clients online / clients max
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Map size
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Map size of the game{}Click to sort by area
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Date
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Current date
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Years
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Number of years{}the game is running
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}GAME INFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Language: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tileset: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Map size: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Server version: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Server address: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start date: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Current date: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Password protected!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER FULL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSION MISMATCH
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF MISMATCH
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Join game
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start new game
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Game name:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}The game name will be displayed to other players in the multiplayer game selection menu
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Enter a name for the network 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 other people to join it
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Select a map:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Which map do you want to play?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (advertize)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max clients:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Choose a maximum number of clients. Not all slots need to be filled.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P y ies}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max companies:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limit the server to a certain number of companies
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max spectators:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limit the server to a certain number of spectators
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Language spoken:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Other players will know which language is spoken on the server.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start Game
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Start a new network game from a random map, or scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Load Game
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Resume an earlier saved multiplayer game (be sure to connect as the correct player)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Any
@@ -1874,33 +1874,33 @@ STR_NETWORK_LANG_GREEK                                          :Greek
 STR_NETWORK_LANG_LATVIAN                                        :Latvian
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer game lobby
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Multiplayer game lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparing to join: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}A list of all companies currently in this game. You can either join one or start a
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}New company
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Open a new company
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Watch game
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Watch the game as a spectator
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Join company
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Help managing this company
-STR_NETWORK_REFRESH                                             :{BLACK}Refresh server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refresh the server info
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparing to join: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}A list of all companies currently in this game. You can either join one or start a
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}New company
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Open a new company
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Watch game
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Watch the game as a spectator
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Join company
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Help managing this company
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refresh server
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refresh the server info
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}COMPANY INFO
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}COMPANY INFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Company value: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's income: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Company name: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguration: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Company value: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Current balance: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Last year's income: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performance: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Players: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vehicles: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stations: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Players: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Connecting...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Connecting...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connecting..
@@ -1916,49 +1916,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} in front of us
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} downloaded so far
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnect
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconnect
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Enter the amount of money you want to give
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Client List
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Client List
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectate
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}New Company
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}No network devices found or compiled without ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Could not find any network games
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}The server didn't answer the request
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Could not connect due to NewGRF mismatch
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Network-Game synchronization failed.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Network-Game connection lost.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Could not load savegame
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Could not start the server
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Could not connect
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Connection #{NUM} timed out
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} We made a protocol-error and our connection is closed.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}The revision of this client does not match the server's revision
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Wrong password
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}The server is full
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}You are banned from this server
-STR_NETWORK_ERR_KICKED                                          :{WHITE}You were kicked out of the game
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Cheating is not allowed on this server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}No network devices found or compiled without ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Could not find any network games
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}The server didn't answer the request
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Could not connect due to NewGRF mismatch
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Network-Game synchronization failed.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Network-Game connection lost.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Could not load savegame
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Could not start the server
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Could not connect
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Connection #{NUM} timed out
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} We made a protocol-error and our connection is closed.
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}The revision of this client does not match the server's revision
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Wrong password
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}The server is full
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}You are banned from this server
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}You were kicked out of the game
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheating is not allowed on this server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :general error
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync error
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :could not load map
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection lost
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protocol error
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF mismatch
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :not authorized
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :received strange packet
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :wrong revision
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :name already in use
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :wrong game-password
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :wrong company-id in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :kicked by server
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :was trying to use a cheat
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server full
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :general error
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desync error
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :could not load map
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connection lost
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protocol error
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF mismatch
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :not authorized
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :received strange packet
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :wrong revision
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :name already in use
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :wrong game-password
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :wrong company-id in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :kicked by server
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :was trying to use a cheat
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server full
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1968,15 +1968,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Game paused (co
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Game unpaused (client connected)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Game unpaused (client failed to connect)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :leaving
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} has joined the game
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} has joined company #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} has joined spectators
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} has started a new company (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} has left the game ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} has changed his/her name to {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gave your company {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** You gave {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :leaving
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} has joined the game
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} has joined company #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} has joined spectators
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} has started a new company (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} has left the game ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} has changed his/her name to {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gave your company {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** You gave {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] To {STRING}: {WHITE}{STRING}
@@ -1986,8 +1986,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] To {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Enter text for network chat
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} The server closed the session
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} The server is restarting...{}Please wait...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} The server closed the session
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} The server is restarting...{}Please wait...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
@@ -2001,19 +2001,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Speak to compan
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Private message
 
 
-STR_NETWORK_SEND                                                :{BLACK}Send
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Send
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Can't load landscape from PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...file not found.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...could not convert image type. 8 or 24-bit PNG image needed.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...something just went wrong. Sorry. (probably corrupted file)
+STR_ERROR_PNGMAP                                                :{WHITE}Can't load landscape from PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...file not found.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...could not convert image type. 8 or 24-bit PNG image needed.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...something just went wrong. Sorry. (probably corrupted file)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Can't load landscape from BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...could not convert image type.
+STR_ERROR_BMPMAP                                                :{WHITE}Can't load landscape from BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...could not convert image type.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Cost: {CURRENCY}
@@ -2027,13 +2027,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Estimate
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Can't raise land here...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Can't lower land here...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Can't level land here...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rocks
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Rough land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Bare land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Grass
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Fields
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snow-covered land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Desert
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rocks
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Rough land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bare land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Grass
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Fields
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snow-covered land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Desert
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Land sloped in wrong direction
@@ -2041,11 +2041,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Impossib
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Excavation would damage tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Already at sea-level
 STR_ERROR_TOO_HIGH                                              :{WHITE}Too high
-STR_ALREADY_LEVELLED                                            :{WHITE}... already flat
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... already flat
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}No suitable railroad track
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...already built
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Must remove railroad track first
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Road is one way or blocked
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Road is one way or blocked
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Railroad Construction
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Electrified Railroad Construction
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Monorail Construction
@@ -2057,43 +2057,43 @@ STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Can't bu
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Can't build railroad track here...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Can't remove railroad track from here...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Can't remove signals from here...
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Bridge selection - click on your prefered bridge to build it
-STR_RAILROAD_TRACK                                              :Railroad track
-STR_RAILROAD_TRAIN_DEPOT                                        :Railroad train depot
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Bridge selection - click on your prefered bridge to build it
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Railroad track
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Railroad train depot
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...area is owned by another company
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Railroad track with block signals
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Railroad track with pre-signals
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Railroad track with exit-signals
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Railroad track with combo-signals
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Railroad track with path signals
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Railroad track with one-way path signals
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Railroad track with block and pre-signals
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Railroad track with block and exit-signals
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Railroad track with block and combo-signals
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Railroad track with block and path signals
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Railroad track with block and one-way path signals
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Railroad track with pre- and exit-signals
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Railroad track with pre- and combo-signals
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Railroad track with pre- and path signals
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Railroad track with pre- and one-way path signals
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Railroad track with exit- and combo-signals
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Railroad track with exit- and path signals
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Railroad track with exit- and one-way path signals
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Railroad track with combo- and path signals
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Railroad track with combo- and one-way path signals
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Railroad track with path and one-way path signals
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Must remove railroad station first
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Must remove rail waypoint first
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Build a separate station
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Build a separate waypoint
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Join station
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Join waypoint
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Railroad track with block signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Railroad track with pre-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Railroad track with exit-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Railroad track with combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Railroad track with path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Railroad track with one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Railroad track with block and pre-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Railroad track with block and exit-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Railroad track with block and combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Railroad track with block and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Railroad track with block and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Railroad track with pre- and exit-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Railroad track with pre- and combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Railroad track with pre- and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Railroad track with pre- and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Railroad track with exit- and combo-signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Railroad track with exit- and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Railroad track with exit- and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Railroad track with combo- and path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Railroad track with combo- and one-way path signals
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Railroad track with path and one-way path signals
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Must remove railroad station first
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Must remove rail waypoint first
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Build a separate station
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Build a separate waypoint
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Join station
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Join waypoint
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Must remove road first
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Road works in progress
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Road works in progress
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Select Road Bridge
 STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... one way roads can't have junctions
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Can't build road here...
@@ -2106,12 +2106,12 @@ STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Can't bu
 STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Can't build truck station...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}Can't build passenger streetcar station...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}Can't build freight streetcar station...
-STR_ROAD_DESCRIPTION_ROAD                                       :Road
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Road with streetlights
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Tree-lined road
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Road vehicle depot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Road/rail grade crossing
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Streetcar track
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Road
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Road with streetlights
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Tree-lined road
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Road vehicle depot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Road/rail grade crossing
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Streetcar track
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Can't remove bus station...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Can't remove truck station...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Can't remove passenger streetcar station...
@@ -2119,12 +2119,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Can't re
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Towns
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Building must be demolished first
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (City)
@@ -2137,9 +2137,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Center t
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Change town name
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passengers last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Mail last month: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Cargo needed for town growth:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} required
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} delivered last month
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Cargo needed for town growth:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} required
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} delivered last month
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Tall office block
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Office block
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Small block of apartments
@@ -2169,7 +2169,7 @@ STR_SUBSIDIES_NONE                                              :{ORANGE}None
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Services already subsidized:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} from {STATION} to {STATION}{YELLOW} ({COMPANY}{YELLOW}, until {DATE_SHORT})
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} local authority refuses to allow another airport to be built in this town
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} local authority refuses permission for airport due to noise concerns
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} local authority refuses permission for airport due to noise concerns
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Cottages
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Houses
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Apartments
@@ -2203,7 +2203,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{WHITE}{STRING}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{WHITE}{STRING}{}{YELLOW}Buy 1 year's exclusive transport rights in town. Town authority will only allow passengers and cargo to use your company's stations.{}Cost: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}{}{YELLOW}Bribe the local authority to increase your rating, at the risk of a severe penalty if caught.{}Cost: {CURRENCY}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (under construction)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (under construction)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igloo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tepees
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teapot-House
@@ -2213,17 +2213,17 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Piggy-Bank
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Trees
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...tree already here
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Can't plant tree here...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...too many signs
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Can't place sign here...
-STR_SIGN_DEFAULT                                                :Sign
+STR_DEFAULT_SIGN_NAME                                           :Sign
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edit sign text
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Can't change sign name...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Can't delete sign...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Select tree type to plant
-STR_TREE_NAME_TREES                                             :Trees
-STR_TREE_NAME_RAINFOREST                                        :Rainforest
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactuses
+STR_LAI_TREE_NAME_TREES                                         :Trees
+STR_LAI_TREE_NAME_RAINFOREST                                    :Rainforest
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactuses
 
 ##id 0x3000
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Too close to another railroad station
@@ -2240,7 +2240,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Must dem
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Too close to another airport
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Must demolish airport first
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Rename station/loading area
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Rename station/loading area
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Can't rename station...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ratings
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepts
@@ -2258,10 +2258,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Outstanding
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Show all trains which have this station on their schedule
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Show all road vehicles which have this station on their schedule
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Show all aircraft which have this station on their schedule
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Show all ships which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Show all trains which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Show all road vehicles which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Show all aircraft which have this station on their schedule
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Show all ships which have this station on their schedule
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}Must demolish bus station first
@@ -2282,41 +2282,41 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Change n
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Show list of accepted cargo
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Station names - click on name to center main view on station
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Select size/type of airport
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Railroad station
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Aircraft hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Airport
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Truck loading area
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bus station
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Ship dock
-STR_STATION_DESCRIPTION_BUOY                                    :Buoy
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Railroad station
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Aircraft hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Airport
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Truck loading area
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bus station
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Ship dock
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Buoy
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...buoy in the way
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...station too spread out
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...nonuniform stations disabled
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold down Ctrl to select more than one item
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...nonuniform stations disabled
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hold down Ctrl to select more than one item
 
 STR_UNDEFINED                                                   :(undefined string)
-STR_STAT_CLASS_DFLT                                             :Default station
-STR_STAT_CLASS_WAYP                                             :Waypoints
+STR_STATION_CLASS_DFLT                                          :Default station
+STR_STATION_CLASS_WAYP                                          :Waypoints
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...must be built on water
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Can't build ship depot here...
-STR_WATER_DESCRIPTION_WATER                                     :Water
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Coast or riverbank
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Ship depot
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aqueduct
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Water
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Coast or riverbank
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Ship depot
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqueduct
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Can't build on water
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Must demolish canal first
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Must demolish canal first
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Save Game
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Load Game
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Save
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Delete
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spectator, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Spectator, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} free
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Unable to read drive
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Game Save Failed{}{STRING}
@@ -2332,12 +2332,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}List of
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Currently selected name for saved-game
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Delete the currently selected saved-game
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Save the current game, using the selected name
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generate random new game
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Load Heightmap
-STR_SAVE_OSKTITLE                                               :{BLACK}Enter a name for the savegame
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generate random new game
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Load Heightmap
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Enter a name for the savegame
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} in the way
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} in the way
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Coal Mine
 STR_INDUSTRY_NAME_POWER_STATION                                 :Power Station
@@ -2393,23 +2393,23 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Produces
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Production last month:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% transported)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Center the main view on industry location
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cost: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cost: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Can't construct this industry type here...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...forest can only be planted above snow-line
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...can only be positioned near edges of map
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Another tunnel in the way
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnel would end out of the map
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnel would end out of the map
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Unable to excavate land for other end of tunnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Must demolish tunnel first
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Must demolish bridge first
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Cannot start and end on same position
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Bridge heads not at the same level
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Bridge is too low for the terrain
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Cannot start and end on same position
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Bridge heads not at the same level
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Bridge is too low for the terrain
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start and end must be in line
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Site unsuitable for tunnel entrance
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspension, Steel
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Girder, Steel
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Cantilever, Steel
@@ -2420,30 +2420,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Tubular, Steel
 STR_BRIDGE_TUBULAR_SILICON                                      :Tubular, Silicon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Can't build bridge here...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Can't build tunnel here...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Railroad tunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Road tunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Steel suspension rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Steel girder rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Steel cantilever rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Reinforced concrete suspension rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Wooden rail bridge
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Concrete rail bridge
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Steel suspension road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Steel girder road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Steel cantilever road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Reinforced concrete suspension road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Wooden road bridge
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Concrete road bridge
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Tubular rail bridge
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Tubular road bridge
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Railroad tunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Road tunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Steel suspension rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Steel girder rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Steel cantilever rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Reinforced concrete suspension rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Wooden rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Concrete rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Steel suspension road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Steel girder road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Steel cantilever road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Reinforced concrete suspension road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Wooden road bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Concrete road bridge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Tubular rail bridge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Tubular road bridge
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Object in the way
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmitter
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Lighthouse
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Company Headquarters
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmitter
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Lighthouse
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Company Headquarters
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...company headquarters in the way
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Company-owned land
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Company-owned land
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Can't purchase this land area...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...you already own it!
 
@@ -2491,7 +2491,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Statio
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Difficulty Level
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Save
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Save
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Easy
@@ -2563,8 +2563,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Color Sc
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Color Scheme:
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Company Name
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}President Name
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Company Name
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :President's Name
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Company Name
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :President's Name
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Can't change company name...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Can't change president's name...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finances {BLACK}{COMPANYNUM}
@@ -2589,7 +2589,7 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bank Balance
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Loan
-STR_MAX_LOAN                                                    :{WHITE}Max Loan: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max Loan: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Borrow {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Repay {SKIP}{SKIP}{CURRENCY}
@@ -2598,7 +2598,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Can't bo
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...no loan to repay
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} required
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Can't repay loan...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Can't give away money that is loaned from the bank...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Can't give away money that is loaned from the bank...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Select new face for president
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Change the company vehicle livery
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Change the president's name
@@ -2608,31 +2608,31 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Repay pa
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(President)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurated: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehicles:
-STR_TRAINS                                                      :{WHITE}{COMMA} train{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} road vehicle{P "" s}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aircraft
-STR_SHIPS                                                       :{WHITE}{COMMA} ship{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} train{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} road vehicle{P "" s}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aircraft
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} ship{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}None
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENTNAME}{}(President)
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}We are looking for a transport company to take-over our company{}{}Do you want to purchase {COMPANY} for {CURRENCY}?
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Can't buy company...
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Build HQ
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Build company headquarters / view company headquarters
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Rebuild company headquarters elsewhere for 1% cost of company value
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Rebuild company headquarters elsewhere for 1% cost of company value
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Can't build company headquarters...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}View HQ
-STR_RELOCATE_HQ                                                 :{BLACK}Relocate HQ
-STR_COMPANY_JOIN                                                :{BLACK}Join
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Join and play as this company
-STR_COMPANY_PASSWORD                                            :{BLACK}Password
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Password-protect your company to prevent unauthorized users from joining.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Set company password
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Relocate HQ
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Join
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Join and play as this company
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Password
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Password-protect your company to prevent unauthorized users from joining.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Set company password
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Do not save the entered password
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Give the company the new password
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Company password
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Default company password
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Use this company password as default for new companies
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Toggle large/small window size
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Default company password
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Use this company password as default for new companies
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Toggle large/small window size
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Company value: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Buy 25% share in company
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sell 25% share in company
@@ -2641,7 +2641,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sell 25%
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Can't buy 25% share in this company...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Can't sell 25% share in this company...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% owned by {COMPANY})
-STR_PROTECTED                                                   :{WHITE}This company is not old enough to trade shares yet...
+STR_ERROR_PROTECTED                                             :{WHITE}This company is not old enough to trade shares yet...
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Steam)
@@ -2948,9 +2948,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(No unload and
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Change the stopping behaviour of the highlighted order
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Change the loading behaviour of the highlighted order
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Change the unloading behaviour of the highlighted order
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Insert an advanced order
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Insert an advanced order
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Go to nearest depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Go to nearest hangar
 STR_ORDER_NEAREST_DEPOT                                         :the nearest
@@ -2960,9 +2960,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Service non-sto
 STR_ORDER_TRAIN_DEPOT                                           :Train Depot
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Road Vehicle Depot
 STR_ORDER_SHIP_DEPOT                                            :Ship Depot
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Always go
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service if needed
@@ -2987,10 +2987,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :is more than
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :is more or equal to
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :is true
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :is false
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Jump to order {COMMA}
-STR_CONDITIONAL_NUM                                             :Jump to order {COMMA} when {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Jump to order {COMMA} when {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Jump to order {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Jump to order {COMMA} when {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Jump to order {COMMA} when {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}No travel
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Travel (not timetabled)
@@ -3013,18 +3013,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Trains c
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Skip
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Delete
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Go To
-STR_REFIT                                                       :{BLACK}Refit
-STR_REFIT_TIP                                                   :{BLACK}Select what cargo type to refit to in this order. Ctrl+Click to remove refit instruction
-STR_REFIT_ORDER                                                 :(Refit to {STRING})
-STR_REFIT_STOP_ORDER                                            :(Refit to {STRING} and stop)
-STR_STOP_ORDER                                                  :(Stop)
-STR_TIMETABLE_VIEW                                              :{BLACK}Timetable
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Switch to the timetable view
-STR_ORDER_VIEW                                                  :{BLACK}Orders
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Switch to the order view
+STR_ORDER_REFIT                                                 :{BLACK}Refit
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Select what cargo type to refit to in this order. Ctrl+Click to remove refit instruction
+STR_ORDER_REFIT_ORDER                                           :(Refit to {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Refit to {STRING} and stop)
+STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Timetable
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Switch to the timetable view
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Orders
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Switch to the order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Orders)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - End of Orders - -
-STR_SERVICE                                                     :{BLACK}Service
+STR_ORDER_SERVICE                                               :{BLACK}Service
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Value: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3044,7 +3044,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vehicle
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}a vehicle sharing this order can't go to that station
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Can't move vehicle...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}The rear engine will always follow its front counterpart
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Unable to find route to local depot
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servicing interval: {LTBLUE}{COMMA}days{BLACK}   Last service: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servicing interval: {LTBLUE}{COMMA}%{BLACK}   Last service: {LTBLUE}{DATE_LONG}
@@ -3064,10 +3064,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Timetabl
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Change the amount of time that the highlighted order should take
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clear the amount of time for the highlighted order
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reset the lateness counter, so the vehicle will be on time
-STR_SERVICE_HINT                                                :{BLACK}Skip this order unless a service is needed
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}, {CARGO}{}Running Cost: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Skip this order unless a service is needed
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {CURRENCY} Weight: {WEIGHT_S}{}Speed: {VELOCITY}  Power: {POWER}{}Running Cost: {CURRENCY}/yr{}Capacity: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}, {CARGO}{}Running Cost: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY} Max. Speed: {VELOCITY}{}Capacity: {CARGO}{}Running Cost: {CURRENCY}/yr
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Age: {LTBLUE}{STRING}{BLACK}   Running Cost: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. speed: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Weight: {LTBLUE}{WEIGHT_S} {BLACK}Power: {LTBLUE}{POWER}{BLACK} Max. speed: {LTBLUE}{VELOCITY}
@@ -3086,24 +3086,24 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Crashed!
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Can't reverse direction of train...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Can't reverse direction of vehicle...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Can't turn vehicles consisting of multiple units
-STR_CLEAR_TIME                                                  :{BLACK}Clear Time
-STR_RESET_LATENESS                                              :{BLACK}Reset Late Counter
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Change waypoint name
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Change buoy name
-
-STR_TRAIN_STOPPING                                              :{RED}Stopping
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stopping, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Incompatible rail types
-STR_TRAIN_NO_POWER                                              :{RED}No power
-STR_TRAIN_START_NO_CATENARY                                     :This track lacks catenary, so the train can't start
-STR_TRAIN_STUCK                                                 :{ORANGE}Waiting for free path
-
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Can't sell destroyed vehicle...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Can't refit destroyed vehicle...
-
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Can't timetable vehicle...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vehicles can only wait at stations.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}This vehicle is not stopping at this station.
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Clear Time
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset Late Counter
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Change waypoint name
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Change buoy name
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stopping
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stopping, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Incompatible rail types
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}No power
+STR_ERROR_TRAIN_START_NO_CATENARY                               :This track lacks catenary, so the train can't start
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Waiting for free path
+
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Can't sell destroyed vehicle...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Can't refit destroyed vehicle...
+
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Can't timetable vehicle...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vehicles can only wait at stations.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}This vehicle is not stopping at this station.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Change Time
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}This vehicle is currently running on time
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}This vehicle is currently running {STRING} late
@@ -3117,7 +3117,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fill the
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...must be stopped inside a road vehicle depot
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Unable to find local depot
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Force vehicle to turn around
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacity: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacity: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vehicle{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3130,39 +3130,39 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Can't bu
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Ship must be stopped in depot
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Can't place buoy here...
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Can't build aqueduct here...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Can't build aqueduct here...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Refit)
 STR_REFIT_TITLE                                                 :{GOLD}Select cargo type to carry:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}New capacity: {GOLD}{CARGO}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(refittable)
+STR_PURCHASE_INFO_REFITTABLE                                    :(refittable)
 
 ##id 0xA000
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Can't build airport here...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Aircraft is in flight
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Aircraft must be stopped in hangar
 
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
 ##id 0xB000
-STR_BRIBE_FAILED                                                :{WHITE}Your attempted bribery has been
-STR_BRIBE_FAILED_2                                              :{WHITE}discovered by a regional investigator
-STR_BUILD_DATE                                                  :{BLACK}Built: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Your attempted bribery has been
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}discovered by a regional investigator
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Built: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Station class: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Station type: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Station class: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Station type: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF settings
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Apply changes
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Toggle palette
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Set parameters
-STR_NEWGRF_FILENAME                                             :{BLACK}Filename: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palette: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Apply changes
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toggle palette
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Filename: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}You are about to make changes to a running game; this can crash OpenTTD.{}Are you absolutely sure about this?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3185,34 +3185,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contains a corrupt sprite. All corrupt sprites will be shown as a red question mark (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Load the selected preset
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Save preset
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Save the current list as a preset
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Enter name for preset
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Delete preset
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Delete the currently selected preset
-STR_NEWGRF_ADD                                                  :{BLACK}Add
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Add a NewGRF file to the list
-STR_NEWGRF_REMOVE                                               :{BLACK}Remove
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Remove the selected NewGRF file from the list
-STR_NEWGRF_MOVEUP                                               :{BLACK}Move Up
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move the selected NewGRF file up the list
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Move Down
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move the selected NewGRF file down the list
-STR_NEWGRF_FILE_TIP                                             :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameters: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Enter NewGRF parameters
-STR_NEWGRF_NO_INFO                                              :{BLACK}No information available
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Load the selected preset
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Save preset
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Save the current list as a preset
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Enter name for preset
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Delete preset
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Delete the currently selected preset
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Add
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Add a NewGRF file to the list
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Remove
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Remove the selected NewGRF file from the list
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Move Up
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Move the selected NewGRF file up the list
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Move Down
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move the selected NewGRF file down the list
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameters: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enter NewGRF parameters
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}No information available
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Available NewGRF files
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Add to selection
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Add the selected NewGRF file to your configuration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Rescan files
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Update the list of available NewGRF files
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Add the selected NewGRF file to your configuration
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Rescan files
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Update the list of available NewGRF files
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Can't add file: duplicate GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Matching file not found
-STR_NEWGRF_DISABLED                                             :{RED}Disabled
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Matching file not found
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabled
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matching file not found (compatible GRF loaded)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Compatible GRF(s) loaded for missing files
@@ -3228,7 +3228,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit information for '{1:ENGINE}' differs from purchase list after construction. This might cause autorenew/-replace to fail refitting correctly.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' caused an endless loop in the production callback.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Game was saved in version without streetcar support. All streetcars have been removed.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Game was saved in version without streetcar support. All streetcars have been removed.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Custom currency
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Exchange rate: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3239,16 +3239,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Switch
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Switch to Euro: {ORANGE}never
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Preview: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Change custom currency parameter
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Decrease the amount of your currency for one Pound (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Increase the amount of your currency for one Pound (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Set the exchange rate of your currency for one Pound (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Set the separator for your currency
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Set the prefix string for your currency
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Set the suffix string for your currency
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Switch to Euro earlier
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Switch to Euro later
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Set the year to switch to Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pound (£) in your currency
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Decrease the amount of your currency for one Pound (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Increase the amount of your currency for one Pound (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Set the exchange rate of your currency for one Pound (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Set the separator for your currency
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Set the prefix string for your currency
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Set the suffix string for your currency
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Switch to Euro earlier
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Switch to Euro later
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Set the year to switch to Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pound (£) in your currency
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3267,8 +3267,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Ship{P "" s}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aircraft
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Show all vehicles that share this schedule
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Shared orders of {COMMA} Vehicle{P "" s}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Show all vehicles that share this schedule
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Refit train
 STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Refit road vehicle
@@ -3370,39 +3370,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Refit ro
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Refit cargo ship to carry a different cargo type
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Refit aircraft to carry a different cargo type
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Heading for {TOWN} Train Depot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Heading for {TOWN} Train Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Heading for {TOWN} Road Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Heading for {TOWN} Road Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Heading for {TOWN} Ship Depot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Heading for {TOWN} Ship Depot, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Heading for {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service at {TOWN} Train Depot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service at {TOWN} Train Depot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service at {TOWN} Road Depot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service at {TOWN} Road Depot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service at {TOWN} Ship Depot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service at {TOWN} Ship Depot, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service at {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service at {STATION} Hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Clone Train
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clone Vehicle
-STR_CLONE_SHIP                                                  :{BLACK}Clone Ship
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clone Aircraft
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}This will build a copy of the train including all cars. Ctrl+Click will share the orders
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}This will build a copy of the road vehicle. Ctrl+Click will share the orders
-STR_CLONE_SHIP_INFO                                             :{BLACK}This will build a copy of the ship. Ctrl+Click will share the orders
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}This will build a copy of the aircraft. Ctrl+Click will share the orders
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}This will build a copy of a train including all cars. Click this button and then on a train inside or outside the depot. Control-click will share the orders
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}This will build a copy of a road vehicle. Click this button and then on a road vehicle inside or outside the depot. Ctrl+Click will will share the orders
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}This will build a copy of a ship. Click this button and then on a ship inside or outside the depot. Ctrl+Click will share the orders
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}This will build a copy of an aircraft. Click this button and then on an aircraft inside or outside the hangar. Ctrl+Click will share the orders
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Heading for {TOWN} Train Depot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Heading for {TOWN} Train Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Heading for {TOWN} Road Depot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Heading for {TOWN} Road Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Heading for {TOWN} Ship Depot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Heading for {TOWN} Ship Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Heading for {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Heading for {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Service at {TOWN} Train Depot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Service at {TOWN} Train Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Service at {TOWN} Road Depot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Service at {TOWN} Road Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Service at {TOWN} Ship Depot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service at {TOWN} Ship Depot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service at {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service at {STATION} Hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clone Train
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clone Vehicle
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clone Ship
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clone Aircraft
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}This will build a copy of the train including all cars. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}This will build a copy of the road vehicle. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}This will build a copy of the ship. Ctrl+Click will share the orders
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}This will build a copy of the aircraft. Ctrl+Click will share the orders
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}This will build a copy of a train including all cars. Click this button and then on a train inside or outside the depot. Control-click will share the orders
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}This will build a copy of a road vehicle. Click this button and then on a road vehicle inside or outside the depot. Ctrl+Click will will share the orders
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}This will build a copy of a ship. Click this button and then on a ship inside or outside the depot. Ctrl+Click will share the orders
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}This will build a copy of an aircraft. Click this button and then on an aircraft inside or outside the hangar. Ctrl+Click will share the orders
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}New Rail Vehicles
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}New Electric Rail Vehicles
@@ -3472,38 +3472,38 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Center m
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}You are about to sell all the vehicles in the depot. Are you sure?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Wrong depot type
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Wrong depot type
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sell all trains in the depot
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Sell all road vehicles in the depot
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sell all ships in the depot
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sell all aircraft in the hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Sell all trains in the depot
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Sell all road vehicles in the depot
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Sell all ships in the depot
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Sell all aircraft in the hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Get a list of all trains with the current depot in their orders
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Get a list of all road vehicles with the current depot in their orders
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Get a list of all ships with the current depot in their orders
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Get a list of all aircraft with any hangar at this airport in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Get a list of all trains with the current depot in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Get a list of all road vehicles with the current depot in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Get a list of all ships with the current depot in their orders
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Get a list of all aircraft with any hangar at this airport in their orders
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autoreplace all trains in the depot
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autoreplace all road vehicles in the depot
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autoreplace all ships in the depot
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autoreplace all aircraft in the hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autoreplace all trains in the depot
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autoreplace all road vehicles in the depot
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autoreplace all ships in the depot
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autoreplace all aircraft in the hangar
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Available Trains
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Available Road Vehicles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Available Ships
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Available Aircraft
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Available Trains
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Available Road Vehicles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Available Ships
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Available Aircraft
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Send to Depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send to Depot
-STR_SEND_SHIP_TO_DEPOT                                          :Send to Depot
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send to Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Send to Depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Send to Depot
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Send to Depot
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Send to Hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Replace {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start Replacing Vehicles
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop Replacing Vehicles
-STR_NOT_REPLACING                                               :{BLACK}Not replacing
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}No vehicle selected
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Not replacing
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}No vehicle selected
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Select the engine type to replace
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Select the new engine type you would like to use in place of the left selected engine type
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Press to stop the replacement of the engine type selected on the left
@@ -3515,40 +3515,40 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Make aut
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Replacing: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Switch between engine and car replacement windows
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehicle is not available
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehicle is not available
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Ship is not available
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aircraft is not available
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehicle is not available
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehicle is not available
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Ship is not available
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aircraft is not available
 
-STR_ENGINES                                                     :Engines
-STR_WAGONS                                                      :Cars
+STR_REPLACE_ENGINES                                             :Engines
+STR_REPLACE_WAGONS                                              :Cars
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Click to stop all trains inside the depot
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Click to stop all road vehicles inside the depot
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Click to stop all ships inside the depot
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Click to stop all aircraft inside the hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Click to stop all trains inside the depot
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Click to stop all road vehicles inside the depot
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Click to stop all ships inside the depot
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Click to stop all aircraft inside the hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Click to start all trains inside the depot
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Click to start all the road vehicles inside the depot
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Click to start all ships inside the depot
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Click to start all aircraft inside the hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Click to start all trains inside the depot
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Click to start all the road vehicles inside the depot
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Click to start all ships inside the depot
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Click to start all aircraft inside the hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Click to stop all vehicles in the list
-STR_MASS_START_LIST_TIP                                         :{BLACK}Click to start all listed vehicles
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Click to stop all vehicles in the list
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Click to start all listed vehicles
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Sign List - {COMMA} Sign{P "" s}
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Rail Vehicles
-STR_ELRAIL_VEHICLES                                             :Electrified Rail Vehicles
-STR_MONORAIL_VEHICLES                                           :Monorail Vehicles
-STR_MAGLEV_VEHICLES                                             :Maglev Vehicles
+STR_REPLACE_RAIL_VEHICLES                                       :Rail Vehicles
+STR_REPLACE_ELRAIL_VEHICLES                                     :Electrified Rail Vehicles
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorail Vehicles
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev Vehicles
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Weight: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Speed: {GOLD}{VELOCITY}{BLACK} Power: {GOLD}{POWER}
@@ -3575,67 +3575,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generate
-STR_RANDOM                                                      :{BLACK}Randomize
-STR_RANDOM_HELP                                                 :{BLACK}Change the random seed used for Terrain Generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}World generation
-STR_RANDOM_SEED                                                 :{BLACK}Random Seed:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Click to enter a random seed
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Enter a random seed
-STR_LAND_GENERATOR                                              :{BLACK}Land generator:
-STR_TREE_PLACER                                                 :{BLACK}Tree algorithm:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Heightmap rotation:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrain type:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Sea level:
-STR_SMOOTHNESS                                                  :{BLACK}Smoothness:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Snow line height:
-STR_DATE                                                        :{BLACK}Date:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}No. of towns:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. of industries:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Move the snow line height up one
-STR_SNOW_LINE_DOWN                                              :{BLACK}Move the snow line height down one
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Change snow line height
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Change starting year
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Scale warning
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Heightmap name:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Size: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generate
+STR_MAPGEN_RANDOM                                               :{BLACK}Randomize
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Change the random seed used for Terrain Generation
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}World generation
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Random Seed:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Click to enter a random seed
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Enter a random seed
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Land generator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Tree algorithm:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Heightmap rotation:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrain type:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Sea level:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Smoothness:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Snow line height:
+STR_MAPGEN_DATE                                                 :{BLACK}Date:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}No. of towns:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}No. of industries:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Move the snow line height up one
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Move the snow line height down one
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Change snow line height
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Change starting year
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Scale warning
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Heightmap name:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Size: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generating world...
 STR_GENERATION_ABORT                                            :{BLACK}Cancel
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Cancel World Generation
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Do you really want to cancel the generation?
-STR_PROGRESS                                                    :{WHITE}{NUM}% complete
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}World generation
-STR_TREE_GENERATION                                             :{BLACK}Tree generation
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Unmovable generation
-STR_CLEARING_TILES                                              :{BLACK}Rough and rocky area generation
-STR_SETTINGUP_GAME                                              :{BLACK}Setting up game
-STR_PREPARING_TILELOOP                                          :{BLACK}Running tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Preparing game
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}This action changed the difficulty level to custom
-STR_SE_FLAT_WORLD                                               :{WHITE}Flat land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generate a flat land
-STR_SE_RANDOM_LAND                                              :{WHITE}Random land
-STR_SE_NEW_WORLD                                                :{BLACK}Create new scenario
-STR_SE_CAPTION                                                  :{WHITE}Scenario type
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Move the height of flat land down one
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Move the height of flat land up one
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Change height of flat land
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Height of flat land:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% complete
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}World generation
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Tree generation
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Unmovable generation
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Rough and rocky area generation
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Setting up game
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Running tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparing game
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}This action changed the difficulty level to custom
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Flat land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generate a flat land
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Random land
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Create new scenario
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenario type
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Move the height of flat land down one
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Move the height of flat land up one
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Change height of flat land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Height of flat land:
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Map edges:
-STR_NORTHWEST                                                   :{BLACK}Northwest
-STR_NORTHEAST                                                   :{BLACK}Northeast
-STR_SOUTHEAST                                                   :{BLACK}Southeast
-STR_SOUTHWEST                                                   :{BLACK}Southwest
-STR_BORDER_FREEFORM                                             :{BLACK}Freeform
-STR_BORDER_WATER                                                :{BLACK}Water
-STR_BORDER_RANDOM                                               :{BLACK}Random
-STR_BORDER_RANDOMIZE                                            :{BLACK}Random
-STR_BORDER_MANUAL                                               :{BLACK}Manual
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Map edges:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Northwest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Northeast
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Southeast
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Southwest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Freeform
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Water
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Random
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Random
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
 
 ############ Tooltip measurment
 
@@ -3644,9 +3644,9 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Length: {NUM}{}Height difference: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Height difference: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...this is a town owned road
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...road facing in the wrong direction
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...this is a town owned road
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...road facing in the wrong direction
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3656,7 +3656,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :All trains
 STR_GROUP_ALL_ROAD_VEHICLES                                     :All road vehicles
 STR_GROUP_ALL_SHIPS                                             :All ships
@@ -3665,24 +3665,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ungrouped train
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ungrouped road vehicles
 STR_GROUP_DEFAULT_SHIPS                                         :Ungrouped ships
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ungrouped aircraft
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Add shared vehicles
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Remove all vehicles
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Rename a group
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Can't create group...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Can't delete this group...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Can't rename group...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Can't remove all vehicles from this group...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Can't add the vehicle to this group...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Can't add shared vehicles to group...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Can't create group...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Can't delete this group...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Can't rename group...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Can't remove all vehicles from this group...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Can't add the vehicle to this group...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Can't add shared vehicles to group...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Groups - click on a group to list all vehicles of this group
-STR_GROUP_CREATE_TIP                                            :{BLACK}Click to create a group
-STR_GROUP_DELETE_TIP                                            :{BLACK}Delete the selected group
-STR_GROUP_RENAME_TIP                                            :{BLACK}Rename the selected group
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Click to protect this group from global autoreplace
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groups - click on a group to list all vehicles of this group
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Click to create a group
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Delete the selected group
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Rename the selected group
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Click to protect this group from global autoreplace
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3699,7 +3699,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3744,19 +3744,19 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Name must be unique
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Name must be unique
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Go to next sign
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Go to previous sign
-STR_SIGN_OSKTITLE                                               :{BLACK}Enter a name for the sign
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Go to next sign
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Go to previous sign
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Enter a name for the sign
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fund
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospect
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Build
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Choose the appropriate industry from this list
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fund
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospect
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Build
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Choose the appropriate industry from this list
 
 ############ on screen keyboard
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -3765,37 +3765,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 
 ############ AI GUI
 STR_AI_DEBUG                                                    :{WHITE}AI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Name of the AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Name of the AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Reload AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Kill the AI, reload the script, and restart the AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI Debug window is only available for the server
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Kill the AI, reload the script, and restart the AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI Debug window is only available for the server
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Configuration
-STR_AI_CHANGE                                                   :{BLACK}Select AI
-STR_AI_CONFIGURE                                                :{BLACK}Configure
-STR_AI_CHANGE_TIP                                               :{BLACK}Load another AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configure the parameters of the AI
-STR_AI_LIST_TIP                                                 :{BLACK}All AIs that will be loaded in the next game
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Select AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configure
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Load another AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configure the parameters of the AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}All AIs that will be loaded in the next game
 STR_AI_LIST_CAPTION                                             :{WHITE}Available AIs
-STR_AI_AILIST_TIP                                               :{BLACK}Click to select an AI
-STR_AI_ACCEPT                                                   :{BLACK}Accept
-STR_AI_ACCEPT_TIP                                               :{BLACK}Select highlighted AI
-STR_AI_CANCEL                                                   :{BLACK}Cancel
-STR_AI_CANCEL_TIP                                               :{BLACK}Don't change AI
-STR_AI_CLOSE                                                    :{BLACK}Close
-STR_AI_RESET                                                    :{BLACK}Reset
-STR_AI_HUMAN_PLAYER                                             :Human player
-STR_AI_RANDOM_AI                                                :Random AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Click to select an AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accept
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select highlighted AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancel
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Don't change AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Close
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Human player
+STR_AI_CONFIG_RANDOM_AI                                         :Random AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parameters
-STR_AI_AUTHOR                                                   :{BLACK}Author: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Version: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}One of the running AIs crashed. Please report this to the AI author with a screenshot of the AI Debug Window.
-STR_AI_NO_AI_FOUND                                              :No suitable AI found to load.{}This AI is a dummy AI and won't do anything.{}You can download several AIs via the 'Online Content' system.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Author: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}One of the running AIs crashed. Please report this to the AI author with a screenshot of the AI Debug Window.
+STR_ERROR_AI_NO_AI_FOUND                                        :No suitable AI found to load.{}This AI is a dummy AI and won't do anything.{}You can download several AIs via the 'Online Content' system.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Noise limit in town: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Noise generated: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Noise limit in town: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Noise generated: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3805,6 +3805,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... conn
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... file not writable
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Could not decompress the downloaded file
 
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Find missing content online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Check whether the missing content can be found online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Find missing content online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Check whether the missing content can be found online
 ########
diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt
index 4a80a9c2b..6d6a56488 100644
--- a/src/lang/esperanto.txt
+++ b/src/lang/esperanto.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mapo - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Ludaj Opcioj
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Mesa�o
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mesa�o de {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Atentu!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Atentu!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Ne eblas fari ĉi tion....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Ne eblas malplenigi la regionon....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Origina kopirajto {COPYRIGHT} 1995 Chris Sawyer, Ĉiuj rajtoj rezervitaj
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD-
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 La teamo de OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Fermi
-STR_YES                                                         :{BLACK}Jes
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Jes
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {STRING}?
 
 STR_JUST_NOTHING                                                :Nenio
 STR_COLOUR_DARK_BLUE                                            :Malhelblua
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Dezerto
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Ne�o
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mesa�o
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Normo
-STR_QUERY_CANCEL                                                :{BLACK}Nuligu
-STR_QUERY_OK                                                    :{BLACK}Bone
-STR_QUERY_RENAME                                                :{BLACK}Renomu
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Normo
+STR_BUTTON_CANCEL                                               :{BLACK}Nuligu
+STR_BUTTON_OK                                                   :{BLACK}Bone
+STR_BUTTON_RENAME                                               :{BLACK}Renomu
 
 STR_OSNAME_WINDOWS                                              :Vindozo
 STR_OSNAME_DOS                                                  :DOS
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Ŝar�o
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informoj
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapabloj
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Tuta Ŝar�o
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Tuta �ar�kapablo de ĉi tiu trajno:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Tuta �ar�kapablo de ĉi tiu trajno:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova Ludo
 STR_INTRO_LOAD_GAME                                             :{BLACK}Ŝar�u ludon
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Pluraj Ludantoj
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scenarkreilo
 
-STR_MAPSIZE                                                     :{BLACK}Mapgrandeco:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Mapgrandeco:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Ludaj Opcioj
 
 STR_COMPANY_SOMEONE                                             :iu{SKIP}{SKIP}
@@ -309,10 +309,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Foriru de la lu
 STR_FILE_MENU_EXIT                                              :Fermu
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Ĉu vi certas ke vi volas foriri?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Foriri de la ludo
-STR_SORT_ORDER_TIP                                              :{BLACK}Elektu vicordo (deira/alira)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Elektu ordigaj kondiĉoj
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selektu kriteriojn por filtrado
-STR_SORT_BY                                                     :{BLACK}Ordigu laÅ­
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Elektu vicordo (deira/alira)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Elektu ordigaj kondiĉoj
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selektu kriteriojn por filtrado
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordigu laÅ­
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Enlo�antaro
@@ -344,24 +344,24 @@ STR_SORT_BY_RUNNING_COST                                        :Irkosto
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potenco/Irkosto
 STR_SORT_BY_CARGO_CAPACITY                                      :Ŝar�kapablo
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Nenia �ar�o atendas
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Elektu ĉiujn konstruaĵojn
-STR_SELECT_ALL_TYPES                                            :{BLACK}Elektu ĉiujn �ar�otipojn (inkluzive de ne atendanta �ar�o)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vidu liston da ĉiuj haveblaj ma�inoj por ĉi tiu veturilspeco.
-STR_MANAGE_LIST                                                 :{BLACK}Mana�u liston
-STR_MANAGE_LIST_TIP                                             :{BLACK}Sendu instrukciojn al ĉiuj veturiloj en la listo
-STR_REPLACE_VEHICLES                                            :AnstataÅ­u veturilojn
-STR_SEND_FOR_SERVICING                                          :Sendu por Prizorgo
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Haveblaj Trajnoj
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Haveblaj Veturiloj
-STR_AVAILABLE_SHIPS                                             :{BLACK}Haveblaj Åœipoj
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Haveblaj Aviadiloj
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Sendu al Deponejo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Sendu al Deponejo
-STR_SEND_SHIP_TO_DEPOT                                          :Sendu al Deponejo
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Sendu al Hangaro
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nenia �ar�o atendas
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Elektu ĉiujn konstruaĵojn
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Elektu ĉiujn �ar�otipojn (inkluzive de ne atendanta �ar�o)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Vidu liston da ĉiuj haveblaj ma�inoj por ĉi tiu veturilspeco.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Mana�u liston
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Sendu instrukciojn al ĉiuj veturiloj en la listo
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :AnstataÅ­u veturilojn
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Sendu por Prizorgo
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Haveblaj Trajnoj
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Haveblaj Veturiloj
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Haveblaj Åœipoj
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Haveblaj Aviadiloj
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Sendu al Deponejo
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Sendu al Deponejo
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Sendu al Deponejo
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Sendu al Hangaro
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -391,12 +391,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcioj
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Ne povas �an�i prizorga intervalo...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fermu fenestron
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Fenestra titolo - tiru por movi la fenestron
-STR_STICKY_BUTTON                                               :{BLACK}Marku ke ne fermi�u la fenestro per la 'ĉiujn fenestrojn fermu'-klavo
-STR_RESIZE_BUTTON                                               :{BLACK}Klaku kaj tiru por reformi la fenestron
+STR_TOOLTIP_STICKY                                              :{BLACK}Marku ke ne fermi�u la fenestro per la 'ĉiujn fenestrojn fermu'-klavo
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klaku kaj tiru por reformi la fenestron
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klaku ĉi tie por salti al la nuna defaŭlta konserva dosierujo
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Detruu konstruaĵojn ktp. sur landkvadrato
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Malaltigu landangulon
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Altigu landangulon
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Malaltigu landangulon
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Altigu landangulon
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Skrolbreto - skrolas la liston supren/malsupren
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Skrolbreto - skrolas la liston dekstren/maldekstren
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Montru landkonturojn sur la mapo
@@ -409,21 +409,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Vidu aÅ­
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Gajno ĉi-jare: {CURRENCY} (pasintjare: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} jaro{P "" j} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} jaro{P "" j} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} jaro{P "" j} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} jaro{P "" j} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Trajno
-STR_VEHICLE_ROAD_VEHICLE                                        :Vojveturilo
-STR_VEHICLE_SHIP                                                :Åœipo
-STR_VEHICLE_AIRCRAFT                                            :Aviadilo
+STR_REPLACE_VEHICLE_TRAIN                                       :Trajno
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Vojveturilo
+STR_REPLACE_VEHICLE_SHIP                                        :Åœipo
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aviadilo
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} malnovi�is
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} tre malnovi�is
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} tro malnovi�is kaj postulas anstataŭi�on
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Landregionaj informoj
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Forvi�kosto: {LTBLUE}ne eblas
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Forvi�kosto: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Enspezo kaze de forigo: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Enspezo kaze de forigo: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Posedanto: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Stratposedanto: {LTBLUE}{STRING}
@@ -432,7 +432,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Posedant
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokaj estroj: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neniu
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nomo
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1a de
@@ -544,7 +544,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Alklaku
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Alklaku muzikeron por vi�i el la nuna programo (nur propra)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Miksu/ne miksu
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Montru muziker-elektan fenestron
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Alklaku servon por centrigi la vidon al industrio/urbo
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Alklaku servon por centrigi la vidon al industrio/urbo
 STR_INTRO_DIFFICULTY                                            :{BLACK}Malfacileco ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Lasta mesa�o/novaĵo
@@ -593,7 +593,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Malgrand
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Kreu landon hazarde
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Reigu landaspekton
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Reigu Landaspekton
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Forvi�u ĉiujn posedaĵojn de la ludanto el la mapo
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Forvi�u ĉiujn posedaĵojn de la ludanto el la mapo
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ĉu vi certas ke vi volas forvi�i ĉiujn posedaĵojn de la ludanto?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landaspekta generado
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Urba generado
@@ -607,11 +607,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...tro p
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...tro proksime al alia urbo
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...nekonvena ejo
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...tro da urboj
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ne povas konstrui ajnan urbon
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...spaco mankas sur la mapo
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Ne povas konstrui ajnan urbon
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...spaco mankas sur la mapo
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Grandigu la urbon
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Vastigu
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}La urbo ne konstruos stratojn. Vi povas ebligi stratkonstruadon per Avancitaj Agordoj->Ekonomio->Urboj.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}La urbo ne konstruos stratojn. Vi povas ebligi stratkonstruadon per Avancitaj Agordoj->Ekonomio->Urboj.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Hazarda Urbo
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Konstruu urbon en hazarda loko
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Ne povas konstrui {STRING.n} ĉi tie...
@@ -625,13 +625,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Metu rok
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Metu lumturon
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Metu transmitilon
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Difinu dezertan regionon.{}Premu kaj tenu CTRL por forigi �in
-STR_CREATE_LAKE                                                 :{BLACK}Difinu akvoregionon.{}Faru kanalon, krom se CTRL estas tenata ĉe marnivelo, kiukaze �i anstataŭe transfluas al la ĉirkaŭaĵo
-STR_CREATE_RIVER                                                :{BLACK}Loku riverojn.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Difinu akvoregionon.{}Faru kanalon, krom se CTRL estas tenata ĉe marnivelo, kiukaze �i anstataŭe transfluas al la ĉirkaŭaĵo
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Loku riverojn.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Forigu
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Plene forigu ĉi tiun urbon
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Konservu scenaron
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Ŝar�u scenaron
-STR_MENU_LOAD_HEIGHTMAP                                         :Ŝar�u altecmapon
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Ŝar�u altecmapon
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Fermu kreilon
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Fermu
@@ -641,7 +641,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Konservu
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Ludu Scenaron
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Ludu Altecmapon
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Startu novan ludon, uzante altecmapon por landaspekto
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Ĉu vi certas ke vi volas forlasi ĉi tiun scenaron?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Ĉu vi certas ke vi volas forlasi ĉi tiun scenaron?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...nur konstruebla en urboj havantaj pli ol 1200 enlo�antojn
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Movu la komencdaton 1 jaron posten
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Movu la komencdaton 1 jaron antaÅ­en
@@ -649,21 +649,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...ambaÅ
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Malgranda
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mezgranda
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Granda
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Arbitre
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Arbitre
 STR_FOUND_TOWN_CITY                                             :{BLACK}Urbo
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Urbegoj kreskas pli rapide ol kutimaj urboj{}Depende de agordoj, ili pli grandas je fondi�o
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Elektu urban grandecon
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Urba grandeco:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Urba strataran�o:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selektu strataran�on uzendan por ĉi tiu urbo
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originalo
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Pli bonaj stratoj
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 krado
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 krado
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Hazarde
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Urba strataran�o:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selektu strataran�on uzendan por ĉi tiu urbo
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalo
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Pli bonaj stratoj
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 krado
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 krado
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Hazarde
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Montru lastan mesa�on aŭ novaĵon
 STR_NEWS_MESSAGES_OFF                                           :Ne
 STR_NEWS_MESSAGES_SUMMARY                                       :Resume
@@ -763,10 +763,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekranfoto sukcese konservi�is kiel '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ekranfoto fiaskis!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Aĉetu landon por onta uzo
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Aĉetu landon por onta uzo
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AŬTOMATA KONSERVADO
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  KONSERVAS LUDON  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ankoraŭ konservas,{}bv atendi �is fini�o!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Ankoraŭ konservas,{}bv atendi �is fini�o!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Elektu programon de 'Facilvoja muziko'
 
 ############ start of townname region
@@ -829,7 +829,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Elektu u
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Plena ekrano
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Ŝaltu ĉi tiun kvadrateton por plenekrane ludi OpenTTD
-STR_FULLSCREEN_FAILED                                           :{WHITE}Plenekrana moduso fiaskis
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Plenekrana moduso fiaskis
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrana montrogrando
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Elektu uzotan ekranan montrograndon
@@ -842,12 +842,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selektu
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} mankanta/koruptita dosiero{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Aldonaj informoj pri la baza grafikaro
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Fiaskis aÅ­tomate konservi
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Fiaskis aÅ­tomate konservi
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Irante al {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Irante al {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sen ordenoj
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sen ordenoj, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Irante al {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Irante al {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sen ordenoj
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sen ordenoj, {VELOCITY}
 
 STR_PASSENGERS                                                  :pasa�eroj
 STR_BAGS                                                        :sakoj
@@ -858,9 +858,9 @@ STR_CRATES                                                      :kestoj
 STR_RES_OTHER                                                   :alia
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Ne povas dividi ordenliston...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Ne povas kopii ordenliston...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fino de Dividitaj Ordenoj - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Ne povas dividi ordenliston...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Ne povas kopii ordenliston...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fino de Dividitaj Ordenoj - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ne povas trovi padon por daÅ­rigi.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} estas perdita.
@@ -1129,15 +1129,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-grand
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :malaktiva
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ŝan�u agord-valoron
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Ŝan�u agord-valoron
 
-STR_TEMPERATE_LANDSCAPE                                         :Modera landaspekto
-STR_SUB_ARCTIC_LANDSCAPE                                        :Arktikeca landaspekto
-STR_SUB_TROPICAL_LANDSCAPE                                      :Tropikeca landaspekto
-STR_TOYLAND_LANDSCAPE                                           :Ludolandaspekto
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Modera landaspekto
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Arktikeca landaspekto
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Tropikeca landaspekto
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Ludolandaspekto
 
 STR_CHEATS                                                      :{WHITE}Filudaĵoj
-STR_CHEATS_TIP                                                  :{BLACK}La kvadratetoj indikas ĉu vi jam uzis la filudaĵon antaŭe.
+STR_CHEATS_TOOLTIP                                              :{BLACK}La kvadratetoj indikas ĉu vi jam uzis la filudaĵon antaŭe.
 STR_CHEATS_WARNING                                              :{BLACK}Atentu! Vi perfidos viajn kunulajn konkurantojn. Memoru ke io tia rememori�os eterne.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Altigu monkvanton per {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Ludanta kiel kompanio: {ORANGE}{COMMA}
@@ -1149,177 +1149,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Ŝan�u
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ŝan�u daton: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ebligu �an�i produktvalorojn: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Irante al {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Irante al {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Irante al {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Irante al {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Iru laÅ­ {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Iru senhalte laÅ­ {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Iru laÅ­ {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Iru senhalte laÅ­ {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Vojpunkto {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Vojpunkto {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Trairejo
+STR_FORMAT_WAYPOINT_NAME                                        :Vojpunkto {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Vojpunkto {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Trairejo
 
-STR_WAYPOINT                                                    :{WHITE}Trairejo
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Elektu trairejan tipon
+STR_WAYPOINT_CAPTION                                            :{WHITE}Trairejo
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Elektu trairejan tipon
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ŝan�u trairejan nomon
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Ne povas �an�i trairejan nomon...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Ne povas �an�i trairejan nomon...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Ŝan�u relon al trairejo
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Ne povas konstrui trajnan trairejon ĉi tie...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Ne povas forigi trajnan trairejon ĉi tie...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Ne povas konstrui trajnan trairejon ĉi tie...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Ne povas forigi trajnan trairejon ĉi tie...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Konstruu fervojojn per AÅ­tomata relo
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...mankas urboj en ĉi tiu scenaro
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Mapkreado haltita...{}...mankas taÅ­gaj urbejoj
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...mankas urboj en ĉi tiu scenaro
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Mapkreado haltita...{}...mankas taÅ­gaj urbejoj
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Multaj hazardaj urboj
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Kovru la mapon per hazarde metitajn urbojn
-STR_MANY_RANDOM_INDUSTRIES                                      :Multaj hazardaj industrioj
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Kovru la mapon per hazarde metitajn industriojn
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Ne povas generi industriojn...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Multaj hazardaj urboj
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Kovru la mapon per hazarde metitajn urbojn
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Multaj hazardaj industrioj
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Kovru la mapon per hazarde metitajn industriojn
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Ne povas generi industriojn...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Malfermu la landaspektan ilbreton por (mal)altigi landon, planti arbojn ktp.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landaspekto
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Ebenigu landon
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Ebenigu landon
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arboj de hazardaj tipoj
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Metu arbojn de hazardaj tipoj
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Metu arbojn de hazardaj tipoj
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Ne povas konstrui kanalojn ĉi tie...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Ne povas konstrui kanalojn ĉi tie...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Konstruu kanalojn.
-STR_LANDINFO_CANAL                                              :Kanalo
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanalo
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Ne povas konstrui kluzojn ĉi tie...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Ne povas konstrui kluzojn ĉi tie...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Konstruu kluzojn
-STR_LANDINFO_LOCK                                               :Kluzo
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Kluzo
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Ne povas meti riverojn ĉi tien...
-STR_LANDINFO_RIVER                                              :Rivero
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Ne povas meti riverojn ĉi tien...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rivero
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...buo estas uzata
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...buo estas uzata
 
-STR_LANDINFO_COORDS                                             :{BLACK}Trovi�o: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Trovi�o: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Ne povas forigi stacidomeron...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Ne povas transigi reltipon ĉi tie...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Ne povas forigi stacidomeron...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Ne povas transigi reltipon ĉi tie...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Transigu reltipon
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Tiru la lokomotivon ĉi tien por vendi la tutan trajnon.
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Tiru la lokomotivon ĉi tien por vendi la tutan trajnon.
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Tiru k metu
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Tiru por konstrui stacidomon
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Elektu stacidomklason por montri
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Elektu stacidomtipon por konstrui
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Elektu stacidomklason por montri
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Elektu stacidomtipon por konstrui
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Rapide pluirigu la ludon
 STR_MESSAGE_HISTORY                                             :{WHITE}Mesa�a Historio
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Listo da aktualaj novaĵoj
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Malaktivigu ĉiujn
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Aktivigu ĉiujn
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Listo da aktualaj novaĵoj
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Malaktivigu ĉiujn
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Aktivigu ĉiujn
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrioj
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportite)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportite)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinomoj - klaku la nomon por centrigi la vidujon al la industrio
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrioj
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportite)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportite)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industrinomoj - klaku la nomon por centrigi la vidujon al la industrio
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...tro proksime al alia industrio
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...tro proksime al alia industrio
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ŝan�u produktadon
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Pluraj ludantoj
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ludantnomo:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ĉi tio estas la nomo per kiu la aliaj ekkonas vin
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Tajpu vian nomon
-STR_NETWORK_CONNECTION                                          :{BLACK}Konekto:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Elektu inter interreta kaj lokareta ludo
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Startu servilon
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Startu propran servilon
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nomo
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nomo de la ludo
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Lingvo, servila versio ktp.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Alklaku ludon el la listo por elekti �in
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}La servilo kiun vi laste ensalutis:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klaku por selekti la servilon kie vi ludis la lastan fojon
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Trovu servilon
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Serĉu reton por servilo
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Aldonu servilon
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Aldonas servilon al la listo kiu ĉiam estos kontrolata pri kurantaj ludoj.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Enigu la adreson de la gastiganto
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientoj
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientoj surrete / maksimume{}Kompanioj surrete / maksimume
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Mapgrandeco
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Mapgrandeco de la ludo{}Klaku por ordigi laÅ­ areo
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dato
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuala dato
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jaroj
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombro de jaroj{}la ludo jam rulas
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}LUDINFORMOJ
-STR_NETWORK_CLIENTS                                             :{SILVER}Klientoj: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Lingvo: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tegolaro: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Mapgrandeco: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versio de servilo: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adreso de servilo: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Komenca dato: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuna dato: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protektata per pasvorto!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVILO NE SURRETAS
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVILO PLENAS
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIOJ NE KONGRUAS
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}MISO PRI NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Ali�u al la ludo
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Komencu novan ludon por pluraj ludantoj
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Ludnomo:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}La ludnomo estos montrata al aliaj ludantoj en la ludelektejo por plurludantaj ludoj.
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Tajpu nomon por la retludo
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Agordu pasvorton
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protektu vian ludon per pasvorto por ne publike atingebligi �in
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Elektu mapon:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Kiun mapon vi volas ludi?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Loka reto
-STR_NETWORK_INTERNET                                            :Interreto
-STR_NETWORK_LAN_INTERNET                                        :Loka reto / Interreto
-STR_NETWORK_INTERNET_ADVERTISE                                  :Interreto (reklamu)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Klienta maksimumo:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Elektu klientan maksimumon. Ne ĉiuj lokoj estas plenigendaj
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanio{P "" j}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Kompania maksimumo:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limu la servilon al certa kvanto da kompanioj
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spektanto{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Spektanta maksimumo:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limigu la servilon al certa kvanto da spektantoj
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Parolata lingvo:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aliaj ludantoj scios kiu lingvo paroli�as en la servilo
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Startu Ludon
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Komencu novan retan ludon de hazarda mapo, aÅ­ scenaro
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Ŝar�u Ludon
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Restartu antaÅ­an plurludantan ludon (certigu ke vi kiel la korekta ludanto konektu)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Pluraj ludantoj
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ludantnomo:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ĉi tio estas la nomo per kiu la aliaj ekkonas vin
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Tajpu vian nomon
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Konekto:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Elektu inter interreta kaj lokareta ludo
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Startu servilon
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Startu propran servilon
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nomo
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nomo de la ludo
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Lingvo, servila versio ktp.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Alklaku ludon el la listo por elekti �in
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}La servilo kiun vi laste ensalutis:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klaku por selekti la servilon kie vi ludis la lastan fojon
+
+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_ENTER_IP                                :{BLACK}Enigu la adreson de la gastiganto
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klientoj
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klientoj surrete / maksimume{}Kompanioj surrete / maksimume
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Mapgrandeco
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Mapgrandeco de la ludo{}Klaku por ordigi laÅ­ areo
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dato
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Aktuala dato
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Jaroj
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Nombro de jaroj{}la ludo jam rulas
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}LUDINFORMOJ
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klientoj: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Lingvo: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tegolaro: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Mapgrandeco: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versio de servilo: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adreso de servilo: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Komenca dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Nuna dato: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protektata per pasvorto!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVILO NE SURRETAS
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVILO PLENAS
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIOJ NE KONGRUAS
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}MISO PRI NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Ali�u al la ludo
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Komencu novan ludon por pluraj ludantoj
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Ludnomo:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}La ludnomo estos montrata al aliaj ludantoj en la ludelektejo por plurludantaj ludoj.
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Tajpu nomon por la retludo
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Agordu pasvorton
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protektu vian ludon per pasvorto por ne publike atingebligi �in
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Elektu mapon:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Kiun mapon vi volas ludi?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Loka reto
+STR_NETWORK_SERVER_LIST_INTERNET                                :Interreto
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Loka reto / Interreto
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Interreto (reklamu)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Klienta maksimumo:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Elektu klientan maksimumon. Ne ĉiuj lokoj estas plenigendaj
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanio{P "" j}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Kompania maksimumo:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limu la servilon al certa kvanto da kompanioj
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spektanto{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Spektanta maksimumo:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limigu la servilon al certa kvanto da spektantoj
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Parolata lingvo:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Aliaj ludantoj scios kiu lingvo paroli�as en la servilo
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Startu Ludon
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Komencu novan retan ludon de hazarda mapo, aÅ­ scenaro
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Ŝar�u Ludon
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Restartu antaÅ­an plurludantan ludon (certigu ke vi kiel la korekta ludanto konektu)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Ajna
@@ -1360,33 +1360,33 @@ STR_NETWORK_LANG_GREEK                                          :Greka
 STR_NETWORK_LANG_LATVIAN                                        :Latva
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Atendejo por plurludantaj ludoj
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Atendejo por plurludantaj ludoj
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparanta por ali�i: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Listo da kompanioj haveblaj en ĉi tiu ludo. Vi povas ali�i al unu aŭ komenci novan kompanion se restas loko
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova kompanio
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Kreu novan kompanion
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Spektu ludon
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Spektu la ludon kiel spektanto
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Ali�u al kompanio
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Helpu mana�i ĉi tiun kompanion
-STR_NETWORK_REFRESH                                             :{BLACK}Refre�igu servilon
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Refre�igu servilajn informojn
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparanta por ali�i: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Listo da kompanioj haveblaj en ĉi tiu ludo. Vi povas ali�i al unu aŭ komenci novan kompanion se restas loko
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova kompanio
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Kreu novan kompanion
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Spektu ludon
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Spektu la ludon kiel spektanto
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Ali�u al kompanio
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Helpu mana�i ĉi tiun kompanion
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Refre�igu servilon
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Refre�igu servilajn informojn
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}KOMPANIAJ INFORMOJ
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}KOMPANIAJ INFORMOJ
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Kompaninomo: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}InaÅ­guro: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Kompanivaloro: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuna monstato: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Lastjara enspezo: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendimento: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Kompaninomo: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}InaÅ­guro: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Kompanivaloro: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Nuna monstato: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Lastjara enspezo: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Rendimento: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veturiloj: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stacioj: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Ludantoj: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Veturiloj: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stacioj: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Ludantoj: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Konektante...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Konektante...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Konektante..
@@ -1402,49 +1402,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Kaptante
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} kliento{P "" j} antaÅ­ vi
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} �is nun el�uti�is
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Malkonektu
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Malkonektu
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Tajpu kiom da mono vi volas doni
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servilo estas protektata. Enigu pasvorton
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanio estas protektata. Enigu pasvorton
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientlisto
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientlisto
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spekti
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Kompanio
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ne trovis retstirilojn aŭ kompili�is sen ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Ne povis trovi ajnan retludon
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} La servilo ne respondis al la peto
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Ne povis konekti pro miso pri NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Retluda sinkronigado fiaskis
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Perdis konekton al retludo
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Ne povis �ar�i konservitan ludon
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Ne povis eki la servilon
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Ne povis konekti
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Konekto #{NUM} ekstertempi�is
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Okazis protokoleraro kaj la konekto estis fermita
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} La revidaĵo de la kliento ne kongruas kun la servila revidaĵo
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Mal�usta pasvorto
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}La servilo plenas
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Oni forbaris vin de la servilo
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Oni forbatis vin el la ludo
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Vi ne rajtas filudi en ĉi tiu servilo
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Ne trovis retstirilojn aŭ kompili�is sen ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Ne povis trovi ajnan retludon
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} La servilo ne respondis al la peto
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Ne povis konekti pro miso pri NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Retluda sinkronigado fiaskis
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Perdis konekton al retludo
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Ne povis �ar�i konservitan ludon
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Ne povis eki la servilon
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Ne povis konekti
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Konekto #{NUM} ekstertempi�is
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Okazis protokoleraro kaj la konekto estis fermita
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} La revidaĵo de la kliento ne kongruas kun la servila revidaĵo
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Mal�usta pasvorto
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}La servilo plenas
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Oni forbaris vin de la servilo
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Oni forbatis vin el la ludo
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Vi ne rajtas filudi en ĉi tiu servilo
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :�enerala eraro
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :sensinkroneca eraro
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :ne povis �ar�i mapon
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :konekto perdi�is
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokola eraro
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Miso pri NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ne rajtigite
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ricevis strangan pakaĵon
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :mal�usta revidaĵo
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nomo jam uzi�as
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :mal�usta pasvorto
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :mal�usta kompani-ID en DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :forbatite de servilo
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :provis uzi filudaĵon
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servilo plenas
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :�enerala eraro
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :sensinkroneca eraro
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :ne povis �ar�i mapon
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :konekto perdi�is
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokola eraro
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Miso pri NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ne rajtigite
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :ricevis strangan pakaĵon
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :mal�usta revidaĵo
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nomo jam uzi�as
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :mal�usta pasvorto
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :mal�usta kompani-ID en DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :forbatite de servilo
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :provis uzi filudaĵon
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servilo plenas
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1454,15 +1454,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Ludo paÅ­zita (
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Ludo malpaÅ­zita (kliento konektita)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Ludo malpaÅ­zita (konektado de kliento fiaskis)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :forlasanta
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} ensalutis la ludon
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} i�is ano de kompanio #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} i�is spektanto
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ekis novan kompanion (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} ĉesis la ludon ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} �an�is sian nomon al {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} donis al via kompanio {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Vi donis {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :forlasanta
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ensalutis la ludon
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} i�is ano de kompanio #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} i�is spektanto
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ekis novan kompanion (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ĉesis la ludon ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} �an�is sian nomon al {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} donis al via kompanio {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Vi donis {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Teamo] :
 STR_NETWORK_CHAT_COMPANY                                        :[Teamo] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Teamo] Al {STRING}: {WHITE}{STRING}
@@ -1472,8 +1472,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] Al {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Ĉiuj] :
 STR_NETWORK_CHAT_ALL                                            :[Ĉiuj] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Tajpu tekston por retbabilado
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} La servilo fermis la seancon
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} La servilo restarti�as...{}Bonvolu atendi...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} La servilo fermis la seancon
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} La servilo restarti�as...{}Bonvolu atendi...
 
 STR_NETWORK_SERVER                                              :Servilo
 STR_NETWORK_CLIENT                                              :Kliento
@@ -1487,19 +1487,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Parolu al kompa
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privata mesa�o
 
 
-STR_NETWORK_SEND                                                :{BLACK}Sendu
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Sendu
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Ne povas �ar�i landaspekton de PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...dosiero ne trovi�is.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ne povis transformi bildtipon. Necesas 8-bita aÅ­ 24-bita PNG-bildo.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...io simple fiaskis. Pardonu. (probable aĉa dosiero)
+STR_ERROR_PNGMAP                                                :{WHITE}Ne povas �ar�i landaspekton de PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...dosiero ne trovi�is.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...ne povis transformi bildtipon. Necesas 8-bita aÅ­ 24-bita PNG-bildo.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...io simple fiaskis. Pardonu. (probable aĉa dosiero)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Ne povas �ar�i landaspekton el BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ne povis transigi bildotipon.
+STR_ERROR_BMPMAP                                                :{WHITE}Ne povas �ar�i landaspekton el BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...ne povis transigi bildotipon.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Kosto: {CURRENCY}
@@ -1513,13 +1513,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Atendata
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Ne povas altigi landon ĉi tie...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Ne povas malaltigi landon ĉi tie...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Ne povas ebenigi terenon ĉi tie...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rokoj
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Malglata lando
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Nuda lando
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Herbo
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Kampoj
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Ne�kovrita lando
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Dezerto
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rokoj
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Malglata lando
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Nuda lando
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Herbo
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Kampoj
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Ne�kovrita lando
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Dezerto
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Lando ne �uste klini�as
@@ -1527,11 +1527,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Neebla t
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Elkavigo dama�us tunelon
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Jam marnivele
 STR_ERROR_TOO_HIGH                                              :{WHITE}Tro alte
-STR_ALREADY_LEVELLED                                            :{WHITE}... jam plata
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... jam plata
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nekonvena fervojtrako
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...jam konstruite
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}AntaÅ­e forigu relon
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Strato estas unudirekta aÅ­ blokita
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Strato estas unudirekta aÅ­ blokita
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Konstruado de Reloj
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Konstruado de Elektraj Reloj
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Konstruado de Unurela Fervojo
@@ -1555,24 +1555,24 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Konstruu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Konstruu fervojan ponton
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Konstruu fervojtunelon
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Elektu inter konstruado kaj forigado de reloj kaj signaloj
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Pontelekton - alklaku vian preferatan ponton por konstrui �in
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Pontelekton - alklaku vian preferatan ponton por konstrui �in
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Elektu deponejan orientadon
-STR_RAILROAD_TRACK                                              :Reloj
-STR_RAILROAD_TRAIN_DEPOT                                        :Trajndeponejo
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Reloj
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Trajndeponejo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...regiono estas posedata de alia kompanio
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Reloj kun bloko-signaloj
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Reloj kun antaÅ­-signaloj
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Reloj kun elir-signaloj
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Reloj kun kombin-signaloj
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Reloj kun pad-signaloj
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Reloj kun unudirektaj pad-signaloj
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Reloj kun blok- kaj antaÅ­-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Reloj kun bloko-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Reloj kun antaÅ­-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Reloj kun elir-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Reloj kun kombin-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Reloj kun pad-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Reloj kun unudirektaj pad-signaloj
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Reloj kun blok- kaj antaÅ­-signaloj
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}AntaÅ­e forigu vojon
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Aktivas vojprilaborado
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Aktivas vojprilaborado
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Vojkonstruado
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Elektu Vojan Ponton
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Ne povas konstrui vojon ĉi tie...
@@ -1589,23 +1589,23 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}Konstruu
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}Konstruu vojponton
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Konstruu vojtunelon
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Ĉu konstrui ĉu forigi por vojkonstruado
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Elektu vojveturildeponejan direkton
-STR_ROAD_DESCRIPTION_ROAD                                       :Vojo
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Vojo kun lanternoj
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Vojo kun arboj apude
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Vojveturila deponejo
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Kruci�o inter vojo kaj relo
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Elektu vojveturildeponejan direkton
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Vojo
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Vojo kun lanternoj
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Vojo kun arboj apude
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Vojveturila deponejo
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Kruci�o inter vojo kaj relo
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Ne povas forigi bushaltejon...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Ne povas forigi �ar�stacion...
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Urboj
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Antaŭe forigu konstruaĵon
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Enlo�antoj: {ORANGE}{COMMA}{BLACK}  Domoj: {ORANGE}{COMMA}
@@ -1688,7 +1688,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Trafika ĥaoso en {TOWN}!{}{}Vojrekonstruada programo komencita de {STRING} alportas 6-monatan mizeron al vojuzantoj!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (konstruata)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (konstruata)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igluo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipioj
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tekruĉa Domo
@@ -1701,16 +1701,16 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Metu afi�on
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Arboj
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...jam estas arbo
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Ne povas planti arbon ĉi tie...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...tro da afi�oj
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Ne povas meti afi�on ĉi tie...
-STR_SIGN_DEFAULT                                                :Afi�o
+STR_DEFAULT_SIGN_NAME                                           :Afi�o
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Ŝan�u afi�an tekston
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Ne povas �an�i afi�an nomon...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Elektu arbo-tipon por plant
-STR_TREE_NAME_TREES                                             :Arboj
-STR_TREE_NAME_RAINFOREST                                        :Praarbaro
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusoj
+STR_LAI_TREE_NAME_TREES                                         :Arboj
+STR_LAI_TREE_NAME_RAINFOREST                                    :Praarbaro
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusoj
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Elekto de Stacidomo
@@ -1729,7 +1729,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}AntaÅ­e
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Tro proksime al alia flughaveno
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}AntaÅ­e forigu flughavenon
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Renomu stacion/�ar�ejon
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Renomu stacion/�ar�ejon
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Ne povas renomi stacion...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Takso
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Akceptas
@@ -1747,10 +1747,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Elstare bonege
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Montru ĉiujn trajnojn kun ĉi tiu stacio en la plano
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Montru ĉiujnvojveturilojn kun ĉi tiu stacio en la plano
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Montru ĉiujn aviadilojn kun ĉi tiu stacio en la plano
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Montru ĉiujn �ipojn kun ĉi tiu stacio en la plano
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Montru ĉiujn trajnojn kun ĉi tiu stacio en la plano
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Montru ĉiujnvojveturilojn kun ĉi tiu stacio en la plano
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Montru ĉiujn aviadilojn kun ĉi tiu stacio en la plano
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Montru ĉiujn �ipojn kun ĉi tiu stacio en la plano
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} ne plu akceptas {STRING.n}
@@ -1777,36 +1777,36 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Ŝan�u
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Montru liston de akceptataj �ar�oj
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Staciaj nomoj - alklaku nomon por centre de la ĉefvido vidi �in
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Elektu grandecon/tipon de flughaveno
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Stacidomo
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Aviadila hangaro
-STR_STATION_DESCRIPTION_AIRPORT                                 :Flughaveno
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Ŝar�ejo
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bushaltejo
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Haveno
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Stacidomo
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Aviadila hangaro
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Flughaveno
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Ŝar�ejo
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bushaltejo
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Haveno
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Marku �ar�regionon ĉe proponata loko
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Ne marku �ar�regionon de proponata loko
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Ŝar�regiona marko
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Haveno
-STR_STATION_DESCRIPTION_BUOY                                    :Buo
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Buo
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...buo okupas la lokon
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stacio tro vastas
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...nekonformaj stacioj neebligitaj
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tenu la CTRL-klavon por elekti plurajn erojn
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...nekonformaj stacioj neebligitaj
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Tenu la CTRL-klavon por elekti plurajn erojn
 
 STR_UNDEFINED                                                   :(nedifinita tekstero)
-STR_STAT_CLASS_DFLT                                             :DefaÅ­lta stacio
-STR_STAT_CLASS_WAYP                                             :Transirejoj
+STR_STATION_CLASS_DFLT                                          :DefaÅ­lta stacio
+STR_STATION_CLASS_WAYP                                          :Transirejoj
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Åœipdeponeja Direkto
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...devas esti konstruata sur akvo
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Ne povas konstrui �ipdeponejon ĉi tie...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Elektu �ipdeponejan direkton
-STR_WATER_DESCRIPTION_WATER                                     :Akvo
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Mara aÅ­ rivera bordo
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Åœipdeponejo
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Akvo
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Mara aÅ­ rivera bordo
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Åœipdeponejo
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Ne povas konstrui sur akvo
 
 ##id 0x4000
@@ -1814,7 +1814,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Konservu
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Ŝar�u Ludon
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Konservu
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Forvi�u
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY} je {STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY} je {STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} libera{P "" j}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Ne eblas legi diskon
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Ludkonservado Fiaskis{}{STRING}
@@ -1827,11 +1827,11 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Listo da
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nune elektita nomo por luddosiero
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Forvi�u la nun elektitan luddosieron
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Konservu la nunan ludon per la elektita nomo
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generu hazardan novan ludon
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Ŝar�u Altecmapon
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generu hazardan novan ludon
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Ŝar�u Altecmapon
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} okupas la lokon
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} okupas la lokon
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Karbminejo
 STR_INDUSTRY_NAME_POWER_STATION                                 :Elektrejo
@@ -1885,7 +1885,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centre en la ĉefvido vidu la industilokon
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Nova {STRING} konstrui�as ĉe {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nova {STRING} planti�as ĉe {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kosto: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kosto: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Industritipo ne konstrueblas ĉi tie...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...arbaro nur planteblas super ne�a limlinio
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} anoncas tre baldaŭan fermi�on!
@@ -1906,10 +1906,10 @@ STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Alia tun
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Ne eblas liberigi la landon aliflanke de la tunelo
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}AntaÅ­e forigu tunelon
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}AntaÅ­e forigu ponton
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Ne povas komenci kaj fini en la sama loko
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Ne povas komenci kaj fini en la sama loko
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Komenco kaj fino devas esti samliniaj
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Nekonvena loko por tunelkomenco
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Åœtala pendanta
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Åœtala ebena
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Åœtala luksa
@@ -1920,30 +1920,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Åœtala tuba
 STR_BRIDGE_TUBULAR_SILICON                                      :Tuba, Silicia
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Ne povas konstrui ponton ĉi tie...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Ne povas konstrui tunelon ĉi tie...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Fervoja tunelo
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Voja tunelo
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Åœtala pendanta relponto
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Åœtala ebena relponto
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Åœtala luksa relponto
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Fortbetona pendanta relponto
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Ligna relponto
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betona relponto
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Åœtala pendanta vojponto
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Åœtala ebena vojponto
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Åœtala luksa vojponto
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Fortbetona pendanta vojponto
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Ligna vojponto
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betona vojponto
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Tuba relponto
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Tuba vojponto
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Fervoja tunelo
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Voja tunelo
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Åœtala pendanta relponto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Åœtala ebena relponto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Åœtala luksa relponto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Fortbetona pendanta relponto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ligna relponto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betona relponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Åœtala pendanta vojponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Åœtala ebena vojponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Åœtala luksa vojponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Fortbetona pendanta vojponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ligna vojponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betona vojponto
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Tuba relponto
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Tuba vojponto
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objekto okupas la lokon
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmitilo
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Lumturo
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Kompania Ĉefkonstruaĵo
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmitilo
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Lumturo
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Kompania Ĉefkonstruaĵo
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...kompania ĉefkonstruaĵo okupas la lokon
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Kompanie posedata lando
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Kompanie posedata lando
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Ne povas aĉeti ĉi tiun regionon...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...vi jam posedas �in!
 
@@ -1989,7 +1989,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stacio
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Malfacilec-nivelo
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Konservu
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Konservu
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Facile
@@ -2062,8 +2062,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kolorskem
 STR_LIVERY_CAPTION                                              :{WHITE}Nova Kolorskemo
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Kompaninomo
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Mana�antnomo
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Kompania Nomo
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nomo de la Mana�anto
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Kompania Nomo
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nomo de la Mana�anto
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Ne povas �an�i kompaninomon...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Ne povas �an�i mana�antnomon...
 STR_FINANCES_CAPTION                                            :{WHITE}Financoj de {COMPANY} {BLACK}{COMPANYNUM}
@@ -2087,11 +2087,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Entute:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Enspeza Grafiko
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Gajna Grafiko
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Banka Balanco
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Prunto
-STR_MAX_LOAN                                                    :{WHITE}Maksimuma prunto: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maksimuma prunto: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pruntu {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Repagu {SKIP}{SKIP}{CURRENCY}
@@ -2100,7 +2100,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Ne povas
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...ne estas repagebla prunto
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} necesas
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Ne povas repagi prunton...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Ne povas donaci monon pruntitan de la banko...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Ne povas donaci monon pruntitan de la banko...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Elektu novan viza�on por la mana�anto
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Ŝan�u la kompaniveturilan koloraron
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Ŝan�u la nomon de la mana�anto
@@ -2110,10 +2110,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Repagu p
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Mana�anto)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}InaÅ­gurita: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Veturiloj:
-STR_TRAINS                                                      :{WHITE}{COMMA} trajno{P "" j}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} vojveturilo{P "" j}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aviadiloj
-STR_SHIPS                                                       :{WHITE}{COMMA} �ipo{P "" j}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} trajno{P "" j}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} vojveturilo{P "" j}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aviadiloj
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} �ipo{P "" j}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Neniu
 STR_FACE_CAPTION                                                :{WHITE}Viza�elekto
 STR_FACE_MALE_BUTTON                                            :{BLACK}Vira
@@ -2127,7 +2127,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Kreu haz
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Åœlosilo
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Montru �losilon al grafikoj
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Åœlosilo al kompanigrafikoj
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klaku ĉi tie por (mal)�alti la kompanian eron de la grafiko
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klaku ĉi tie por (mal)�alti la kompanian eron de la grafiko
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Kiom da �ar�o liveri�is
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Kompania rendimento (maksimumo=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Kompaniaj valoroj
@@ -2161,17 +2161,17 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Potenculo
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Plejpotenculo
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Faru HQ
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Konstruu kompanian ĉefkonstruaĵon / vidu kompanian ĉefkonstruaĵon
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Rekonstruu kompanian ĉefkonstruaĵon aliloke por 1% de kompanivaloro
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Rekonstruu kompanian ĉefkonstruaĵon aliloke por 1% de kompanivaloro
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Ne povas konstrui kompanian ĉefkonstruaĵon...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Vidu HQ
-STR_RELOCATE_HQ                                                 :{BLACK}Relokigu HQ
-STR_COMPANY_PASSWORD                                            :{BLACK}Pasvorto
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Pasvorte protektu vian kompanion por eviti ke eksteruloj ali�u.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Agordu kompanian pasvorton
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Relokigu HQ
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Pasvorto
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Pasvorte protektu vian kompanion por eviti ke eksteruloj ali�u.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Agordu kompanian pasvorton
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Kompania pasvorto
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Monda Recesio!{}{}Financaj spertuloj timas ke malpliboni�as treege! Ekonomio malboni�adas!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Recesio fini�is!{}{}Komerca pliboni�os donas konfidon al industrioj! Ekonomio pliboni�as!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Åœaltu inter granda kaj malgranda fenestro
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Åœaltu inter granda kaj malgranda fenestro
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Kompania valoro: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Aĉetu 25%-an dividaĵon
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vendu 25%-an dividaĵon
@@ -2181,7 +2181,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Ne povas
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Ne povas vendi 25%-an dividaĵon...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% posedataj de {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} estas transprenita de {STRING}!
-STR_PROTECTED                                                   :{WHITE}Ĉi tiu kompanio ne sufiĉe a�as por jam komerci dividaĵojn...
+STR_ERROR_PROTECTED                                             :{WHITE}Ĉi tiu kompanio ne sufiĉe a�as por jam komerci dividaĵojn...
 
 STR_LIVERY_DEFAULT                                              :Normala Koloro
 STR_LIVERY_STEAM                                                :Vaporma�ino
@@ -2203,14 +2203,14 @@ STR_LIVERY_HELICOPTER                                           :Helikoptero
 STR_LIVERY_SMALL_PLANE                                          :Malgranda Aviadilo
 STR_LIVERY_LARGE_PLANE                                          :Granda Aviadilo
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Montru �eneralajn kolorskemojn
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Montru trajnajn kolorskemojn
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Montru vojveturilajn kolorskemojn
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Montru �ipkolorajn skemojn
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Montru aviadilajn kolorskemojn
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Elektu la unuan koloron por la elektita skemo
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Elektu la duan koloron por la elektita skemo
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Elektu la kolorskemon �an�endan, aŭ plurajn per CTRL+click. Alklaku kvadraton por uzi/ne uzi skemon
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Montru �eneralajn kolorskemojn
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Montru trajnajn kolorskemojn
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Montru vojveturilajn kolorskemojn
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Montru �ipkolorajn skemojn
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Montru aviadilajn kolorskemojn
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Elektu la unuan koloron por la elektita skemo
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Elektu la duan koloron por la elektita skemo
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Elektu la kolorskemon �an�endan, aŭ plurajn per CTRL+click. Alklaku kvadraton por uzi/ne uzi skemon
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Vaporo)
@@ -2481,10 +2481,10 @@ STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :magleva lokomot
 ##id 0x8800
 STR_NEWS_FIRST_TRAIN_ARRIVAL                                    :{BIGFONT}{BLACK}Enlo�antoj festas . . .{}Unua trajno alvenas ĉe {STATION}!
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detaloj)
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
 
 
 STR_ORDER_CONDITIONAL_UNCONDITIONALLY                           :Ĉiam
@@ -2502,12 +2502,12 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Trajno n
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Plusaltu
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Forvi�u
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Iru al
-STR_REFIT                                                       :{BLACK}Transformu
-STR_REFIT_TIP                                                   :{BLACK}Elektu kargospecon por transformo en ĉi tiu ordono. CTRL+klako por forigi transforminstrukcion
-STR_REFIT_ORDER                                                 :(Transformu al {STRING})
+STR_ORDER_REFIT                                                 :{BLACK}Transformu
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Elektu kargospecon por transformo en ĉi tiu ordono. CTRL+klako por forigi transforminstrukcion
+STR_ORDER_REFIT_ORDER                                           :(Transformu al {STRING})
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordenoj)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fino de Ordenoj - -
-STR_SERVICE                                                     :{BLACK}Prizorgo
+STR_ORDER_SERVICE                                               :{BLACK}Prizorgo
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Kreite: {LTBLUE}{NUM}{BLACK} Valoro: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valoro: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2520,7 +2520,7 @@ STR_ERROR_CAN_T_DELETE_THIS_ORDER                               :{WHITE}Ne povas
 STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}Ne povas �an�i ĉi tiun ordenon...
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Ne povas movi veturilon
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}La malantaŭa ma�ino ĉiam sekvos la antaŭan
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ne eblas trovi lokan deponejon
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}tagoj{BLACK}   Lasta prizorgo: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Prizorga intervalo: {LTBLUE}{COMMA}%{BLACK}   Lasta prizorgo: {LTBLUE}{DATE_LONG}
@@ -2535,8 +2535,8 @@ STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Montru t
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Ordena listo - alklaku ordenon por elekti. CTRL + klako skrolas al la stacio
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Forvi�u la elektitan ordenon
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Enigu novan ordenon antaÅ­ la elektita ordeno, aÅ­ aldonu fine de la listo
-STR_SERVICE_HINT                                                :{BLACK}Transsaltu ordenon �is prizorgo necesos
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kosto: {CURRENCY} Pezo: {WEIGHT_S}{}Rapideco: {VELOCITY}  Forto: {POWER}{}Irkosto: po {CURRENCY} jare{}Kapablo: {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Transsaltu ordenon �is prizorgo necesos
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kosto: {CURRENCY} Pezo: {WEIGHT_S}{}Rapideco: {VELOCITY}  Forto: {POWER}{}Irkosto: po {CURRENCY} jare{}Kapablo: {CARGO}
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Haltis
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Ne povas igi trajnon transiri signalon je dan�ero...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kra�is!
@@ -2546,11 +2546,11 @@ STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ne povas
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Ne povas inversigi direkton de veturilo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne povas turni veturilojn konsistantaj el pluraj unuoj
 
-STR_TRAIN_STOPPING                                              :{RED}Halti�as
-STR_TRAIN_STOPPING_VEL                                          :{RED}Halti�as, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Neinter�an�eblaj reltipoj
-STR_TRAIN_NO_POWER                                              :{RED}Senforte
-STR_TRAIN_START_NO_CATENARY                                     :Mankas ĉi-trake supera elektro, do la trajno ne povas starti
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Halti�as
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Halti�as, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Neinter�an�eblaj reltipoj
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Senforte
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Mankas ĉi-trake supera elektro, do la trajno ne povas starti
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nova {STRING} nun haveblas!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
@@ -2563,7 +2563,7 @@ STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ŝan�u
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...devas esti haltigata en vojveturila deponejo
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ne eblas trovi lokan deponejon
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Igu veturilon ĉirkaŭturni
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapacito: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacito: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veturilo{P "" j}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2587,7 +2587,7 @@ STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Ne povas
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Transformu)
 STR_REFIT_TITLE                                                 :{GOLD}Elektu �ar�otipon por porti:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova kapablo: {GOLD}{CARGO}{}{BLACK}Transformkosto: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(transformebla)
+STR_PURCHASE_INFO_REFITTABLE                                    :(transformebla)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flughavenoj
@@ -2600,7 +2600,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Kreu flu
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Enlo�antoj festas . . .{}Unua aviadilo alvenas en {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Aviadilo Kra�as!{}{COMMA} mortas pro fajro en {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Aviadila Kra�o!{}Aviadilo ne havis sufiĉan brulaĵon, {COMMA} mortas pro fajro!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Timetable)
 
@@ -2613,9 +2613,9 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Karbmineja ter�ovi�o lasas trakon da detruado ĉe {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Fluegoj!{}Almenaŭ {COMMA} mankas kaj ver�ajne mortis pro signifoplena fluego!
 
-STR_BRIBE_FAILED                                                :{WHITE}Via subaĉeta provo estas
-STR_BRIBE_FAILED_2                                              :{WHITE}malkovrita de regiona esploristo
-STR_BUILD_DATE                                                  :{BLACK}Kreite: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Via subaĉeta provo estas
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}malkovrita de regiona esploristo
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Kreite: {LTBLUE}{DATE_LONG}
 
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detala rendimento
@@ -2636,24 +2636,24 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Mono:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Prunto:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Entute:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Nombro da veturiloj; tio enkalkulas vojveturilojn, trajnojn, �ipojn kaj aviadilojn
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Nombro da staciaj eroj. Ĉiu parto de stacio (ekz. stacidomo, bushaltejo, flughaveno) kalkuli�as, eĉ se konektite kiel unu stacio
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}La gajno de la malplejenspeza veturilo (de ĉiuj veturiloj pli a�aj ol 2 jaroj)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Enspezite en la plej malaltenspeza monato de la lasta 12 kvaronoj
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Enspezite en la plej altenspeza monato de la lasta 12 kvaronoj
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Ŝar�unuoj liveritaj en la lastaj 4 kvaronoj
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Nombro da �ar�tipoj liveritaj en la lasta kvarono
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Monkvanto de ĉi tiu kompanio en la banko
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}La monkvanto pruntita de ĉi tiu kompanio
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Entuta poentaro el eblaj poentoj
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Nombro da veturiloj; tio enkalkulas vojveturilojn, trajnojn, �ipojn kaj aviadilojn
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Nombro da staciaj eroj. Ĉiu parto de stacio (ekz. stacidomo, bushaltejo, flughaveno) kalkuli�as, eĉ se konektite kiel unu stacio
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}La gajno de la malplejenspeza veturilo (de ĉiuj veturiloj pli a�aj ol 2 jaroj)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Enspezite en la plej malaltenspeza monato de la lasta 12 kvaronoj
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Enspezite en la plej altenspeza monato de la lasta 12 kvaronoj
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Ŝar�unuoj liveritaj en la lastaj 4 kvaronoj
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Nombro da �ar�tipoj liveritaj en la lasta kvarono
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Monkvanto de ĉi tiu kompanio en la banko
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}La monkvanto pruntita de ĉi tiu kompanio
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Entuta poentaro el eblaj poentoj
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Agordoj de NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Agordoj de NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Apliku �an�ojn
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Agordu parametrojn
-STR_NEWGRF_FILENAME                                             :{BLACK}Dosiernomo: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Apliku �an�ojn
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Agordu parametrojn
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Dosiernomo: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vi ĉi tiel �an�os al kuranta ludo; tio povas kra�igi la ludon.{}Ĉu vi nepre volas fari tion?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2669,28 +2669,28 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{SKIP}{STRING}
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :la GRF-dosiero estas farita por traduki
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Tro da novaj grafikaĵoj estas �ar�ataj
 
-STR_NEWGRF_ADD                                                  :{BLACK}Aldonu
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Aldonu NewGRF-dosieron al la listo
-STR_NEWGRF_REMOVE                                               :{BLACK}Forvi�u
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Forvi�u la elektitan dosieron de NewGRF el la listo
-STR_NEWGRF_MOVEUP                                               :{BLACK}Supren
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Movu la elektitan NewGRF-dosieron supren en la listo
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Malsupren
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por �an�i la parametrojn
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametroj: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Enigu NewGRF-parametrojn
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ne haveblas informoj
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Aldonu
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Aldonu NewGRF-dosieron al la listo
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Forvi�u
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Forvi�u la elektitan dosieron de NewGRF el la listo
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Supren
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Movu la elektitan NewGRF-dosieron supren en la listo
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Malsupren
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por �an�i la parametrojn
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametroj: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Enigu NewGRF-parametrojn
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ne haveblas informoj
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Haveblaj NewGRF-dosieroj
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Aldonu al elekto
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Aldonu la elektitan NewGRF-dosieron al viaj agordoj
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Reserĉu dosierojn
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Äœisdatigu la liston da haveblaj NewGRF-dosieroj
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Aldonu la elektitan NewGRF-dosieron al viaj agordoj
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Reserĉu dosierojn
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Äœisdatigu la liston da haveblaj NewGRF-dosieroj
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Dosiero ne aldoneblas: duobla GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ne trovis apartenan dosieron
-STR_NEWGRF_DISABLED                                             :{RED}Malaktiva
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ne trovis apartenan dosieron
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Malaktiva
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ne trovi�is apartena dosiero (�ar�is taŭgan GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Taŭga(j) GRF(oj) �ar�i�is por mankaj dosieroj
@@ -2726,8 +2726,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Åœipo{P "" j}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aviadiloj
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Kunhavaj ordonoj de {COMMA} Veturilo{P "" j}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Montru ĉiujn veturilojn kiuj dividas ĉi tiun planon
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Kunhavaj ordonoj de {COMMA} Veturilo{P "" j}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Montru ĉiujn veturilojn kiuj dividas ĉi tiun planon
 
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Transformu trajnon
@@ -2830,39 +2830,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Transfor
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Transformu �ar��ipon por porti alian �ar�on
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Transformu aviadilon por porti alian �ar�otipon
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Irante al {TOWN} Trajndeponejo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Irante al {TOWN} Voja Deponejo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Irante al {TOWN} Voja Deponejo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Irante al {TOWN} Åœipdeponejo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Irante al {TOWN} Åœipdeponejo, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Irante al {STATION} Hangaro
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Irante al {STATION} Hangaro, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Prizorgo ĉe {STATION} Hangaro
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Prizorgo ĉe {STATION} Hangaro, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klonu Trajnon
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonu Veturilon
-STR_CLONE_SHIP                                                  :{BLACK}Klonu Åœipon
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonu aviadilon
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ĉi tiel konstruu kopion de la trajno kun ĉiuj vagonoj. CTRL+klako transprenos la itineron
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ĉi tiel konstruu kopion de la vojveturilo. CTRL+klako transprenos la itineron
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ĉi tiel konstruu kopion de la �ipo. CTRL+klako transprenos la itineron
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ĉi tio konstruas kopion de la aviadilo. CTRL+klako transprenas la itineron
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ĉi tio konstruas kopion de la trajno kun ĉiuj vagonoj. Alklaku ĉi tiun butenon kaj poste trajnon en aŭ ekster deponejo. CTRL+klako transprenas la itineron
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ĉi tio konstruas kopion de la vojveturilo. Alklaku ĉi tiun butenon kaj poste veturilon en aŭ ekster deponejo. CTRL+klako transprenos la itineron
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ĉi tio konstruas kopion de la �ipo. Alklaku ĉi tiun butenon kaj poste �ipon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ĉi tio konstruas kopion de la aviadilo. Alklaku ĉi tiun butenon kaj poste aviadilon en aŭ ekster hangaro. CTRL+klako dividos la ordenojn
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Irante al {TOWN} Trajndeponejo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Irante al {TOWN} Trajndeponejo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Irante al {TOWN} Voja Deponejo
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Irante al {TOWN} Voja Deponejo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Irante al {TOWN} Åœipdeponejo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Irante al {TOWN} Åœipdeponejo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Irante al {STATION} Hangaro
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Irante al {STATION} Hangaro, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Prizorgo ĉe {TOWN} Trajndeponejo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Prizorgo ĉe {TOWN} Voja Deponejo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Prizorgo ĉe {TOWN} Ŝipdeponejo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Prizorgo ĉe {STATION} Hangaro
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Prizorgo ĉe {STATION} Hangaro, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klonu Trajnon
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonu Veturilon
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonu Åœipon
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonu aviadilon
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Ĉi tiel konstruu kopion de la trajno kun ĉiuj vagonoj. CTRL+klako transprenos la itineron
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Ĉi tiel konstruu kopion de la vojveturilo. CTRL+klako transprenos la itineron
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Ĉi tiel konstruu kopion de la �ipo. CTRL+klako transprenos la itineron
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Ĉi tio konstruas kopion de la aviadilo. CTRL+klako transprenas la itineron
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ĉi tio konstruas kopion de la trajno kun ĉiuj vagonoj. Alklaku ĉi tiun butenon kaj poste trajnon en aŭ ekster deponejo. CTRL+klako transprenas la itineron
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ĉi tio konstruas kopion de la vojveturilo. Alklaku ĉi tiun butenon kaj poste veturilon en aŭ ekster deponejo. CTRL+klako transprenos la itineron
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ĉi tio konstruas kopion de la �ipo. Alklaku ĉi tiun butenon kaj poste �ipon en aŭ ekster deponejo. CTRL+klako dividos la ordenojn
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ĉi tio konstruas kopion de la aviadilo. Alklaku ĉi tiun butenon kaj poste aviadilon en aŭ ekster hangaro. CTRL+klako dividos la ordenojn
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novaj Relaj Veturiloj
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novaj Elektraj Relaj Veturiloj
@@ -2933,26 +2933,26 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centre v
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Vi volas vendi ĉiujn veturilojn en la deponejo. Ĉu vi certas?
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vendu ĉiujn trajnojn en la deponejo
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vendu ĉiujn vojveturilojn en la deponejo
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vendu ĉiujn �ipojn en la deponejo
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vendu ĉiujn aviadilojn en la hangaro
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vendu ĉiujn trajnojn en la deponejo
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vendu ĉiujn vojveturilojn en la deponejo
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vendu ĉiujn �ipojn en la deponejo
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vendu ĉiujn aviadilojn en la hangaro
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Akiru liston da trajnoj kun ĉi tiu deponejo en siaj ordenoj
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Akiru liston da ĉiuj vojveturiloj kun ĉi tiu deponejo en siaj ordenoj
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Akiru liston da ĉiuj �ipoj kun ĉi tiu deponejo en siaj ordenoj
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Akiru liston da ĉiuj aviadiloj kun ajna hangaro en ĉi tiu flughaveno en siaj ordenoj
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Akiru liston da trajnoj kun ĉi tiu deponejo en siaj ordenoj
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Akiru liston da ĉiuj vojveturiloj kun ĉi tiu deponejo en siaj ordenoj
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Akiru liston da ĉiuj �ipoj kun ĉi tiu deponejo en siaj ordenoj
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Akiru liston da ĉiuj aviadiloj kun ajna hangaro en ĉi tiu flughaveno en siaj ordenoj
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Aŭtomate anstataŭu ĉiujn trajnojn en la deponejo
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Aŭtomate anstataŭu ĉiujn vojveturilojn en la deponejo
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Aŭtomate anstataŭu ĉiujn �ipojn en la deponejo
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Aŭtomate anstataŭu ĉiujn aviadilojn en la hangaro
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Aŭtomate anstataŭu ĉiujn trajnojn en la deponejo
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Aŭtomate anstataŭu ĉiujn vojveturilojn en la deponejo
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Aŭtomate anstataŭu ĉiujn �ipojn en la deponejo
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Aŭtomate anstataŭu ĉiujn aviadilojn en la hangaro
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}AnstataÅ­u {STRING.n}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Komencu AnstataÅ­i
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Ĉesu Anstataŭi
-STR_NOT_REPLACING                                               :{BLACK}Ne anstataÅ­ante
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ne elekti�is veturilo
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ne anstataÅ­ante
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ne elekti�is veturilo
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Elektu ma�inon por anstataŭi
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Elektu novan ma�inon por uzi anstataŭ la maldekstre elektitan
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Premu por ĉesi anstataŭi la maldekstre elektitan ma�inon
@@ -2964,26 +2964,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ĉe aŭt
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}AnstataÅ­ante: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Ŝaltu inter ma�ina kaj vagona anstataŭigo
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Trajno ne haveblas
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Veturilo ne haveblas
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Åœipo ne haveblas
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aviadilo ne haveblas
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Trajno ne haveblas
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Veturilo ne haveblas
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Åœipo ne haveblas
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aviadilo ne haveblas
 
-STR_ENGINES                                                     :Ma�inoj
-STR_WAGONS                                                      :Vagonoj
+STR_REPLACE_ENGINES                                             :Ma�inoj
+STR_REPLACE_WAGONS                                              :Vagonoj
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Alklaku por haltigi ĉiujn trajnojn en la deponejo
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Alklaku por haltigi ĉiujn vojveturilojn en la deponejo
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Alklaku por haltigi ĉiujn �ipojn en la deponejo
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Alklaku por haltigi ĉiujn aviadilojn en la hangaro
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Alklaku por haltigi ĉiujn trajnojn en la deponejo
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Alklaku por haltigi ĉiujn vojveturilojn en la deponejo
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Alklaku por haltigi ĉiujn �ipojn en la deponejo
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Alklaku por haltigi ĉiujn aviadilojn en la hangaro
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Alklaku por starti ĉiujn trajnojn en la deponejo
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Alklaku por starti ĉiujn vojveturilojn en la deponejo
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Alklaku por starti ĉiujn �ipojn en la deponejo
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Alklaku por starti ĉiujn aviadilojn en la hangaro
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Alklaku por starti ĉiujn trajnojn en la deponejo
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Alklaku por starti ĉiujn vojveturilojn en la deponejo
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Alklaku por starti ĉiujn �ipojn en la deponejo
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Alklaku por starti ĉiujn aviadilojn en la hangaro
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Alklaku por haltigi ĉiujn veturilojn en la listo
-STR_MASS_START_LIST_TIP                                         :{BLACK}Alklaku por starti ĉiujn veturilojn en la listo
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Alklaku por haltigi ĉiujn veturilojn en la listo
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Alklaku por starti ĉiujn veturilojn en la listo
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Afi�a listo - {COMMA} Afi�o{P "" j}
@@ -2991,14 +2991,14 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Afi�a l
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Relaj Veturiloj
-STR_ELRAIL_VEHICLES                                             :Elektraj Relaj Veturiloj
-STR_MONORAIL_VEHICLES                                           :Unurelaj Veturiloj
-STR_MAGLEV_VEHICLES                                             :Maglevaj Veturiloj
+STR_REPLACE_RAIL_VEHICLES                                       :Relaj Veturiloj
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektraj Relaj Veturiloj
+STR_REPLACE_MONORAIL_VEHICLES                                   :Unurelaj Veturiloj
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglevaj Veturiloj
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kosto: {GOLD}{CURRENCY}{BLACK} Pezo: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rapido: {GOLD}{VELOCITY}{BLACK}   Forto: {GOLD}{POWER}
@@ -3024,54 +3024,54 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generu
-STR_RANDOM                                                      :{BLACK}Hazardigu
-STR_RANDOM_HELP                                                 :{BLACK}Ŝan�u la hazardan enigon uzatan de la terengenerilo
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Mondgenerado
-STR_RANDOM_SEED                                                 :{BLACK}Hazarda Enigo:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klaku por enigi hazardan enigon
-STR_LAND_GENERATOR                                              :{BLACK}Landgenerilo:
-STR_TREE_PLACER                                                 :{BLACK}Arba algoritmo:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Mapa turni�o:
-STR_TERRAIN_TYPE                                                :{BLACK}Terentipo:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Marnivelo:
-STR_SMOOTHNESS                                                  :{BLACK}Reguleco:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Ne�linia alteco:
-STR_DATE                                                        :{BLACK}Dato:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Kiom da urboj:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Kiom da industrioj:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Altigu la ne�linion per unu
-STR_SNOW_LINE_DOWN                                              :{BLACK}Malaltigu la ne�linion per unu
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ŝan�u altecon de la ne�linio
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Ŝan�u komencjaron
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skala averto
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ne rekomendindas tro �an�i la grandecon de la mapo. Ĉu daŭrigi la generadon?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Mapa nomo:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Grandeco: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generu
+STR_MAPGEN_RANDOM                                               :{BLACK}Hazardigu
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Ŝan�u la hazardan enigon uzatan de la terengenerilo
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Mondgenerado
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Hazarda Enigo:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klaku por enigi hazardan enigon
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landgenerilo:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Arba algoritmo:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Mapa turni�o:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terentipo:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Marnivelo:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Reguleco:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Ne�linia alteco:
+STR_MAPGEN_DATE                                                 :{BLACK}Dato:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Kiom da urboj:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Kiom da industrioj:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Altigu la ne�linion per unu
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Malaltigu la ne�linion per unu
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ŝan�u altecon de la ne�linio
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Ŝan�u komencjaron
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skala averto
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ne rekomendindas tro �an�i la grandecon de la mapo. Ĉu daŭrigi la generadon?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Mapa nomo:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Grandeco: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generante mondon...
 STR_GENERATION_ABORT                                            :{BLACK}Ĉesu
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Ĉesu generi mondon
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ĉu vi vere volas ĉesi generi mondon?
-STR_PROGRESS                                                    :{WHITE}{NUM}% komplete
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Mondgenerado
-STR_TREE_GENERATION                                             :{BLACK}Arba generado
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Nemoveblaĵa generado
-STR_CLEARING_TILES                                              :{BLACK}Generado de malglataj kaj rokaj regionoj
-STR_SETTINGUP_GAME                                              :{BLACK}Agordante ludon
-STR_PREPARING_TILELOOP                                          :{BLACK}Trakurante kvadratojn
-STR_PREPARING_GAME                                              :{BLACK}Preparante ludon
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ĉi tiu ago �an�is la malfacilec-nivelon al '�an�ite'
-STR_SE_FLAT_WORLD                                               :{WHITE}Ebena lando
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generu ebenan landon
-STR_SE_RANDOM_LAND                                              :{WHITE}Hazarda lando
-STR_SE_NEW_WORLD                                                :{BLACK}Kreu novan scenaron
-STR_SE_CAPTION                                                  :{WHITE}Scenara tipo
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Malaltigu la altecon de ebena lando per unu
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Altigu la altecon de ebena lando per unu
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ŝan�u altecon de ebena lando
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Alteco de ebena lando:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% komplete
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Mondgenerado
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Arba generado
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Nemoveblaĵa generado
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generado de malglataj kaj rokaj regionoj
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Agordante ludon
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Trakurante kvadratojn
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparante ludon
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Ĉi tiu ago �an�is la malfacilec-nivelon al '�an�ite'
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Ebena lando
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generu ebenan landon
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Hazarda lando
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Kreu novan scenaron
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenara tipo
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Malaltigu la altecon de ebena lando per unu
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Altigu la altecon de ebena lando per unu
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Ŝan�u altecon de ebena lando
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Alteco de ebena lando:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrigu la mapeton al la nuna loko
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
@@ -3101,18 +3101,18 @@ STR_MEASURE_AREA                                                :{BLACK}Regiono:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Longo: {NUM}{}Altecdiferenco: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Regiono: {NUM} x {NUM}{}Altecdiferenco: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transigaj Kreditoj: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ĉi tiun vojon posedas la urbo
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vojo direkti�as mal�uste
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transigaj Kreditoj: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ĉi tiun vojon posedas la urbo
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...vojo direkti�as mal�uste
 
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Ebloj por travidebleco
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}(Ne)travideblu la staciaj afi�oj
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}(Ne)travideblu la arboj
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}(Ne)travideblu la domoj
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}(Ne)travideblu la industrioj
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}(Ne)travideblu konstrueblaĵoj kiel stacidomoj, deponejoj, trairejoj kaj kondukdratoj
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}(Ne)travideblu la pontoj
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}(Ne)travideblu aĵoj kiel lumturoj kaj antenoj, kaj eble estonte vid�uaĵoj
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Ebloj por travidebleco
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}(Ne)travideblu la staciaj afi�oj
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}(Ne)travideblu la arboj
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}(Ne)travideblu la domoj
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}(Ne)travideblu la industrioj
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}(Ne)travideblu konstrueblaĵoj kiel stacidomoj, deponejoj, trairejoj kaj kondukdratoj
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}(Ne)travideblu la pontoj
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}(Ne)travideblu aĵoj kiel lumturoj kaj antenoj, kaj eble estonte vid�uaĵoj
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3122,19 +3122,19 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Ĉiuj trajnoj
 STR_GROUP_ALL_SHIPS                                             :Ĉiuj �ipoj
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Renomu grupon
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Ne eblas krei grupon...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Ne eblas vi�i grupon...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Ne eblas krei grupon...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Ne eblas vi�i grupon...
 
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klaku por krei grupon
-STR_GROUP_DELETE_TIP                                            :{BLACK}Vi�u la selektitan grupon
-STR_GROUP_RENAME_TIP                                            :{BLACK}Renomu la sektitan grupon
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klaku por krei grupon
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Vi�u la selektitan grupon
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renomu la sektitan grupon
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3194,18 +3194,18 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nomo devas esti ununura
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nomo devas esti ununura
 
 #### Improved sign GUI
 
 ########
 
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Konstruu
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Konstruu
 
 ############ Face formatting
 STR_FACE_SIMPLE                                                 :{BLACK}Simpla
 STR_FACE_SAVE                                                   :{BLACK}Konservi
-STR_FACE_SAVE_TIP                                               :{BLACK}Konservi faman viza�on
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Konservi faman viza�on
 STR_FACE_SAVE_DONE                                              :{WHITE}Tiu ĉi viza�o estos konservita kiel via fama en agord-dosiero de OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europa
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Elekti eŭropecajn viza�ojn
@@ -3214,12 +3214,12 @@ STR_FACE_SELECT_AFRICAN                                         :{BLACK}Elekti a
 STR_FACE_YES                                                    :Jes
 STR_FACE_NO                                                     :Ne
 STR_FACE_HAIR                                                   :Hararo:
-STR_FACE_HAIR_TIP                                               :{BLACK}Ŝan�u hararon
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Ŝan�u hararon
 STR_FACE_EYECOLOUR                                              :Okula koloro:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Ŝan�u okulan koloron
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Ŝan�u okulan koloron
 STR_FACE_GLASSES                                                :Okulvitroj:
 STR_FACE_NOSE                                                   :Nazo:
-STR_FACE_NOSE_TIP                                               :{BLACK}Ŝan�i nazon
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Ŝan�i nazon
 STR_FACE_LIPS                                                   :Lipoj:
 STR_FACE_MOUSTACHE                                              :Liphararo:
 ########
diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt
index e83a09486..135e34d81 100644
--- a/src/lang/estonian.txt
+++ b/src/lang/estonian.txt
@@ -215,7 +215,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kaart -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Mängu valikud
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Sõnum
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}{STRING} teatab
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Ettevaatust!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Ettevaatust!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Seda ei saa teha....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Seda ala ei saa puhastada....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Algne autorikaitse {COPYRIGHT} 1995 Chris Sawyer, kõik õigused kaitstud
@@ -223,9 +223,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD meeskond
 
 STR_QUIT_CAPTION                                                :{WHITE}Mängust väljumine
-STR_YES                                                         :{BLACK}Jah
-STR_NO                                                          :{BLACK}Ei
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Jah
+STR_QUIT_NO                                                     :{BLACK}Ei
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}?
 
 STR_JUST_NOTHING                                                :Mitte midagi
 STR_COLOUR_DARK_BLUE                                            :Tumesinine
@@ -286,11 +286,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Kõrb
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Lumi
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Teade
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Vaikimisi
-STR_QUERY_CANCEL                                                :{BLACK}Tühista
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Nimevahetus
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Vaikimisi
+STR_BUTTON_CANCEL                                               :{BLACK}Tühista
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Nimevahetus
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -307,16 +307,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Laadung
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Andmed
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kandevõimed
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Veoseid kokku
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Selle rongi kandevõime:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Selle rongi kandevõime:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Uus mäng
 STR_INTRO_LOAD_GAME                                             :{BLACK}Mängu laadimine
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Võrgumäng
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Stsenaariumiredaktor
 
-STR_MAPSIZE                                                     :{BLACK}Kaardi suurus:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kaardi suurus:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Mängu valikud
 
 STR_COMPANY_SOMEONE                                             :keegi{SKIP}{SKIP}
@@ -365,10 +365,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Lahku mängust
 STR_FILE_MENU_EXIT                                              :Välju
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Kas te soovite selle mängu lõpetada?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Mängu lõpetamine
-STR_SORT_ORDER_TIP                                              :{BLACK}Sorteerimise järjekorra valimine (kahanev/kasvav)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Sorteerimistingimuse valimine
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vali sõelumisalused
-STR_SORT_BY                                                     :{BLACK}Sorteeri:
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Sorteerimise järjekorra valimine (kahanev/kasvav)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Sorteerimistingimuse valimine
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Vali sõelumisalused
+STR_BUTTON_SORT_BY                                              :{BLACK}Sorteeri:
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Rahvaarv
@@ -400,24 +400,24 @@ STR_SORT_BY_RUNNING_COST                                        :Käituskulud
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Võimsus- ja käituskulud
 STR_SORT_BY_CARGO_CAPACITY                                      :Kandevõime
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Veoseid pole ootamas
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vali kõik tööstused
-STR_SELECT_ALL_TYPES                                            :{BLACK}Vali kõik kaubatüüpid (ka mitteoodatav kaup)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vaata nimekirja seda tüüpi veovahenditest
-STR_MANAGE_LIST                                                 :{BLACK}Halda nimekirja
-STR_MANAGE_LIST_TIP                                             :{BLACK}Saada juhised kõikidele selles nimekirjas olevatele veovahenditele
-STR_REPLACE_VEHICLES                                            :Asenda veovahendeid
-STR_SEND_FOR_SERVICING                                          :Saada hooldusesse
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Saadaval rongid
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Saadaval sõidukid
-STR_AVAILABLE_SHIPS                                             :{BLACK}Saadaval laevad
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Saadaval õhusõidukid
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Saada depoose
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Saada depoose
-STR_SEND_SHIP_TO_DEPOT                                          :Saada depoose
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Saada angaari
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Veoseid pole ootamas
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Vali kõik tööstused
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Vali kõik kaubatüüpid (ka mitteoodatav kaup)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Vaata nimekirja seda tüüpi veovahenditest
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Halda nimekirja
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Saada juhised kõikidele selles nimekirjas olevatele veovahenditele
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Asenda veovahendeid
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Saada hooldusesse
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Saadaval rongid
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Saadaval sõidukid
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Saadaval laevad
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Saadaval õhusõidukid
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Saada depoose
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Saada depoose
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Saada depoose
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Saada angaari
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -447,12 +447,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Valikud
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Hooldusvahemiku ei saa muuta...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Sulge aken
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Akna pealkiri. Liigutamiseks lohista seda hiirega.
-STR_STICKY_BUTTON                                               :{BLACK}Keela selle akna sulgemine 'Sulge kõik aknad' nupu klõpsamisel
-STR_RESIZE_BUTTON                                               :{BLACK}Kliki ja venita, et akna suurust muuta
+STR_TOOLTIP_STICKY                                              :{BLACK}Keela selle akna sulgemine 'Sulge kõik aknad' nupu klõpsamisel
+STR_TOOLTIP_RESIZE                                              :{BLACK}Kliki ja venita, et akna suurust muuta
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Vajuta siia, et minna praegusesse vaikimisi valitud salvestamise/laadimise kausta
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Ruudul asuvate hoonete jms. lammutamine
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Maapinna madaldamine
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Maapinna kõrgendamine
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Maapinna madaldamine
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Maapinna kõrgendamine
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Kerimisriba - kerib nimistut üles/alla
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Kerimisriba - kerib listi üles/alla
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Näitab kaardil maastikku
@@ -465,21 +465,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Linnanim
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Kasum sellel aastal: {CURRENCY} (eelneval: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} aasta{P "" t} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} aasta{P "" t} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} aasta{P "" t} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} aasta{P "" t} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Rong
-STR_VEHICLE_ROAD_VEHICLE                                        :Sõiduk
-STR_VEHICLE_SHIP                                                :Laev
-STR_VEHICLE_AIRCRAFT                                            :Õhusõiduk
+STR_REPLACE_VEHICLE_TRAIN                                       :Rong
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Sõiduk
+STR_REPLACE_VEHICLE_SHIP                                        :Laev
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Õhusõiduk
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} on vanaks saamas
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} on väga vanaks saamas
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} on väga vanaks saamas ja vajab kiiret väljavahetamist
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Maa-ala andmed
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Puhastustasu: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Puhastustasu: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Sissetulek puhastamisel: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Sissetulek puhastamisel: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :puudub
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Omanik: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Maantee omanik: {LTBLUE}{STRING}
@@ -488,7 +488,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Rongitee
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Kohalik omavalitsus: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :puudub
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nimi
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -600,7 +600,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Vajuta l
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Vajuta laulule, et see eemaldada praegusest progammist (Custom1 või Custom2 ainult)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Lülita lugude segamine sisse ja välja
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Näita muusikalugude valimise akent
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Vajuta pakkumisele, et näha linna või tööstuse asukohta
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Vajuta pakkumisele, et näha linna või tööstuse asukohta
 STR_INTRO_DIFFICULTY                                            :{BLACK}Raskusaste ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Viimane teade
@@ -649,7 +649,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Vähenda
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Suvalise kaardi tekitamine
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Nulli maastik
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Nulli maastik
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Eemalda kõik mängija omandid
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Eemalda kõik mängija omandid
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Kas oled kindel, et tahad lammutada kõik mängija omandid?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Maastiku loomine
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Linnade loomine
@@ -663,11 +663,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...liiga
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...liiga lähedal teisele linnale
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...ebasobiv koht
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...liiga palju linnu
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ei saa ühtegi linna ehitada...
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...pole enam ruumi kaardil
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Ei saa ühtegi linna ehitada...
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...pole enam ruumi kaardil
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Linna suuruse suurendamine
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Laienda
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Linn ei ehita teid. Teedeehituse lubamiseks Täpsemad seaded->Majandus->Linnad.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Linn ei ehita teid. Teedeehituse lubamiseks Täpsemad seaded->Majandus->Linnad.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Suvaline linn
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Ehita linn suvalisse kohta
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}{STRING} ei saa siia ehitada...
@@ -681,13 +681,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Loo maas
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Ehita tuletorn
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Paigalda saatjamast
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Loo kõrbealad.{}Eemaldamiseks klõpsa hoides all CTRL nuppu
-STR_CREATE_LAKE                                                 :{BLACK}Määratle veealad.{}Ehita kanal. CTRL-klahvi all hoides ujutab ümbruskonna üle.
-STR_CREATE_RIVER                                                :{BLACK}Jõgede paigutamine.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Määratle veealad.{}Ehita kanal. CTRL-klahvi all hoides ujutab ümbruskonna üle.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Jõgede paigutamine.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Kustuta
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Hävita see linn täielikult
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Salvesta kaart
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Laadi kaart
-STR_MENU_LOAD_HEIGHTMAP                                         :Lae kõrguskaart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Lae kõrguskaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Lahku redaktorist
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Välju
@@ -697,7 +697,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Salvesta
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Stsenaariumi mängimine
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Kõrguskaardil mängimine
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Alusta uut mängu kasutades kõrguskaarti maastikuna
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Kas sa oled kindel, et sa tahad kaardi tegemise lõpetada?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Kas sa oled kindel, et sa tahad kaardi tegemise lõpetada?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...saab ainult ehitada linna, mille rahvastikuarv ületab 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Alguse liigutamine 1 aasta võrra tagasi
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Alguse liigutamine 1 aasta võrra edasi
@@ -705,21 +705,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...mõle
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Väike
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Keskmine
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Suur
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Suvaline
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Suvaline
 STR_FOUND_TOWN_CITY                                             :{BLACK}Linn
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Suuremad linnad kasvavad kiiremini kui väikesed{}Sõltuvalt seadetest on need ka alguses suuremad
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vali linna suurus
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Linna suurus:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Aleviku teeplaneering
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Vali alevikus kasutatav teeplaneering
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Algne
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Paremad teed
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 ruudustik
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 ruudustik
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Suvaline
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Aleviku teeplaneering
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Vali alevikus kasutatav teeplaneering
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Algne
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Paremad teed
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 ruudustik
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 ruudustik
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Suvaline
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Näita viimast teadet
 STR_NEWS_MESSAGES_OFF                                           :Väljas
 STR_NEWS_MESSAGES_SUMMARY                                       :Lühike
@@ -819,10 +819,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  SE
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekraanitõmmis edukalt salvestatud nimega '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ekraanitõmmise võtmine nurjus!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Maa ostmine tulevaseks kasutamiseks
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Maa ostmine tulevaseks kasutamiseks
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOMAATSALVESTUS
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  MÄNGU SALVESTAMINE  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ikka salvestamisel,{}palun oota salvestuse lõpuni!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Ikka salvestamisel,{}palun oota salvestuse lõpuni!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}'Ezy Street' stiilis muusikaprogrammi valimine
 
 ############ start of townname region
@@ -885,7 +885,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vali kas
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Täisekraan
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Märgi see kast, et OpenTTD täisekraanirežiimis mängida
-STR_FULLSCREEN_FAILED                                           :{WHITE}Täisekraanrežiim ebaõnnestus
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Täisekraanrežiim ebaõnnestus
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekraanilahutus
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Ekraanilahutuse valimine
@@ -898,12 +898,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Valige k
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} puuduv{P "" ad}/viga{P ne sed} fail{P "" id}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Lisaandmed põhigraafikakomplekti kohta
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automaatne salvestus nurjus
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automaatne salvestus nurjus
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Siht: {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Siht: {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sihita
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sihita, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Siht: {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Siht: {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sihita
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sihita, {VELOCITY}
 
 STR_PASSENGERS                                                  :reisijad
 STR_BAGS                                                        :kotti
@@ -914,9 +914,9 @@ STR_CRATES                                                      :kasti
 STR_RES_OTHER                                                   :muu
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Sihtpunktide nimekirja ei saa jagada...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Sihtpunktide nimekirja ei saa kopeerida...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Jagatud sihtpunktide lõpp - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Sihtpunktide nimekirja ei saa jagada...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Sihtpunktide nimekirja ei saa kopeerida...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Jagatud sihtpunktide lõpp - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ei leia jätkamiseks rada.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} on eksinud.
@@ -1185,15 +1185,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Kaardi
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :väljas
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Muuda seadete väärtusi
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Muuda seadete väärtusi
 
-STR_TEMPERATE_LANDSCAPE                                         :Parasvöötme maastik
-STR_SUB_ARCTIC_LANDSCAPE                                        :Arktiline maastik
-STR_SUB_TROPICAL_LANDSCAPE                                      :Troopiline maastik
-STR_TOYLAND_LANDSCAPE                                           :Mänguasjamaa
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Parasvöötme maastik
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Arktiline maastik
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Troopiline maastik
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Mänguasjamaa
 
 STR_CHEATS                                                      :{WHITE}Petmine
-STR_CHEATS_TIP                                                  :{BLACK}Märgistatud kastid näitavad et, kas sa oled varem seda pettust kasutanud
+STR_CHEATS_TOOLTIP                                              :{BLACK}Märgistatud kastid näitavad et, kas sa oled varem seda pettust kasutanud
 STR_CHEATS_WARNING                                              :{BLACK}Hoiatus! Sa kavatsed oma konkurente reeta. Pea meeles, et sellisest häbist ei saa sa enam kunagi lahti.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Suurenda raha hulka {CURRENCY} võrra
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Mängimine ettevõttena: {ORANGE}{COMMA}
@@ -1205,177 +1205,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Vaheta
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Muuda kuupäeva: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tootmisväärtuste muutmine: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Suudub meldepunkti: {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Suundub {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Suudub meldepunkti: {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Suundub {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Läbi punkti {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Läbi peatumata punkti{WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Läbi punkti {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Läbi peatumata punkti{WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN} meldepunkt
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Meldepunkt {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Meldepunkt
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} meldepunkt
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Meldepunkt {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Meldepunkt
 
-STR_WAYPOINT                                                    :{WHITE}Meldepunkt
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vali meldepunkti liik
+STR_WAYPOINT_CAPTION                                            :{WHITE}Meldepunkt
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vali meldepunkti liik
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Muuda meldepunkti nime
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Meldepunkti nime ei saa muuta...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Meldepunkti nime ei saa muuta...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Muuda rööpad meldepunktiks
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Meldepunkti ei saa siia rajada...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Meldepunkti ei saa siit eemaldada...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Meldepunkti ei saa siia rajada...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Meldepunkti ei saa siit eemaldada...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Rööbaste ehitamine kasutades "lohistamist"
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...kaardil puudub linn
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kaarditekitamine katkes...{}...linnadele pole sobilike kohti
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...kaardil puudub linn
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaarditekitamine katkes...{}...linnadele pole sobilike kohti
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Palju suvalisi linnu
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Kaardi katmine suvaliselt asetatud linnadega
-STR_MANY_RANDOM_INDUSTRIES                                      :Palju suvalisi tööstusi
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Kata kaart suvaliselt paigutatud tööstustega
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Tööstust ei saa tekitada...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Palju suvalisi linnu
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Kaardi katmine suvaliselt asetatud linnadega
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Palju suvalisi tööstusi
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Kata kaart suvaliselt paigutatud tööstustega
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Tööstust ei saa tekitada...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Maastiku tööriistade avamine maa tõstmiseks/langetamiseks, puude istutamiseks, jne.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Maastik
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Maapinna kõrgus
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Maapinna kõrgus
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Suvalised puutüübid
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Istutab suvalisi puid
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Istutab suvalisi puid
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Siia ei saa kanaleid ehitada...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Siia ei saa kanaleid ehitada...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Ehita kanaleid.
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Siia ei saa lüüse ehitada...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Siia ei saa lüüse ehitada...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Lüüsi ehitamine
-STR_LANDINFO_LOCK                                               :Lüüs
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Lüüs
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Jõgesid ei saa siia teha...
-STR_LANDINFO_RIVER                                              :Jõgi
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Jõgesid ei saa siia teha...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Jõgi
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...poi on kasutusel!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...poi on kasutusel!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinaadid: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinaadid: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Siinset jaamablokki ei saa lammutada...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Siin ei saa raudtee tüüpi muuta...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Siinset jaamablokki ei saa lammutada...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Siin ei saa raudtee tüüpi muuta...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Muuda/uuenda rööpaliiki
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Tõsta vedur siia, et kogu rong maha müüa
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Tõsta vedur siia, et kogu rong maha müüa
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Venitamine
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Ehita jaam kasutades hiirega venitust
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Vali jaama klass mida tahad näidata
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vali ehitatava jaama tüüp
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vali jaama klass mida tahad näidata
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vali ehitatava jaama tüüp
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Mängu aja kiirendamine
 STR_MESSAGE_HISTORY                                             :{WHITE}Sõnumite ajalugu
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Nimekiri hiljutistest uudistest
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Kõik välja
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Kõik sisse
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Nimekiri hiljutistest uudistest
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Kõik välja
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Kõik sisse
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Tööstused
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% veetud)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% veetud)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Tööstuste nimed - klõpsates keskendatakse vaade tööstusele
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Tööstused
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% veetud)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% veetud)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Tööstuste nimed - klõpsates keskendatakse vaade tööstusele
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liiga lähedal mõnele teisele tööstusele
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...liiga lähedal mõnele teisele tööstusele
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Tootlikuse muutmine
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Võrgumäng
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Mängija nimi:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Teised mängijad tunnevad sind selle nime järgi
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Sisesta enda nimi
-STR_NETWORK_CONNECTION                                          :{BLACK}Ãœhendus:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Valimine interneti- või kohtvõrkmängu vahel
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Alusta serverit
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Oma serveri alustamine
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nimi
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Mängu nimi
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Suhtluskeel, serveri osa, jne.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Mäng valimiseks vajuta nimekirjas olevale nimele
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server, kus sa viimati mängisid:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klõpsa, et valida server, kus sa viimati mängisid
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Serveri otsimine
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Võrgust serveri otsimine
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Lisa server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Pidevalt jälgitava serveri lisamine loendisse.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Sisesta serveri aadress
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliendid
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliente sees / enim kliente{}Ettevõtteid sees / enim ettevõtteid
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kaardi suurus
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kaardisuurus mängus{}Klõpsa, et järjestada pindala järgi
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Kuupäev
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Kuupäev hetkel
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Kestnud
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Mitu aastat{}on mäng kestnud
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}MÄNGU ANDMED
-STR_NETWORK_CLIENTS                                             :{SILVER}Kliendid: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Keel: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Ruudustik: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaardi suurus: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Osa serveris:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveri aadress: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Aeg alguses: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aeg hetkel: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Parooliga kaitstud!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER ON MAAS
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER ON TÄIS
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}OSAD EI SOBI
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF SOBIMATUS
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Liitu mänguga
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Uue võrgumängu alustamine
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Mängu nimi:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Mängu nime näidatakse teistele mänijatele võrgumängu serverite nimekirjas
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Sisesta võrgumängu nimi
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Sea parool
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Kaitse oma mäng parooliga, kui sa ei taha, et kõik sellele ligi pääseksid
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Vali kaart:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Millist kaarti sa tahad mängida?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :kohtvõrk (LAN)
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (reklaami)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Suurim klientide arv:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Määra suurim klientide arv. Kõik vabad kohad ei pea täidetud olema
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} ettevõte{P "" t}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Enim ettevõtteid:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Teatud ettevõtete piirang serveris
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} pealtvaataja{P "" t}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Enim pealtvaatajaid
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Teatud vaatlejate piirang serveris
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Räägitav keel:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Teistele mängijatele teadmiseks, et mis keelt serveris räägitakse
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Alusta mängu
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Uue võrgumängu alustamine suvalise kaardiga
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Mängu laadimine
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Varasema võrgumängu jätkamine (vaata, et ühendad ennast õige mängijana)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Võrgumäng
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Sisesta enda nimi
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Ãœhendus:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Valimine interneti- või kohtvõrkmängu vahel
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Alusta serverit
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Oma serveri alustamine
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nimi
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Mängu nimi
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Suhtluskeel, serveri osa, jne.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Mäng valimiseks vajuta nimekirjas olevale nimele
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Server, kus sa viimati mängisid:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klõpsa, et valida server, kus sa viimati mängisid
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Serveri otsimine
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Võrgust serveri otsimine
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Lisa server
+STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Pidevalt jälgitava serveri lisamine loendisse.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Sisesta serveri aadress
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Kliendid
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Kliente sees / enim kliente{}Ettevõtteid sees / enim ettevõtteid
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kaardi suurus
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kaardisuurus mängus{}Klõpsa, et järjestada pindala järgi
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Kuupäev
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Kuupäev hetkel
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Kestnud
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Mitu aastat{}on mäng kestnud
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}MÄNGU ANDMED
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Kliendid: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Keel: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Ruudustik: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kaardi suurus: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Osa serveris:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serveri aadress: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Aeg alguses: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Aeg hetkel: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Parooliga kaitstud!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER ON MAAS
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER ON TÄIS
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}OSAD EI SOBI
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF SOBIMATUS
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Liitu mänguga
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Uue võrgumängu alustamine
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Mängu nimi:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Mängu nime näidatakse teistele mänijatele võrgumängu serverite nimekirjas
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Sisesta võrgumängu nimi
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Sea parool
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Kaitse oma mäng parooliga, kui sa ei taha, et kõik sellele ligi pääseksid
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Vali kaart:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Millist kaarti sa tahad mängida?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :kohtvõrk (LAN)
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (reklaami)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Suurim klientide arv:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Määra suurim klientide arv. Kõik vabad kohad ei pea täidetud olema
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} ettevõte{P "" t}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Enim ettevõtteid:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Teatud ettevõtete piirang serveris
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} pealtvaataja{P "" t}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Enim pealtvaatajaid
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Teatud vaatlejate piirang serveris
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Räägitav keel:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Teistele mängijatele teadmiseks, et mis keelt serveris räägitakse
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Alusta mängu
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Uue võrgumängu alustamine suvalise kaardiga
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Mängu laadimine
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Varasema võrgumängu jätkamine (vaata, et ühendad ennast õige mängijana)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Suvaline
@@ -1416,33 +1416,33 @@ STR_NETWORK_LANG_GREEK                                          :Kreeka
 STR_NETWORK_LANG_LATVIAN                                        :Läti
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Võrgumängu jututuba
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Võrgumängu jututuba
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Liitumiseks valmistumine: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Nimekiri mängus oelvatest ettevõtetest. Saad liituda ühega või alustada uut, kui on vabu kohti
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Uus ettevõte
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Uue ettevõtte loomine
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Jälgi mängu
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Vaata mängu kõrvalt
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Liitu ettevõttega
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Aita seda ettevõtet töös hoida
-STR_NETWORK_REFRESH                                             :{BLACK}Värskenda servereid
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Serveri info värskendamine
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Liitumiseks valmistumine: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Nimekiri mängus oelvatest ettevõtetest. Saad liituda ühega või alustada uut, kui on vabu kohti
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Uus ettevõte
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Uue ettevõtte loomine
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Jälgi mängu
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Vaata mängu kõrvalt
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Liitu ettevõttega
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Aita seda ettevõtet töös hoida
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Värskenda servereid
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Serveri info värskendamine
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}ETTEVÕTTE ANDMED
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}ETTEVÕTTE ANDMED
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Ettevõtte nimi: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Avamine: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Firmaväärtus: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Rahaline seis: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Eelmise aasta tulud: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Suutlikus: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Ettevõtte nimi: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Avamine: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Firmaväärtus: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Rahaline seis: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Eelmise aasta tulud: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Suutlikus: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Sõidukid: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Jaamad: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Mängijad: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Sõidukid: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Jaamad: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Mängijad: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Ãœhendumine...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Ãœhendumine...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Ãœhendumine...
@@ -1458,49 +1458,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hangin e
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" i} sinu ees
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} allalaaditud
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Katkesta
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Katkesta
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sisesta summa mida anda
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server on kaitstud. Sisesta parool
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Ettevõte on kaitstud. Sisesta parool
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientide nimekiri
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientide nimekiri
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Jälgi
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uus Ettevõte
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Võrgukaarti ei leitud või kompileeritud ilma võtmeta ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Ei leidnud ühtegi võrgumängu
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Server ei vastanud päringule
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Ühendus ebaõnnestus NewGRF-i sobimatuse tõttu
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Võrgumängu sünkroonimine ebaõnnestus
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Võrgumängu ühendus katkes
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Salvestatud mängu laadimine ebaõnnestus
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Ei saa uut serverit alustada
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Ei õnnestu ühendada
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}#{NUM}. ühendus aegus
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Tekkis protokolliviga ja ühendus katkes
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Kliendi osa ei vasta serveri osaga
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Vale parool
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Server on täis
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sinu sisenemine siia serverisse on keelatud
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Sind visati mängust välja
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Selles serveris on petmine keelatud
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Võrgukaarti ei leitud või kompileeritud ilma võtmeta ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Ei leidnud ühtegi võrgumängu
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Server ei vastanud päringule
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Ühendus ebaõnnestus NewGRF-i sobimatuse tõttu
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Võrgumängu sünkroonimine ebaõnnestus
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Võrgumängu ühendus katkes
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Salvestatud mängu laadimine ebaõnnestus
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Ei saa uut serverit alustada
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Ei õnnestu ühendada
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}#{NUM}. ühendus aegus
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Tekkis protokolliviga ja ühendus katkes
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Kliendi osa ei vasta serveri osaga
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Vale parool
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server on täis
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sinu sisenemine siia serverisse on keelatud
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sind visati mängust välja
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Selles serveris on petmine keelatud
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :üldine viga
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :sünkroniseerimise viga
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :ei saa kaarti laadida
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :ühendus katkes
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokolli viga
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-i kokkusobimatus
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :keelatud
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :kahtlane pakett vastu võetud
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :vale osa
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nimi on juba kasutusel
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :vale parool
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :vale ettevõtte id DoCommand-is
-STR_NETWORK_ERR_CLIENT_KICKED                                   :server viskas välja
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :üritas pettust kasutada
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server on täis
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :üldine viga
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :sünkroniseerimise viga
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :ei saa kaarti laadida
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :ühendus katkes
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokolli viga
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF-i kokkusobimatus
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :keelatud
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :kahtlane pakett vastu võetud
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :vale osa
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nimi on juba kasutusel
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :vale parool
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :vale ettevõtte id DoCommand-is
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :server viskas välja
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :üritas pettust kasutada
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server on täis
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1510,15 +1510,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Mäng seisab (Ã
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Mäng jätkub (klient ühendunud)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Mäng jätkub (klient ei ühendunud)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :lahkub
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} liitus mänguga
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} liitus {2:NUM}. ettevõttega
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} liitus vaatajatega
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} alustas uue ettevõtte (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} lahkus mängust ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} vahetas oma nime {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} andis su ettevõttele {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Sa andsid {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :lahkub
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} liitus mänguga
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} liitus {2:NUM}. ettevõttega
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} liitus vaatajatega
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} alustas uue ettevõtte (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} lahkus mängust ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} vahetas oma nime {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} andis su ettevõttele {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Sa andsid {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] kohta {STRING}: {WHITE}{STRING}
@@ -1528,8 +1528,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] kohta
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Sisesta tekst võrgus suhtlemiseks
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Server sulges sessiooni
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Server restardib...{}Palun oota...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Server sulges sessiooni
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Server restardib...{}Palun oota...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
@@ -1543,19 +1543,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Räägi ettevõ
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privaatne sõnum
 
 
-STR_NETWORK_SEND                                                :{BLACK}Saada
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Saada
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Ei suuda laadida maastiku PNG failist...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...faili ei leitud.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ei suutnud pilditüüpi teisendada. Vaja läheb 8 või 24-bitist PNG pilti.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...midagi läks just valesti. Vabandust. (tõenäoliselt rikutud fail)
+STR_ERROR_PNGMAP                                                :{WHITE}Ei suuda laadida maastiku PNG failist...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...faili ei leitud.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...ei suutnud pilditüüpi teisendada. Vaja läheb 8 või 24-bitist PNG pilti.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...midagi läks just valesti. Vabandust. (tõenäoliselt rikutud fail)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Ei suuda laadida maastikku BMP failist...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ei suutnud muuta pildi tüüpi.
+STR_ERROR_BMPMAP                                                :{WHITE}Ei suuda laadida maastikku BMP failist...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...ei suutnud muuta pildi tüüpi.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Hind: {CURRENCY}
@@ -1569,13 +1569,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Eeldatav
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Siin ei saa maad kõrgendada...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Siin ei saa maad madaldada...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Ei saa maad siin tasandada...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Kaljud
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Konarlik maa
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Lage maa
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Rohi
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Põllud
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Lumine maa
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Kõrb
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kaljud
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Konarlik maa
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Lage maa
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Rohi
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Põllud
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Lumine maa
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Kõrb
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Maa on vales suunas kaldu
@@ -1583,11 +1583,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Teostama
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Kaevandamine kahjustaks tunnelit
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Juba jõutud meretasemeni
 STR_ERROR_TOO_HIGH                                              :{WHITE}Liiga kõrge
-STR_ALREADY_LEVELLED                                            :{WHITE}... juba tasane
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... juba tasane
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Sobiv rongitee puudub
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...juba ehitatud
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Rööbastee tuleb eelnevalt lammutada
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Läbipääsmatu või ühesuunaline maantee
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Läbipääsmatu või ühesuunaline maantee
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Rööbasteede ehitamine
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrifitseeritud rööbasteede ehitamine
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Monorelsi ehitamine
@@ -1611,41 +1611,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Ehita rÃ
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Ehita raudteesild
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Ehita rongitunnel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Lülitu rööbastee ja signaalide ehitamise ja lammutamise vahel
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Silla valik - klõpsa sobivale sillale, et seda ehitada
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Silla valik - klõpsa sobivale sillale, et seda ehitada
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Depoole suuna valimine
-STR_RAILROAD_TRACK                                              :Rööbastee
-STR_RAILROAD_TRAIN_DEPOT                                        :Rongidepoo
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Rööbastee
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Rongidepoo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...ala kuulub teisele ettevõttele
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Läbisõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Hoiatussignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Väljasõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Ühesuunaliste täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Läbisõidu- ja hoiatussignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Läbisõidu- ja väljasõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Läbisõidu- ja mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Tavaliste ja täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Tavaliste ja ühesuunaliste täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Hoiatus- ja väljasõidusignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Hoiatus- ja mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Hoiatus- ja täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Hoiatus- ja ühesuunaliste täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Väljasõidu- ja mitmiksignaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Väljasõidu- ja täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Väljasõidu- ja ühesuunaliste täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Mitmik- ja täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Mitmik- ja ühesuunaliste täiustatud signaalidega rööbastee osa
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Täiustatud ja ühesuunaliste täiustatud signaalidega rööbastee osa
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Raudteejaama peab eelnevalt lammutama
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Ehita eraldi jaam
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Liida jaamale
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Läbisõidusignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Hoiatussignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Väljasõidusignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Mitmiksignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Ühesuunaliste täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Läbisõidu- ja hoiatussignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Läbisõidu- ja väljasõidusignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Läbisõidu- ja mitmiksignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Tavaliste ja täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Tavaliste ja ühesuunaliste täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Hoiatus- ja väljasõidusignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Hoiatus- ja mitmiksignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Hoiatus- ja täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Hoiatus- ja ühesuunaliste täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Väljasõidu- ja mitmiksignaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Väljasõidu- ja täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Väljasõidu- ja ühesuunaliste täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Mitmik- ja täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Mitmik- ja ühesuunaliste täiustatud signaalidega rööbastee osa
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Täiustatud ja ühesuunaliste täiustatud signaalidega rööbastee osa
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Raudteejaama peab eelnevalt lammutama
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Ehita eraldi jaam
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Liida jaamale
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Enne on vaja sõidutee lammutada
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Teede ehitamine
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Teede ehitamine
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Sõiduteede ehitamine
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Trammiteede ehitamine
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Vali sillatüüp
@@ -1681,14 +1681,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Ehita tr
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Lülita ühesuunalised teed sisse/välja
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Lülitu maanteede ehitamise ja lammutamise vahel
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Lülitu trammitee ehitamise ja lammutamise vahel
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Vali depoole suund
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Vali trammidepoo suund
-STR_ROAD_DESCRIPTION_ROAD                                       :Sõidutee
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Valgustatud sõidutee
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Puiestee
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depoo
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Raudteeületuskoht
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Trammitee
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vali depoole suund
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vali trammidepoo suund
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Sõidutee
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Valgustatud sõidutee
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Puiestee
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depoo
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Raudteeületuskoht
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Trammitee
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Siinset bussijaama ei saa lammutada...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Siinset laadimisplatsi ei saa lammutada...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Siinset reisitrammijaama ei saa lammutada...
@@ -1696,12 +1696,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Siinset
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Linnad
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Hoone tuleb enne lammutada
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Linn)
@@ -1714,9 +1714,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Vaate vi
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Linnanime muutmine
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Reisijaid eelmisel kuul: {ORANGE}{COMMA}{BLACK}  Enim: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Posti eelmisel kuul: {ORANGE}{COMMA}{BLACK}  Enim: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Veoseid linna kasvamiseks:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} vajalik
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} toimetatud eelmisel kuul
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Veoseid linna kasvamiseks:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} vajalik
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} toimetatud eelmisel kuul
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Kõrge büroohoone
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Büroohoone
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Väike kortermaja
@@ -1753,7 +1753,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Teenusetoetust makstakse ettevõttele {STRING}!{}{}{STRING} kohast {STATION} kohta {STATION} teenuse eest makstakse järgmisel aastal kolmekordselt!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Teenusetoetust makstakse ettevõttele {STRING}!{}{}{STRING} kohast {STATION} kohta {STATION} teenuse eest makstakse järgmisel aastal neljakordselt!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Linna {TOWN} kohalik omavalitsus keeldub uut lennujaama lubamast
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} kohalik omavalitsus keeldub ehitusluba lennujaamale väljastamast kuna on mures müra pärast
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} kohalik omavalitsus keeldub ehitusluba lennujaamale väljastamast kuna on mures müra pärast
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Suvilad
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Majad
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Korterid
@@ -1789,7 +1789,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Liikluskaos linnas {TOWN}!{}{}Ettevõtte {STRING} poolt rahastatud teedeehitus tekitab 6 kuu jooksul maanteedel liiklushäireid!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (ehitusel)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (ehitusel)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglu
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipid
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teekannu maja
@@ -1802,17 +1802,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Sildi paigaldam
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Puud
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...siin on juba puu olemas
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Siia ei saa puud istutada...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...liiga palju silte
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Siia ei saa silti paigaldada...
-STR_SIGN_DEFAULT                                                :Silt
+STR_DEFAULT_SIGN_NAME                                           :Silt
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Sildi muutmine
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Silti ei saa muuta...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Silti ei saa kustutada...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Istutatava puu liigi valimine
-STR_TREE_NAME_TREES                                             :Puud
-STR_TREE_NAME_RAINFOREST                                        :Vihmamets
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktused
+STR_LAI_TREE_NAME_TREES                                         :Puud
+STR_LAI_TREE_NAME_RAINFOREST                                    :Vihmamets
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktused
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Raudteejaama valik
@@ -1832,7 +1832,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Raudteej
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Liiga lähedal teisele lennuväljale
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Lennuväli tuleb enne lammutada
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Jaama nime vahetamine
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Jaama nime vahetamine
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Jaama nime ei saa vahetada...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Hinnangud
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Võtab vastu
@@ -1850,10 +1850,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Suurepärane
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Näita kõiki ronge, mille sõidugraafik sisaldab seda rongijaama
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Näita kõiki mootorsõidukeid, mille sõidugraafik sisaldab seda jaama
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Näita kõiki lennukeid, mille sõidugraafik sisaldab seda lennujaama
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Näita kõiki laevu, mille sõidugraafik sisaldab seda sadamat
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Näita kõiki ronge, mille sõidugraafik sisaldab seda rongijaama
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Näita kõiki mootorsõidukeid, mille sõidugraafik sisaldab seda jaama
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Näita kõiki lennukeid, mille sõidugraafik sisaldab seda lennujaama
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Näita kõiki laevu, mille sõidugraafik sisaldab seda sadamat
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Jaam {STATION} ei võta enam vastu veost {STRING}
@@ -1886,47 +1886,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Muuda ja
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Näita vastuvõetavate veoste nimistut
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Jaamanimed - vajuta nimel, et vaadet jaamale keskendada
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vali lennuvälja suurus ja tüüp
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Raudteejaam
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Angaar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lennuväli
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Laadimisplats
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bussijaam
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Laevadokk
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Raudteejaam
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Angaar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lennuväli
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Laadimisplats
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bussijaam
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Laevadokk
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Lülita sisse jaama mõjupiirkonna näitamine
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Lülita välja jaama mõjupiirkonna näitamine
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Mõjupiirkonna näitamine
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Dokk
-STR_STATION_DESCRIPTION_BUOY                                    :Poi
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Poi
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...poi on ees
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...jaam on liiga laiaks venitatud
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...korrapäratud jaamad keelatud
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Enam kui ühe eseme valimiseks hoia all CTRL klahvi
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...korrapäratud jaamad keelatud
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Enam kui ühe eseme valimiseks hoia all CTRL klahvi
 
 STR_UNDEFINED                                                   :(määratlemata väljend)
-STR_STAT_CLASS_DFLT                                             :Vaikimisi valitud jaam
-STR_STAT_CLASS_WAYP                                             :Meldepunktid
+STR_STATION_CLASS_DFLT                                          :Vaikimisi valitud jaam
+STR_STATION_CLASS_WAYP                                          :Meldepunktid
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Laevaremonditehase suund
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...peab ehitama vette
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Laevaremonditehast ei saa siia ehitada...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Laevaremonditehase suuna valimine
-STR_WATER_DESCRIPTION_WATER                                     :Vesi
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kallas
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Laevaremonditehas
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvedukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vesi
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kallas
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Laevaremonditehas
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvedukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...vette ei saa ehitada
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal tuleb enne lammutada
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Kanal tuleb enne lammutada
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Salvesta mäng
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Laadi mäng
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Salvesta
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Kustuta
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Vaatleja, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Vaatleja, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} vaba
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Ei suuda kettalt lugeda
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Mängu salvestamine nurjus{}{STRING}
@@ -1942,12 +1942,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Nimekiri
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Mängu salvestuse nimi
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Kustuta valitud salvestus
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Salvesta mäng valitud nimega
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Tekita suvaline kaart
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Laadi kõrguskaart
-STR_SAVE_OSKTITLE                                               :{BLACK}Sisesta salvestatavale mängule nimi
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Tekita suvaline kaart
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Laadi kõrguskaart
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Sisesta salvestatavale mängule nimi
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} on ees
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} on ees
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :kivisöekaevandus
 STR_INDUSTRY_NAME_POWER_STATION                                 :elektrijaam
@@ -2005,7 +2005,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Vaate keskendamine tööstusele
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Uus {STRING} on linna {TOWN} lähedal ehitamisel!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Uus {STRING} on istutatud linna {TOWN} lähedale!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Hind: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Hind: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Seda tüüpi tööstust ei saa siia ehitada...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...metsa saab istutada ainult lumepiirist kõrgemale
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} juhtkond teatab sulgemisest!
@@ -2023,16 +2023,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Teine tunnel on ees
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnel lõpeks väljaspool kaarti
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnel lõpeks väljaspool kaarti
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Ei saa tunneli teise otsa jaoks maad parajaks kaevata
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Tunnel tuleb enne lammutada
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Sild tuleb enne lammutada
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Ei saa alata ja lõppeda samas kohas
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Sillaotsad pole samal kõrgusel
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Sild on maastiku suhtes liiga madal
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Ei saa alata ja lõppeda samas kohas
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Sillaotsad pole samal kõrgusel
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Sild on maastiku suhtes liiga madal
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Algus ja lõpp peavad samal joonel olema
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Koht ei sobi tunneli sissekäiguks
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Rippsild, terasest
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Raamistikuga, terasest
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Ulgtugi, terasest
@@ -2043,30 +2043,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Torujas, terase
 STR_BRIDGE_TUBULAR_SILICON                                      :Torujas, silikoonist
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Siia ei saa silda ehitada...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Siia ei saa tunnelit ehitada...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Raudteetunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Maanteetunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Terasest raudteerippsild
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Terasest võrestikuga raudteesild
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Terasest ulgtoestikuga raudteesild
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Raudbetoonist raudteerippsild
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Puitraudteesild
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betoonist raudteesild
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Terasest autoteerippsild
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Terasraamistikuga autoteesild
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Terasest ulgtoestikuga autoteesild
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Raudbetoonist autotee rippsild
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Puidust autoteesild
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betoonist autoteesild
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Torujas raudteesild
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Torujas autoteesild
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Raudteetunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Maanteetunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Terasest raudteerippsild
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Terasest võrestikuga raudteesild
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Terasest ulgtoestikuga raudteesild
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Raudbetoonist raudteerippsild
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Puitraudteesild
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betoonist raudteesild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Terasest autoteerippsild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Terasraamistikuga autoteesild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Terasest ulgtoestikuga autoteesild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Raudbetoonist autotee rippsild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Puidust autoteesild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betoonist autoteesild
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Torujas raudteesild
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Torujas autoteesild
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Mingi objekt on ees
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Retranslaator
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Tuletorn
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Ettevõtte peakorter
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Retranslaator
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Tuletorn
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Ettevõtte peakorter
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...ettevõtte peakorter on ees
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Ettevõtte maa
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Ettevõtte maa
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Seda maad ei saa osta...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...see on juba sinu oma!
 
@@ -2112,7 +2112,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} {NUM}.
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Raskusaste
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Salvesta
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Salvesta
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Kerge
@@ -2185,8 +2185,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Värvival
 STR_LIVERY_CAPTION                                              :{WHITE}Uus värvivalik
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Ettevõtte nimi
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Presidendi nimi
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Ettevõtte nimi
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Presidendi nimi
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Ettevõtte nimi
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Presidendi nimi
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Ei saa ettevõtte nime muuta...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Ei saa presidendi nime muuta...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} rahavoogude aruanne {BLACK}{COMPANYNUM}
@@ -2210,11 +2210,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kokku:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Tulugraafik
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Opereerimiskasumi graafik
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Kontojääk
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Laen
-STR_MAX_LOAN                                                    :{WHITE}Laenupiir:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Laenupiir:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Laena {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Tagasta {SKIP}{SKIP}{CURRENCY}
@@ -2223,7 +2223,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Rohkem r
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...pole laenu, mida tagasi maksta
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...vajad {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Ei saa laenu tagasi maksta...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Ei saa anda raha, mis on laenatud pangast.
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Ei saa anda raha, mis on laenatud pangast.
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Vali presidendile uus nägu
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Muuda ettevõtte veovahendite värvi
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Muuda presidendi nägu
@@ -2233,10 +2233,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Maksa la
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(President)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Asutatud: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Sõidukeid:
-STR_TRAINS                                                      :{WHITE}{COMMA} rong{P "" i}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} veok {P "" it}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} lennuk
-STR_SHIPS                                                       :{WHITE}{COMMA} laev{P "" a}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} rong{P "" i}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} veok {P "" it}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lennuk
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} laev{P "" a}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Mitte ühtegi
 STR_FACE_CAPTION                                                :{WHITE}Näo valik
 STR_FACE_MALE_BUTTON                                            :{BLACK}Mees
@@ -2249,9 +2249,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Vali nai
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Tekita uus suvaline nägu
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Selgitus
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Näita selgitust graafikute juures
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Näita põhjalike tegevushinnanguid
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Näita põhjalike tegevushinnanguid
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Ettevõttegraafiku selgitus
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klõpsa, et ettevõtte graafikut sisse ja välja lülitada
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klõpsa, et ettevõtte graafikut sisse ja välja lülitada
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Veetud veoste kogus
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Ettevõtte tegevushinnang (suurim hinnang saab olla 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmaväärtus
@@ -2285,23 +2285,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnaat
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Ehita peakorter
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Ehita ettevõtte peakorter või vii vaade peakorterile
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Ehita ettevõtte peakorter mujale 1% firmaväärtuse tasu eest
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ehita ettevõtte peakorter mujale 1% firmaväärtuse tasu eest
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Ettevõtte peakorterit ei saa ehitada...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Vaata peakorterit
-STR_RELOCATE_HQ                                                 :{BLACK}Liiguta peakorterit
-STR_COMPANY_JOIN                                                :{BLACK}Liitu
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Liitu ja mängi selle ettevõttena
-STR_COMPANY_PASSWORD                                            :{BLACK}Salasõna
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Ettevõtte kaitsmine salasõnaga, et võõrad ei saaks ilma loata ühineda.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Vali ettevõttele salasõna
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Liiguta peakorterit
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Liitu
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Liitu ja mängi selle ettevõttena
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Salasõna
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Ettevõtte kaitsmine salasõnaga, et võõrad ei saaks ilma loata ühineda.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Vali ettevõttele salasõna
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Sisestatud salasõna ei salvestata
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Määra ettevõtte uus salasõna
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Ettevõtte salasõna
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Vaikimisi määratud ettevõtte salasõna
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Kasuta selle ettevõtte salasõna uute ettevõtete vaikimisi määratud salasõnana
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Vaikimisi määratud ettevõtte salasõna
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Kasuta selle ettevõtte salasõna uute ettevõtete vaikimisi määratud salasõnana
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Majanduslik tagasilöök!{}{}Finantseksperdid ennustavad suurt majanduslangust!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Madalseis on läbi!{}{}Kõrgenenud äritegevusega kaasnev tugevnev majandus julgustab tööstuseid!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Lülita aken suureks/väikseks
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Lülita aken suureks/väikseks
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmaväärtus: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Osta 25% ettevõtte aktsiatest
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Müü 25% ettevõtte aktsiatest
@@ -2311,7 +2311,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Selle et
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Selle ettevõtte aktsiatest ei saa 25% müüa...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% on ettevõtte {COMPANY} käes)
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} võeti üle ettevõtte {STRING} poolt!
-STR_PROTECTED                                                   :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada...
+STR_ERROR_PROTECTED                                             :{WHITE}See ettevõtte pole veel piisavalt vana, et aktsiaid vahetada...
 
 STR_LIVERY_DEFAULT                                              :Firmavärv
 STR_LIVERY_STEAM                                                :Aurumootorvedur
@@ -2337,14 +2337,14 @@ STR_LIVERY_LARGE_PLANE                                          :Suurlennuk
 STR_LIVERY_PASSENGER_TRAM                                       :Reisitramm
 STR_LIVERY_FREIGHT_TRAM                                         :Kaubatramm
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Näita üldiseid värvistikke
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Näita rongide värvistikke
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Näita mootorsõidukite värvistikke
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Näita laevavärvistikke
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Näita lennukivärvistikke
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Vali põhivärv värvistikule
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Vali teine värv valitud värvistikule
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Vali muudetav värvivalik - või mitu CTRL+klõps abil. Klõpsa kastil, et muuta värvivaliku kasutust.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Näita üldiseid värvistikke
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Näita rongide värvistikke
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Näita mootorsõidukite värvistikke
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Näita laevavärvistikke
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Näita lennukivärvistikke
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Vali põhivärv värvistikule
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Vali teine värv valitud värvistikule
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Vali muudetav värvivalik - või mitu CTRL+klõps abil. Klõpsa kastil, et muuta värvivaliku kasutust.
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (auruvedur)
@@ -2652,9 +2652,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Maha ei laadit
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Valitud sihtpunktis peatumise protseduuri muutmine
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Valitud sihtpunktis pealelaadimise protseduuri muutmine
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Valitud sihtpunktis mahalaadimise protseduuri muutmine
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Täpsustatud käskluse lisamine
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Täpsustatud käskluse lisamine
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Mine lähimasse depoosse
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Mine lähimasse angaari
 STR_ORDER_NEAREST_DEPOT                                         :lähim
@@ -2664,9 +2664,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Hooldus ilma pe
 STR_ORDER_TRAIN_DEPOT                                           :rongidepoos
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :sõidukidepoos
 STR_ORDER_SHIP_DEPOT                                            :laevaremonditehases
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} angaar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} angaar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Alati mine
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Vajadusel hoolda
@@ -2691,10 +2691,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :on rohkem, kui
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :on võrdne või rohkem, kui
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :on tõene
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :on väär
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Mine sihtpunkti {COMMA}
-STR_CONDITIONAL_NUM                                             :Mine sihtpunkti {COMMA}, kui {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Mine sihtpunkti{COMMA}, kui {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Mine sihtpunkti {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Mine sihtpunkti {COMMA}, kui {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Mine sihtpunkti{COMMA}, kui {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Sõitu pole
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Sõitmine (sõiduplaanita)
@@ -2717,18 +2717,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Ainult d
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Jäta vahele
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Kustuta
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Mine
-STR_REFIT                                                       :{BLACK}Taasseadista
-STR_REFIT_TIP                                                   :{BLACK}Vali, millist laadungit ümber seadistada selles järjestuses. Ümberseadistuse käsu eemaldamiseks hoia klõpsamise ajal all Control nuppu
-STR_REFIT_ORDER                                                 :(Taasseadista {STRING})
-STR_REFIT_STOP_ORDER                                            :(Seadista ümber {STRING} jaoks ja peatu)
-STR_STOP_ORDER                                                  :(Peatu)
-STR_TIMETABLE_VIEW                                              :{BLACK}Sõiduplaan
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Näita sõiduplaani
-STR_ORDER_VIEW                                                  :{BLACK}Korraldused
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Lülita korralduste vaatesse
+STR_ORDER_REFIT                                                 :{BLACK}Taasseadista
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vali, millist laadungit ümber seadistada selles järjestuses. Ümberseadistuse käsu eemaldamiseks hoia klõpsamise ajal all Control nuppu
+STR_ORDER_REFIT_ORDER                                           :(Taasseadista {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Seadista ümber {STRING} jaoks ja peatu)
+STR_ORDER_STOP_ORDER                                            :(Peatu)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Sõiduplaan
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Näita sõiduplaani
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Korraldused
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Lülita korralduste vaatesse
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (käsud)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Sihtpunktide lõpp - -
-STR_SERVICE                                                     :{BLACK}Hooldus
+STR_ORDER_SERVICE                                               :{BLACK}Hooldus
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Ehitatud: {LTBLUE}{NUM}{BLACK} Väärtus: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Väärtus: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2748,7 +2748,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}sõiduk
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}seda käsku jagav sõiduk ei saa sinna jaama minna
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Transpordivahendit ei saa liigutada...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Tagumine vedur järgneb alati eesmisele
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ei leia teed kohalikku depoosse
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA} päeva{BLACK}  Viimati hooldatud: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Hooldusvahemik: {LTBLUE}{COMMA}%{BLACK}   Viimati hooldatud: {LTBLUE}{DATE_LONG}
@@ -2768,10 +2768,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Sõidupl
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Muuda, kaua esile tõstetud sihtpunkti peale aega peaks kuluma
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Tühista esile tõstetud sihtpunkti ajaperiood
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Tühista hilinemisloendur, et sõiduk ei jääks hiljaks
-STR_SERVICE_HINT                                                :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Hind: {CURRENCY} Tühimass: {WEIGHT_S}{}Tippkiirus: {VELOCITY}  Võimsus: {POWER}{}Käituskulud: {CURRENCY}/aastas{}Kandevõime: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Hind: {CURRENCY} Tippkiirus: {VELOCITY}{}Kandevõime: {CARGO}, {CARGO}{}Käituskulud: {CURRENCY}/a
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Hind: {CURRENCY} Tippkiirus: {VELOCITY}{}Kandevõime: {CARGO}{}Käituskulud: {CURRENCY}/a
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Hind: {CURRENCY} Tühimass: {WEIGHT_S}{}Tippkiirus: {VELOCITY}  Võimsus: {POWER}{}Käituskulud: {CURRENCY}/aastas{}Kandevõime: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Hind: {CURRENCY} Tippkiirus: {VELOCITY}{}Kandevõime: {CARGO}, {CARGO}{}Käituskulud: {CURRENCY}/a
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Hind: {CURRENCY} Tippkiirus: {VELOCITY}{}Kandevõime: {CARGO}{}Käituskulud: {CURRENCY}/a
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Vanus: {LTBLUE}{STRING}{BLACK}   Käituskulud: {LTBLUE}{CURRENCY}/a
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Tippkiirus: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Tühimass: {LTBLUE}{WEIGHT_S} {BLACK}Võimsus: {LTBLUE}{POWER}{BLACK} Tippkiirus: {LTBLUE}{VELOCITY}
@@ -2790,27 +2790,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kokkupõrg
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}RONGIKOKKUPÕRGE!{}{COMMA} surid tules peale kokkusõitmist
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ei saa rongi ümber pöörata.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Mitmest osast koosnevaid veovahendeid ei saa ümber pöörata
-STR_CLEAR_TIME                                                  :{BLACK}Tühista aeg
-STR_RESET_LATENESS                                              :{BLACK}Tühista hilinemisloendur
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Muuda meldepunkti nime
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Tühista aeg
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Tühista hilinemisloendur
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Muuda meldepunkti nime
 
-STR_TRAIN_STOPPING                                              :{RED}Peatub
-STR_TRAIN_STOPPING_VEL                                          :{RED}Peatub, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Ühildamatud rööbasteetüübid
-STR_TRAIN_NO_POWER                                              :{RED}Vool puudub
-STR_TRAIN_START_NO_CATENARY                                     :Selle raja ahel puudub, rong ei saa sõitu alustada
-STR_TRAIN_STUCK                                                 :{ORANGE}Ootamas vaba rada
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Peatub
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Peatub, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Ühildamatud rööbasteetüübid
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Vool puudub
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Selle raja ahel puudub, rong ei saa sõitu alustada
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Ootamas vaba rada
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Uus {STRING} saadaval!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Uus {STRING} saadaval!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Hävinenud sõidukit ei saa müüa...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Hävitatud sõidukit pole võimalik ümber seadistada...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Hävinenud sõidukit ei saa müüa...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Hävitatud sõidukit pole võimalik ümber seadistada...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Sõidukile ei saa sõiduplaani anda...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Sõidukid saavad ainult peatustes oodata.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Sellel sõidukil pole ühtegi peatust.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Sõidukile ei saa sõiduplaani anda...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Sõidukid saavad ainult peatustes oodata.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Sellel sõidukil pole ühtegi peatust.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Muuda aega
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Sõiduk on graafikus
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}See sõiduk on {STRING} hiljaks jäämas
@@ -2824,7 +2824,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täida l
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...peab garaaþis olema
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ei leia kohalikku garaaži üles
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Sunni veovahendit ümber pöörama
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kandevõime: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kandevõime: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} sõiduk{P "" id}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2850,11 +2850,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Raja teemärgisena kasutatav poi
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Poid ei saa siia asetada...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Ehita veejuhe
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Siia ei saa veejuhet ehitada...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Siia ei saa veejuhet ehitada...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Seadista ümber)
 STR_REFIT_TITLE                                                 :{GOLD}Vali veetav veoseliik:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Uus kandevõime: {GOLD}{CARGO}{}{BLACK}Laeva ümberseadistamise hind: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(ümberseadistatav)
+STR_PURCHASE_INFO_REFITTABLE                                    :(ümberseadistatav)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lennuväljad
@@ -2867,7 +2867,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Ehita le
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Rahvas rõõmustab . . .{}{STATION} terminali saabus esimene lennuk!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Lennuõnnetus!{}{COMMA} surid tules {STATION}s
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Lennuõnnetus!{}Lennukil lõppes kütus, {COMMA} surid tules!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Sõiduplaan)
 
@@ -2880,13 +2880,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Söekaevanduse vajumine jättis endast linna {TOWN} lähedal purustused!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Üleujutused!{}Vähemalt {COMMA} kadunut arvatakse surnuks peale olulist üleujutust!
 
-STR_BRIBE_FAILED                                                :{WHITE}Sinu altkäemaksu proov on
-STR_BRIBE_FAILED_2                                              :{WHITE}kohalike uurijate poolt avastatud
-STR_BUILD_DATE                                                  :{BLACK}Ehitatud: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Sinu altkäemaksu proov on
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}kohalike uurijate poolt avastatud
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Ehitatud: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Jaama liik: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Jaama rühm: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Jaama liik: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Jaama rühm: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Täpsustatud tulemushinnang
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Täpsustatud
@@ -2906,28 +2906,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Raha:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Laen:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Kokku:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Veeremit kokku; sisaldab sõidutee-, rööbastee- ja õhusõidukeid, ning laevu
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Jaamaosade arv. Iga osa jaamast (nt. raudteejaam, bussipeatus, lennujaam) loetakse eraldi, isegi kui need on ühendatud üheks jaamaks
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Kõige väiksema tuluga sõiduki kasum (kõikidest vähemalt 2 aastastest veovahenditest)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Väikseim kuukasum viimase 12 kvartali jooksul
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Suurim kuukasum viimase 12 kvartali jooksul
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Viimasel neljal kvartalil kohale toimetatud kaubaühikute koguarv
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Viimasel kvartalil kohale toimetatud veoseliikide koguarv
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Rahakogus sellel firmal pangas
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Selle ettevõtte kogulaen
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Kokku punkte võimalikest punktidest
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Veeremit kokku; sisaldab sõidutee-, rööbastee- ja õhusõidukeid, ning laevu
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Jaamaosade arv. Iga osa jaamast (nt. raudteejaam, bussipeatus, lennujaam) loetakse eraldi, isegi kui need on ühendatud üheks jaamaks
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Kõige väiksema tuluga sõiduki kasum (kõikidest vähemalt 2 aastastest veovahenditest)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Väikseim kuukasum viimase 12 kvartali jooksul
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Suurim kuukasum viimase 12 kvartali jooksul
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Viimasel neljal kvartalil kohale toimetatud kaubaühikute koguarv
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Viimasel kvartalil kohale toimetatud veoseliikide koguarv
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Rahakogus sellel firmal pangas
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Selle ettevõtte kogulaen
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Kokku punkte võimalikest punktidest
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF seadistused
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Näita NewGRF-seadeid
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Uue graafika sätted
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Rakenda muudatused
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Vaheta paletti
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Vaheta valitud NewGRF-i paletti.{}Tee seda, kui NewGRF-i graafika paistab mängus roosa.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Vali parameetrid
-STR_NEWGRF_FILENAME                                             :{BLACK}Faili nimi: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palett: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Rakenda muudatused
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Vaheta paletti
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Vaheta valitud NewGRF-i paletti.{}Tee seda, kui NewGRF-i graafika paistab mängus roosa.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Vali parameetrid
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Faili nimi: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palett: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Sa oled tegemas muudatusi töötavasse mängu; see võib OpenTTD kokku jooksutada.{}Kas sa oled täielikult veendunud selles?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2950,34 +2950,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Vale tunnuse ka
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sisaldab vigast pilti. Kõiki vigaseid pilte näidatakse punase küsimärgina (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisaldab mitmeid Action 8 kirjeid
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Laadi valitud eelseadistused
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Salvesta eelseadistus
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Salvesta praegune loend eelseadistusena
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Sisesta eelseadistuse nimi
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Kustuta eelseadistus
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Kustuta hetkel valitud eelseadistus
-STR_NEWGRF_ADD                                                  :{BLACK}Lisa
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Lisa nimekirja NewGRF fail
-STR_NEWGRF_REMOVE                                               :{BLACK}Eemalda
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Eemalda nimekirjast valitud NewGRF fail
-STR_NEWGRF_MOVEUP                                               :{BLACK}Liiguta üles
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}NewGRF-faili liigutamine loendis üles.
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Liiguta alla
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}NewGRF-faili liigutamine loendis alla
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Nimekiri installeerimata NewGRF failidest. Parameetrite muutmiseks klõpsa failil.
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameetrid: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Sisesta NewGRF parameetrid
-STR_NEWGRF_NO_INFO                                              :{BLACK}Andmed puuduvad
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Laadi valitud eelseadistused
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Salvesta eelseadistus
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Salvesta praegune loend eelseadistusena
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Sisesta eelseadistuse nimi
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Kustuta eelseadistus
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Kustuta hetkel valitud eelseadistus
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Lisa
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Lisa nimekirja NewGRF fail
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Eemalda
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Eemalda nimekirjast valitud NewGRF fail
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Liiguta üles
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}NewGRF-faili liigutamine loendis üles.
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Liiguta alla
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}NewGRF-faili liigutamine loendis alla
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Nimekiri installeerimata NewGRF failidest. Parameetrite muutmiseks klõpsa failil.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameetrid: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Sisesta NewGRF parameetrid
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Andmed puuduvad
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Olemasolevad NewGRF failid
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Lisa valikule
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Lisa valitud NewGRF fail enda seadistusse
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Skanni failid uuesti
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Uuenda saadaval olevate NewGRF failide nimekirja
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Lisa valitud NewGRF fail enda seadistusse
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Skanni failid uuesti
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Uuenda saadaval olevate NewGRF failide nimekirja
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ei saa faili lisada: korduv GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Sobivat faili ei leitud
-STR_NEWGRF_DISABLED                                             :{RED}Väljas
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Sobivat faili ei leitud
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Väljas
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Sobivat faili ei leitud (ühilduv GRF fail on laaditud)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Puuduvatele failidele on laaditud ühilduvad GRF failid
@@ -2993,7 +2993,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Veose/ümberseadistamise teave sõidukil '{1:ENGINE}' erineb ehitamisaegsest ostunimekirjast. Seetõttu võib uuendamisel või asendamisel ümberseadistamine ebaõnnestuda.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' põhjustas toodangu tagasikutsumises lõpmatu korduse.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Mäng on salvestatud osas, kus trammid ei olnud toetatud. Kõik trammid on eemaldatud.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Mäng on salvestatud osas, kus trammid ei olnud toetatud. Kõik trammid on eemaldatud.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Oma valuuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vahetuskurss: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3004,16 +3004,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mine eu
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mine eurole: {ORANGE}Mitte kunagi
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Eelvaade: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Muuda personaalse valuuta parameetreid
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Langeta oma valuuta väärtust naela (£) suhtes
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Tõsta oma valuuta väärtust naela (£) suhtes
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Määra oma valuuta kurss naela (£) suhtes
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Määra oma valuuta eraldusmärk
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Määra oma valuuta eesliide
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Määra oma valuuta järelliide
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Mine eurole varem
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Mine eurole hiljem
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Määra eurole minemise aasta
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 naela (£) sinu valuutas
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Langeta oma valuuta väärtust naela (£) suhtes
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Tõsta oma valuuta väärtust naela (£) suhtes
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Määra oma valuuta kurss naela (£) suhtes
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Määra oma valuuta eraldusmärk
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Määra oma valuuta eesliide
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Määra oma valuuta järelliide
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mine eurole varem
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mine eurole hiljem
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Määra eurole minemise aasta
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 naela (£) sinu valuutas
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3032,8 +3032,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} laev{P "" a}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} lennuk{P "" it}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} sõiduki vahel jagatud sõidugraafik
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Näita kõiki sama sõidugraafikuga mootorsõidukeid
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA} sõiduki vahel jagatud sõidugraafik
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Näita kõiki sama sõidugraafikuga mootorsõidukeid
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ootab depoos
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ootab depoos
@@ -3140,39 +3140,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Seadista
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Seadista kaubalaev teisele veosele
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Seadista lennuk teistsuguse kauba kandmiseks ümber
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Suundub linna {TOWN} rongidepoosse
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Suundub linna {TOWN} rongidepoosse, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Suundub {TOWN} garaaþi
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Suundub {TOWN} garaaþi, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse.
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suundub {STATION} Angaari
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Hooldus linna {TOWN} raudteedepoos
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Hooldus linna {TOWN} raudteedepoos, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Hooldus linna {TOWN} depoos
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Hooldus linna {TOWN} depoos, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases.
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Hooldus linna {STATION} angaaris
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Hooldus linna {STATION} angaaris, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klooni rong
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonimine
-STR_CLONE_SHIP                                                  :{BLACK}Klooni laev
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klooni lennuk
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. CTRL-klikk jagab sihtpunkte
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}See paljundab mootorsõidukit. CTRL-klõps jagab sihtpunkte
-STR_CLONE_SHIP_INFO                                             :{BLACK}See ehitab koopia laevast. CTRL-klikk jagab sihtpunkte
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}See paljundab õhusõidukit. CTRL-klikk jagab sihtpunkte
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. Vajuta sellele nuppule, ning seejärel rongile depoo sees või väljas. CTRL-klikk jagab sihtpunkte
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}See paljundab mootorsõidukit. Klõpsa seda nuppu, ning seejärel mootorsõidukil depoos või sellest väljas. CTRL-klõps jagab sihtpunkte
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}See ehitab koopia laevast. Vajuta sellele nuppule, ning seejärel laevale laevaremonditehase sees või väljas. Sihtpunkte jagab CTRL-klikk.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}See paljundab õhusõidukit. Vajuta sellele nuppule, ning seejärel lennukile angaari sees või väljas. CTRL-klikk jagab sihtpunkte
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Suundub linna {TOWN} rongidepoosse
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Suundub linna {TOWN} rongidepoosse, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Suundub {TOWN} garaaþi
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Suundub {TOWN} garaaþi, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse.
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Suundub linna {TOWN} laevaremonditehasesse, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Suundub {STATION} Angaari
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Suundub {STATION} angaari, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Hooldus linna {TOWN} raudteedepoos
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Hooldus linna {TOWN} raudteedepoos, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Hooldus linna {TOWN} depoos
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Hooldus linna {TOWN} depoos, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases.
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Hooldus linna {TOWN} laevaremonditehases, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Hooldus linna {STATION} angaaris
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Hooldus linna {STATION} angaaris, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klooni rong
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloonimine
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klooni laev
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klooni lennuk
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. CTRL-klikk jagab sihtpunkte
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}See paljundab mootorsõidukit. CTRL-klõps jagab sihtpunkte
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}See ehitab koopia laevast. CTRL-klikk jagab sihtpunkte
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}See paljundab õhusõidukit. CTRL-klikk jagab sihtpunkte
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}See ehitab koopia rongist koos kõikide vagunitega. Vajuta sellele nuppule, ning seejärel rongile depoo sees või väljas. CTRL-klikk jagab sihtpunkte
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}See paljundab mootorsõidukit. Klõpsa seda nuppu, ning seejärel mootorsõidukil depoos või sellest väljas. CTRL-klõps jagab sihtpunkte
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}See ehitab koopia laevast. Vajuta sellele nuppule, ning seejärel laevale laevaremonditehase sees või väljas. Sihtpunkte jagab CTRL-klikk.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}See paljundab õhusõidukit. Vajuta sellele nuppule, ning seejärel lennukile angaari sees või väljas. CTRL-klikk jagab sihtpunkte
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Uued rööbassõidukid
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Uus elektriraudteesõiduk
@@ -3242,28 +3242,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vii vaad
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Sa oled müümas kõiki depoos asuvaid masinaid. Kas sa oled kindel?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Vale depootüüp
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Vale depootüüp
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Müü kõik rongid jaamast
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Müü kõik autod garaažist
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Müü kõik laevad sadamast
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Müü kõik lennukid angaarist
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Müü kõik rongid jaamast
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Müü kõik autod garaažist
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Müü kõik laevad sadamast
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Müü kõik lennukid angaarist
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Võta nimekiri kõikidest rongidest selles jaamas nende käskude järgi
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Hangi kõikidest autodest nimekiri, kus praegune depoo on üks sihtpunktidest
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Võta nimekiri kõikidest laevadest selles sadamas nende käskude järgi
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Võta nimekiri kõikidest lennukitest suvalistest angaaridest selles lennujaamas nende käskude järgi
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Võta nimekiri kõikidest rongidest selles jaamas nende käskude järgi
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Hangi kõikidest autodest nimekiri, kus praegune depoo on üks sihtpunktidest
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Võta nimekiri kõikidest laevadest selles sadamas nende käskude järgi
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Võta nimekiri kõikidest lennukitest suvalistest angaaridest selles lennujaamas nende käskude järgi
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Asenda kõik rongid jaamas ise
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Asenda kõik depoos olevad mootorsõidukid ise
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Asenda kõik laevad depoos ise
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Asenda kõik lennumasinad angaaris ise
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Asenda kõik rongid jaamas ise
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Asenda kõik depoos olevad mootorsõidukid ise
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Asenda kõik laevad depoos ise
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Asenda kõik lennumasinad angaaris ise
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Asenda {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Alusta veovahendite asendamist
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lõpeta veovahendite asendamine
-STR_NOT_REPLACING                                               :{BLACK}Ei asenda praegu
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ãœhtegi veovahendit pole valitud
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ei asenda praegu
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ãœhtegi veovahendit pole valitud
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vali asendatav veduritüüp
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vali uus vedur, millega sa soovid vasakult valitud vedurit asendada.
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Vajuta lõpetamaks vasakult valitud veduri asendust
@@ -3275,26 +3275,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Sunni au
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Asendamisel: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Vaheta aken mootori ja vaguni asendamise aknate vahel
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Sõiduk pole saadaval
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Sõiduk pole saadaval
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laev pole saadaval
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Lennuk pole saadaval
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Sõiduk pole saadaval
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Sõiduk pole saadaval
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Laev pole saadaval
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Lennuk pole saadaval
 
-STR_ENGINES                                                     :Vedurid
-STR_WAGONS                                                      :Vaguneid
+STR_REPLACE_ENGINES                                             :Vedurid
+STR_REPLACE_WAGONS                                              :Vaguneid
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Vajuta, kui tahad seisata kõiki ronge jaamas
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Vajuta, kui tahad seisata kõiki masinaid garaažis
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klõpsa, et peatada kõik sadamas olevad laevad.
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Vajuta, kui tahad seisata kõiki lennukeid angaaris
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Vajuta, kui tahad seisata kõiki ronge jaamas
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vajuta, kui tahad seisata kõiki masinaid garaažis
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klõpsa, et peatada kõik sadamas olevad laevad.
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Vajuta, kui tahad seisata kõiki lennukeid angaaris
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klõpsa kõikide depoos asuvate rongide käivitamiseks
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klõpsa, et käivitada kõik depoos olevad mootorsõidukid
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klõpsa kõikide angaaris asuvate laevade käivitamiseks
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klõpsa kõikide angaaris asuvate lennukite käivitamiseks
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klõpsa kõikide depoos asuvate rongide käivitamiseks
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klõpsa, et käivitada kõik depoos olevad mootorsõidukid
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klõpsa kõikide angaaris asuvate laevade käivitamiseks
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klõpsa kõikide angaaris asuvate lennukite käivitamiseks
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klõpsa, et kõik nimekirjas olevad masinad peatada
-STR_MASS_START_LIST_TIP                                         :{BLACK}Vajuta, kui tahad käivitada kõiki masinaid nimekirjas
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klõpsa, et kõik nimekirjas olevad masinad peatada
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Vajuta, kui tahad käivitada kõiki masinaid nimekirjas
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i}
@@ -3303,14 +3303,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Ãœmberse
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Raudteesõidukid
-STR_ELRAIL_VEHICLES                                             :Elektrirongid
-STR_MONORAIL_VEHICLES                                           :Monorelssveerem
-STR_MAGLEV_VEHICLES                                             :Magnethõljukveerem
+STR_REPLACE_RAIL_VEHICLES                                       :Raudteesõidukid
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrirongid
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorelssveerem
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magnethõljukveerem
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Hind: {GOLD}{CURRENCY}{BLACK} Tühimass: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Tippkiirus: {GOLD}{VELOCITY}{BLACK}   Võimsus: {GOLD}{POWER}
@@ -3337,70 +3337,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Tekita
-STR_RANDOM                                                      :{BLACK}Suvaline
-STR_RANDOM_HELP                                                 :{BLACK}Muuda maastiku loomisel kasutatavat suvalist seemet
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Maailma genereerimine
-STR_RANDOM_SEED                                                 :{BLACK}Juhuarv:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klõpsa juhuarvu sisestamiseks
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Sisesta suvaline arv
-STR_LAND_GENERATOR                                              :{BLACK}Maa generaator:
-STR_TREE_PLACER                                                 :{BLACK}Puude algoritm:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Kõrgustekaardi pööre:
-STR_TERRAIN_TYPE                                                :{BLACK}Maapinna tüüp:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Merepinna tase:
-STR_SMOOTHNESS                                                  :{BLACK}Tasapinnalisus:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Lumepiiri kõrgus:
-STR_DATE                                                        :{BLACK}Algus:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Linnade sagedus:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Tehaste sagedus:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Lumepiiri liigutamine ühe võrra üles
-STR_SNOW_LINE_DOWN                                              :{BLACK}Lumepiiri liigutamine ühe võrra alla
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Muuda lumepiiri kõrgust
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Muuda algusaastat
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skaala hoiatus
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Kaardi suuruse muutmine pole soovitatav. Jätka?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Kõrgusekaardi nimi:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Suurus: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Tekita
+STR_MAPGEN_RANDOM                                               :{BLACK}Suvaline
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Muuda maastiku loomisel kasutatavat suvalist seemet
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Maailma genereerimine
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Juhuarv:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klõpsa juhuarvu sisestamiseks
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Sisesta suvaline arv
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Maa generaator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Puude algoritm:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Kõrgustekaardi pööre:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Maapinna tüüp:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Merepinna tase:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Tasapinnalisus:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Lumepiiri kõrgus:
+STR_MAPGEN_DATE                                                 :{BLACK}Algus:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Linnade sagedus:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Tehaste sagedus:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Lumepiiri liigutamine ühe võrra üles
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Lumepiiri liigutamine ühe võrra alla
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Muuda lumepiiri kõrgust
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Muuda algusaastat
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skaala hoiatus
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Kaardi suuruse muutmine pole soovitatav. Jätka?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Kõrgusekaardi nimi:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Suurus: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Maailma genereerimine...
 STR_GENERATION_ABORT                                            :{BLACK}Loobu
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Loobu Maailma Genereerimisest
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Kas sa tõesti tahad loobuda genereerimisest?
-STR_PROGRESS                                                    :{WHITE}{NUM}% valmis
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Maailma genereerimine
-STR_TREE_GENERATION                                             :{BLACK}Puude genereerimine
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Liigutamatu tekitamine
-STR_CLEARING_TILES                                              :{BLACK}Mägise ja kivise maaala tegemine
-STR_SETTINGUP_GAME                                              :{BLACK}Mängu seadistamine
-STR_PREPARING_TILELOOP                                          :{BLACK}Klotsisilmuse täitmine
-STR_PREPARING_GAME                                              :{BLACK}Mängu valmistamine
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}See tegevus muutis raskusastme erilise peale
-STR_SE_FLAT_WORLD                                               :{WHITE}Tasane maa
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Genereeri tasane maapind
-STR_SE_RANDOM_LAND                                              :{WHITE}Suvaline maa
-STR_SE_NEW_WORLD                                                :{BLACK}Alusta uut stsenaariumit
-STR_SE_CAPTION                                                  :{WHITE}Stsenaariumi tüüp
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Lameda maa kõrguse langetamine ühe võrra
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Lameda maa kõrguse tõstmine ühe võrra
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Muuda maa kõrgust lamedal maal
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Lameda maa kõrgus:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% valmis
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Maailma genereerimine
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Puude genereerimine
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Liigutamatu tekitamine
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Mägise ja kivise maaala tegemine
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Mängu seadistamine
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Klotsisilmuse täitmine
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Mängu valmistamine
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}See tegevus muutis raskusastme erilise peale
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Tasane maa
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Genereeri tasane maapind
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Suvaline maa
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Alusta uut stsenaariumit
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Stsenaariumi tüüp
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Lameda maa kõrguse langetamine ühe võrra
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Lameda maa kõrguse tõstmine ühe võrra
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Muuda maa kõrgust lamedal maal
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Lameda maa kõrgus:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Vii väikekaart praegusele asukohale
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kaardi ääred:
-STR_NORTHWEST                                                   :{BLACK}Loe
-STR_NORTHEAST                                                   :{BLACK}Kirre
-STR_SOUTHEAST                                                   :{BLACK}Kagu
-STR_SOUTHWEST                                                   :{BLACK}Edel
-STR_BORDER_FREEFORM                                             :{BLACK}Vaba
-STR_BORDER_WATER                                                :{BLACK}Vesi
-STR_BORDER_RANDOM                                               :{BLACK}Suvaline
-STR_BORDER_RANDOMIZE                                            :{BLACK}Suvaline
-STR_BORDER_MANUAL                                               :{BLACK}Ise valitud
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kaardi ääred:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Loe
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Kirre
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Kagu
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Edel
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Vaba
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vesi
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Suvaline
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Suvaline
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Ise valitud
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Väike
@@ -3425,21 +3425,21 @@ STR_MEASURE_AREA                                                :{BLACK}Pindala:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Pikkus: {NUM}{}Kõrguserinevus: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Pindala: {NUM} x {NUM}{}Kõrguste erinevus: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Ãœlekantud tulu: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...see tee on omatud linna poolt
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...tee on vales suunas
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Läbipaistvusvalikud
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Vaheta jaamamärkide läbipaistvust
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Vaheta puude läbipaistvust
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Vaheta majade läbipaistvust
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Vaheta tööstusehitiste läbipaistvust
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Vaheta läbipaistvust hoonetel nagu jaamad, depood, vahepunktid ja elektriliinid. CTRL+klõps lukustab.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Vaheta sildade läbipaistvust
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Vaheta läbipaistvust rajatistel, nagu: majakad, antennid ja võimalik, et tulevikus ka silmailu
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Õhuliinide läbipaistvuse vahetamine. CTRL-klahvi toel klõpsamine lukustab.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Vaheta laadimisnäidikute läbipaistvust
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Muuda esemed nähtamatuks, mitte läbipaistvaks
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Ãœlekantud tulu: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...see tee on omatud linna poolt
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...tee on vales suunas
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Läbipaistvusvalikud
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Vaheta jaamamärkide läbipaistvust
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Vaheta puude läbipaistvust
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Vaheta majade läbipaistvust
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Vaheta tööstusehitiste läbipaistvust
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Vaheta läbipaistvust hoonetel nagu jaamad, depood, vahepunktid ja elektriliinid. CTRL+klõps lukustab.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Vaheta sildade läbipaistvust
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Vaheta läbipaistvust rajatistel, nagu: majakad, antennid ja võimalik, et tulevikus ka silmailu
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Õhuliinide läbipaistvuse vahetamine. CTRL-klahvi toel klõpsamine lukustab.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Vaheta laadimisnäidikute läbipaistvust
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Muuda esemed nähtamatuks, mitte läbipaistvaks
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3449,7 +3449,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Kõik raudteeveerem
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Kõik mootorsõidukid
 STR_GROUP_ALL_SHIPS                                             :Kõik laevad
@@ -3458,24 +3458,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Rühmitamata ro
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Rühmitamata sõidukid
 STR_GROUP_DEFAULT_SHIPS                                         :Rühmitamata laevad
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Rühmitamata õhusõidukid
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Kõik jagatud sõidukid
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Eemalda kõik sõidukid
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Rühma nime vahetamine
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Ei saa rühma luua...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Seda rühma ei saa eemaldada...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Rühma nime ei saa vahetada...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Ei saa kõiki sõidukeid sellest rühmast eemaldada...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Antud sõidukit ei saa sellesse rühma lisada...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Jagatud sõidukeid ei saa rühma lisada...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Ei saa rühma luua...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Seda rühma ei saa eemaldada...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Rühma nime ei saa vahetada...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Ei saa kõiki sõidukeid sellest rühmast eemaldada...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Antud sõidukit ei saa sellesse rühma lisada...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Jagatud sõidukeid ei saa rühma lisada...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Rühm - Klõpsa rühmal, et kõiki seal olevaid sõidukeid järjestada
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klõpsa rühma loomiseks
-STR_GROUP_DELETE_TIP                                            :{BLACK}Eemalda valitud rühm
-STR_GROUP_RENAME_TIP                                            :{BLACK}Valitud rühma nime vahetamine
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klõpsa, et seda rühma üldise automaatse asenduse eest kaitsta
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Rühm - Klõpsa rühmal, et kõiki seal olevaid sõidukeid järjestada
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klõpsa rühma loomiseks
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Eemalda valitud rühm
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Valitud rühma nime vahetamine
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klõpsa, et seda rühma üldise automaatse asenduse eest kaitsta
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3536,35 +3536,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nime ei tohi korduda
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nime ei tohi korduda
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Mine järgmise märgi juurde
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Mine eelmise märgi juurde
-STR_SIGN_OSKTITLE                                               :{BLACK}Sisesta sildile nimi
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Mine järgmise märgi juurde
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Mine eelmise märgi juurde
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Sisesta sildile nimi
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Rahasta
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Uuri
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Ehita
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Vali siit nimistust sobiv tööstus
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Rahasta
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Uuri
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Ehita
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Vali siit nimistust sobiv tööstus
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Täpsem
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Täpsem näovalik
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Täpsem näovalik
 STR_FACE_SIMPLE                                                 :{BLACK}Lihtne
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Lihtne näo valik.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Lihtne näo valik.
 STR_FACE_LOAD                                                   :{BLACK}Lae
-STR_FACE_LOAD_TIP                                               :{BLACK}Lae lemmik nägu
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Lae lemmik nägu
 STR_FACE_LOAD_DONE                                              :{WHITE}Sinu lemmiknägu on OpenTTD seadistusfailist laaditud.
 STR_FACE_FACECODE                                               :{BLACK}Mängja nägu no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Vaata või säti näonumbrit
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Vaata või säti näonumbrit
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Vaata või säti näonumbrit
 STR_FACE_FACECODE_SET                                           :{WHITE}Uus näonumbri kood on sätitud.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Ei saanud näonumbrit sättida - peab olema number 0 ja 4,494,967,295 vahel!
 STR_FACE_SAVE                                                   :{BLACK}Salvesta
-STR_FACE_SAVE_TIP                                               :{BLACK}Salvesta lemmiknägu
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Salvesta lemmiknägu
 STR_FACE_SAVE_DONE                                              :{WHITE}See nägu salvestatakse sinu lemmikuna OpenTTD seadete faili.
 STR_FACE_EUROPEAN                                               :{BLACK}Eurooplane
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Vali euroopa näod
@@ -3572,51 +3572,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Aafrikla
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Vali aafrika näod
 STR_FACE_YES                                                    :Jah
 STR_FACE_NO                                                     :Ei
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Vuntsid või kõrvarõngad on lubatud
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Vuntsid või kõrvarõngad on lubatud
 STR_FACE_HAIR                                                   :Soeng:
-STR_FACE_HAIR_TIP                                               :{BLACK}Vaheta juukseid
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Vaheta juukseid
 STR_FACE_EYEBROWS                                               :Kulmud:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Vaheta kulmusid
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Vaheta kulmusid
 STR_FACE_EYECOLOUR                                              :Silmavärv:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Vaheta silmavärvi:
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Vaheta silmavärvi:
 STR_FACE_GLASSES                                                :Prillid:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Prillid on lubatud
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Vaheta prille
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Prillid on lubatud
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Vaheta prille
 STR_FACE_NOSE                                                   :Nina:
-STR_FACE_NOSE_TIP                                               :{BLACK}Vaheta nina
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Vaheta nina
 STR_FACE_LIPS                                                   :Huuled:
 STR_FACE_MOUSTACHE                                              :Vuntsid:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Vaheta huuli või vuntse
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Vaheta huuli või vuntse
 STR_FACE_CHIN                                                   :Lõug:
-STR_FACE_CHIN_TIP                                               :{BLACK}Vaheta lõuga
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Vaheta lõuga
 STR_FACE_JACKET                                                 :Pintsak:
-STR_FACE_JACKET_TIP                                             :{BLACK}Vaheta pintsakut
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Vaheta pintsakut
 STR_FACE_COLLAR                                                 :Krae:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Vaheta kraed
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Vaheta kraed
 STR_FACE_TIE                                                    :Lips:
 STR_FACE_EARRING                                                :Kõrvarõngas:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Vaheta kraed või kõrvarõngast
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Vaheta kraed või kõrvarõngast
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signaali valik
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Siin ei saa signaale teisendada...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Läbisõidusignaal (semafor){}Signaale läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sissesõidusignaal (semafor){}Roheline, kuni vähemalt üks väljasõidusignaal on roheline. Muudel juhtudel näitab punast.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Väljasõidusignaal (semafor){}Käitub samamoodi, nagu läbisõidusignaal, kuid läheb vaja et sissesõidu- ja mitmik-hoiatussignaalid näitaksid õiget värvi.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombineeritud signaal (semafor){}Kombineeritud signaal toimib nii sissesõidu-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid hoiatussignaalide harusid.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Täiustatud signaal (semafor){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Ühesuunaline täiustatud signaal (semafor){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Läbisõidusignaal (elektriline){}Signaale läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sissesõidusignaal (elektriline){}Roheline, kuni vähemalt üks väljasõidusignaal on roheline. Muudel juhtudel näitab punast.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Väljasõidusignaal (elektriline){}Käitub samamoodi, nagu läbisõidusignaal, kuid läheb vaja et sissesõidu- ja mitmik-hoiatussignaalid näitaksid õiget värvi.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombineeritud signaal (elektriline){}Kombineeritud signaal toimib nii sisse-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid sissesõidusignaalide harusid.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Täiustatud signaal (elektriline){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Ühesuunaline täiustatud signaal (elektriline){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signaalide teisendamine{}Kui see on valitud, siis olemasoleval signaalil klõpsates teisendatakse see määratud signaalitüübiks ja -variandiks. Samal ajal CTRL klahvi all hoides lülitutakse olemasoleva variandi vahel.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Signaalide paigaldustihedus
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Kahanda signaalide paigaldustihedust
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Suurenda signaalide paigaldustihedust
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signaali valik
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Siin ei saa signaale teisendada...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Läbisõidusignaal (semafor){}Signaale läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sissesõidusignaal (semafor){}Roheline, kuni vähemalt üks väljasõidusignaal on roheline. Muudel juhtudel näitab punast.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Väljasõidusignaal (semafor){}Käitub samamoodi, nagu läbisõidusignaal, kuid läheb vaja et sissesõidu- ja mitmik-hoiatussignaalid näitaksid õiget värvi.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombineeritud signaal (semafor){}Kombineeritud signaal toimib nii sissesõidu-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid hoiatussignaalide harusid.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Täiustatud signaal (semafor){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Ühesuunaline täiustatud signaal (semafor){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Läbisõidusignaal (elektriline){}Signaale läheb tarvis vältimaks kokkupõrkeid enam kui ühe rongiga rööbasteedel.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sissesõidusignaal (elektriline){}Roheline, kuni vähemalt üks väljasõidusignaal on roheline. Muudel juhtudel näitab punast.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Väljasõidusignaal (elektriline){}Käitub samamoodi, nagu läbisõidusignaal, kuid läheb vaja et sissesõidu- ja mitmik-hoiatussignaalid näitaksid õiget värvi.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombineeritud signaal (elektriline){}Kombineeritud signaal toimib nii sisse-, kui ka väljasõidusignaalina. See võimaldab ehitada laialiulatuvaid sissesõidusignaalide harusid.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Täiustatud signaal (elektriline){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Täiustatud signaalidest saab tagant mööduda.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Ühesuunaline täiustatud signaal (elektriline){}Kui rongide tee kahe signaali vahel kordagi ei ristu, siis täiustatud signaalidega saab signaalivahedesse siseneda korraga mitu rongi. Ühesuunalistest täiustatud signaalidest ei saa tagant mööduda.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signaalide teisendamine{}Kui see on valitud, siis olemasoleval signaalil klõpsates teisendatakse see määratud signaalitüübiks ja -variandiks. Samal ajal CTRL klahvi all hoides lülitutakse olemasoleva variandi vahel.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Signaalide paigaldustihedus
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Kahanda signaalide paigaldustihedust
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Suurenda signaalide paigaldustihedust
 ########
 
 ############ on screen keyboard
@@ -3628,36 +3628,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Tehismõistuse seaded
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Näita tehismõistuse seadeid
 STR_AI_DEBUG                                                    :{WHITE}Tehismõistuse debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Tehismõistuse nimi
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Tehismõistuse nimi
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Laadi tehismõistus uuesti
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Sulge tehismõistus, laadi skript uuesti ning taaskäivita tehismõistus
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Tehismõistuse debugi akent saab vaadata ainult server
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Sulge tehismõistus, laadi skript uuesti ning taaskäivita tehismõistus
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Tehismõistuse debugi akent saab vaadata ainult server
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Tehismõistuse seadistus
-STR_AI_CHANGE                                                   :{BLACK}Vali tehismõistus
-STR_AI_CONFIGURE                                                :{BLACK}Seadista
-STR_AI_CHANGE_TIP                                               :{BLACK}Laadi teine tehismõistus
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Muuda tehismõistuse parameetreid
-STR_AI_LIST_TIP                                                 :{BLACK}Kõik järgmises mängus laaditavad tehismõistused
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Vali tehismõistus
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Seadista
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Laadi teine tehismõistus
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Muuda tehismõistuse parameetreid
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Kõik järgmises mängus laaditavad tehismõistused
 STR_AI_LIST_CAPTION                                             :{WHITE}Saadaval tehismõistused
-STR_AI_AILIST_TIP                                               :{BLACK}Klõpsa tehismõistuse valimiseks
-STR_AI_ACCEPT                                                   :{BLACK}Nõustu
-STR_AI_ACCEPT_TIP                                               :{BLACK}Vali esiletõstetud tehismõistus
-STR_AI_CANCEL                                                   :{BLACK}Loobu
-STR_AI_CANCEL_TIP                                               :{BLACK}Ära muuda tehismõistust
-STR_AI_CLOSE                                                    :{BLACK}Sulge
-STR_AI_RESET                                                    :{BLACK}Nulli
-STR_AI_HUMAN_PLAYER                                             :Inimene
-STR_AI_RANDOM_AI                                                :Suvaline tehismõistus
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klõpsa tehismõistuse valimiseks
+STR_AI_LIST_ACCEPT                                              :{BLACK}Nõustu
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vali esiletõstetud tehismõistus
+STR_AI_LIST_CANCEL                                              :{BLACK}Loobu
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ära muuda tehismõistust
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sulge
+STR_AI_SETTINGS_RESET                                           :{BLACK}Nulli
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Inimene
+STR_AI_CONFIG_RANDOM_AI                                         :Suvaline tehismõistus
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Tehismõistuse parameetrid
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versioon: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Tõrge ühe töötava tehismõistusega. Palun teavitage sellest tehismõistuse autorit koos ekraanitõmmisega tehismõistuse tõrkeotsingu aknast.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versioon: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Tõrge ühe töötava tehismõistusega. Palun teavitage sellest tehismõistuse autorit koos ekraanitõmmisega tehismõistuse tõrkeotsingu aknast.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Mürapiirang linnas: {ORANGE}{COMMA}{BLACK}  suurim: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Tekitatud müra: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Mürapiirang linnas: {ORANGE}{COMMA}{BLACK}  suurim: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Tekitatud müra: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3671,21 +3671,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Stsenaarium
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Kõrguskaart
 STR_CONTENT_TITLE                                               :{WHITE}Sisu allalaadimine
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tüüp
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Sisu liik
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Sisu liik
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nimi
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Sisu nimi
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Reale klõpsates näidatakse täpsustust{}Märkeruudule klõpsates märgitakse allalaaditavaks
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Sisu nimi
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Reale klõpsates näidatakse täpsustust{}Märkeruudule klõpsates märgitakse allalaaditavaks
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Vali kõik
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Märgi kõik sisu allalaaditavaks
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Märgi kõik sisu allalaaditavaks
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Märgi uuendused
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Tähista allalaaditavaks kõik olemasoleva sisu uuendused
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Tähista allalaaditavaks kõik olemasoleva sisu uuendused
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Eemalda märgistus kõigilt
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Eemaldatakse allalaadimise märgistus
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Eemaldatakse allalaadimise märgistus
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Sisesta filterkirjend
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Sisesta märksõna mida loendist otsida
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Sisesta märksõna mida loendist otsida
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Sildi- ja nimefilter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Lae alla
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Alusta valitud sisu allalaadimist
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Alusta valitud sisu allalaadimist
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Allalaadimiste kogusuurus: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}SISU TEAVE
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Sa pole seda allalaaditavaks märkinud
@@ -3718,6 +3718,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Alla laa
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Internetisisu kontrollimine
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Otsi allalaadimiseks uut ja uuendatud sisu
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Otsi internetist puuduvat sisu
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Otsi kas puuduvat sisu leidub internetis
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Otsi internetist puuduvat sisu
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Otsi kas puuduvat sisu leidub internetis
 ########
diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt
index 4f4cc0305..984586931 100644
--- a/src/lang/finnish.txt
+++ b/src/lang/finnish.txt
@@ -118,7 +118,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} toffee
 STR_QUANTITY_BATTERIES                                          :{COMMA} paristo{P "" a}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} muovia
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} sihijuoma{P "" a}
-STR_CARGO_N_A                                                   :-{SKIP}
+STR_QUANTITY_N_A                                                :-{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -208,26 +208,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Valitse järjestys (laskeva/nouseva).
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Valitse järjestyskriteeri.
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Valitse suodatuskriteerit
-STR_SORT_BY                                                     :{BLACK}Lajittele
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Valitse järjestys (laskeva/nouseva).
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Valitse järjestyskriteeri.
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Valitse suodatuskriteerit
+STR_BUTTON_SORT_BY                                              :{BLACK}Lajittele
 STR_BUTTON_LOCATION                                             :{BLACK}Sijainti
-STR_QUERY_RENAME                                                :{BLACK}Nimeä uud.
+STR_BUTTON_RENAME                                               :{BLACK}Nimeä uud.
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Sulje ikkuna
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Ikkunan otsake - vedä tästä siirtääksesi ikkunaa
-STR_STICKY_BUTTON                                               :{BLACK}'Sulje Kaikki Ikkunat'-nappi ei vaikuta tähän ikkunaan.
-STR_RESIZE_BUTTON                                               :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa.
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Suuri/pieni ikkunan koko
+STR_TOOLTIP_STICKY                                              :{BLACK}'Sulje Kaikki Ikkunat'-nappi ei vaikuta tähän ikkunaan.
+STR_TOOLTIP_RESIZE                                              :{BLACK}Napsauta ja vedä muuttaaksesi tämän ikkunan kokoa.
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Suuri/pieni ikkunan koko
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Vierityspalkki - luettelon vieritys ylös/alas
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Vierityspalkki - luettelon vieritys vasemmalle/oikealle.
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Tuhoa ruudulla olevat rakennukset, puut, jne.
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Oletus
-STR_QUERY_CANCEL                                                :{BLACK}Peruuta
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Oletus
+STR_BUTTON_CANCEL                                               :{BLACK}Peruuta
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :§1234567890+´ qwertyuiopå¨asdfghjklöä' zxcvbnm,.- .
@@ -316,7 +316,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Sijoita
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Tallenna skenaario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Lataa skenaario
-STR_MENU_LOAD_HEIGHTMAP                                         :Lataa korkeuskartta
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Lataa korkeuskartta
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sulje muokkain
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Sulje
@@ -504,11 +504,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Rahtityypin kuvaaja päälle/pois
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Näytä tarkat suorituskyky arviot
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Näytä tarkat suorituskyky arviot
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Selite yhtiön kuvaajiin
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Napsauta tässä laittaaksesi yhtiön merkinnän graafissa päälle/pois.
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Napsauta tässä laittaaksesi yhtiön merkinnän graafissa päälle/pois.
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Yhtiökilpataulukko
@@ -543,16 +543,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Raha:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Laina:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Yhteensä:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Liikennevälineiden määrä. Tähän kuuluvat ajoneuvot, junat, laivat ja lentokoneet.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Asemien osien määrä. Kaikki osat asemista (esim. rautatieasema, bussipysäkki, lentokenttä) lasketaan, vaikka ne olisivat yhdistettynä yhdeksi asemaksi.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Vähätuottoisimman ajoneuvon tulo (kaikkien yli 2 vuotta vanhojen ajoneuvojen)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Viimeisen 12 neljänneksen vähätuottoisimman kuun käteistuoton määrä
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Viimeisen 12 neljänneksen korkeatuottoisimman kuun käteistuoton määrä
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Viimeisen neljän neljänneksen kuljetetun rahdin määrä
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Viimeisen neljänneksen kuljetetun rahdin tyyppi
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Käteisvarat
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Tämän yhtiön ottaman lainan määrä
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Summa kaikista mahdollisista pisteistä.
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Liikennevälineiden määrä. Tähän kuuluvat ajoneuvot, junat, laivat ja lentokoneet.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Asemien osien määrä. Kaikki osat asemista (esim. rautatieasema, bussipysäkki, lentokenttä) lasketaan, vaikka ne olisivat yhdistettynä yhdeksi asemaksi.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Vähätuottoisimman ajoneuvon tulo (kaikkien yli 2 vuotta vanhojen ajoneuvojen)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Viimeisen 12 neljänneksen vähätuottoisimman kuun käteistuoton määrä
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Viimeisen 12 neljänneksen korkeatuottoisimman kuun käteistuoton määrä
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Viimeisen neljän neljänneksen kuljetetun rahdin määrä
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Viimeisen neljänneksen kuljetetun rahdin tyyppi
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Käteisvarat
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Tämän yhtiön ottaman lainan määrä
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Summa kaikista mahdollisista pisteistä.
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jazz-jukeboksi
@@ -670,8 +670,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Kaupunki
 STR_SMALLMAP_CENTER                                             :{BLACK}Keskitä pieni kartta tähän paikkaan
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Kaikki pois päältä
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Kaikki päälle
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Kaikki pois päältä
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Kaikki päälle
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Näytä viimeisin viesti tai uutisraportti.
@@ -682,8 +682,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  TALL
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Viestihistoria
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Lista viimeisimmistä uutisviesteistä.
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Lista viimeisimmistä uutisviesteistä.
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Viesti
@@ -917,32 +917,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Valitse
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} puuttuva/korruptoitunut tiedosto{P "" ja}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Lisätietoja perusgrafiikoista
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Täyskuvatila ei toimi
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Täyskuvatila ei toimi
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Oma valuutta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Vaihtokurssi: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Vähennä valuuttasi määrää yhdelle Punnalle (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Lisää valuuttasi määrää yhdelle Punnalle (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Aseta vaihtokurssi valuutallesi yhdelle Punnalle (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Vähennä valuuttasi määrää yhdelle Punnalle (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Lisää valuuttasi määrää yhdelle Punnalle (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Aseta vaihtokurssi valuutallesi yhdelle Punnalle (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Välimerkki: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Valitse välimerkki valuutallesi
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Valitse välimerkki valuutallesi
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Etuliite: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Valitse alkuliite valuutallesi
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Valitse alkuliite valuutallesi
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Jälkiliite: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Valitse jälkiliite valuutallesi
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Valitse jälkiliite valuutallesi
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Vaihda euroon: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Vaihda euroon: {ORANGE}ei koskaan
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Valitse vuosi, jona vaihdetaan Euroon
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Vaihda Euroon aikaisemmin
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Vaihda Euroon myöhemmin
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Valitse vuosi, jona vaihdetaan Euroon
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Vaihda Euroon aikaisemmin
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Vaihda Euroon myöhemmin
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Esikatselu: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Puntaa (£) valuutassasi
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Puntaa (£) valuutassasi
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Vaihda oman valuutan parametria.
 
 # Difficulty level window
@@ -956,7 +956,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Oma
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Näytä pistetaulukko
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Tallenna
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Tallenna
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Vastustajien enimmäismäärä: {ORANGE}{COMMA}
@@ -1022,7 +1022,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Salliva
 STR_CITY_APPROVAL_TOLERANT                                      :Suvaitseva
 STR_CITY_APPROVAL_HOSTILE                                       :Vihamielinen
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Tehty toiminto vaihtoi vaikeustason mukautetuksi
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Tehty toiminto vaihtoi vaikeustason mukautetuksi
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Lisäasetukset
@@ -1271,7 +1271,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Ei s
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Kartan x-koko: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Kartan y-koko: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Muuta asetusarvo
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Muuta asetusarvo
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1313,9 +1313,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sulje Op
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Sulje
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Lopetetaanko peli ja palataan {STRING}-järjestelmään?
-STR_YES                                                         :{BLACK}Kyllä
-STR_NO                                                          :{BLACK}Ei
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Lopetetaanko peli ja palataan {STRING}-järjestelmään?
+STR_QUIT_YES                                                    :{BLACK}Kyllä
+STR_QUIT_NO                                                     :{BLACK}Ei
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1331,11 +1331,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Lopeta peli
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Lopetetaanko peli?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Lopetetaanko skenaario?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Lopetetaanko skenaario?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Huijaukset
-STR_CHEATS_TIP                                                  :{BLACK}Valintaruudut osoittavat, oletko käyttänyt huijausta aiemmin.
+STR_CHEATS_TOOLTIP                                              :{BLACK}Valintaruudut osoittavat, oletko käyttänyt huijausta aiemmin.
 STR_CHEATS_WARNING                                              :{BLACK}Varoitus! Olet juuri pettämässä kanssakilpailijoitasi. Pidä mielessä, että tällainen häväistys pidetään mielessä ikuisuuden ajan.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Anna lisää rahaa: {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Hallinnassa oleva yritys: {ORANGE}{COMMA}
@@ -1344,24 +1344,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunneli
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Rakenna tauon aikana: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Suihkukoneet eivät syöksy (usein) pienille lentokentille: {ORANGE}{STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Vaihda ilmastoa: {ORANGE}{STRING}
-STR_TEMPERATE_LANDSCAPE                                         :lauhkea maasto
-STR_SUB_ARCTIC_LANDSCAPE                                        :pohjoinen maasto
-STR_SUB_TROPICAL_LANDSCAPE                                      :subtrooppinen maasto
-STR_TOYLAND_LANDSCAPE                                           :Lelumaan maasto
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :lauhkea maasto
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :pohjoinen maasto
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :subtrooppinen maasto
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Lelumaan maasto
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Muuta päiväystä: {ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Muuntuvat tuotantoarvot: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Uusi Väriteema
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Näytä yleiset väriteemat
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Näytä junan väriteemat
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Näytä tieajoneuvojen väriteemat
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Näytä laivojen väriteemat
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Näytä lentokoneiden väriteemat
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Valitse valitulle teemalle ensisijainen väri
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Valitse valitulle teemalle toissijainen väri
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Valitse muutettava väriteema, tai valitse useita Ctrl pohjassa. Paina valintalaatikkoa valitaksesi teeman
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Näytä yleiset väriteemat
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Näytä junan väriteemat
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Näytä tieajoneuvojen väriteemat
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Näytä laivojen väriteemat
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Näytä lentokoneiden väriteemat
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Valitse valitulle teemalle ensisijainen väri
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Valitse valitulle teemalle toissijainen väri
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Valitse muutettava väriteema, tai valitse useita Ctrl pohjassa. Paina valintalaatikkoa valitaksesi teeman
 
 STR_LIVERY_DEFAULT                                              :Normaalit tunnusvärit
 STR_LIVERY_STEAM                                                :Höyryveturi
@@ -1399,19 +1399,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Valitse
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Uudet kasvot
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Luo satunnaiset kasvot.
 STR_FACE_ADVANCED                                               :{BLACK}Monipuolinen
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Monipuolisempi kasvojenvalitsin.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Monipuolisempi kasvojenvalitsin.
 STR_FACE_SIMPLE                                                 :{BLACK}Yksinkertainen
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Yksinkertainen kasvojenvalitsin.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Yksinkertainen kasvojenvalitsin.
 STR_FACE_LOAD                                                   :{BLACK}Lataa
-STR_FACE_LOAD_TIP                                               :{BLACK}Lataa suosikkikasvot
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Lataa suosikkikasvot
 STR_FACE_LOAD_DONE                                              :{WHITE}Suosikkikasvosi on ladattu OpenTTD:n kokoonpanotiedostosta.
 STR_FACE_FACECODE                                               :{BLACK}Pelaajan kasvot no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Tarkastele ja/tai aseta pelaajan kasvojen numero
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Tarkastele ja/tai aseta pelaajan kasvojen numero
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Tarkastele ja/tai aseta pelaajan kasvojen numero
 STR_FACE_FACECODE_SET                                           :{WHITE}Uusi kasvojen numerokoodi on asetettu.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Pelaajan kasvojen numeroa ei voitu asettaa - arvon on oltaa numeerinen arvo väliltä 0-4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Tallenna
-STR_FACE_SAVE_TIP                                               :{BLACK}Tallenna suosikkikasvot
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Tallenna suosikkikasvot
 STR_FACE_SAVE_DONE                                              :{WHITE}Nämä kasvota tallennetaan suosikkikasvoiksesi OpenTTD:n kokoonpanotiedostoon.
 STR_FACE_EUROPEAN                                               :{BLACK}Eurooppalainen
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Valitse eurooppalaisia kasvoja
@@ -1419,120 +1419,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikkal
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Valitse afrikkalaisia kasvoja
 STR_FACE_YES                                                    :Kyllä
 STR_FACE_NO                                                     :Ei
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Käytä viiksiä tai korvakorua
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Käytä viiksiä tai korvakorua
 STR_FACE_HAIR                                                   :Hiukset:
-STR_FACE_HAIR_TIP                                               :{BLACK}Vaihda hiukset
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Vaihda hiukset
 STR_FACE_EYEBROWS                                               :Kulmakarvat:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Vaihda kulmakarvat
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Vaihda kulmakarvat
 STR_FACE_EYECOLOUR                                              :Silmien väri:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Vaihda silmien väri
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Vaihda silmien väri
 STR_FACE_GLASSES                                                :Silmälasit:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Käytä silmälaseja
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Vaihda silmälasit
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Käytä silmälaseja
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Vaihda silmälasit
 STR_FACE_NOSE                                                   :Nenä:
-STR_FACE_NOSE_TIP                                               :{BLACK}Vaihda nenä
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Vaihda nenä
 STR_FACE_LIPS                                                   :Huulet:
 STR_FACE_MOUSTACHE                                              :Viikset:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Vaihda huulet tai viikset
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Vaihda huulet tai viikset
 STR_FACE_CHIN                                                   :Leuka:
-STR_FACE_CHIN_TIP                                               :{BLACK}Vaihda leuka
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Vaihda leuka
 STR_FACE_JACKET                                                 :Takki:
-STR_FACE_JACKET_TIP                                             :{BLACK}Vaihda takki
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Vaihda takki
 STR_FACE_COLLAR                                                 :Kaulus:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Vaihda kaulus
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Vaihda kaulus
 STR_FACE_TIE                                                    :Solmio:
 STR_FACE_EARRING                                                :Korvakoru:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Vaihda solmio tai korvakoru
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Vaihda solmio tai korvakoru
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Moninpeli
-STR_NETWORK_CONNECTION                                          :{BLACK}Yhteys:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Valitse internet-peli tai paikallisverkkopeli (LAN)
-STR_NETWORK_LAN                                                 :Lähiverkko
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Pelaajan nimi
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Pelaajat tunnistetaan ja erotetaan toisistaan nimien avulla.
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nimi
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Pelin nimi.
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Pelaajia
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Pelaajia online / pelaajia maks.{}Yhtiöitä online / yhtiöitä maks.
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kartan koko
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kartan koko{}Valitse lajitellaksi koon mukaan
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Päiväys
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Tämä päivä
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Vuosia
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Pelin kesto{}vuosina
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Kieli, palvelimen versio, jne.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Napsauta peliä luettelossa valitaksesi
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Edellinen palvelin:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Valitse tästä edellinen palvelin, jolla pelasit
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}PELITIEDOT
-STR_NETWORK_CLIENTS                                             :{SILVER}Pelaajat: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Kieli: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Ruudusto: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartan koko: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Palvelimen versio: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Palvelimen osoite: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Aloitusvuosi: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Päivämäärä: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Salasanasuojattu!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}PALVELIN KIINNI
-STR_NETWORK_SERVER_FULL                                         :{SILVER}PALVELIN TÄYNNÄ
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIO EI TÄSMÄÄ
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF EI TÄSMÄÄ
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Liity peliin
-STR_NETWORK_REFRESH                                             :{BLACK}Päivitä
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Päivitä palvelintiedot.
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Etsi palvelin
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Etsi palvelin verkosta.
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Lisää palvelin
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Lisää palvelin listaan, joka käydään läpi aina uusia pelejä haettaessa.
-STR_NETWORK_START_SERVER                                        :{BLACK}Käynnistä palvelin
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Käynnistä oma palvelin.
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Kirjoita nimesi
-STR_NETWORK_ENTER_IP                                            :{BLACK}Syötä palvelimen IP-osoite
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Moninpeli
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Yhteys:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Valitse internet-peli tai paikallisverkkopeli (LAN)
+STR_NETWORK_SERVER_LIST_LAN                                     :Lähiverkko
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Pelaajan nimi
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Pelaajat tunnistetaan ja erotetaan toisistaan nimien avulla.
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nimi
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Pelin nimi.
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Pelaajia
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Pelaajia online / pelaajia maks.{}Yhtiöitä online / yhtiöitä maks.
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kartan koko
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kartan koko{}Valitse lajitellaksi koon mukaan
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Päiväys
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Tämä päivä
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Vuosia
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Pelin kesto{}vuosina
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Kieli, palvelimen versio, jne.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Napsauta peliä luettelossa valitaksesi
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Edellinen palvelin:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Valitse tästä edellinen palvelin, jolla pelasit
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}PELITIEDOT
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Pelaajat: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Kieli: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Ruudusto: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kartan koko: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Palvelimen versio: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Palvelimen osoite: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Aloitusvuosi: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Päivämäärä: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Salasanasuojattu!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}PALVELIN KIINNI
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}PALVELIN TÄYNNÄ
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIO EI TÄSMÄÄ
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF EI TÄSMÄÄ
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Liity peliin
+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_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
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Käynnistä oma palvelin.
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Kirjoita nimesi
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Syötä palvelimen IP-osoite
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Aloita uusi peli
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Pelin nimi:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Nimi näytetään muille pelaajille moninpelivalikossa.
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Aseta salasana
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Jos peliin ei halua ulkopuolisia, voi sen suojata salasanalla.
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Valitse kartta:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Mitä karttaa haluat pelata?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Luo uusi satunnainen peli
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :Lähiverkko / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (mainosta)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} asiakas{P "" ta}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Pelaajien enimmäismäärä:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Pelaajien enimmäismäärä. Pelissä voi olla myös vähemmän pelaajia.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} yritys{P "" tä}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Yhtiöiden enimmäismäärä:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Rajoita yhtiöiden määrää palvelimella
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} katsoja{P "" a}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Katsojien enimmäismäärä:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Rajoita katsojien määrää palvelimella
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Puhuttu kieli:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Toiset pelaajat tietävät tästä, mitä kieltä palvelimella puhutaan.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Aloita peli
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Aloita uusi verkkopeli skenaariolla tai satunnaisella kartalla.
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Lataa peli
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Jatka aiemmin tallennettua moninpeliä (muista liittyä oikeana pelaajana).
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Syötä nimi verkkopelille
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Aloita uusi peli
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Pelin nimi:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nimi näytetään muille pelaajille moninpelivalikossa.
+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_SELECT_MAP                             :{BLACK}Valitse kartta:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Mitä karttaa haluat pelata?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Luo uusi satunnainen peli
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Lähiverkko / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (mainosta)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} asiakas{P "" ta}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Pelaajien enimmäismäärä:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Pelaajien enimmäismäärä. Pelissä voi olla myös vähemmän pelaajia.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} yritys{P "" tä}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Yhtiöiden enimmäismäärä:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Rajoita yhtiöiden määrää palvelimella
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} katsoja{P "" a}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Katsojien enimmäismäärä:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Rajoita katsojien määrää palvelimella
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Puhuttu kieli:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Toiset pelaajat tietävät tästä, mitä kieltä palvelimella puhutaan.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Aloita peli
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Aloita uusi verkkopeli skenaariolla tai satunnaisella kartalla.
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Lataa peli
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Jatka aiemmin tallennettua moninpeliä (muista liittyä oikeana pelaajana).
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Syötä nimi verkkopelille
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1575,32 +1575,32 @@ STR_NETWORK_LANG_LATVIAN                                        :latvia
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Moninpeliaula
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Valmistautuu yhdistämään: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista pelissä olevista yhtiöistä. Voit joko liittyä yhteen tai perustaa omasi.
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}YHTIÖN TIEDOT
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Yhtiön nimi: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Perustettu: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Yhtiön arvo: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nykyinen kate: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Viime vuoden tulot: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Suorite: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Liikenneväl.: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Asemat: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Pelaajat: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Uusi yhtiö
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Perusta uusi yhtiö.
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Seuraa peliä
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Seuraa pelin kulkua.
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Liity yhtiöön
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Auta tämän yhtiön hallinnassa.
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Moninpeliaula
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Valmistautuu yhdistämään: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Lista pelissä olevista yhtiöistä. Voit joko liittyä yhteen tai perustaa omasi.
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}YHTIÖN TIEDOT
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Yhtiön nimi: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Perustettu: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Yhtiön arvo: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Nykyinen kate: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Viime vuoden tulot: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Suorite: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Liikenneväl.: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Asemat: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Pelaajat: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Uusi yhtiö
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Perusta uusi yhtiö.
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Seuraa peliä
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Seuraa pelin kulkua.
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Liity yhtiöön
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Auta tämän yhtiön hallinnassa.
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Yhdistetään...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Yhdistetään...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Yhdistetään...
@@ -1616,13 +1616,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Haetaan
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} pelaaja{P "" a} jonossa
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} ladattu
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Pura yhteys
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Pura yhteys
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Palvelin on suojattu. Anna salasana
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Yhtiö on suojattu. Anna salasana
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Asiakaslista
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Asiakaslista
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Katsele
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Uusi Yhtiö
 
@@ -1644,18 +1644,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Syötä
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Älä tallenna syötettyä salasanaa
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Anna yhtiölle uusi salasana
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Yhtiön salasana
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Yhtiön oletussalasana
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Käytä tätä yhtiön salasanaa oletuksena uusissa yrityksissä
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Yhtiön oletussalasana
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Käytä tätä yhtiön salasanaa oletuksena uusissa yrityksissä
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Liity
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Liity ja pelaa tässä yhtiössä
-STR_COMPANY_PASSWORD                                            :{BLACK}Salasana
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Salasanalla voit suojata yhtiösi, jotta kukaan vieras ei pääse liittymään.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Aseta yhtiön salasana
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Liity
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Liity ja pelaa tässä yhtiössä
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Salasana
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Salasanalla voit suojata yhtiösi, jotta kukaan vieras ei pääse liittymään.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Aseta yhtiön salasana
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Lähetä
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Lähetä
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Joukkue] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Yksityinen] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Kaikki] :
@@ -1668,40 +1668,40 @@ STR_NETWORK_CHAT_ALL                                            :[Kaikki] {STRIN
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Syötä teksti verkkokeskustelua varten
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Verkkolaitteita ei löytynyt tai käännetty ilman ENABLE_NETWORK-valintaa
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Verkkopelejä ei löytynyt
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Palvelin ei vastannut pyyntöön
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Yhteyden muodostaminen epäonnistui NewGRF-virheen vuoksi
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Verkkopelin tahdistus epäonnistui
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Verkkopeliyhteys katkesi
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Palvelimen pelitallennetta ei voi ladata
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Palvelinta ei voitu käynnistää
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Yhdistäminen ei onnistunut
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Yhteys #{NUM} aikakatkaistiin
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Protokollavirhe tapahtui ja yhteys suljettiin
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Tämän asiakkaan versio ei vastaa palvelimen versiota
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Väärä salasana
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Palvelin on täynnä
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sinut on kielletty palvelimelta
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Sinut potkittiin pihalle palvelimelta
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Huijaaminen ei ole sallittua tällä palvelimella
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Verkkolaitteita ei löytynyt tai käännetty ilman ENABLE_NETWORK-valintaa
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Verkkopelejä ei löytynyt
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Palvelin ei vastannut pyyntöön
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Yhteyden muodostaminen epäonnistui NewGRF-virheen vuoksi
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Verkkopelin tahdistus epäonnistui
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Verkkopeliyhteys katkesi
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Palvelimen pelitallennetta ei voi ladata
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Palvelinta ei voitu käynnistää
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Yhdistäminen ei onnistunut
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Yhteys #{NUM} aikakatkaistiin
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Protokollavirhe tapahtui ja yhteys suljettiin
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Tämän asiakkaan versio ei vastaa palvelimen versiota
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Väärä salasana
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Palvelin on täynnä
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sinut on kielletty palvelimelta
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sinut potkittiin pihalle palvelimelta
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Huijaaminen ei ole sallittua tällä palvelimella
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :yleinen virhe
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :tahdistusvirhe
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :karttaa ei voitu ladata
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :yhteys katkesi
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollavirhe
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-virhe
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ei valtuutettu
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :vastaanotettiin omituinen paketti
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :väärä revisio
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nimi on jo käytössä
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :väärä salasana
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :väärä company-id DoCommandissa
-STR_NETWORK_ERR_CLIENT_KICKED                                   :palvelin potki pihalle
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :yritti käyttää huijausta
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :palvelin täynnä
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :yleinen virhe
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :tahdistusvirhe
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :karttaa ei voitu ladata
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :yhteys katkesi
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokollavirhe
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF-virhe
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ei valtuutettu
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :vastaanotettiin omituinen paketti
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :väärä revisio
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nimi on jo käytössä
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :väärä salasana
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :väärä company-id DoCommandissa
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :palvelin potki pihalle
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :yritti käyttää huijausta
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :palvelin täynnä
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1713,36 +1713,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Peli pysäytett
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Peliä jatketaan (asiakas yhdistänyt)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Peliä jatketaan (asiakkaan yhteys epäonnistui)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :poistutaan
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} on liittynyt peliin
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} on liittynyt yhtiöön #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} on liittynyt katselijoihin
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} on aloittanut uuden yhtiön (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} on poistunut pelistä ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} on muuttanut nimekseen {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} antoi yrityksellesi {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Annoit henkilölle {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Palvelin sulki istunnon
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Palvelin käynnistyy uudelleen...{}Odota, ole hyvä...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :poistutaan
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} on liittynyt peliin
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} on liittynyt yhtiöön #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} on liittynyt katselijoihin
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} on aloittanut uuden yhtiön (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} on poistunut pelistä ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} on muuttanut nimekseen {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} antoi yrityksellesi {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Annoit henkilölle {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Palvelin sulki istunnon
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Palvelin käynnistyy uudelleen...{}Odota, ole hyvä...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Sisällön lataus
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tyyppi
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Sisällön tyyppi
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Sisällön tyyppi
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nimi
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Sisällön nimi
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klikkaa kohtaa nähdäkesi lisätiedot{}Klikkaa valintaruutua valitaksesi sen ladattavaksi
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Sisällön nimi
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klikkaa kohtaa nähdäkesi lisätiedot{}Klikkaa valintaruutua valitaksesi sen ladattavaksi
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Valitse kaikki
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Merkitse kaikki sisältö ladattavaksi
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Merkitse kaikki sisältö ladattavaksi
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Valitse päivitykset
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Valitse kaikki sisältö, joka on päivitys nykyiseen sisältöön, ladattavaksi
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Valitse kaikki sisältö, joka on päivitys nykyiseen sisältöön, ladattavaksi
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Poista valinnat
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Poista kaikesta sisällöstä valinta ladattavaksi
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Poista kaikesta sisällöstä valinta ladattavaksi
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Syötä suodatin teksti
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Syötä avainsana suodattaaksesi listan
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Syötä avainsana suodattaaksesi listan
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tagi/nimi suodatus:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Lataa
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Aloita valitun sisällön lataaminen
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Aloita valitun sisällön lataaminen
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Latausten koko: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}TIETOA SISÄLLÖSTÄ
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Et ole valinnut tätä ladattavaksi
@@ -1786,17 +1786,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... tied
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Ei voitu purkaa ladattua tiedostoa
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Läpinäkyvyysvalinnat
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Muuta ajolinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Tee kohteista läpinäkyvyyden sijaan näkymättömiä
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Läpinäkyvyysvalinnat
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Muuta asemakylttien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Muuta puiden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Muuta talojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Muuta teollisuuden läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Muuta asemien, varikoiden, reittipisteiden ja sähkölinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Muuta siltojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Muuta rakenteiden, kuten majakoiden ja antennien, läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Muuta ajolinjojen läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Muuta lastausilmaisimien läpinäkyvyyttä. Ctrl+Click lukitaksesi.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Tee kohteista läpinäkyvyyden sijaan näkymättömiä
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Vaikutusalueen korostus
@@ -1808,11 +1808,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Vastaano
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Tuottaa: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Liitä asema
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Rakenna erillinen asema
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Liitä asema
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Rakenna erillinen asema
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Liitä reittipiste
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Rakenna erillinen reittipiste
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Liitä reittipiste
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Rakenna erillinen reittipiste
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Rautatien rakentaminen
@@ -1836,8 +1836,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Veturita
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Valitse veturitallin suunta.
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Reittipiste
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Valitse reittipisteen tyyppi
+STR_WAYPOINT_CAPTION                                            :{WHITE}Reittipiste
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Valitse reittipisteen tyyppi
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Rautatieaseman valinta
@@ -1850,36 +1850,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Valitse
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Vedä & Pudota
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Rakenna asema vetämällä ja pudottamalla.
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Valitse asemaluokka
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Valitse asematyyppi
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Valitse asemaluokka
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Valitse asematyyppi
 
-STR_STAT_CLASS_DFLT                                             :Oletusasema
-STR_STAT_CLASS_WAYP                                             :Reittipisteet
+STR_STATION_CLASS_DFLT                                          :Oletusasema
+STR_STATION_CLASS_WAYP                                          :Reittipisteet
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Opastimien valinta
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Blokkisignaali (siipiopastin){}Tämä on kaikkein alkeellisin signaali, joka sallii vain yhden junan samassa blokissa yhtä aikaa.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sisääntulo-opastin (siipiopastin){}Näyttää vihreää aina, kun yksi tai useampi seuraavan rataosuuden poistumisopastin näyttää vihreää. Muutoin näyttää punaista.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Poistumisopastin (siipiopastin){}Käyttäytyy samalla tavalla kuin blokkiopastin, mutta on välttämätön oikean valon näyttämiseen eri sisääntulo- ja yhdistelmäopastimissa.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Yhdistelmäopastin (siipiopastin){}Yhdistelmäopastin toimii yhtä aikaa sisääntulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita".
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Reittiopastin (siipiopastin){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Tavalliset reittiopastimet voi ohittaa takakautta.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Yksisuuntainen reittiopastin (siipiopastin){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Yksisuuntaisia opastimia ei voi ohittaa takakautta.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Blokkiopastin (sähköistetty){}Tämä on kaikkein tavallisin opastintyyppi, joka sallii vain yhden junan kulkevan samassa blokissa kerrallaan.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sisääntulo-opastin (sähköistetty){}Näyttää vihreää aina, kun yksi tai useampi seuraavan rataosuuden poistumisopastin näyttää vihreää. Muutoin näyttää punaista.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Poistumisopastin (sähköistetty){}Käyttäytyy samalla tavalla kuin blokkiopastin, mutta on välttämätön oikean valon näyttämiseen eri sisääntulo- ja yhdistelmäopastimissa.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Yhdistelmäopastin (sähköistetty){}Yhdistelmäopastin toimii yhtä aikaa sisääntulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita".
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Reittiopastin (sähköistetty){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Tavalliset reittiopastimet voi ohittaa takakautta.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Yksisuuntainen reittiopastin (sähköistetty){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Yksisuuntaisia opastimia ei voi ohittaa takakautta.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen klikkaaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Click vaihtaa nykyistä opastimen muotoa.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Opastimien tiheys vetämällä lisättäessä
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Pienennä opastimien tiheyttä vetämällä lisättäessä
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Suurenna opastimien tiheyttä vetämällä lisättäessä
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Opastimien valinta
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Blokkisignaali (siipiopastin){}Tämä on kaikkein alkeellisin signaali, joka sallii vain yhden junan samassa blokissa yhtä aikaa.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sisääntulo-opastin (siipiopastin){}Näyttää vihreää aina, kun yksi tai useampi seuraavan rataosuuden poistumisopastin näyttää vihreää. Muutoin näyttää punaista.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Poistumisopastin (siipiopastin){}Käyttäytyy samalla tavalla kuin blokkiopastin, mutta on välttämätön oikean valon näyttämiseen eri sisääntulo- ja yhdistelmäopastimissa.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Yhdistelmäopastin (siipiopastin){}Yhdistelmäopastin toimii yhtä aikaa sisääntulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita".
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Reittiopastin (siipiopastin){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Tavalliset reittiopastimet voi ohittaa takakautta.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Yksisuuntainen reittiopastin (siipiopastin){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Yksisuuntaisia opastimia ei voi ohittaa takakautta.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blokkiopastin (sähköistetty){}Tämä on kaikkein tavallisin opastintyyppi, joka sallii vain yhden junan kulkevan samassa blokissa kerrallaan.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sisääntulo-opastin (sähköistetty){}Näyttää vihreää aina, kun yksi tai useampi seuraavan rataosuuden poistumisopastin näyttää vihreää. Muutoin näyttää punaista.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Poistumisopastin (sähköistetty){}Käyttäytyy samalla tavalla kuin blokkiopastin, mutta on välttämätön oikean valon näyttämiseen eri sisääntulo- ja yhdistelmäopastimissa.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Yhdistelmäopastin (sähköistetty){}Yhdistelmäopastin toimii yhtä aikaa sisääntulo- ja poistumisopastimena. Tämän avulla on mahdollista luoda suuria "opastinpuita".
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Reittiopastin (sähköistetty){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Tavalliset reittiopastimet voi ohittaa takakautta.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Yksisuuntainen reittiopastin (sähköistetty){}Reittiopastin sallii useamman junan päästä opastinblokkiin samaan aikaan, jos junalle jää tilaa turvalliseen pysähtymiseen. Yksisuuntaisia opastimia ei voi ohittaa takakautta.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Opastinten muuntaminen{}Kun tämä on valittu, olemassaolevan opastimen klikkaaminen muuntaa siitä valituntyyppisen ja -muotoisen. Ctrl+Click vaihtaa nykyistä opastimen muotoa.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Opastimien tiheys vetämällä lisättäessä
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Pienennä opastimien tiheyttä vetämällä lisättäessä
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Suurenna opastimien tiheyttä vetämällä lisättäessä
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Valitse rautatiesilta.
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Valitse maantiesilta
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Sillan valinta - napsauta valittua siltaa rakentaaksesi sen.
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Sillan valinta - napsauta valittua siltaa rakentaaksesi sen.
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Riippusilta, terästä
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Palkki, terästä
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Ulokepalkki, terästä
@@ -1913,9 +1913,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Vaihda r
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Autovarikon suunta
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Valitse autovarikon suunta.
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Valitse autovarikon suunta.
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Varikon suunta
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Valitse varikon suunta
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Valitse varikon suunta
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Linja-autoaseman suunta
@@ -1936,8 +1936,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Rakenna
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Rakenna satama
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Sijoita poiju; sitä voidaan käyttää ylimääräisenä opasteena.
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Rakenna akvedukti
-STR_CREATE_LAKE                                                 :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos Ctrl on alaspainettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
-STR_CREATE_RIVER                                                :{BLACK}Sijoita jokia.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Määrittele vesialue.{}Tee kanava, paitsi jos Ctrl on alaspainettuna merenpinnalla. Tällöin meri laajenee ympäristöön.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Sijoita jokia.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Telakan suunta
@@ -1969,20 +1969,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Isot len
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Keskuslentokenttä
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopterikentät
 
-STR_STATION_NOISE                                               :{BLACK}Aiheutettu melu: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Aiheutettu melu: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Maastonmuokkaus
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Madalla ruudun kulmausta.
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Korota ruudun kulmausta.
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Tasoita maata
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Osta maata tulevaa käyttöä varten.
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Madalla ruudun kulmausta.
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Korota ruudun kulmausta.
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Tasoita maata
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Osta maata tulevaa käyttöä varten.
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Puita
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Valitse istutettava puutyyppi.
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Sattumanvaraisia puita
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Aseta sattumanvaraisia puita
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Aseta sattumanvaraisia puita
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Satunnaisia puita.
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Istuta puita satunnaisesti maastoon.
 
@@ -1995,9 +1995,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Sijoita
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Suurenna madallettavan/korotettavan maa-alueen kokoa.
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Pienennä madallettavan/korotettavan maa-alueen kokoa.
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Luo satunnainen maa
-STR_SE_NEW_WORLD                                                :{BLACK}Luo uusi skenaario
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Luo uusi skenaario
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Nollaa maasto
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Poista kaikki pelaaja-omisteiset tontit kartalta
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Poista kaikki pelaaja-omisteiset tontit kartalta
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Nollaa maasto
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Haluatko varmasti poistaa kaikki pelaaja-omisteiset tontit?
@@ -2008,41 +2008,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Uusi kau
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Rakenna uusi kaupunki
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Satunnainen kaupunki
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Rakenna kaupunki satunnaiseen paikkaan
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Monta satunnaista kaupunkia
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Peitä kartta satunnaisesti sijoitetuilla kaupungeilla.
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Monta satunnaista kaupunkia
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Peitä kartta satunnaisesti sijoitetuilla kaupungeilla.
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Kaupungin koko:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Pieni
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Keskisuuri
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Suuri
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Sattumanvarainen
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Sattumanvarainen
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Valitse kaupungin koko.
 STR_FOUND_TOWN_CITY                                             :{BLACK}Kaupunki
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Suurkaupungit kasvavat nopeammin kuin tavalliset kaupungit{}Asetuksista riippuen, ne ovat suurempia perustettaessa
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Kaupungin tiekaava:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Valitse tiekaava tälle kaupungille
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Alkuperäinen
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Parempia teitä
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 ruudukko
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 ruudukko
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Sattumanvarainen
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Kaupungin tiekaava:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Valitse tiekaava tälle kaupungille
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Alkuperäinen
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Parempia teitä
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 ruudukko
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 ruudukko
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Sattumanvarainen
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Rakenna uutta teollisuutta
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Valitse tehdas listasta
-STR_MANY_RANDOM_INDUSTRIES                                      :Monta satunnaista teollisuusaluetta
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Peitä kartta satunnaisesti sijoitetuilla teollisuusalueilla.
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kustannus: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Koekaivaus
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Rakenna
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Perusta
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Valitse tehdas listasta
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Monta satunnaista teollisuusaluetta
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Peitä kartta satunnaisesti sijoitetuilla teollisuusalueilla.
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kustannus: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Koekaivaus
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Rakenna
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Perusta
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Maa-aluetiedot
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Puhdistuksen hinta: {LTBLUE}-
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Puhdistuksen hinta: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Tulo kun tyhjennetty: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Tulo kun tyhjennetty: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :-
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Omistaja: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Tien omistaja: {LTBLUE}{STRING}
@@ -2050,104 +2050,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Raitioti
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Junaradan omistaja: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Kunta: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ei mitään
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinaatit: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Rakennettu: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Aseman luokka: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Aseman tyyppi: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinaatit: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Rakennettu: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Aseman luokka: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Aseman tyyppi: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Vastaanottaa rahtia: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Kalliota
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Epätasaista maata
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Paljasta maata
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Ruohikkoa
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Peltoja
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Lumen peittämää maata
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Aavikkoa
-
-STR_RAILROAD_TRACK                                              :Rautatie
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rautatie blokkiopasteilla
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rautatie esiopastimin
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Rautatie poistumisopastimin
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Rautatie yhdistelmäopastein
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Rautatiekiskot reittiopastimilla
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Rautatiekiskot yksisuuntaisilla reittiopastimilla
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Rautatie blokki- ja sisääntulo-opasteilla
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Rautatie blokki- ja poistumisopasteilla
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Rautatie blokki- ja yhdistelmäopasteilla
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Rautatieraiteet blokki- ja reittiopastimilla
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Rautatieraiteet blokki- ja yksisuuntaisilla reittiopastimilla
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Rautatie esi- ja poistumissignaaleilla
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Rautatie esi- ja yhdistelmäopastein
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Rautatieraiteet ehto- ja reittiopastimilla
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Rautatieraiteet ehto- ja yksisuuntaisopastimilla
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Rautatie poistumis- ja yhdistelmäopastein
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Rautatieraiteet poistumis- ja reittiopastimilla
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Rautatieraiteet poistumis- ja yksisuuntaisopastimilla
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Rautatieraiteet yhdistelmä- ja reittiopastimilla
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Rautatieraiteet yhdistelmä- ja yksisuuntaisopastimilla
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Rautatieraiteet reitti- ja yksisuuntaisopastimilla
-STR_RAILROAD_TRAIN_DEPOT                                        :Veturitalli
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Tie
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Tie katuvaloilla
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Puilla reunustettu tie
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Autovarikko
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Tasoristeys
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Raitiotie
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kalliota
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Epätasaista maata
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Paljasta maata
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Ruohikkoa
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Peltoja
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Lumen peittämää maata
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Aavikkoa
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Rautatie
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Rautatie blokkiopasteilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Rautatie esiopastimin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Rautatie poistumisopastimin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Rautatie yhdistelmäopastein
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Rautatiekiskot reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Rautatiekiskot yksisuuntaisilla reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Rautatie blokki- ja sisääntulo-opasteilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Rautatie blokki- ja poistumisopasteilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Rautatie blokki- ja yhdistelmäopasteilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Rautatieraiteet blokki- ja reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Rautatieraiteet blokki- ja yksisuuntaisilla reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Rautatie esi- ja poistumissignaaleilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Rautatie esi- ja yhdistelmäopastein
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Rautatieraiteet ehto- ja reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Rautatieraiteet ehto- ja yksisuuntaisopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Rautatie poistumis- ja yhdistelmäopastein
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Rautatieraiteet poistumis- ja reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Rautatieraiteet poistumis- ja yksisuuntaisopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Rautatieraiteet yhdistelmä- ja reittiopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Rautatieraiteet yhdistelmä- ja yksisuuntaisopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Rautatieraiteet reitti- ja yksisuuntaisopastimilla
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Veturitalli
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Tie
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Tie katuvaloilla
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Puilla reunustettu tie
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Autovarikko
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Tasoristeys
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Raitiotie
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (rakennusvaiheessa)
-
-STR_TREE_NAME_TREES                                             :Puita
-STR_TREE_NAME_RAINFOREST                                        :Sademetsää
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktuksia
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Rautatieasema
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Lentokonesuoja
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lentokenttä
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Lastauslaituri
-STR_STATION_DESCRIPTION_BUS_STATION                             :Linja-autoasema
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Satama
-STR_STATION_DESCRIPTION_BUOY                                    :Poiju
-STR_LANDINFO_WAYPOINT                                           :Reittipiste
-
-STR_WATER_DESCRIPTION_WATER                                     :Vettä
-STR_LANDINFO_CANAL                                              :Kanaali
-STR_LANDINFO_LOCK                                               :Sulku
-STR_LANDINFO_RIVER                                              :Joki
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Rannikko tai joenpenkka
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Telakka
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (rakennusvaiheessa)
+
+STR_LAI_TREE_NAME_TREES                                         :Puita
+STR_LAI_TREE_NAME_RAINFOREST                                    :Sademetsää
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktuksia
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Rautatieasema
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Lentokonesuoja
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lentokenttä
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lastauslaituri
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Linja-autoasema
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Satama
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Poiju
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Reittipiste
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vettä
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanaali
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sulku
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Joki
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Rannikko tai joenpenkka
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Telakka
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Rautatietunneli
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Maantietunneli
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Rautatietunneli
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Maantietunneli
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Teräksinen rautatieriippusilta
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Teräksinen rautatiepalkkisilta
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Teräksinen rautatieulokepalkkisilta
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Vahvennettu betoninen rautatieriippusilta
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Puinen rautatiesilta
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betoninen rautatiesilta
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Putkirakenteinen rautatiesilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Teräksinen rautatieriippusilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Teräksinen rautatiepalkkisilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Teräksinen rautatieulokepalkkisilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Vahvennettu betoninen rautatieriippusilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Puinen rautatiesilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betoninen rautatiesilta
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Putkirakenteinen rautatiesilta
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Teräksinen maantieriippusilta
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Teräksinen maantiepalkkisilta
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Teräksinen maantieulokepalkkisilta
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Vahvennettu betoninen maantieriippusilta
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Puinen maantiesilta
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betoninen maantiesilta
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Putkirakenteinen maantiesilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Teräksinen maantieriippusilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Teräksinen maantiepalkkisilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Teräksinen maantieulokepalkkisilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Vahvennettu betoninen maantieriippusilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Puinen maantiesilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betoninen maantiesilta
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Putkirakenteinen maantiesilta
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvedukti
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvedukti
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Lähetin
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Majakka
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Yhtiön päärakennus
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Yhtiön omistamaa maata
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Lähetin
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Majakka
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Yhtiön päärakennus
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Yhtiön omistamaa maata
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Tietoja OpenTTD:stä
@@ -2160,7 +2160,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Tallenna
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Lataa peli
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Tallenna skenaario
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Lataa skenaario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Lataa korkeuskartta
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Lataa korkeuskartta
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Siirry tallennusten oletuskansioon napsauttamalla tätä
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} vapaana
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista asemista, hakemistoista ja tallennetuista peleistä.
@@ -2170,119 +2170,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Poista v
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Tallenna
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Tallenna nykyinen peli käyttäen valittua nimeä.
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Syötä nimi tallennustiedostolle
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Syötä nimi tallennustiedostolle
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Maailman luominen
-STR_MAPSIZE                                                     :{BLACK}Kartan koko:
-STR_BY                                                          :{BLACK}×
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Kaupungit:
-STR_DATE                                                        :{BLACK}Päivämäärä:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Teollisuus:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Lumilinjan korkeus:
-STR_SNOW_LINE_UP                                                :{BLACK}Siirrä lumilinjaa yksi ylöspäin
-STR_SNOW_LINE_DOWN                                              :{BLACK}Siirrä lumilinjan korkeutta yksi alaspäin
-STR_RANDOM_SEED                                                 :{BLACK}Satunnaisluku-siemen:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klikkaa antaaksesi satunnaisluku-siemen
-STR_RANDOM                                                      :{BLACK}Satunnainen
-STR_RANDOM_HELP                                                 :{BLACK}Vaihda maaston luomisessa käytettävä satunnaisluku-siemen
-STR_LAND_GENERATOR                                              :{BLACK}Maageneraattori:
-STR_TREE_PLACER                                                 :{BLACK}Puiden algoritmi:
-STR_TERRAIN_TYPE                                                :{BLACK}Maaston tyyppi:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Merenpinta:
-STR_SMOOTHNESS                                                  :{BLACK}Tasaisuus:
-STR_GENERATE                                                    :{WHITE}Generoi
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Maailman luominen
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kartan koko:
+STR_MAPGEN_BY                                                   :{BLACK}×
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Kaupungit:
+STR_MAPGEN_DATE                                                 :{BLACK}Päivämäärä:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Teollisuus:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Lumilinjan korkeus:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Siirrä lumilinjaa yksi ylöspäin
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Siirrä lumilinjan korkeutta yksi alaspäin
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Satunnaisluku-siemen:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klikkaa antaaksesi satunnaisluku-siemen
+STR_MAPGEN_RANDOM                                               :{BLACK}Satunnainen
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Vaihda maaston luomisessa käytettävä satunnaisluku-siemen
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Maageneraattori:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Puiden algoritmi:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Maaston tyyppi:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Merenpinta:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Tasaisuus:
+STR_MAPGEN_GENERATE                                             :{WHITE}Generoi
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kartan reunat:
-STR_NORTHWEST                                                   :{BLACK}Luode
-STR_NORTHEAST                                                   :{BLACK}Koillinen
-STR_SOUTHEAST                                                   :{BLACK}Kaakko
-STR_SOUTHWEST                                                   :{BLACK}Lounas
-STR_BORDER_FREEFORM                                             :{BLACK}Vapaa
-STR_BORDER_WATER                                                :{BLACK}Vesi
-STR_BORDER_RANDOM                                               :{BLACK}Sattumanvarainen
-STR_BORDER_RANDOMIZE                                            :{BLACK}Sattumanvarainen
-STR_BORDER_MANUAL                                               :{BLACK}Manuaalinen
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Korkeuskartan kierto:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Korkeuskartan nimi:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Koko: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Syötä satunnaissiemen
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Vaihda lumilinjan korkeutta
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Vaihda aloitusvuosi
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kartan reunat:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Luode
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Koillinen
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Kaakko
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Lounas
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Vapaa
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vesi
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Sattumanvarainen
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Sattumanvarainen
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuaalinen
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Korkeuskartan kierto:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Korkeuskartan nimi:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Koko: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Syötä satunnaissiemen
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Vaihda lumilinjan korkeutta
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Vaihda aloitusvuosi
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Skenaarion tyyppi
-STR_SE_FLAT_WORLD                                               :{WHITE}Tasainen maa
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Luo tasainen maa
-STR_SE_RANDOM_LAND                                              :{WHITE}Satunnainen maa
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Tasaisen maan korkeus:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Siirrä tasaista maata yksi alaspäin
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Siirrä tasaista maata yksi ylöspäin
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Skenaarion tyyppi
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Tasainen maa
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Luo tasainen maa
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Satunnainen maa
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Tasaisen maan korkeus:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Siirrä tasaista maata yksi alaspäin
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Siirrä tasaista maata yksi ylöspäin
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Vaihda tasaisen maan korkeutta
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Vaihda tasaisen maan korkeutta
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Maailmaa luodaan...
 STR_GENERATION_ABORT                                            :{BLACK}Peruuta
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Keskeytä maan luominen
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Haluatko varmasti keskeyttää maan luomisen?
-STR_PROGRESS                                                    :{WHITE}{NUM}% valmiina
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Maailman luominen
-STR_TREE_GENERATION                                             :{BLACK}Puiden luominen
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Siirtämättömän luominen
-STR_CLEARING_TILES                                              :{BLACK}Karun ja kivisen alueen luominen
-STR_SETTINGUP_GAME                                              :{BLACK}Valmistellaan peliä
-STR_PREPARING_TILELOOP                                          :{BLACK}Ajetaan tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Valmistellaan peliä
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% valmiina
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Maailman luominen
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Puiden luominen
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Siirtämättömän luominen
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Karun ja kivisen alueen luominen
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Valmistellaan peliä
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Ajetaan tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Valmistellaan peliä
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-asetukset
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Lataa valittu valmislista
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Tallenna valmislistaksi
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Tallenna nykyinen lista valmislistaksi
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Syötä nimi valmislistalle
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Poista valmislista
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Poista valittu valmislista
-STR_NEWGRF_ADD                                                  :{BLACK}Lisää
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Lisää NewGRF-tiedosto listaan
-STR_NEWGRF_REMOVE                                               :{BLACK}Poista
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Poista valittu NewGRF-tiedosto listalta
-STR_NEWGRF_MOVEUP                                               :{BLACK}Siirrä ylös
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa ylöspäin
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Siirrä alas
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa alaspäin
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Lista asennetuista NewGRF-tiedostoista. Valitse tiedosto muokataksesi sen parametreja.
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Aseta parametrit
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Käytä eri palettia
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Käytä valitun NewGRF:n kanssa eri palettia.{}Tee näin, jos tämän NewGRF:n grafiikat näkyvät pelissä vaaleanpunaisina.
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Ota käyttöön
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Etsi puuttuvaa sisältöä online-palvelusta
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Tarkista löytyykö puuttuvaa sisältöä online-palvelusta
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Tiedostonimi: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5-summa: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paletti: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametrit: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ei tietoa
-STR_NEWGRF_NOT_FOUND                                            :{RED}Sopivaa tiedostoa ei löydy
-STR_NEWGRF_DISABLED                                             :{RED}Ei käytössä
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Anna NewGRF-parametrit
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Lataa valittu valmislista
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Tallenna valmislistaksi
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Tallenna nykyinen lista valmislistaksi
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Syötä nimi valmislistalle
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Poista valmislista
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Poista valittu valmislista
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Lisää
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Lisää NewGRF-tiedosto listaan
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Poista
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Poista valittu NewGRF-tiedosto listalta
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Siirrä ylös
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa ylöspäin
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Siirrä alas
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Siirrä valittua NewGRF-tiedostoa listassa alaspäin
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista asennetuista NewGRF-tiedostoista. Valitse tiedosto muokataksesi sen parametreja.
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Aseta parametrit
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Käytä eri palettia
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Käytä valitun NewGRF:n kanssa eri palettia.{}Tee näin, jos tämän NewGRF:n grafiikat näkyvät pelissä vaaleanpunaisina.
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Ota käyttöön
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Etsi puuttuvaa sisältöä online-palvelusta
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Tarkista löytyykö puuttuvaa sisältöä online-palvelusta
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Tiedostonimi: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5-summa: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paletti: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametrit: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ei tietoa
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Sopivaa tiedostoa ei löydy
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Ei käytössä
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Anna NewGRF-parametrit
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}NewGRF-tiedostot
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Lisää valintaan
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Lisää valittu NewGRF-tiedosto peliin
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Päivitä
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Päivitä saatavilla olevien NewGRF-tiedostojen lista
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Lisää valittu NewGRF-tiedosto peliin
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Päivitä
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Päivitä saatavilla olevien NewGRF-tiedostojen lista
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2306,7 +2306,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sisältää useamman Action 8 -kohdan.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varoitus!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varoitus!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Olet tekemässä muutoksia käynnissä olevaan peliin. OpenTTD voi kaatua.{}Oletko varma?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ei voi lisätä tiedostoa: duplicate GRF ID
@@ -2331,10 +2331,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Kylttili
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Muokkaa kyltin tekstiä.
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Siirry seuraavaan kylttiin
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Siirry edelliseen kylttiin
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Siirry seuraavaan kylttiin
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Siirry edelliseen kylttiin
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Syötä kyltin nimi
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Syötä kyltin nimi
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Kaupungit
@@ -2348,10 +2348,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Asukasluku: {ORANGE}{COMMA}{BLACK}  Taloja: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Matkustajia viime kuussa: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Postia viime kuussa: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Kaupungin kasvuun tarvittava rahti:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} vaadittu
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} kuljetettu viime kuussa
-STR_NOISE_IN_TOWN                                               :{BLACK}Meluraja kaupungissa: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Kaupungin kasvuun tarvittava rahti:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} vaadittu
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} kuljetettu viime kuussa
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Meluraja kaupungissa: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Keskitä näkymä kaupungkiin.
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Viranomaiset
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Näytä tietoja paikallisviranomaisista.
@@ -2398,18 +2398,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Ei mitään
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Käytetyt tuet:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} välille {STATION}-{STATION}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} asti)
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Napsauta palvelussa keskittääksesi näkymän teollisuuteen/kaupunkiin.
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Napsauta palvelussa keskittääksesi näkymän teollisuuteen/kaupunkiin.
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Asemien nimet - napsauta nimeä keskittääksesi näkymän asemaan.
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Pidä Ctrl painettuna valitaksesi useamman kuin yhden vaihtoehdon
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Pidä Ctrl painettuna valitaksesi useamman kuin yhden vaihtoehdon
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} asema{P "" a}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Ei mitään -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Valitse kaikki laitteet
-STR_SELECT_ALL_TYPES                                            :{BLACK}Valitse kaikki lastityypit (myös odottava lasti)
-STR_NO_WAITING_CARGO                                            :{BLACK}Minkäänlaista lastia ei ole odottamassa
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Valitse kaikki laitteet
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Valitse kaikki lastityypit (myös odottava lasti)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Minkäänlaista lastia ei ole odottamassa
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2440,18 +2440,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Loistava
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Keskitä näkymä aseman sijaintiin.
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Muuta aseman nimi.
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Näytä kaikki junat, joilla on asema aikataulussaan.
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Näytä kaikki autot, joilla on asema aikataulussaan.
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Näytä kaikki lentokoneet, joilla on asema aikataulussaan.
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Näytä kaikki laivat, joilla on asema aikataulussaan.
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Näytä kaikki junat, joilla on asema aikataulussaan.
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Näytä kaikki autot, joilla on asema aikataulussaan.
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Näytä kaikki lentokoneet, joilla on asema aikataulussaan.
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Näytä kaikki laivat, joilla on asema aikataulussaan.
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Nimeä asema/lastausalue
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Nimeä asema/lastausalue
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Keskitä ruutu reittipisteen sijaintiin
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Muuta reittipisteen nimeä
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Muuta reittipisteen nimeä
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Keskitä ruutu poijun sijaintiin
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Vaihda poijun nimeä
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Vaihda poijun nimeä
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Muokkaa reittipisteen nimeä
 
@@ -2477,7 +2477,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Yhteensä:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Tilin saldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Laina
-STR_MAX_LOAN                                                    :{WHITE}Laina enimmillään: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Laina enimmillään: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Lainaa {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Ota lisää lainaa. Ctrl+Click lisää lainaa niin paljon kuin mahdollista
@@ -2491,10 +2491,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Avattu: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Väriteema:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Liikenneväl.:
-STR_TRAINS                                                      :{WHITE}{COMMA} juna{P "" a}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} ajoneuvo{P "" a}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} lentokone{P "" tta}
-STR_SHIPS                                                       :{WHITE}{COMMA} laiva{P "" a}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} juna{P "" a}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} ajoneuvo{P "" a}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lentokone{P "" tta}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} laiva{P "" a}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ei mitään
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Yhtiön arvo: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}{NBSP}%:n omistus: {COMPANY})
@@ -2502,8 +2502,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Rakenna päämaja
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Näytä päämaja
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Rakenna yhtiön päärakennus / näytä yhtiön päärakennus.
-STR_RELOCATE_HQ                                                 :{BLACK}Sijoita päämaja
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Rakenna yhtiön päärakennus muualle, hintana 1{NBSP}% yhtiön arvosta.
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Sijoita päämaja
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Rakenna yhtiön päärakennus muualle, hintana 1{NBSP}% yhtiön arvosta.
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Uudet kasvot
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Valitse uudet kasvot pääjohtajalle.
@@ -2519,17 +2519,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Myy 25{N
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Osta 25{NBSP}%:n osuus tästä yhtiöstä
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Myy 25{NBSP}%:n osuus tästä yhtiöstä
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Yhtiön nimi
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Pääjohtajan nimi
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Yhtiön nimi
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Pääjohtajan nimi
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Etsimme kuljetusyhtiötä, joka ottaisi haltuunsa yhtiömme{}{}Haluatko ostaa yhtiön {COMPANY} hintaan {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Teollisuusala
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% kuljetettu)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Teollisuusmuotojen nimet - paina nimeä kohdistaaksesi kuvakulman teollisuuslaitokseen
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Teollisuusala
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% kuljetettu)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% kuljetettu)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Teollisuusmuotojen nimet - paina nimeä kohdistaaksesi kuvakulman teollisuuslaitokseen
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2565,26 +2565,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Lentokon
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Voittoa tänä vuonna: {CURRENCY} (viime vuonna: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Käytett. Junat
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Käytett. Ajoneuvot
-STR_AVAILABLE_SHIPS                                             :{BLACK}Käytett. Laivat
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Käytett. Ilma-alukset
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Näytä lista saatavilla olevista moottorityypeistä tälle ajoneuvotyypille.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Käytett. Junat
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Käytett. Ajoneuvot
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Käytett. Laivat
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Käytett. Ilma-alukset
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Näytä lista saatavilla olevista moottorityypeistä tälle ajoneuvotyypille.
 
-STR_MANAGE_LIST                                                 :{BLACK}Muokkaa listaa
-STR_MANAGE_LIST_TIP                                             :{BLACK}Ohjaa kaikkia listan ajoneuvoja
-STR_REPLACE_VEHICLES                                            :Korvaa liikenneväl.
-STR_SEND_FOR_SERVICING                                          :Lähetä huoltoon
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Muokkaa listaa
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Ohjaa kaikkia listan ajoneuvoja
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Korvaa liikenneväl.
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Lähetä huoltoon
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Lähetä varikolle
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Lähetä varikolle
-STR_SEND_SHIP_TO_DEPOT                                          :Lähetä varikolle
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Lähetä varikolle
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Lähetä varikolle
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Lähetä varikolle
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Lähetä varikolle
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Lähetä varikolle
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Pysäytä kaikki listalla olevat kulkuneuvot klikkaamalla
-STR_MASS_START_LIST_TIP                                         :{BLACK}Käynnistä kaikki listalla olevat ajoneuvot klikkaamalla
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Pysäytä kaikki listalla olevat kulkuneuvot klikkaamalla
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Käynnistä kaikki listalla olevat ajoneuvot klikkaamalla
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} ajoneuvon jaettu aikataulu
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA} ajoneuvon jaettu aikataulu
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Kaikki junat
@@ -2597,11 +2597,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Muut autot
 STR_GROUP_DEFAULT_SHIPS                                         :Muut laivat
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Muut lentokoneet
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Ryhmät - klikkaa ryhmää nähdäksesi kaikki kulkuneuvot tässä ryhmässä
-STR_GROUP_CREATE_TIP                                            :{BLACK}Luo ryhmä
-STR_GROUP_DELETE_TIP                                            :{BLACK}Poista valittu ryhmä
-STR_GROUP_RENAME_TIP                                            :{BLACK}Nimeä valittu ryhmä
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Poista ryhmä automaattisesti korvattavien joukosta
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Ryhmät - klikkaa ryhmää nähdäksesi kaikki kulkuneuvot tässä ryhmässä
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Luo ryhmä
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Poista valittu ryhmä
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Nimeä valittu ryhmä
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Poista ryhmä automaattisesti korvattavien joukosta
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Lisää jaettuja ajoneuvoja
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Poista kaikki ajoneuvot
@@ -2624,7 +2624,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Nopeus:
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Nopeus: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Käyttökukustannus: {GOLD}{CURRENCY}/vuosi
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasiteetti: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(sovitettava)
+STR_PURCHASE_INFO_REFITTABLE                                    :(sovitettava)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Suunniteltu: {GOLD}{NUM}{BLACK} Elinikä: {GOLD}{COMMA} vuotta
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Enimmäisluotettavuus: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kulu: {GOLD}{CURRENCY}
@@ -2688,17 +2688,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Vedä aj
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Vedä laiva tähän myydäksesi sen.
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Vedä lentokone tähän myydäksesi sen.
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Vedä junan veturi tähän myydäksesi koko junan.
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Vedä junan veturi tähän myydäksesi koko junan.
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Myy kaikki varikolla olevat junat
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Myy kaikki varikolla olevat ajoneuvot
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Myy kaikki telakalla olevat laivat
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Myy kaikki hallissa olevat ilma-alukset
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Myy kaikki varikolla olevat junat
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Myy kaikki varikolla olevat ajoneuvot
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Myy kaikki telakalla olevat laivat
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Myy kaikki hallissa olevat ilma-alukset
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Korvaa kaikki varikolla olevat junat automaattisesti
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Korvaa kaikki varikolla olevat ajoneuvot automaattisesti
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Korvaa kaikki telakalla olevat laivat automaattisesti
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Korvaa kaikki hallissa olevat lento-alukset automaattisesti
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Korvaa kaikki varikolla olevat junat automaattisesti
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Korvaa kaikki varikolla olevat ajoneuvot automaattisesti
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Korvaa kaikki telakalla olevat laivat automaattisesti
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Korvaa kaikki hallissa olevat lento-alukset automaattisesti
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Uusia liikennevälineitä
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Uusia ajoneuvoja
@@ -2710,35 +2710,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Rakenna
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Rakenna uusi laiva
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Rakenna uusi lentokone
 
-STR_CLONE_TRAIN                                                 :{BLACK}Kloonaa juna
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloonaa ajoneuvo
-STR_CLONE_SHIP                                                  :{BLACK}Kloonaa laiva
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloonaa lentokone
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kloonaa juna
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloonaa ajoneuvo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloonaa laiva
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloonaa lentokone
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tämä rakentaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tämä rakentaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tämä rakentaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Paina tätä nappia ja sen jälkeen junaa varikon sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tämä rakentaa kopion ajoneuvosta. Paina tätä nappia ja sen jälkeen ajoneuvoa varikon sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Tämä rakentaa kopion laivasta. Paina tätä nappia ja sen jälkeen laivaa telakan sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Tämä rakentaa kopion lentokoneesta. Paina tätä nappia ja sen jälkeen lentokonetta lentokonehallin sisä- tai ulkopuolella. Ctrl+Click jakaa komennot
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Keskitä näkymä veturitallin sijaintiin.
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Keskitä päänäkymä huoltoaseman sijaintiin.
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Keskitä näkymä telakan sijaintiin.
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Keskitä näkymä lentokonehallin sijaintiin.
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Näytä tällä asemalla olevien junien käskyt
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Näytä tässä terminaalissa olevien ajoneuvojen käskyt
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Näytä tässä terminaalissa olevien laivojen käskyt
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Näytä tämän lentokentän ilma-alusten käskyistä hallista riippumatta
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Näytä tällä asemalla olevien junien käskyt
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Näytä tässä terminaalissa olevien ajoneuvojen käskyt
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Näytä tässä terminaalissa olevien laivojen käskyt
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Näytä tämän lentokentän ilma-alusten käskyistä hallista riippumatta
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pysäytä kaikki varikolla olevat junat klikkaamalla
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Pysäytä kaikki varikolla olevat ajoneuvot klikkaamalla
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Pysäytä kaikki telakalla olevat laivat klikkaamalla
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Pysäytä kaikki hallissa olevat ilma-alukset klikkaamalla
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Pysäytä kaikki varikolla olevat junat klikkaamalla
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Pysäytä kaikki varikolla olevat ajoneuvot klikkaamalla
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Pysäytä kaikki telakalla olevat laivat klikkaamalla
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Pysäytä kaikki hallissa olevat ilma-alukset klikkaamalla
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Käynnistä kaikki varikolla olevat junat klikkaamalla
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Käynnistä kaikki varikolla olevat ajoneuvot klikkaamalla
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Käynnistä kaikki telakalla olevat laivat klikkaamalla
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Käynnistä kaikki hallissa olevat ilma-alukset klikkaamalla
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Käynnistä kaikki varikolla olevat junat klikkaamalla
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Käynnistä kaikki varikolla olevat ajoneuvot klikkaamalla
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Käynnistä kaikki telakalla olevat laivat klikkaamalla
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Käynnistä kaikki hallissa olevat ilma-alukset klikkaamalla
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Olet myymässä kaikki varikon ajoneuvot. Oletko varma?
 
@@ -2752,38 +2752,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :laivan
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :yksiraiteisen veturin
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :maglev-veturin
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kulu: {CURRENCY} Paino: {WEIGHT_S}{}Nopeus: {VELOCITY}  Teho: {POWER}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Hinta: {CURRENCY} Maks. Nopeus: {VELOCITY}{}Kapasiteetti: {CARGO}, {CARGO}{}Käyttökustannukset: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Hinta: {CURRENCY} Maks. Nopeus: {VELOCITY}{}Kapasiteetti: {CARGO}{}Käyttökustannukset: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kulu: {CURRENCY} Paino: {WEIGHT_S}{}Nopeus: {VELOCITY}  Teho: {POWER}{}Käyttökustannukset: {CURRENCY}/vuosi{}Kapasiteetti: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Hinta: {CURRENCY} Maks. Nopeus: {VELOCITY}{}Kapasiteetti: {CARGO}, {CARGO}{}Käyttökustannukset: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Hinta: {CURRENCY} Maks. Nopeus: {VELOCITY}{}Kapasiteetti: {CARGO}{}Käyttökustannukset: {CURRENCY}/yr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Korvaa {STRING}
-STR_VEHICLE_TRAIN                                               :Juna
-STR_VEHICLE_ROAD_VEHICLE                                        :Ajoneuvo
-STR_VEHICLE_SHIP                                                :Laiva
-STR_VEHICLE_AIRCRAFT                                            :Lentokone
+STR_REPLACE_VEHICLE_TRAIN                                       :Juna
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Ajoneuvo
+STR_REPLACE_VEHICLE_SHIP                                        :Laiva
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Lentokone
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Valitse korvattava veturityyppi.
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Valitse vasemmalla näkyvän veturityypinn korvaava uusi veturityyppi.
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Aloita ajoneuvojen korv.
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Napsauta aloittaaksesi vasemmalta valitun veturityypin korvauksen oikealta valitulla veturityypillä.
-STR_NOT_REPLACING                                               :{BLACK}Ei korvata
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ei liikennevälinettä valittuna
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ei korvata
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ei liikennevälinettä valittuna
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Lopeta ajoneuvojen korv.
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Napsauta pysäyttääksesi vasemmalta valitun veturityypin korvauksen.
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Korvataan: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Vaihda toiseen korvausikkunaan
-STR_ENGINES                                                     :Veturit
-STR_WAGONS                                                      :Vaunut
+STR_REPLACE_ENGINES                                             :Veturit
+STR_REPLACE_WAGONS                                              :Vaunut
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Valitse rautatietyyppi, jolle veturikorvaukset tehdään.
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Näyttää, millä vasemmalta valittu veturi korvataan, jos millään.
-STR_RAIL_VEHICLES                                               :Rautatiejunat
-STR_ELRAIL_VEHICLES                                             :Sähköjunat
-STR_MONORAIL_VEHICLES                                           :Yksiraiteiset
-STR_MAGLEV_VEHICLES                                             :Maglev-junat
+STR_REPLACE_RAIL_VEHICLES                                       :Rautatiejunat
+STR_REPLACE_ELRAIL_VEHICLES                                     :Sähköjunat
+STR_REPLACE_MONORAIL_VEHICLES                                   :Yksiraiteiset
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev-junat
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Vaunun poisto: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Automaattikorvaus pitäköön junan vakiopituisena poistamalla vaunuja (edestä) jos veturi pidentäisi junaa.
@@ -2801,10 +2801,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Lähetä
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Lähetä laiva telakalle.
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Lähetä lentokone lentokonehalliin.
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Klikkaus Ctrl painettuna jakaa komennot
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tämä tekee kopion ajoneuvosta. Klikkaaminen Ctrl painettuna jakaa komennot
-STR_CLONE_SHIP_INFO                                             :{BLACK}Tämä rakentaa kopion laivasta. Ctrl+Click jakaa komennot
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tämä rakentaa kopion lentokoneesta. Ctrl+Click jakaa komennot
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Tämä rakentaa kopion junasta ja kaikista sen vaunuista. Klikkaus Ctrl painettuna jakaa komennot
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Tämä tekee kopion ajoneuvosta. Klikkaaminen Ctrl painettuna jakaa komennot
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Tämä rakentaa kopion laivasta. Ctrl+Click jakaa komennot
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Tämä rakentaa kopion lentokoneesta. Ctrl+Click jakaa komennot
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Anna junalle lupa ohittaa punainen opastin.
 
@@ -2837,36 +2837,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Poistuu
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kolaroitu!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Hajonnut
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Pysäytetty
-STR_TRAIN_STOPPING                                              :{RED}Pysäytetään
-STR_TRAIN_STOPPING_VEL                                          :{RED}Pysäytetään, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Ei virtaa
-STR_TRAIN_STUCK                                                 :{ORANGE}Odottaa vapaata reittiä
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Suuntana {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Suuntana {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Ei pysähdyksiä
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Ei pysähdyksiä, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Kohde: {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Kohde: {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Suuntana veturitalli ({TOWN})
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Suuntana veturitalli ({TOWN}), {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Suuntana huoltoasema, {TOWN}.
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Suuntana huoltoasema, {TOWN}, {VELOCITY}.
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Suuntana telakka, {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Suuntana telakka, {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Suuntana lentokonehalli, {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Huolto {TOWN} Varikko
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Huolto{TOWN} Varikko, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Huolto {TOWN} Varikko
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Huolto {TOWN} Varikko, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Huolto {TOWN} Telakka
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Huolto {TOWN} Telakka, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Huolto {STATION} Halli
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Huolto {STATION} Halli, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Pysäytetään
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Pysäytetään, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ei virtaa
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Odottaa vapaata reittiä
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Suuntana {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Suuntana {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Ei pysähdyksiä
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Ei pysähdyksiä, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Kohde: {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Kohde: {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Suuntana veturitalli ({TOWN})
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Suuntana veturitalli ({TOWN}), {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Suuntana huoltoasema, {TOWN}.
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Suuntana huoltoasema, {TOWN}, {VELOCITY}.
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Suuntana telakka, {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Suuntana telakka, {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Suuntana lentokonehalli, {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Suuntana lentokonehalli, {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Huolto {TOWN} Varikko
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Huolto{TOWN} Varikko, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Huolto {TOWN} Varikko
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Huolto {TOWN} Varikko, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Huolto {TOWN} Telakka
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Huolto {TOWN} Telakka, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Huolto {STATION} Halli
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Huolto {STATION} Halli, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (yksityiskohdat)
@@ -2879,8 +2879,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nimeä l
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Ikä: {LTBLUE}{STRING}{BLACK}   Käyttökustannukset: {LTBLUE}{CURRENCY}/yr
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} vuo{P si tta} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} vuo{P si tta} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} vuo{P si tta} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} vuo{P si tta} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Maks. nopeus: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Paino: {LTBLUE}{WEIGHT_S} {BLACK}Teho: {LTBLUE}{POWER}{BLACK} Maks. nopeus: {LTBLUE}{VELOCITY}
@@ -2894,7 +2894,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Kapasite
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Kapasiteetti: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Kapasiteetti: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Siirrä rahaa: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Siirrä rahaa: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Huoltoväli: {LTBLUE}{COMMA} päivää{BLACK}   Viimeisin huolto: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Huoltoväli: {LTBLUE}{COMMA}%{BLACK}   Viime huolto: {LTBLUE}{DATE_LONG}
@@ -2910,9 +2910,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nimeä l
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Rakennettu: {LTBLUE}{NUM}{BLACK} Arvo: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Arvo: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Kokonaisrahtikapasiteetti:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Kokonaisrahtikapasiteetti:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Tyhjä
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} asemalta {STATION}
@@ -2927,7 +2927,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Näytä
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Rahtia yhteensä
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Näytä junan kokonaiskapasiteetti, eritelty rahtityypin mukaan.
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapasiteetti: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapasiteetti: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (sovita)
@@ -2951,15 +2951,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Sovita l
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (aikataulu)
-STR_TIMETABLE_VIEW                                              :{BLACK}Aikataulu
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Näytä aikataulu
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Aikataulu
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Näytä aikataulu
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Aikataulu - napsauta määräystä korostaaksesi.
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - aikataulun loppu - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - jaetun aikataulun loppu - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - jaetun aikataulun loppu - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Nonstop
@@ -2983,14 +2983,14 @@ STR_ORDER_DROP_TRANSFER                                         :Siirrä
 STR_ORDER_DROP_NO_UNLOADING                                     :Ei rahdinpurkua
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Muuta korostetun määräyksen purkamiskäyttäytymistä
 
-STR_REFIT                                                       :{BLACK}Sovita
-STR_REFIT_TIP                                                   :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Click poistaa sovituskäskyn
+STR_ORDER_REFIT                                                 :{BLACK}Sovita
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Valitse mihin rahtityyppiin tämä käsky sovittaa. Ctrl+Click poistaa sovituskäskyn
 
-STR_SERVICE                                                     :{BLACK}Huolto
+STR_ORDER_SERVICE                                               :{BLACK}Huolto
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Mene aina
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Huolto, jos tarpeen
 STR_ORDER_DROP_HALT_DEPOT                                       :Pysähdy
-STR_SERVICE_HINT                                                :{BLACK}Ohita tämä määräys, ellei palvelua tarvita.
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Ohita tämä määräys, ellei palvelua tarvita.
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Kulkuneuvon tiedot, joiden perusteella hypätään
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Lastin prosentuaalinen määrä
@@ -3011,7 +3011,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :on tosi
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :on epätosi
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Arvo, johon kulkuneuvon tietoja verrataan
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Syötä arvo, johon verrataan
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Ohita
@@ -3025,13 +3025,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Mene lähimmäl
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Mene lähimmälle varikolle
 STR_ORDER_CONDITIONAL                                           :Ehdollinen hyppymääräys
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Lisää uusi pysähdys ennen valittua, tai lisää listan viimeiseksi.
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Lisää kehittynyt määräys
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Lisää kehittynyt määräys
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Näytä kaikki ajoneuvot, joilla on sama aikataulu
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Näytä kaikki ajoneuvot, joilla on sama aikataulu
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Kierrä reittipisteen {WAYPOINT} kautta
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Mene pysäht. pisteen {WAYPOINT} kautta
+STR_ORDER_GO_TO_WAYPOINT                                        :Kierrä reittipisteen {WAYPOINT} kautta
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Mene pysäht. pisteen {WAYPOINT} kautta
 
 STR_ORDER_SERVICE_AT                                            :Huolto
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Nonstop-huolto
@@ -3041,15 +3041,15 @@ STR_ORDER_NEAREST_HANGAR                                        :lähin varikko
 STR_ORDER_TRAIN_DEPOT                                           :Junavarikko
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Varikko
 STR_ORDER_SHIP_DEPOT                                            :Varikko
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} aseman {STATION} lentokonehalliin
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} aseman {STATION} lentokonehalliin
 
-STR_REFIT_ORDER                                                 :(Sovita {STRING})
-STR_REFIT_STOP_ORDER                                            :(Sovita rahtityypiksi {STRING} ja pysähdy)
-STR_STOP_ORDER                                                  :(Pysähdy)
+STR_ORDER_REFIT_ORDER                                           :(Sovita {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Sovita rahtityypiksi {STRING} ja pysähdy)
+STR_ORDER_STOP_ORDER                                            :(Pysähdy)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Täysi lastaus)
 STR_ORDER_FULL_LOAD_ANY                                         :(Lastaa täyteen mitä tahansa rahtia)
@@ -3070,16 +3070,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[loppuun]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[keskelle]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[aivan loppuun]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Hyppää määräykseen {COMMA}
-STR_CONDITIONAL_NUM                                             :Hyppää määräykseen {COMMA}, kun {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Hyppää määräykseen {COMMA}, kun {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Hyppää määräykseen {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Hyppää määräykseen {COMMA}, kun {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Hyppää määräykseen {COMMA}, kun {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (virheellinen käsky)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (aikataulu)
-STR_ORDER_VIEW                                                  :{BLACK}Määräykset
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Vaihda määräysnäkymään
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Määräykset
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Vaihda määräysnäkymään
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Aikataulu - valitse rivi
 
@@ -3101,10 +3101,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Ajoneuvo
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Muuta aikaa
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Aseta kuinka kauan käskyn tulisi kestää
 
-STR_CLEAR_TIME                                                  :{BLACK}Nollaa aika
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nollaa aika
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nollaa tämän rivin aika
 
-STR_RESET_LATENESS                                              :{BLACK}Nollaa myöhästymislaskuri
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nollaa myöhästymislaskuri
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nollaa myöhästymislaskuri, jotta vaunu olisi taas aikataulussa
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automaattinen
@@ -3112,42 +3112,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Täytä
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}Tekoälyn virheenjäljitys
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Tekoälyn nimi
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Tekoälyn nimi
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Lataa tekoäly uudelleen
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Lopeta tekoäly, lataa skripti uudelleen ja käynnistä tekoäly uudelleen
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Lopeta tekoäly, lataa skripti uudelleen ja käynnistä tekoäly uudelleen
 
-STR_AI_NO_AI_FOUND                                              :Sopivaa tekoälyä ei löydetty.{}Tämä tekoäly ei tee mitään.{}Voit ladata tekoälyjä 'Online Sisältö' järjestelmällä.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Yksi käynnissä olevista tekoälyistä kaatui. Ole hyvä ilmoita tästä tekoälyn kehittäjälle, sekä ota kuvankaappaus Tekoälyn Virheenkorjaus ikkunasta.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Tekoälyn virheenjäljitysikkuna on vain palvelimen käytettävissä
+STR_ERROR_AI_NO_AI_FOUND                                        :Sopivaa tekoälyä ei löydetty.{}Tämä tekoäly ei tee mitään.{}Voit ladata tekoälyjä 'Online Sisältö' järjestelmällä.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Yksi käynnissä olevista tekoälyistä kaatui. Ole hyvä ilmoita tästä tekoälyn kehittäjälle, sekä ota kuvankaappaus Tekoälyn Virheenkorjaus ikkunasta.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Tekoälyn virheenjäljitysikkuna on vain palvelimen käytettävissä
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Tekoälyn määritteet
-STR_AI_LIST_TIP                                                 :{BLACK}Kaikki seuraavassa pelissä ladattavat tekoälyt
-STR_AI_HUMAN_PLAYER                                             :Ihmispelaaja
-STR_AI_RANDOM_AI                                                :Sattumanvarainen tekoäly
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Kaikki seuraavassa pelissä ladattavat tekoälyt
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Ihmispelaaja
+STR_AI_CONFIG_RANDOM_AI                                         :Sattumanvarainen tekoäly
 
-STR_AI_CHANGE                                                   :{BLACK}Valitse tekoäly
-STR_AI_CHANGE_TIP                                               :{BLACK}Lataa toinen tekoäly
-STR_AI_CONFIGURE                                                :{BLACK}Määritä
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Määritä tekoälyn parametrit
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Valitse tekoäly
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Lataa toinen tekoäly
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Määritä
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Määritä tekoälyn parametrit
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Valittavissa olevat tekoälyt
-STR_AI_AILIST_TIP                                               :{BLACK}Napsauta valitaksesi tekoälyn
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Napsauta valitaksesi tekoälyn
 
-STR_AI_AUTHOR                                                   :{BLACK}Tekijä: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versio: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Tekijä: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versio: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Hyväksy
-STR_AI_ACCEPT_TIP                                               :{BLACK}Valitse korostettu tekoäly
-STR_AI_CANCEL                                                   :{BLACK}Peruuta
-STR_AI_CANCEL_TIP                                               :{BLACK}Älä vaihda tekoälyä
+STR_AI_LIST_ACCEPT                                              :{BLACK}Hyväksy
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Valitse korostettu tekoäly
+STR_AI_LIST_CANCEL                                              :{BLACK}Peruuta
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Älä vaihda tekoälyä
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Tekoälyn parametrit
-STR_AI_CLOSE                                                    :{BLACK}Sulje
-STR_AI_RESET                                                    :{BLACK}Palauta
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sulje
+STR_AI_SETTINGS_RESET                                           :{BLACK}Palauta
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3168,8 +3168,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Arvioitu
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Arvioitu tulo: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Tallentaminen käynnissä,{}odota, kunnes se päättyy!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automaattitallennus epäonnistui.
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Tallentaminen käynnissä,{}odota, kunnes se päättyy!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automaattitallennus epäonnistui.
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Asemaa ei voi lukea.
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Tallennus epäonnistui.{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Tiedostoa ei voi poistaa.
@@ -3180,22 +3180,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Tallennus on te
 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_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Peli tallennettiin versiossa, joka ei tue raitiovaunuja. Kaikki raitiovaunut on poistettu.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Peli tallennettiin versiossa, joka ei tue raitiovaunuja. Kaikki raitiovaunut on poistettu.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kartan generointi peruutettu...{}...ei kelvollisia kaupunkien sijainteja
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...tässä skenaariossa ei ole kaupunkeja.
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kartan generointi peruutettu...{}...ei kelvollisia kaupunkien sijainteja
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...tässä skenaariossa ei ole kaupunkeja.
 
-STR_PNGMAP_ERROR                                                :{WHITE}Maastoa ei voida ladata PNG-tiedostosta...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...tiedostoa ei löydy.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kuvan tyyppiä ei voida muuttaa. Tarvitaan 8- tai 24-bittinen PNG-kuva.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...tapahtui tunnistamaton virhe. (todennäköisesti viallinen tiedosto)
+STR_ERROR_PNGMAP                                                :{WHITE}Maastoa ei voida ladata PNG-tiedostosta...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...tiedostoa ei löydy.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...kuvan tyyppiä ei voida muuttaa. Tarvitaan 8- tai 24-bittinen PNG-kuva.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...tapahtui tunnistamaton virhe. (todennäköisesti viallinen tiedosto)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Maastoa ei voida ladata BMP-tiedostosta...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kuvan tyyppiä ei voida muuntaa.
+STR_ERROR_BMPMAP                                                :{WHITE}Maastoa ei voida ladata BMP-tiedostosta...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...kuvan tyyppiä ei voida muuntaa.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Mittakaava-varoitus
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Lähdekartan koon liiallinen muuttaminen ei ole suositeltavaa. Haluatko jatkaa?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Mittakaava-varoitus
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Lähdekartan koon liiallinen muuttaminen ei ole suositeltavaa. Haluatko jatkaa?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Kuvakaappaus tallennettu nimellä '{STRING}'.
@@ -3218,15 +3218,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...maast
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...se on jo rakennettu.
 STR_ERROR_OWNED_BY                                              :{WHITE}...omistaja: {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...alueen omistaa toinen yhtiö.
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nimen täytyy olla uniikki
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} on tiellä.
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nimen täytyy olla uniikki
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} on tiellä.
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN}: paikallisviranomaiset kieltäytyvät.
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} paikallisviranomaiset eivät salli toisen lentokentän rakentamista tähän kaupunkiin.
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} paikallisviranomaiset kieltävät lentokentän rakennuksen äänekkyyden takia
-STR_BRIBE_FAILED                                                :{WHITE}Yleinen syyttäjä on saanut selville
-STR_BRIBE_FAILED_2                                              :{WHITE}lahjontayrityksesi.
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} paikallisviranomaiset kieltävät lentokentän rakennuksen äänekkyyden takia
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Yleinen syyttäjä on saanut selville
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}lahjontayrityksesi.
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Maata ei voi korottaa.
@@ -3235,7 +3235,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Maata ei
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Kaivuualue vahingoittaisi tunnelia.
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Merenpinta on jo saavutettu.
 STR_ERROR_TOO_HIGH                                              :{WHITE}Liian korkea.
-STR_ALREADY_LEVELLED                                            :{WHITE}... alue on jo litteä
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... alue on jo litteä
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Yhtiön nimeä ei voi muuttaa...
@@ -3246,29 +3246,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Lisälai
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...ei lainaa maksettavana.
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...tarvitaan {CURRENCY}.
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Lainaa ei voi lyhentää...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Pankista lainattua rahaa ei voi antaa pois...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Pankista lainattua rahaa ei voi antaa pois...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Yhtiötä ei voi ostaa...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Yhtiön päärakennusta ei voi rakentaa...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Tästä yhtiöstä ei voi ostaa 25{NBSP}%:n osuutta...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Tästä yhtiöstä ei voi myydä 25{NBSP}%:n osuutta...
-STR_PROTECTED                                                   :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
+STR_ERROR_PROTECTED                                             :{WHITE}Tällä yhtiöllä ei ole vielä osakkeita...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kaupunkeja ei voi rakentaa
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kaupunkeja ei voi rakentaa
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Kaupungin nimeä ei voi vaihtaa.
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Kaupunkia ei voi rakentaa tähän...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...liian lähellä kartan reunaa.
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...liian lähellä toista kaupunkia.
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...liian monta kaupunkia.
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...kartalla ei ole enää tilaa
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Kaupunki ei rakenna teitä. Voit sallia teiden rakentamisen valikosta Lisäasetukset->Talous->Kaupungit.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Tietyöt ovat käynnissä.
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...kartalla ei ole enää tilaa
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Kaupunki ei rakenna teitä. Voit sallia teiden rakentamisen valikosta Lisäasetukset->Talous->Kaupungit.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Tietyöt ovat käynnissä.
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Teollisuusaluetta ei voi luoda...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Teollisuusaluetta ei voi luoda...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}{STRING}: tähän ei voi rakentaa...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Teollisuustyyppiä ei voi rakentaa tähän...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...liian lähellä toista teollisuutta.
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...liian lähellä toista teollisuutta.
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}...kaupunki pitää rakentaa ensin.
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}...vain yksi on sallittu kaupunkia kohden.
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...voidaan rakentaa vain kaupunkeihin, joissa on yli 1200 asukasta.
@@ -3289,7 +3289,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Lentoken
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Liitä yhteen useampi asema/lastausalue.
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...asema liian levittäytynyt.
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...epäsymmetriset asemat poissa käytöstä.
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...epäsymmetriset asemat poissa käytöstä.
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Liian monta asemaa ja lastausaluetta.
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Rautatieasema on jakautunut liian moneen osaan
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Liian monta linja-autopysäkkiä.
@@ -3299,12 +3299,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Liian lÃ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Liian lähellä toista satamaa.
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Liian lähellä toista lentokenttää.
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Asemaa ei voi nimetä uudelleen.
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...kaupunki omistaa tien
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...tie on väärin päin
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...kaupunki omistaa tien
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...tie on väärin päin
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Aseman osaa ei voi poistaa...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Poista asema ensin
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Aseman osaa ei voi poistaa...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Poista asema ensin
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Linja-autoasemaa ei voida poistaa...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kuorma-auto asemaa ei voida poistaa...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Ei voi poistaa asemaa.
@@ -3322,14 +3322,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Lentoken
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Liittää useamman kuin yhden reittipisteen
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Liian lähellä toista reittipistettä
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Junien reittipistettä ei voi rakentaa tähän...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Junien reittipistettä ei voi rakentaa tähän...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Poijua ei voi sijoittaa tähän...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Reittipisteen nimeä ei voi muuttaa...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Reittipisteen nimeä ei voi muuttaa...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Junien reittipistettä ei voi poistaa...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Junaradan reittipiste täytyy poistaa ensin
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Junien reittipistettä ei voi poistaa...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Junaradan reittipiste täytyy poistaa ensin
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...poiju on tiellä.
-STR_BUOY_IS_IN_USE                                              :{WHITE}...poiju on käytössä!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...poiju on käytössä!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Veturitallia ei voi rakentaa.
@@ -3346,14 +3346,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Junia vo
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Juna on liian pitkä.
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kulkuneuvoa ei voida kääntää...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ei voi kääntää moniosaista ajoneuvoa
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Raiteet eivät ole yhteensopivia
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Raiteet eivät ole yhteensopivia
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Liikennevälinettä ei voi poistaa...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Moottorivaunun takaosa seuraa aina etuosaansa
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Reittiä paikalliselle veturitallille ei löydy.
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Paikallista huoltoasemaa ei löydy.
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Väärä varikkotyyppi
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Väärä varikkotyyppi
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} on liian pitkä korvaamisen jälkeen
@@ -3364,14 +3364,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(rahoitusraja)
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Mahdoton ratayhdistelmä.
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Ei kelvollista rautatietä.
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Rautatie pitää poistaa ensin.
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Tie on yksisuuntainen tai suljettu
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Tie on yksisuuntainen tai suljettu
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Opastinta ei voi rakentaa.
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Rautatietä ei voi rakentaa.
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Rautatietä ei voi poistaa.
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Opastinta ei voi poistaa tästä.
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Ei voi muuntaa opastimia tässä...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Ei voi muuntaa opastimia tässä...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Raidetyyppiä ei voi muuntaa...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Raidetyyppiä ei voi muuntaa...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Tie pitää siirtää ensin.
@@ -3382,13 +3382,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Tietä e
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Tästä ei voi poistaa raitiotietä.
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kanaalia ei voi rakentaa tähän...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Sulkua ei voi rakentaa tähän...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Tähän ei voi asettaa jokea...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kanaalia ei voi rakentaa tähän...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Sulkua ei voi rakentaa tähän...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Tähän ei voi asettaa jokea...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...se pitää rakentaa veteen.
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...veteen ei voi rakentaa.
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanava täytyy purkaa ensin
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tähän ei voi rakentaa akveduktia...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Kanava täytyy purkaa ensin
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Tähän ei voi rakentaa akveduktia...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...tässä on jo puu.
@@ -3397,9 +3397,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Puuta ei
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Siltaa ei voi rakentaa...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Silta pitää tuhota ensin.
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Ei voi aloittaa ja lopettaa samasta paikkasta.
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Sillan päät eivät ole samalla korkeudella
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Silta on liian matalalla maastoa varten
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Ei voi aloittaa ja lopettaa samasta paikkasta.
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Sillan päät eivät ole samalla korkeudella
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Silta on liian matalalla maastoa varten
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Alku- ja päätepisteen pitää olla linjassa.
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...sillan molempien päiden pitää sijaita maalla.
 
@@ -3408,7 +3408,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tunnelia
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Alue on sopimaton tunnelinsuulle.
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Tunneli pitää tuhota ensin.
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Toinen tunneli on tiellä.
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunneli loppuisi kartan ulkopuolelle
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunneli loppuisi kartan ulkopuolelle
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Maata ei voi kaivaa tunnelin toisessa päässä.
 
 # Unmovable related errors
@@ -3418,12 +3418,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Maa-alue
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...omistat sen jo!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Ei voi luoda ryhmää.
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Ryhmää ei voi poistaa.
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Ryhmää ei voi nimetä.
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Ryhmän kaikkia ajoneuvoja ei voi poistaa.
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Ei voi lisätä ajoneuvoa ryhmään.
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Ei voi lisätä jaettuja ajoneuvoja ryhmään.
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Ei voi luoda ryhmää.
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Ryhmää ei voi poistaa.
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Ryhmää ei voi nimetä.
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Ryhmän kaikkia ajoneuvoja ei voi poistaa.
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Ei voi lisätä ajoneuvoa ryhmään.
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Ei voi lisätä jaettuja ajoneuvoja ryhmään.
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Juna on tiellä.
@@ -3466,21 +3466,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Ajoneuvo
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Laivaa ei voi myydä...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Lentokonetta ei voi myydä...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Juna tai vaunu ei ole saatavilla
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Ajoneuvo ei ole saatavilla
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laiva ei ole saatavilla
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Lentokone ei ole saatavilla
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Juna tai vaunu ei ole saatavilla
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Ajoneuvo ei ole saatavilla
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Laiva ei ole saatavilla
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Lentokone ei ole saatavilla
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Liian monta ajoneuvoa pelissä.
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Huoltoväliä ei voi muuttaa.
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Tuhoutunutta kulkuneuvoa ei voi myydä...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Ei voi sovittaa tuhoutunutta kulkuneuvoa...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Tuhoutunutta kulkuneuvoa ei voi myydä...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Ei voi sovittaa tuhoutunutta kulkuneuvoa...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Junaa ei voi pakottaa jatkamaan opastimen ohi vaaratilanteessa...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Junan suuntaa ei voi kääntää...
-STR_TRAIN_START_NO_CATENARY                                     :Radalta puuttuu ajolinja, joten junaa ei voi käynnistää
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Radalta puuttuu ajolinja, joten junaa ei voi käynnistää
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Ajoneuvoa ei voida kääntää...
 
@@ -3499,14 +3499,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}kulkuneu
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}kulkuneuvo ei pääse tälle asemalle
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}kulkuneuvo, jonka kanssa aikataulu on jaettu, ei pääse tälle asemalle
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Aikataulua ei voi jakaa...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Aikataulua ei voi kopioida...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Aikataulua ei voi jakaa...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Aikataulua ei voi kopioida...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...liian kaukana edellisestä määränpäästä
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Ei voi asettaa aikataulua.
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Kulkuneuvo voi odottaa vain asemalla.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Tämä ajoneuvo ei pysähdy tällä asemalla.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Ei voi asettaa aikataulua.
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Kulkuneuvo voi odottaa vain asemalla.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Tämä ajoneuvo ei pysähdy tällä asemalla.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...liian monta kylttiä.
@@ -3896,35 +3896,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Poiju
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Poiju #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Poiju
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Poiju #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Yhtiö {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Ryhmä {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} ({STRING})
-STR_WAYPOINTNAME_CITY                                           :Reittipiste: {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Reittipiste: {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Reittipiste: {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Reittipiste: {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :tuntematon asema
-STR_SIGN_DEFAULT                                                :Kyltti
+STR_DEFAULT_SIGN_NAME                                           :Kyltti
 STR_COMPANY_SOMEONE                                             :joku{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Katsoja, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Katsoja, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3942,7 +3942,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3956,25 +3956,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/french.txt b/src/lang/french.txt
index be5c6e31f..12c356c28 100644
--- a/src/lang/french.txt
+++ b/src/lang/french.txt
@@ -119,7 +119,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} de car
 STR_QUANTITY_BATTERIES                                          :{COMMA} batterie{P "" s}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plastique
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} boisson{P "" s} gazeuse{P "" s}
-STR_CARGO_N_A                                                   :N/D{SKIP}
+STR_QUANTITY_N_A                                                :N/D{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -209,26 +209,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Choisir l'ordre de tri croissant/décroissant
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Choisir le critère de tri
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Choisir le critère de filtrage
-STR_SORT_BY                                                     :{BLACK}Trier par
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Choisir l'ordre de tri croissant/décroissant
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Choisir le critère de tri
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Choisir le critère de filtrage
+STR_BUTTON_SORT_BY                                              :{BLACK}Trier par
 STR_BUTTON_LOCATION                                             :{BLACK}Emplacement
-STR_QUERY_RENAME                                                :{BLACK}Renommer
+STR_BUTTON_RENAME                                               :{BLACK}Renommer
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fermer la fenêtre
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titre de fenêtre - Faire Glisser pour déplacer la fenêtre
-STR_STICKY_BUTTON                                               :{BLACK}Marquer cette fenêtre comme ineffaçable pour la touche 'Fermer toutes les fenêtres'
-STR_RESIZE_BUTTON                                               :{BLACK}Cliquer et faire glisse pour redimensionner la fenêtre
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Bascule entre une grande/petite fenêtre
+STR_TOOLTIP_STICKY                                              :{BLACK}Marquer cette fenêtre comme ineffaçable pour la touche 'Fermer toutes les fenêtres'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Cliquer et faire glisse pour redimensionner la fenêtre
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Bascule entre une grande/petite fenêtre
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barre de défilement - Défile la liste de bas en haut
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barre de défilement - Défile la liste de gauche à droite
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Démolir les constructions sur un carré de terrain
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Défaut
-STR_QUERY_CANCEL                                                :{BLACK}Annuler
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Défaut
+STR_BUTTON_CANCEL                                               :{BLACK}Annuler
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :²&é"'(-è_çà)= azertyuiop^$qsdfghjklmù*<wxcvbn,;:!
@@ -317,7 +317,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Placer u
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Sauvegarder scénario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Charger scénario
-STR_MENU_LOAD_HEIGHTMAP                                         :Charger une carte d'altitude
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Charger une carte d'altitude
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Quitter éditeur
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Quitter
@@ -505,11 +505,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Afficher/cacher le type de marchandise
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Afficher le détail de l'évaluation de la performance
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Afficher le détail de l'évaluation de la performance
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Légende du graphique des compagnies
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Cliquer ici pour activer/désactiver l'affichage de la compagnie
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Cliquer ici pour activer/désactiver l'affichage de la compagnie
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Classement des compagnies
@@ -544,16 +544,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Argent :
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Emprunt :
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total :
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Nombre de véhicules. Ceci inclut les véhicules routiers, les trains, les navies et les aéronefs.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Nombre de parties de stations. Chaque partie d'une station (i.e. gare, arrêt de bus, [aéro]port) est comptée, même si elles sont connectées à une seule station.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Le profit du véhicule ayant le revenu le plus bas (de tous les véhicules ayant plus de 2 année d'existence)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Quantité d'argent fait dans le mois ayant le plus bas profit des trois dernières années.
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Quantité d'argent fait dans le mois ayant le plus haut profit des trois dernières années.
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unités de cargo livrées durant les 4 derniers trimestres.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Types de cargo livrés durant le dernier trimestre.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Quantité d'argent disponible.
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Le montant emprunté par cette compagnie
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total des points par rapport aux points possibles.
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Nombre de véhicules. Ceci inclut les véhicules routiers, les trains, les navies et les aéronefs.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Nombre de parties de stations. Chaque partie d'une station (i.e. gare, arrêt de bus, [aéro]port) est comptée, même si elles sont connectées à une seule station.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Le profit du véhicule ayant le revenu le plus bas (de tous les véhicules ayant plus de 2 année d'existence)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Quantité d'argent fait dans le mois ayant le plus bas profit des trois dernières années.
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Quantité d'argent fait dans le mois ayant le plus haut profit des trois dernières années.
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unités de cargo livrées durant les 4 derniers trimestres.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Types de cargo livrés durant le dernier trimestre.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Quantité d'argent disponible.
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Le montant emprunté par cette compagnie
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total des points par rapport aux points possibles.
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jukebox Jazz
@@ -671,8 +671,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Afficher
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrer la carte sur la position actuelle
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Désactiver tout
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activer tout
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Désactiver tout
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activer tout
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Afficher le dernier message ou bulletin
@@ -683,8 +683,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  Part
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Historique des Messages
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Liste des messages récents
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Liste des messages récents
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Message
@@ -918,32 +918,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Sélecti
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fichier{P "" s} manquant{P "" s}/corrompu{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Information additionnelle sur les graphiques de base
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Echec du mode plein écran
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Echec du mode plein écran
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Devise personnalisée
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taux de change : {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Réduire le montant de votre monnaie pour une Livre (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Augmenter le montant de votre monnaie pour une Livre (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Définir le taux de change de votre monnaie pour une Livre (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Réduire le montant de votre monnaie pour une Livre (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Augmenter le montant de votre monnaie pour une Livre (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Définir le taux de change de votre monnaie pour une Livre (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Séparateur : {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Définir le séparateur pour votre monnaie
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Définir le séparateur pour votre monnaie
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Préfixe : {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Définir le préfixe pour votre monnaie
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Définir le préfixe pour votre monnaie
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffixe : {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Définir le suffixe pour votre monnaie
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Définir le suffixe pour votre monnaie
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Passer à l'Euro : {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Passer à l'Euro : {ORANGE}jamais
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Définir la date de passage à l'Euro
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Passer à l'Euro plus tôt
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Passer à l'Euro plus tard
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Définir la date de passage à l'Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Passer à l'Euro plus tôt
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Passer à l'Euro plus tard
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prévisualisation : {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Livres (£) dans votre monnaie
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Livres (£) dans votre monnaie
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Changer les paramètres de devises personnalisées
 
 # Difficulty level window
@@ -957,7 +957,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Personna
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Afficher le tableau des scores
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Sauver
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Sauver
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Nombre maximal de concurents: {ORANGE}{COMMA}
@@ -1023,7 +1023,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Laxiste
 STR_CITY_APPROVAL_TOLERANT                                      :Tolérant
 STR_CITY_APPROVAL_HOSTILE                                       :Hostile
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Cette action a modifié le niveau de difficulté en personnalisé
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Cette action a modifié le niveau de difficulté en personnalisé
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Options Avancées
@@ -1272,7 +1272,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Not
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Taille X de la carte : {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Taille Y de la carte : {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Changer valeur du paramètre
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Changer valeur du paramètre
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1314,9 +1314,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quitter
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Quitter
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Êtes vous sur de vouloir quitter OpenTTD et retourner à {STRING}?
-STR_YES                                                         :{BLACK}Oui
-STR_NO                                                          :{BLACK}Non
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Êtes vous sur de vouloir quitter OpenTTD et retourner à {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Oui
+STR_QUIT_NO                                                     :{BLACK}Non
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1332,11 +1332,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandonner la partie
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Êtes vous sur de vouloir abandonner cette partie?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Voulez-vous vraiment quitter ce scénario ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Voulez-vous vraiment quitter ce scénario ?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Triches
-STR_CHEATS_TIP                                                  :{BLACK}Les cases à cocher indiquent que vous avez déjà utilisé cette triche auparavant
+STR_CHEATS_TOOLTIP                                              :{BLACK}Les cases à cocher indiquent que vous avez déjà utilisé cette triche auparavant
 STR_CHEATS_WARNING                                              :{BLACK}Attention ! Vous êtes sur le point de trahir vos adversaires. Gardez en tête qu'une telle honte sera gardée en mémoire pour l'éternité.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Augmenter l'argent de {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jouer en tant que compagnie: {ORANGE}{COMMA}
@@ -1345,24 +1345,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Les tun
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construire pendant le mode pause: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Les jets ne s'écrasent plus (fréquemment) sur les petits aéroports: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Changer de climat : {ORANGE}{STRING}
-STR_TEMPERATE_LANDSCAPE                                         :environnement 'Tempéré'
-STR_SUB_ARCTIC_LANDSCAPE                                        :environnement 'Arctique'
-STR_SUB_TROPICAL_LANDSCAPE                                      :environnement 'Tropical'
-STR_TOYLAND_LANDSCAPE                                           :environnement 'Jouets'
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :environnement 'Tempéré'
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :environnement 'Arctique'
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :environnement 'Tropical'
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :environnement 'Jouets'
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Changer la date: {ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permettre la modification des valeurs de production : {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nouvelle couleur
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Montrer les livrées générales
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Montrer les livrées de trains
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Montrer les livrées de véhicules routiers
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Montrer les livrées de navires
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Montrer les livrées des aéronefs
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Choisir la couleur primaire de la  livrée sélectionnée
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Choisir la couleur secondaire de la livrée sélectionnée
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Sélectionner la livrée à modifier, ou plusieurs par Ctrl-clic. Cliquer sur la case pour en intervertir l'utilisation
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Montrer les livrées générales
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Montrer les livrées de trains
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Montrer les livrées de véhicules routiers
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Montrer les livrées de navires
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Montrer les livrées des aéronefs
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Choisir la couleur primaire de la  livrée sélectionnée
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Choisir la couleur secondaire de la livrée sélectionnée
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Sélectionner la livrée à modifier, ou plusieurs par Ctrl-clic. Cliquer sur la case pour en intervertir l'utilisation
 
 STR_LIVERY_DEFAULT                                              :Livrée standard
 STR_LIVERY_STEAM                                                :Locomotive à vapeur
@@ -1400,19 +1400,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Choisir
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nouveau visage
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Génère un visage au hasard
 STR_FACE_ADVANCED                                               :{BLACK}Avancé
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Sélection avancée du visage.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Sélection avancée du visage.
 STR_FACE_SIMPLE                                                 :{BLACK}Simple
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Sélection simple du visage.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Sélection simple du visage.
 STR_FACE_LOAD                                                   :{BLACK}Charger
-STR_FACE_LOAD_TIP                                               :{BLACK}Charger visage favori
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Charger visage favori
 STR_FACE_LOAD_DONE                                              :{WHITE}Votre visage favori a été chargé depuis le fichier de configuration d'OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}No. de visage
-STR_FACE_FACECODE_TIP                                           :{BLACK}Voir et/ou définir le numéro de visage
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Voir et/ou définir le numéro de visage
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Voir et/ou définir le numéro de visage
 STR_FACE_FACECODE_SET                                           :{WHITE}Le nouveau numéro de visage a été défini.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Impossibe de définir le numéro de visage - doit être un nombre entre 0 et 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Enregistrer
-STR_FACE_SAVE_TIP                                               :{BLACK}Enregistrer visage favori
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Enregistrer visage favori
 STR_FACE_SAVE_DONE                                              :{WHITE}Ce visage sera enregistré comme favori dans le fichier de configuration d'OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Européen
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Choisir les visages européens
@@ -1420,120 +1420,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Africain
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Choisir les visages africains
 STR_FACE_YES                                                    :Oui
 STR_FACE_NO                                                     :Non
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Activer la moustache ou la boucle d'oreille
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Activer la moustache ou la boucle d'oreille
 STR_FACE_HAIR                                                   :Cheveux:
-STR_FACE_HAIR_TIP                                               :{BLACK}Modifier les cheveux
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Modifier les cheveux
 STR_FACE_EYEBROWS                                               :Yeux:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Modifier les yeux
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Modifier les yeux
 STR_FACE_EYECOLOUR                                              :Couleur des yeux:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Modifier la couleur des yeux
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Modifier la couleur des yeux
 STR_FACE_GLASSES                                                :Lunettes:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Activer les lunettes
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Modifier les lunettes
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Activer les lunettes
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Modifier les lunettes
 STR_FACE_NOSE                                                   :Nez:
-STR_FACE_NOSE_TIP                                               :{BLACK}Modifier le nez
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Modifier le nez
 STR_FACE_LIPS                                                   :Lèvres:
 STR_FACE_MOUSTACHE                                              :Moustache:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Modifier les lèvres ou la moustache
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Modifier les lèvres ou la moustache
 STR_FACE_CHIN                                                   :Menton:
-STR_FACE_CHIN_TIP                                               :{BLACK}Modifier le menton
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Modifier le menton
 STR_FACE_JACKET                                                 :Veste:
-STR_FACE_JACKET_TIP                                             :{BLACK}Modifier la veste
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Modifier la veste
 STR_FACE_COLLAR                                                 :Col:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Modifier le col
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Modifier le col
 STR_FACE_TIE                                                    :Cravate:
 STR_FACE_EARRING                                                :Boucle d'oreille:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Modifier la cravate ou la boucle d'oreille
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Modifier la cravate ou la boucle d'oreille
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multijoueur
-STR_NETWORK_CONNECTION                                          :{BLACK}Connexion :
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Choisir entre un jeu sur Internet ou sur réseau local
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nom du joueur:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ceci est le nom avec lequel les autres joueurs pourront vous identifier
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nom
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nom de la partie
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clients
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clients en ligne / clients max{}Compagnies en ligne / compagnies max
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Taille
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Taille de la carte{}Cliquer pour trier par surface
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Date
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Date courante
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Années
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nombre d'années{}écoulées dans le jeu
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Langue, version du serveur, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Cliquer sur une partie de la liste pour la sélectionner
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Le dernier serveur utilisé:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Cliquer pour choisir le dernier serveur utilisé
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFOS SUR LE SERVEUR
-STR_NETWORK_CLIENTS                                             :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Langue: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Terrain: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Taille de la carte : {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Version du serveur : {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresse du serveur : {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Date de début : {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Date courante : {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protégée par mot de passe !
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVEUR HORS-LIGNE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVEUR PLEIN
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSION NON CORRESPONDANTE
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF REQUIS
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Rejoindre la partie
-STR_NETWORK_REFRESH                                             :{BLACK}Actualiser
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualiser les infos sur le serveur
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Trouver un serveur
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Cherche sur le réseau un serveur
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Ajouter un serveur
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Ajouter à la liste un serveur où le jeu cherchera toujours des parties en cours.
-STR_NETWORK_START_SERVER                                        :{BLACK}Démarrer le serveur
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Démarre son propre serveur
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Entrer votre nom
-STR_NETWORK_ENTER_IP                                            :{BLACK}Saisir l'adresse IP du serveur
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijoueur
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Connexion :
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Choisir entre un jeu sur Internet ou sur réseau local
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nom du joueur:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ceci est le nom avec lequel les autres joueurs pourront vous identifier
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nom
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nom de la partie
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clients
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clients en ligne / clients max{}Compagnies en ligne / compagnies max
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Taille
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Taille de la carte{}Cliquer pour trier par surface
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Date
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Date courante
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Années
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Nombre d'années{}écoulées dans le jeu
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Langue, version du serveur, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Cliquer sur une partie de la liste pour la sélectionner
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Le dernier serveur utilisé:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Cliquer pour choisir le dernier serveur utilisé
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFOS SUR LE SERVEUR
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clients: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Langue: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Terrain: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Taille de la carte : {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Version du serveur : {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adresse du serveur : {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Date de début : {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Date courante : {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protégée par mot de passe !
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVEUR HORS-LIGNE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVEUR PLEIN
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSION NON CORRESPONDANTE
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF REQUIS
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Rejoindre la partie
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualiser
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualiser les infos sur le serveur
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Trouver un serveur
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Cherche sur le réseau un serveur
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Ajouter un serveur
+STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Ajouter à la liste un serveur où le jeu cherchera toujours des parties en cours.
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Démarrer le serveur
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Démarre son propre serveur
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Entrer votre nom
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Saisir l'adresse IP du serveur
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Commencer une nouvelle partie
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nom de la partie:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Le nom de la partie sera affiché aux autres joueurs dans le menu de sélection de partie multijoueur
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Choisir le mot de passe
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protéger votre partie avec un mot de passe si vous ne souhaitez pas que d'autres l'utilisent
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Choisir une carte:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Sur quelle carte désirez-vous jouer?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Créer une partie aléatoirement
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (publier)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Nombre de clients max. :
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Choisir un nombre maximum de clients. Tous les emplacements n'auront pas besoin d'être remplis.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compagnie{P "" s}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max compagnies:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limiter le serveur à un certain nombre de compagnies
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectateur{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max spectateurs:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limiter le serveur à un certain nombre de spectateurs
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Langue utilisée :
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Les autres joueurs sauront quelle langue est parlée sur ce serveur.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Démarrer la partie
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Démarrer une nouvelle partie réseau à partir d'une carte aléatoire ou d'un scénario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Charger une partie
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Continuer une partie multijoueur sauvée précédemment (attention à reprendre le même joueur)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Entrer un nom pour la partie en réseau
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Commencer une nouvelle partie
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nom de la partie:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Le nom de la partie sera affiché aux autres joueurs dans le menu de sélection de partie multijoueur
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Choisir le mot de passe
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protéger votre partie avec un mot de passe si vous ne souhaitez pas que d'autres l'utilisent
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Choisir une carte:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Sur quelle carte désirez-vous jouer?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Créer une partie aléatoirement
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (publier)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Nombre de clients max. :
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Choisir un nombre maximum de clients. Tous les emplacements n'auront pas besoin d'être remplis.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compagnie{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max compagnies:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limiter le serveur à un certain nombre de compagnies
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectateur{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max spectateurs:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limiter le serveur à un certain nombre de spectateurs
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Langue utilisée :
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Les autres joueurs sauront quelle langue est parlée sur ce serveur.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Démarrer la partie
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Démarrer une nouvelle partie réseau à partir d'une carte aléatoire ou d'un scénario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Charger une partie
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Continuer une partie multijoueur sauvée précédemment (attention à reprendre le même joueur)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Entrer un nom pour la partie en réseau
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1576,32 +1576,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Letton
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Préparation de la partie
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Se prépare à rejoindre : {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Liste des compagnies présentes dans le jeu.  Vous pouvez soit en rejoindre une, soit en créer une.
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFOS SUR LA COMPAGNIE
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nom de la compagnie : {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration : {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valeur de la compagnie : {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Argent courant : {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Revenus de l'année dernière : {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance : {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Véhicules : {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stations : {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Joueurs : {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nouvelle compagnie
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Crée une nouvelle compagnie
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Observer une partie
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Permet d'observer une partie en tant que spectateur
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Rejoindre la compagnie
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Aider à gérer cette compagnie
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Préparation de la partie
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Se prépare à rejoindre : {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Liste des compagnies présentes dans le jeu.  Vous pouvez soit en rejoindre une, soit en créer une.
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFOS SUR LA COMPAGNIE
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nom de la compagnie : {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguration : {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valeur de la compagnie : {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Argent courant : {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Revenus de l'année dernière : {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performance : {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Véhicules : {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stations : {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Joueurs : {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nouvelle compagnie
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Crée une nouvelle compagnie
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Observer une partie
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Permet d'observer une partie en tant que spectateur
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Rejoindre la compagnie
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Aider à gérer cette compagnie
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Connexion en cours...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Connexion en cours...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connexion en cours..
@@ -1617,13 +1617,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Rapatrie
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client{P "" s} avant vous
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} téléchargés
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Déconnecter
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Déconnecter
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Le serveur est protégé. Entrez le mot de passe
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}La compagnie est protégée. Entrez le mot de passe
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste des clients
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste des clients
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Spectateur
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nouvelle compagnie
 
@@ -1645,18 +1645,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Entrer l
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne pas sauver le mot de passe entré
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Donner un nouveau mot de passe à la compagnie
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Mot de passe de compagnie
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Mot de passe de compagnie par défaut
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Utiliser ce mot de passe de compagnie comme défaut pour les nouvelles compagnies
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Mot de passe de compagnie par défaut
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Utiliser ce mot de passe de compagnie comme défaut pour les nouvelles compagnies
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Rejoindre
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Rejoindre et jouer dans cette compagnie
-STR_COMPANY_PASSWORD                                            :{BLACK}Mot de passe
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Permet de protéger par mot de passe votre compagnie pour empêcher des utilisateurs non-autorisés de rejoindre. Utilisez '*' pour vider le mot de passe.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Choisir le mot de passe de la compagnie
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Rejoindre
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Rejoindre et jouer dans cette compagnie
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Mot de passe
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Permet de protéger par mot de passe votre compagnie pour empêcher des utilisateurs non-autorisés de rejoindre. Utilisez '*' pour vider le mot de passe.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Choisir le mot de passe de la compagnie
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Envoyer
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Envoyer
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Equipe] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privé] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Tous] :
@@ -1669,40 +1669,40 @@ STR_NETWORK_CHAT_ALL                                            :[Tous] {STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Entrer le texte pour le chat
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Aucun périphérique réseau trouvé ou programme compilé sans ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Aucune partie réseau n'a été trouvée
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Le serveur n'a pas répondu à la requête
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Échec de la connexion : NewGRF requis
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}La synchronisation de la partie réseau a échouée.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}La connection de la partie réseau a été perdue
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}La sauvegarde serveur n'a pas pu être chargée
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Le serveur n'a pas pu être démarré
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Connexion échouée
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}La connection #{NUM} a dépassé le temps d'attente
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Il y a eu une erreur de protocole et la connection a été fermée
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}La révision de ce client ne correspond pas à celle du serveur
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Mot de passe incorrect
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Le serveur est complet
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Vous êtes bannis de ce serveur
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Vous avez été exclu de la partie
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Tricher n'est pas autorisé sur ce serveur
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Aucun périphérique réseau trouvé ou programme compilé sans ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Aucune partie réseau n'a été trouvée
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Le serveur n'a pas répondu à la requête
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Échec de la connexion : NewGRF requis
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}La synchronisation de la partie réseau a échouée.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}La connection de la partie réseau a été perdue
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}La sauvegarde serveur n'a pas pu être chargée
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Le serveur n'a pas pu être démarré
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Connexion échouée
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}La connection #{NUM} a dépassé le temps d'attente
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Il y a eu une erreur de protocole et la connection a été fermée
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}La révision de ce client ne correspond pas à celle du serveur
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Mot de passe incorrect
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Le serveur est complet
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Vous êtes bannis de ce serveur
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Vous avez été exclu de la partie
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Tricher n'est pas autorisé sur ce serveur
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :erreur générale
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :erreur de désynchronisation
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :chargement de la carte impossible
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connection perdue
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erreur de protocole
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF requis
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :non autorisé
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :paquet étrange reçu
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :révision incorrecte
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nom déjà utilisé
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :mot de passe de partie incorrect
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :mauvais company-id dans DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :jeté par le serveur
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :a tenté de tricher
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :Serveur complet
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :erreur générale
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :erreur de désynchronisation
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :chargement de la carte impossible
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connection perdue
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :erreur de protocole
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF requis
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :non autorisé
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :paquet étrange reçu
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :révision incorrecte
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nom déjà utilisé
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :mot de passe de partie incorrect
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :mauvais company-id dans DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :jeté par le serveur
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :a tenté de tricher
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :Serveur complet
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1714,36 +1714,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Partie suspendu
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Partie reprise (client connecté)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Partie reprise (echec de connexion du client)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :départ
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} a rejoint la partie
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} a rejoint la compagnie #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} a rejoint les spectateurs
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} a lancé une nouvelle compagnie (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} a quitté la partie ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} a changé son nom en {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} a donné {2:CURRENCY} à votre compagnie
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Vous avez donné {2:CURRENCY} à {1:STRING}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Le serveur a fermé la session
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Le serveur redémarre...{}Veuillez patienter...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :départ
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} a rejoint la partie
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} a rejoint la compagnie #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} a rejoint les spectateurs
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} a lancé une nouvelle compagnie (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} a quitté la partie ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} a changé son nom en {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} a donné {2:CURRENCY} à votre compagnie
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Vous avez donné {2:CURRENCY} à {1:STRING}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Le serveur a fermé la session
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Le serveur redémarre...{}Veuillez patienter...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Téléchargement de contenu
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type de contenu
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Type de contenu
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nom
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nom du contenu
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Cliquer sur une ligne pour voir les détails{}Cocher la case pour le sélectionner pour être télécharger
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nom du contenu
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Cliquer sur une ligne pour voir les détails{}Cocher la case pour le sélectionner pour être télécharger
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Sélectionner tout
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marquer tous les contenus pour être téléchargés
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marquer tous les contenus pour être téléchargés
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Sélectionner les mises à jour
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marquer tous les contenus qui sont une mise à jour du contenu existant pour être téléchargés
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marquer tous les contenus qui sont une mise à jour du contenu existant pour être téléchargés
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Désélectionner tout
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Marquer tous les contenus pour ne pas être téléchargés
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marquer tous les contenus pour ne pas être téléchargés
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Entrer le filtre
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Entrer un mot clé pour filtrer la liste
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Entrer un mot clé pour filtrer la liste
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtre sur tag/nom:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Télécharger
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Démarrer le téléchargement du contenu choisi
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Démarrer le téléchargement du contenu choisi
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Taille de téléchargement total: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMATION DE CONTENU
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Vous n'avez pas sélectionné ceci pour être téléchargé
@@ -1787,17 +1787,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... fich
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Impossible de décompresser le fichier téléchargé
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Options de transparence
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Transparence des noms de station. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Transparence des arbres. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Transparence des maisons. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Transparence des industries. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Transparence des éléments constructibles tels que stations, dépôts, points de contrôle et caténaire. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Transparence des ponts. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Transparence des structures telles que phares et antennes. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Transparence des caténaires. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Transparence pour les indicateurs de chargement. Ctrl-clic pour vérouiller.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Basculer transparence/invisibilité
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Options de transparence
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Transparence des noms de station. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Transparence des arbres. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Transparence des maisons. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Transparence des industries. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Transparence des éléments constructibles tels que stations, dépôts, points de contrôle et caténaire. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Transparence des ponts. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Transparence des structures telles que phares et antennes. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Transparence des caténaires. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Transparence pour les indicateurs de chargement. Ctrl-clic pour vérouiller.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Basculer transparence/invisibilité
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Afficher la zone couverte
@@ -1809,11 +1809,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepte:
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Fournit: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Joindre une station
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construire une station séparée
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Joindre une station
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construire une station séparée
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Joindre un point de contrôle
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Construire un point de contrôle séparé
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Joindre un point de contrôle
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Construire un point de contrôle séparé
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Construction de voie ferrée
@@ -1837,8 +1837,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientat
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Choisir l'orientation du dépôt ferroviaire
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Point de contrôle
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Choisir le type de point de contrôle
+STR_WAYPOINT_CAPTION                                            :{WHITE}Point de contrôle
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Choisir le type de point de contrôle
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Choix de la gare
@@ -1851,36 +1851,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Choisir
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Glisser/déposer
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construire une gare avec le glisser/déposer
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Choisir la classe de station à afficher
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Choisir le type de station à construire
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Choisir la classe de station à afficher
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Choisir le type de station à construire
 
-STR_STAT_CLASS_DFLT                                             :Station par défaut
-STR_STAT_CLASS_WAYP                                             :Points de contrôle
+STR_STATION_CLASS_DFLT                                          :Station par défaut
+STR_STATION_CLASS_WAYP                                          :Points de contrôle
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Sélection des signaux
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Signal de bloc (sémaphore){}Ce sont les signaux les plus basiques, autorisant seulement un train à la fois dans un même bloc.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Signal d'entrée (sémaphore){}Vert tant qu'un ou plusieurs signaux de sortie sont verts dans le bloc. Rouge sinon.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Signal de sortie (sémaphore){}Fonctionne comme un signal de bloc, mais est nécessaire pour commander les signaux d'entrée et combinés.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Signal combiné (sémaphore){}Le signal combiné est simplement l'unification d'un signal d'entrée et d'un signal de sortie. Cela vous permet de construire de larges "arbres" de pré-signaux.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Signal avancé (sémaphore){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin peuvent être passés par l'arrière.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Signal de chemin à sens unique (sémaphore){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin à sens unique ne peuvent pas être passés par l'arrière.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Signal de bloc (électrique){}Ce sont les signaux les plus basiques, autorisant seulement un train à la fois dans un même bloc.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Signal d'entrée (électrique){}Vert tant qu'un ou plusieurs signaux de sortie sont verts dans le bloc. Rouge sinon.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Signal de sortie (électrique){}Fonctionne comme un signal de bloc, mais est nécessaire pour commander les signaux d'entrée et combinés.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Signal combiné (électrique){}Le signal combiné est simplement l'unification d'un signal d'entrée et d'un signal de sortie. Cela vous permet de construire de larges "arbres" de pré-signaux.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Signal de chemin (électrique){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin peuvent être passés par l'arrière.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Signal de chemin à sens unique (électrique){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin à sens unique ne peuvent pas être passés par l'arrière.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Conversion de signal{}Si sélectionné, cliquer sur un signal existant pour le convertir vers le type et la variante choisis, Ctrl-clic pour basculer la variante.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densité de signal
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Réduire la densité de signal
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Augmenter la densité de signal
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Sélection des signaux
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Signal de bloc (sémaphore){}Ce sont les signaux les plus basiques, autorisant seulement un train à la fois dans un même bloc.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Signal d'entrée (sémaphore){}Vert tant qu'un ou plusieurs signaux de sortie sont verts dans le bloc. Rouge sinon.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Signal de sortie (sémaphore){}Fonctionne comme un signal de bloc, mais est nécessaire pour commander les signaux d'entrée et combinés.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Signal combiné (sémaphore){}Le signal combiné est simplement l'unification d'un signal d'entrée et d'un signal de sortie. Cela vous permet de construire de larges "arbres" de pré-signaux.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Signal avancé (sémaphore){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin peuvent être passés par l'arrière.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Signal de chemin à sens unique (sémaphore){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin à sens unique ne peuvent pas être passés par l'arrière.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Signal de bloc (électrique){}Ce sont les signaux les plus basiques, autorisant seulement un train à la fois dans un même bloc.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Signal d'entrée (électrique){}Vert tant qu'un ou plusieurs signaux de sortie sont verts dans le bloc. Rouge sinon.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Signal de sortie (électrique){}Fonctionne comme un signal de bloc, mais est nécessaire pour commander les signaux d'entrée et combinés.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Signal combiné (électrique){}Le signal combiné est simplement l'unification d'un signal d'entrée et d'un signal de sortie. Cela vous permet de construire de larges "arbres" de pré-signaux.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Signal de chemin (électrique){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin peuvent être passés par l'arrière.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Signal de chemin à sens unique (électrique){}Un signal de chemin autorise plus d'un train à entrer dans un bloc de signaux en même temps, si le train peut réserver un chemin jusqu'à un point d'attente sûr. Les signaux de chemin à sens unique ne peuvent pas être passés par l'arrière.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Conversion de signal{}Si sélectionné, cliquer sur un signal existant pour le convertir vers le type et la variante choisis, Ctrl-clic pour basculer la variante.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Densité de signal
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Réduire la densité de signal
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Augmenter la densité de signal
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Choisir Pont Ferroviaire
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Choisir Pont Routier
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Sélection de Pont - cliquer sur le type de pont désiré pour le construire
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Sélection de Pont - cliquer sur le type de pont désiré pour le construire
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspendu en acier
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :À poutres en Acier
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Porte-à-faux en acier
@@ -1914,9 +1914,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Basculer
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientation du dépôt
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Choisir orientation du dépôt routier
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Choisir orientation du dépôt routier
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientation du dépôt
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Choisir l'orientation du dépôt de tramway
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Choisir l'orientation du dépôt de tramway
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Arrêt d'autobus
@@ -1937,8 +1937,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construi
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construire un port
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Placer une bouée, peut servir de guide aux navires
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construire un aqueduc
-STR_CREATE_LAKE                                                 :{BLACK}Définir une zone d'eau.{}Construit un canal, si Ctrl est enfoncé au niveau de la mer, le voisinage sera innondé.
-STR_CREATE_RIVER                                                :{BLACK}Placer des rivières.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Définir une zone d'eau.{}Construit un canal, si Ctrl est enfoncé au niveau de la mer, le voisinage sera innondé.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Placer des rivières.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientation du dépôt
@@ -1970,20 +1970,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Grands a
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aéroports Internationaux
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Héliports
 
-STR_STATION_NOISE                                               :{BLACK}Bruit généré: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Bruit généré: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Manipulation du paysage
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Abaisser le terrain
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Élever le terrain
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Niveler le terrain
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Acheter le terrain pour une utilisation ultérieure
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Abaisser le terrain
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Élever le terrain
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Niveler le terrain
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Acheter le terrain pour une utilisation ultérieure
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Arbres
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Choix du type d'arbre
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Au hasard
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Planter des arbres de types choisis au hasard
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Planter des arbres de types choisis au hasard
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Ajouter des arbres aléatoires
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Semer des arbres sur l'ensemble du terrain de façon aléatoire
 
@@ -1996,9 +1996,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Placer u
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Augmenter la quantité de terre à modifier
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Diminuer la quantité de terre à modifier
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Créer un monde aléatoire
-STR_SE_NEW_WORLD                                                :{BLACK}Nouveau scénario
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Nouveau scénario
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Réinitialiser le terrain
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Ôter toutes les propriétés des joueurs de la carte
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Ôter toutes les propriétés des joueurs de la carte
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Réinitialiser le terrain
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Êtes-vous sûr de vouloir ôter toutes les propriétés des joueurs?
@@ -2009,41 +2009,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nouvelle
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Construire une nouvelle ville
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Créer une ville
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construire une ville à un emplacement aléatoire
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Beaucoup de villes au hasard
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Couvrir la carte avec des villes placées aléatoirement
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Beaucoup de villes au hasard
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Couvrir la carte avec des villes placées aléatoirement
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Taille:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Petite
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Moyenne
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grande
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Aléatoire
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Aléatoire
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Sélectionner la taille de la ville
 STR_FOUND_TOWN_CITY                                             :{BLACK}Métropole
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Les métropoles se développent plus vite que les villes{}Lors de leur fondation, leur taille dépends de la configuration
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Agencement des routes
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Sélectionner l'agencement des routes pour cette ville
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Meilleures routes
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Grille 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Grille 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Aléatoire
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Agencement des routes
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Sélectionner l'agencement des routes pour cette ville
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Meilleures routes
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Grille 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Grille 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aléatoire
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Financer une nouvelle industrie
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Choisissez l'industrie appropriée dans cette liste
-STR_MANY_RANDOM_INDUSTRIES                                      :Beaucoup d'industries au hasard
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Couvrir la carte avec des industries placées au hasard
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Prix: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospecter
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construire
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fonder
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Choisissez l'industrie appropriée dans cette liste
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Beaucoup d'industries au hasard
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Couvrir la carte avec des industries placées au hasard
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Prix: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospecter
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construire
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fonder
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Information sur le Terrain
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Coût du balayage: {LTBLUE}N/D
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Coût du balayage: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Revenu du balayage: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Revenu du balayage: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/D
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Propriétaire: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Propriétaire de la route: {LTBLUE}{STRING}
@@ -2051,104 +2051,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Proprié
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Propriétaire des rails: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Municipalité: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Aucun
-STR_LANDINFO_COORDS                                             :{BLACK}Coordonnées: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Construit le: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Classe de station: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Type de station: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordonnées: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construit le: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Classe de station: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Type de station: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Cargaison acceptée: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Roches
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Terre en friche
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Terre nue
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Herbe
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Champs
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Terre enneigée
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Désert
-
-STR_RAILROAD_TRACK                                              :Rails
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rails avec des signaux de bloc
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rails avec des signaux d'entrée
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Rails avec des signaux de sortie
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Rails avec des signaux combinés
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Rails avec des signaux de chemin
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Rails avec des signaux de chemin à sens unique
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Rails avec des signaux de bloc et d'entrée
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Rails avec des signaux de bloc et de sortie
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Rails avec des signaux de bloc et combinés
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Rails avec des signaux de bloc et de chemin
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Rails avec des signaux de bloc et de chemin à sens unique
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Rails avec des signaux d'entrée et de sortie
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Rails avec des signaux d'entrée et combinés
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Rails avec des signaux d'entrée et de chemin
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Rails avec des signaux d'entrée et de chemin à sens unique
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Rails avec des signaux de sortie et combinés
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Rails avec des signaux de sortie et de chemin
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Rails avec des signaux de sortie et de chemin à sens unique
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Rails avec des signaux combinés et de chemin
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Rails avec des signaux combinés et de chemin à sens unique
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Rails avec des signaux de chemin et de chemin à sens unique
-STR_RAILROAD_TRAIN_DEPOT                                        :Dépôt ferroviaire
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Route
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Route avec lampadaires
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Route avec lignée d'arbustres
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Dépôt de véhicules routiers
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Route/rail Croisement à niveau
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramway
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Roches
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Terre en friche
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terre nue
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Herbe
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Champs
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Terre enneigée
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Désert
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Rails
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Rails avec des signaux de bloc
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Rails avec des signaux d'entrée
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Rails avec des signaux de sortie
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Rails avec des signaux combinés
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Rails avec des signaux de chemin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Rails avec des signaux de chemin à sens unique
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Rails avec des signaux de bloc et d'entrée
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Rails avec des signaux de bloc et de sortie
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Rails avec des signaux de bloc et combinés
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Rails avec des signaux de bloc et de chemin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Rails avec des signaux de bloc et de chemin à sens unique
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Rails avec des signaux d'entrée et de sortie
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Rails avec des signaux d'entrée et combinés
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Rails avec des signaux d'entrée et de chemin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Rails avec des signaux d'entrée et de chemin à sens unique
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Rails avec des signaux de sortie et combinés
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Rails avec des signaux de sortie et de chemin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Rails avec des signaux de sortie et de chemin à sens unique
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Rails avec des signaux combinés et de chemin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Rails avec des signaux combinés et de chemin à sens unique
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Rails avec des signaux de chemin et de chemin à sens unique
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Dépôt ferroviaire
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Route
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Route avec lampadaires
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Route avec lignée d'arbustres
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Dépôt de véhicules routiers
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Route/rail Croisement à niveau
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramway
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (en contruction)
-
-STR_TREE_NAME_TREES                                             :Arbres
-STR_TREE_NAME_RAINFOREST                                        :Forêt tropicale
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactus
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Gare ferroviaire
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar d'aéronefs
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aéroport
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Aire de chargement
-STR_STATION_DESCRIPTION_BUS_STATION                             :Arrêt d'autobus
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Port
-STR_STATION_DESCRIPTION_BUOY                                    :Bouée
-STR_LANDINFO_WAYPOINT                                           :Point de contrôle
-
-STR_WATER_DESCRIPTION_WATER                                     :Eau
-STR_LANDINFO_CANAL                                              :Canal
-STR_LANDINFO_LOCK                                               :Ecluse
-STR_LANDINFO_RIVER                                              :Rivière
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Rivage ou berge
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Dépôt naval
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (en contruction)
+
+STR_LAI_TREE_NAME_TREES                                         :Arbres
+STR_LAI_TREE_NAME_RAINFOREST                                    :Forêt tropicale
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactus
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Gare ferroviaire
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar d'aéronefs
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aéroport
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Aire de chargement
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Arrêt d'autobus
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Port
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bouée
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Point de contrôle
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Eau
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Ecluse
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rivière
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Rivage ou berge
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Dépôt naval
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Tunnel ferroviaire
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunnel routier
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Tunnel ferroviaire
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunnel routier
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Pont ferroviaire suspendu en acier
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Pont ferroviaire à poutres en acier
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Pont ferroviaire à porte-à-faux en acier
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Pont ferroviaire suspendu renforcé en béton
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Pont ferroviaire en bois
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Pont ferroviaire en béton
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Pont ferroviaire à tubes
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Pont ferroviaire suspendu en acier
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Pont ferroviaire à poutres en acier
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Pont ferroviaire à porte-à-faux en acier
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Pont ferroviaire suspendu renforcé en béton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Pont ferroviaire en bois
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Pont ferroviaire en béton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Pont ferroviaire à tubes
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Pont routier suspendu en acier
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Pont routier à poutres en acier
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Pont routier à porte-à-faux en acier
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Pont routier suspendu renforcé en béton
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Pont routier en bois
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Pont routier en béton
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Pont ferroviaire à tubes en acier
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Pont routier suspendu en acier
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Pont routier à poutres en acier
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Pont routier à porte-à-faux en acier
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Pont routier suspendu renforcé en béton
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Pont routier en bois
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Pont routier en béton
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Pont ferroviaire à tubes en acier
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aqueduc
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqueduc
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmetteur
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Phare
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Siège de la compagnie
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Terrain appartenant à une compagnie
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmetteur
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Phare
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Siège de la compagnie
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Terrain appartenant à une compagnie
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}A propos de OpenTTD
@@ -2161,7 +2161,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Sauvegar
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Charger une partie
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Sauvegarder Scénario
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Charger Scénario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Charger une carte d'altitude
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Charger une carte d'altitude
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Cliquer ici pour passer au répertoire par défaut courant de charge/sauvegarde
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} libre{P "" s}
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Liste des disques, répertoires, et fichiers de sauvegarde
@@ -2171,119 +2171,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Supprime
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Sauvegarder
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Sauvegarde la partie avec le nom choisi
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Entrer un nom pour la sauvegarde
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Entrer un nom pour la sauvegarde
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Création du monde
-STR_MAPSIZE                                                     :{BLACK}Taille de la carte :
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Nb. de villes :
-STR_DATE                                                        :{BLACK}Date:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Nb. d'industries :
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Alt. d'enneigement :
-STR_SNOW_LINE_UP                                                :{BLACK}Augmenter l'altitude d'enneigement
-STR_SNOW_LINE_DOWN                                              :{BLACK}Baisser l'altitude d'enneigement
-STR_RANDOM_SEED                                                 :{BLACK}Amorce :
-STR_RANDOM_SEED_HELP                                            :{BLACK}Cliquer pour saisir une amorce
-STR_RANDOM                                                      :{BLACK}Nouvelle Amorce
-STR_RANDOM_HELP                                                 :{BLACK}Modifier l'amorce utilisée pour la Création du Terrain
-STR_LAND_GENERATOR                                              :{BLACK}Générateur :
-STR_TREE_PLACER                                                 :{BLACK}Ajout des arbres :
-STR_TERRAIN_TYPE                                                :{BLACK}Type de terrain :
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Niveau de la mer :
-STR_SMOOTHNESS                                                  :{BLACK}Lissage :
-STR_GENERATE                                                    :{WHITE}Créer
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Création du monde
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Taille de la carte :
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Nb. de villes :
+STR_MAPGEN_DATE                                                 :{BLACK}Date:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Nb. d'industries :
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Alt. d'enneigement :
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Augmenter l'altitude d'enneigement
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Baisser l'altitude d'enneigement
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Amorce :
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Cliquer pour saisir une amorce
+STR_MAPGEN_RANDOM                                               :{BLACK}Nouvelle Amorce
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Modifier l'amorce utilisée pour la Création du Terrain
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Générateur :
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Ajout des arbres :
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Type de terrain :
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Niveau de la mer :
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Lissage :
+STR_MAPGEN_GENERATE                                             :{WHITE}Créer
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Bords de la carte:
-STR_NORTHWEST                                                   :{BLACK}Nord-Ouest
-STR_NORTHEAST                                                   :{BLACK}Nord-Est
-STR_SOUTHEAST                                                   :{BLACK}Sud-Est
-STR_SOUTHWEST                                                   :{BLACK}Sud-Ouest
-STR_BORDER_FREEFORM                                             :{BLACK}Forme libre
-STR_BORDER_WATER                                                :{BLACK}Eau
-STR_BORDER_RANDOM                                               :{BLACK}Aléatoire
-STR_BORDER_RANDOMIZE                                            :{BLACK}Aléatoire
-STR_BORDER_MANUAL                                               :{BLACK}Manuel
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotation de la carte d'altitude :
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nom de la carte d'altitude :
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Taille: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Entrer une amorce
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Modifier l'altitude d'enneigement
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Modifier l'année de départ
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Bords de la carte:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nord-Ouest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nord-Est
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sud-Est
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sud-Ouest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Forme libre
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Eau
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aléatoire
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aléatoire
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuel
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotation de la carte d'altitude :
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nom de la carte d'altitude :
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Taille: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Entrer une amorce
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Modifier l'altitude d'enneigement
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Modifier l'année de départ
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Type de scénario
-STR_SE_FLAT_WORLD                                               :{WHITE}Terrain plat
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Créer un monde plat
-STR_SE_RANDOM_LAND                                              :{WHITE}Terrain aléatoire
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Altitude du terrain plat :
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Diminuer l'altitude du terrain plat
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Augmenter l'altitude du terrain plat
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Type de scénario
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Terrain plat
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Créer un monde plat
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Terrain aléatoire
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Altitude du terrain plat :
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Diminuer l'altitude du terrain plat
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Augmenter l'altitude du terrain plat
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Modifier l'altitude du terrain plat
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Modifier l'altitude du terrain plat
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Création du monde...
 STR_GENERATION_ABORT                                            :{BLACK}Annuler
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Annuler la génération du terrain
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Voulez-vous vraiment annuler la génération ?
-STR_PROGRESS                                                    :{WHITE}{NUM}% terminé
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Création du monde
-STR_TREE_GENERATION                                             :{BLACK}Création des arbres
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Création des non-déplacables
-STR_CLEARING_TILES                                              :{BLACK}Création des zones rugueuses et rocheuses
-STR_SETTINGUP_GAME                                              :{BLACK}Configuration du jeu
-STR_PREPARING_TILELOOP                                          :{BLACK}Rafraîchissement du terrain
-STR_PREPARING_GAME                                              :{BLACK}Préparation du jeu
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% terminé
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Création du monde
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Création des arbres
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Création des non-déplacables
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Création des zones rugueuses et rocheuses
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Configuration du jeu
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Rafraîchissement du terrain
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Préparation du jeu
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Paramètres Newgrf
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Charger la liste sélectionnée
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Sauver la liste
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Sauver la liste courante
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Entrer un nom pour la liste
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Supprimer la liste
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Supprimer la liste sélectionnée
-STR_NEWGRF_ADD                                                  :{BLACK}Ajouter
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Ajouter un fichier NewGRF à la liste
-STR_NEWGRF_REMOVE                                               :{BLACK}Retirer
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Retirer le fichier NewGRF sélectionné de la liste
-STR_NEWGRF_MOVEUP                                               :{BLACK}Monter
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Monter le fichier NewGRG sélectionné dans la liste
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Descendre
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Descendre le fichier NewGRG sélectionné dans la liste
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Liste des fichiers NewGRF installés. Cliquer sur un fichier pour modifier ses paramètres
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Changer les paramètres
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Basculer palette
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Basculer la palette du NewGRF sélectionné.{}Faites ceci quand les graphiques de ce NewGRF sont rose dans le jeu
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Appliquer les changements
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Trouver le contenu manquant en ligne
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Vérifier si le contenu manquant peut être trouvé en ligne
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Nom de fichier: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palette: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Paramètres: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Pas d'informations disponibles
-STR_NEWGRF_NOT_FOUND                                            :{RED}Fichier correspondant non trouvé
-STR_NEWGRF_DISABLED                                             :{RED}Désactivé
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Entrer les paramètres NewGRF
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Charger la liste sélectionnée
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Sauver la liste
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Sauver la liste courante
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Entrer un nom pour la liste
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Supprimer la liste
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Supprimer la liste sélectionnée
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Ajouter
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Ajouter un fichier NewGRF à la liste
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Retirer
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Retirer le fichier NewGRF sélectionné de la liste
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Monter
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Monter le fichier NewGRG sélectionné dans la liste
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Descendre
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Descendre le fichier NewGRG sélectionné dans la liste
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Liste des fichiers NewGRF installés. Cliquer sur un fichier pour modifier ses paramètres
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Changer les paramètres
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Basculer palette
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Basculer la palette du NewGRF sélectionné.{}Faites ceci quand les graphiques de ce NewGRF sont rose dans le jeu
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Appliquer les changements
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Trouver le contenu manquant en ligne
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Vérifier si le contenu manquant peut être trouvé en ligne
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nom de fichier: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paramètres: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Pas d'informations disponibles
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Fichier correspondant non trouvé
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Désactivé
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Entrer les paramètres NewGRF
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Fichiers NewGRF disponibles
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Ajouter à la sélection
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Ajouter le fichier NewGRF sélectionné à votre configuration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Actualiser la liste
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Mettre à jour la liste des fichiers NewGRF disponibles
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Ajouter le fichier NewGRF sélectionné à votre configuration
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Actualiser la liste
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Mettre à jour la liste des fichiers NewGRF disponibles
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2307,7 +2307,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contient plusieurs Action 8.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Attention!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Attention!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vous êtes sur le point de faire des changements dans une partie en cours; cela peut faire planter OpenTTD.{}Etes-vous absolument sûr ?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ajout impossible: GRF ID en double
@@ -2332,10 +2332,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Liste de
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editer le texte du panneau
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Aller au panneau suivant
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Aller au panneau précédent
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Aller au panneau suivant
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Aller au panneau précédent
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Entrer un nom pour le panneau
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Entrer un nom pour le panneau
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Villes
@@ -2349,10 +2349,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Population: {ORANGE}{COMMA}{BLACK}  Maisons: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passagers le mois dernier : {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Courrier le mois dernier : {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Cargaison nécessaire à la croissance de la ville:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} requis
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} livré le mois dernier
-STR_NOISE_IN_TOWN                                               :{BLACK}Limite de nuisance pour la ville: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Cargaison nécessaire à la croissance de la ville:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} requis
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} livré le mois dernier
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limite de nuisance pour la ville: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrer la vue sur la ville
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Municipalité
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Afficher des informations sur la municipalité
@@ -2399,18 +2399,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Aucune
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Subventions déjà accordées:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} de {STATION} à {STATION}{YELLOW} ({COMPANY}{YELLOW}, jusqu'à {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Cliquer sur le service pour centrer la vue sur l'industrie ou la ville
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Cliquer sur le service pour centrer la vue sur l'industrie ou la ville
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nom des stations - Cliquer sur un nom pour centrer la vue
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Cliquer avec Ctrl pour sélectionner plus d'un élément
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Cliquer avec Ctrl pour sélectionner plus d'un élément
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Station{P 2 "" s}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Aucun -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Tous les types de station
-STR_SELECT_ALL_TYPES                                            :{BLACK}Tous les types de marchandise (y compris pas en attente)
-STR_NO_WAITING_CARGO                                            :{BLACK}Pas de marchandises en attente
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Tous les types de station
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Tous les types de marchandise (y compris pas en attente)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Pas de marchandises en attente
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2441,18 +2441,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Exceptionnel
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrer la vue sur la station
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Renommer la station
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Afficher les trains ayant cette station dans leurs ordres
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Afficher les véhicules routiers ayant cette station dans leurs ordres
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Afficher les aéronefs ayant cette station dans leurs ordres
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Afficher les navires ayant cette station dans leurs ordres
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Afficher les trains ayant cette station dans leurs ordres
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Afficher les véhicules routiers ayant cette station dans leurs ordres
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Afficher les aéronefs ayant cette station dans leurs ordres
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Afficher les navires ayant cette station dans leurs ordres
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Renommer la gare
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Renommer la gare
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrer la vue sur le point de contrôle
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Renommer le point decontrôle
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Renommer le point decontrôle
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrer la vue sur la bouée
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Renommer la bouée
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Renommer la bouée
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Modifier le nom du point de contrôle
 
@@ -2478,7 +2478,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Equilibre bancaire
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Emprunt
-STR_MAX_LOAN                                                    :{WHITE}Emprunt maximum : {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Emprunt maximum : {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Emprunter {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Augmenter le prêt. Ctrl-clic pour emprunter autant que possible
@@ -2492,10 +2492,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inauguré en: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Couleur:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Véhicules:
-STR_TRAINS                                                      :{WHITE}{COMMA} train{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} véhicule{P "" s}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aéronef{P "" s}
-STR_SHIPS                                                       :{WHITE}{COMMA} navire{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} train{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} véhicule{P "" s}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aéronef{P "" s}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} navire{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Aucun
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valeur de la compagnie : {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% détenus par {COMPANY})
@@ -2503,8 +2503,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Const. siège
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Voir le siège
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Contruire/voir le Siège Social
-STR_RELOCATE_HQ                                                 :{BLACK}Déménager le QG
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Reconstruit le quartier général de la compagnie ailleurs pour le prix de 1% de la valeur de la compagnie
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Déménager le QG
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Reconstruit le quartier général de la compagnie ailleurs pour le prix de 1% de la valeur de la compagnie
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nouveau visage
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Choix d'un nouveau visage pour le P.D.G.
@@ -2520,17 +2520,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vendre 2
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Acheter 25% de la compagnie
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vendre 25% de la compagnie
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nom de la société
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nom du P.D.G.
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nom de la société
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nom du P.D.G.
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Nous sommes à la recherche d'un acheteur pour notre compagnie{}{}Voulez vous acheter {COMPANY} pour {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industries
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transporté)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporté)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Noms des industries - Cliquer sur un nom pour centrer la vue
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industries
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transporté)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporté)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Noms des industries - Cliquer sur un nom pour centrer la vue
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2566,26 +2566,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Aéronef
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Profit cette année: {CURRENCY} (année précédente: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trains disponibles
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Véhicules disponibles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Navires disponibles
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aéronefs disponibles
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Voir la liste des modèles disponibles pour ce type de véhicules.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trains disponibles
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Véhicules disponibles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Navires disponibles
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aéronefs disponibles
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Voir la liste des modèles disponibles pour ce type de véhicules.
 
-STR_MANAGE_LIST                                                 :{BLACK}Gérer la liste
-STR_MANAGE_LIST_TIP                                             :{BLACK}Envoyer les instructions à tous les véhicules de cette liste
-STR_REPLACE_VEHICLES                                            :Remplacer véhicules
-STR_SEND_FOR_SERVICING                                          :Envoyer en entretien
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Gérer la liste
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Envoyer les instructions à tous les véhicules de cette liste
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Remplacer véhicules
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Envoyer en entretien
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Envoyer au dépôt
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Envoyer au dépôt
-STR_SEND_SHIP_TO_DEPOT                                          :Envoyer au dépôt
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Envoyer au hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Envoyer au dépôt
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Envoyer au dépôt
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Envoyer au dépôt
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Envoyer au hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Cliquer pour arrêter tous les véhicules de la liste
-STR_MASS_START_LIST_TIP                                         :{BLACK}Cliquer pour démarrer tous les véhicules de la liste
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Cliquer pour arrêter tous les véhicules de la liste
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Cliquer pour démarrer tous les véhicules de la liste
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordres partagés de {COMMA} véhicule{P "" s}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordres partagés de {COMMA} véhicule{P "" s}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Tous les trains
@@ -2598,11 +2598,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Véhicules rout
 STR_GROUP_DEFAULT_SHIPS                                         :Navires dégroupés
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aéronefs dégroupés
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Groupes - Cliquer sur un groupe pour lister tous les véhicules de ce groupe
-STR_GROUP_CREATE_TIP                                            :{BLACK}Cliquer pour créer un groupe
-STR_GROUP_DELETE_TIP                                            :{BLACK}Supprimer le groupe sélectionné
-STR_GROUP_RENAME_TIP                                            :{BLACK}Renommer le groupe sélectionné
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Cliquer pour protéger ce groupe contre l'auto-remplacement global
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Groupes - Cliquer sur un groupe pour lister tous les véhicules de ce groupe
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Cliquer pour créer un groupe
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Supprimer le groupe sélectionné
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renommer le groupe sélectionné
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Cliquer pour protéger ce groupe contre l'auto-remplacement global
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Ajouter des véhicules partagés
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Retirer tous les véhicules
@@ -2625,7 +2625,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Vitesse:
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Vitesse: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coût d'entretien: {GOLD}{CURRENCY}/an
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacité: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(réaménageable)
+STR_PURCHASE_INFO_REFITTABLE                                    :(réaménageable)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Concu en: {GOLD}{NUM}{BLACK}Durée de vie: {GOLD}{COMMA} ans
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilité Max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Prix: {GOLD}{CURRENCY}
@@ -2689,17 +2689,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Glisser
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Glisse le navire jusqu'ici pour le vendre
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Glisser l'aéronef jusqu'ici ici pour le vendre
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Faire Glisser la locomotive ici pour vendre tout le train
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Faire Glisser la locomotive ici pour vendre tout le train
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vendre tous les trains du dépôt
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vendre tous les véhicules routiers du dépôt
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vendre tous les navires du dépôt
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vendre tous les aéronefs du hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vendre tous les trains du dépôt
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vendre tous les véhicules routiers du dépôt
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vendre tous les navires du dépôt
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vendre tous les aéronefs du hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autoremplacer tous les trains du dépôt
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autoremplacer tous les véhicules routiers du dépôt
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autoremplacer tous les navires du dépôt
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autoremplacer tous les aéronefs du hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autoremplacer tous les trains du dépôt
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autoremplacer tous les véhicules routiers du dépôt
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autoremplacer tous les navires du dépôt
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autoremplacer tous les aéronefs du hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nouveaux véhicules
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nouveaux Véhicules
@@ -2711,35 +2711,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construi
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construire nouveau navire
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construire nouvel aéronef
 
-STR_CLONE_TRAIN                                                 :{BLACK}Copier Train
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Copier Véhicule
-STR_CLONE_SHIP                                                  :{BLACK}Copier Navire
-STR_CLONE_AIRCRAFT                                              :{BLACK}Copier aéronef
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Copier Train
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Copier Véhicule
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Copier Navire
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Copier aéronef
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Effectuer la copie d'un train et ses wagons. Cliquer ici puis sur un train dans ou hors d'un dépôt. Ctrl-clic pour partager les ordres
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Effectuer la copie d'un véhicule routier. Cliquer ici puis sur un véhicule routier dans ou hors d'un dépôt. Ctrl-clic pour partager les ordres
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Effectuer la copie d'un navire. Cliquer ici puis sur un navire dans ou hors d'un dépôt. Ctrl-clic pour partager les ordres
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Effectuer la copie d'un aéronef. Cliquer ici puis sur un aéronef dans ou hors d'un hangar. Ctrl-clic pour partager les ordres
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Effectuer la copie d'un train et ses wagons. Cliquer ici puis sur un train dans ou hors d'un dépôt. Ctrl-clic pour partager les ordres
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Effectuer la copie d'un véhicule routier. Cliquer ici puis sur un véhicule routier dans ou hors d'un dépôt. Ctrl-clic pour partager les ordres
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Effectuer la copie d'un navire. Cliquer ici puis sur un navire dans ou hors d'un dépôt. Ctrl-clic pour partager les ordres
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Effectuer la copie d'un aéronef. Cliquer ici puis sur un aéronef dans ou hors d'un hangar. Ctrl-clic pour partager les ordres
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrer la vue sur le dépôt
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centre la vue sur le dépôt
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrer la vue sur emplacement du dépôt naval
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrer la vue principale sur l'emplacement du hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Afficher les trains ayant ce dépôt dans leurs ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Afficher les véhicules routiers ayant ce dépôt dans leurs ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Afficher les navires ayant ce dépôt dans leurs ordres
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Afficher les aéronefs ayant ce dépôt dans leurs ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Afficher les trains ayant ce dépôt dans leurs ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Afficher les véhicules routiers ayant ce dépôt dans leurs ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Afficher les navires ayant ce dépôt dans leurs ordres
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Afficher les aéronefs ayant ce dépôt dans leurs ordres
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Cliquer pour arrêter tous les trains du dépôt
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Cliquer pour arrêter tous les véhicules routiers du dépôt
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Cliquer pour arrêter tous les navires du dépôt
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Cliquer pour arrêter tous les aéronefs du hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Cliquer pour arrêter tous les trains du dépôt
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Cliquer pour arrêter tous les véhicules routiers du dépôt
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Cliquer pour arrêter tous les navires du dépôt
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Cliquer pour arrêter tous les aéronefs du hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Cliquer pour démarrer tous les trains du dépôt
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Cliquer pour démarrer tous les véhicules routiers du dépôt
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Cliquer pour démarrer tous les navires du dépôt
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Cliquer pour démarrer tous les aéronefs du hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Cliquer pour démarrer tous les trains du dépôt
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Cliquer pour démarrer tous les véhicules routiers du dépôt
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Cliquer pour démarrer tous les navires du dépôt
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Cliquer pour démarrer tous les aéronefs du hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Vous êtes sur le point de vendre tous les véhicules du dépôt. Etes-vous sûr ?
 
@@ -2753,38 +2753,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :{G=m}navire
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=f}locomotive monorail
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=f}locomotive magnétique
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Prix: {CURRENCY} Poids: {WEIGHT_S}{}Vitesse: {VELOCITY}  Puissance: {POWER}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Prix: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {CARGO}, {CARGO}{}Coût d'entretien: {CURRENCY}/an
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Prix: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {CARGO}{}Coût d'entretien: {CURRENCY}/an
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Prix: {CURRENCY} Poids: {WEIGHT_S}{}Vitesse: {VELOCITY}  Puissance: {POWER}{}Coût d'entretien: {CURRENCY}/an{}Capacité: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Prix: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {CARGO}, {CARGO}{}Coût d'entretien: {CURRENCY}/an
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Prix: {CURRENCY} Vitesse max.: {VELOCITY}{}Capacité: {CARGO}{}Coût d'entretien: {CURRENCY}/an
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Remplacer {STRING}
-STR_VEHICLE_TRAIN                                               :Train
-STR_VEHICLE_ROAD_VEHICLE                                        :Véhicule routier
-STR_VEHICLE_SHIP                                                :Navire
-STR_VEHICLE_AIRCRAFT                                            :Aéronef
+STR_REPLACE_VEHICLE_TRAIN                                       :Train
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Véhicule routier
+STR_REPLACE_VEHICLE_SHIP                                        :Navire
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aéronef
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Choisir le type de locomotive à remplacer
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Choisir le nouveau type de locomotive devant remplacer le type de locomotive sélectionné à gauche
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Démarrer le remplacement
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Appuyer sur ce bouton pour commencer le remplacement du type locomotive sélectionné à gauche avec la sélection de droite
-STR_NOT_REPLACING                                               :{BLACK}Pas en cours de remplacement
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Aucun véhicule sélectionné
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Pas en cours de remplacement
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Aucun véhicule sélectionné
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stopper le remplacement
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Appuyer sur ce bouton pour arrêter le remplacement du type locomotive sélectionné à gauche
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}En Remplacement: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Passer à la fenêtre de remplacement de locomotives/wagons
-STR_ENGINES                                                     :Locomotives
-STR_WAGONS                                                      :Wagons
+STR_REPLACE_ENGINES                                             :Locomotives
+STR_REPLACE_WAGONS                                              :Wagons
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Choisir un type de rail pour le remplacement de locomotives
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Ceci affiche par quelle locomotive celle qui est sélectionnée à gauche sera remplacée
-STR_RAIL_VEHICLES                                               :Véhicules sur rail
-STR_ELRAIL_VEHICLES                                             :Vehicule électriques sur rail
-STR_MONORAIL_VEHICLES                                           :Véhicules sur monorail
-STR_MAGLEV_VEHICLES                                             :Véhicules sur Maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Véhicules sur rail
+STR_REPLACE_ELRAIL_VEHICLES                                     :Vehicule électriques sur rail
+STR_REPLACE_MONORAIL_VEHICLES                                   :Véhicules sur monorail
+STR_REPLACE_MAGLEV_VEHICLES                                     :Véhicules sur Maglev
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Retrait de wagon: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}L'autoremplacement conserve la même longueur du train en retirant des wagons (d'abord par la tête), si le remplacement fait en sorte que le train ne devienne plus long.
@@ -2802,10 +2802,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Envoie l
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Envoyer le navire au dépôt. Ctrl-clic pour entretien seul
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Envoyer l'aéronef au hangar. Ctrl-clic pour entretien seul
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Effectuer la copie d'un train et ses wagons. Ctrl-clic pour partager les ordres
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Effectuer la copie d'un véhicule routier. Ctrl-clic pour partager les ordres
-STR_CLONE_SHIP_INFO                                             :{BLACK}Effectuer la copie d'un navire. Ctrl-clic pour partager les ordres
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Effectuer une copie de l'aéronef. Ctrl-clic pour partager les ordres
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Effectuer la copie d'un train et ses wagons. Ctrl-clic pour partager les ordres
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Effectuer la copie d'un véhicule routier. Ctrl-clic pour partager les ordres
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Effectuer la copie d'un navire. Ctrl-clic pour partager les ordres
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Effectuer une copie de l'aéronef. Ctrl-clic pour partager les ordres
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forcer le train à continuer sans tenir compte des feux
 
@@ -2838,36 +2838,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Départ
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Crashé!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}En Panne
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stoppé
-STR_TRAIN_STOPPING                                              :{RED}Ralentit
-STR_TRAIN_STOPPING_VEL                                          :{RED}Ralentit, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Pas de puissance
-STR_TRAIN_STUCK                                                 :{ORANGE}En attente d'un chemin libre
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}En route pour {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}En route pour {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Aucun ordre
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Aucun ordre, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}En route pour {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}En route pour {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}En route pour le dépôt de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}En route pour le dépôt de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}En route pour le dépôt de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}En route pour le dépôt de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}En route pour le dépôt naval de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}En route pour le dépôt naval de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}En route pour le hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}En route pour le hangar de {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Entretien au dépôt de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Entretien au dépôt de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Entretien au dépôt de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Entretien au dépôt de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Entretien au dépôt naval de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Entretien au dépôt naval de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Entretien au hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Entretien au hangar de {STATION} , {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Ralentit
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Ralentit, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Pas de puissance
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}En attente d'un chemin libre
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}En route pour {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}En route pour {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Aucun ordre
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Aucun ordre, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}En route pour {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}En route pour {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}En route pour le dépôt de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}En route pour le dépôt de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}En route pour le dépôt de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}En route pour le dépôt de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}En route pour le dépôt naval de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}En route pour le dépôt naval de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}En route pour le hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}En route pour le hangar de {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Entretien au dépôt de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Entretien au dépôt de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Entretien au dépôt de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Entretien au dépôt de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Entretien au dépôt naval de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Entretien au dépôt naval de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Entretien au hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Entretien au hangar de {STATION} , {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Détails)
@@ -2880,8 +2880,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nommer l
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Âge: {LTBLUE}{STRING}{BLACK}   Coût d'entretien: {LTBLUE}{CURRENCY}/an
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} an{P "" nées} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} an{P "" nées} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} an{P "" nées} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} an{P "" nées} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Vitesse max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Poids: {LTBLUE}{WEIGHT_S} {BLACK}Puissance: {LTBLUE}{POWER}{BLACK} Vitesse max.: {LTBLUE}{VELOCITY}
@@ -2895,7 +2895,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}CapacitÃ
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacité: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacité: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Crédits de transfert: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Crédits de transfert: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA}jours{BLACK}   , dernier le : {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalle d'entretien: {LTBLUE}{COMMA}%{BLACK}   , dernier le : {LTBLUE}{DATE_LONG}
@@ -2911,9 +2911,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nommer l
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construit en: {LTBLUE}{NUM}{BLACK} Valeur: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valeur: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacité totale de ce train:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Capacité totale de ce train:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vide
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
@@ -2928,7 +2928,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Afficher
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Charge totale
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Afficher la capacité totale du train, par type de cargaison
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacité: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacité: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Réaménager)
@@ -2952,15 +2952,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Réamén
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordres)
-STR_TIMETABLE_VIEW                                              :{BLACK}Horaire
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Basculer vers la vue horaire
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horaire
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Basculer vers la vue horaire
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Liste des ordres - Cliquer sur un ordre pour le sélectionner. Ctrl-clic pour déplacer la vue sur la station
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin des ordres - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin des ordres partagés - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fin des ordres partagés - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Sans arrêt
@@ -2984,14 +2984,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transférer
 STR_ORDER_DROP_NO_UNLOADING                                     :Pas de déchargement
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Modifier le comportement de déchargement de l'ordre sélectionné
 
-STR_REFIT                                                       :{BLACK}Réaménager
-STR_REFIT_TIP                                                   :{BLACK}Choisir pour quelle cargaison réaménager pour cet ordre. Ctrl-clic pour retirer l'instruction de réaménagement
+STR_ORDER_REFIT                                                 :{BLACK}Réaménager
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Choisir pour quelle cargaison réaménager pour cet ordre. Ctrl-clic pour retirer l'instruction de réaménagement
 
-STR_SERVICE                                                     :{BLACK}Entretien
+STR_ORDER_SERVICE                                               :{BLACK}Entretien
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Toujours aller
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Entretien si nécessaire
 STR_ORDER_DROP_HALT_DEPOT                                       :Arrêt
-STR_SERVICE_HINT                                                :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sauter cet ordre tant qu'aucun entretien n'est requis
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Données du véhicule servant de base au saut
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Pourcentage de chargement
@@ -3012,7 +3012,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :est vrai
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :est faux
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}La valeur à comparer aux données du véhicule
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Entrer la valeur à comparer
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Suivant
@@ -3026,13 +3026,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Aller au dépô
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Aller au hangar le plus proche
 STR_ORDER_CONDITIONAL                                           :Saut conditionnel d'ordre
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insérer un nouvel ordre
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Insérer un ordre avancé
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Insérer un ordre avancé
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Afficher tous les véhicules partageant ce programme
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Afficher tous les véhicules partageant ce programme
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Passer par {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Passer sans arrêt par {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Passer par {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Passer sans arrêt par {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Entretien au
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Entretien sans arrêt au
@@ -3042,15 +3042,15 @@ STR_ORDER_NEAREST_HANGAR                                        :hangar le plus
 STR_ORDER_TRAIN_DEPOT                                           :dépôt ferroviaire
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :dépôt routier
 STR_ORDER_SHIP_DEPOT                                            :dépôt naval
-STR_GO_TO_DEPOT                                                 :{STRING} {2:STRING} de {1:TOWN}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {2:STRING} {1:STRING}
-STR_GO_TO_HANGAR                                                :{STRING} hangar de {STATION}
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {2:STRING} de {1:TOWN}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {2:STRING} {1:STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} hangar de {STATION}
 
-STR_REFIT_ORDER                                                 :(Réaménager pour {STRING})
-STR_REFIT_STOP_ORDER                                            :(Réaménager pour {STRING} et arrêt)
-STR_STOP_ORDER                                                  :(Arrêt)
+STR_ORDER_REFIT_ORDER                                           :(Réaménager pour {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Réaménager pour {STRING} et arrêt)
+STR_ORDER_STOP_ORDER                                            :(Arrêt)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Charger complètement)
 STR_ORDER_FULL_LOAD_ANY                                         :(Charger complètement par un seul type)
@@ -3071,16 +3071,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[queue]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[milieu]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[tête]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Sauter à l'ordre {COMMA}
-STR_CONDITIONAL_NUM                                             :Sauter à l'ordre {COMMA} quand {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Sauter à l'ordre {COMMA} quand {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Sauter à l'ordre {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Sauter à l'ordre {COMMA} quand {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Sauter à l'ordre {COMMA} quand {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Ordre invalide)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horaire)
-STR_ORDER_VIEW                                                  :{BLACK}Ordres
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Basculer vers la vue ordres
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordres
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Basculer vers la vue ordres
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horaire - cliquer sur un ordre pour le séléctionner.
 
@@ -3102,10 +3102,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Ce véhi
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Modifier durée
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modifier la durée de l'ordre séléctionné
 
-STR_CLEAR_TIME                                                  :{BLACK}Annuler durée
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Annuler durée
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Annuler la durée de l'ordre séléctionné
 
-STR_RESET_LATENESS                                              :{BLACK}RAZ compteur de retard
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}RAZ compteur de retard
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Remet à zéro le compteur de retard, le véhicule sera donc à l'heure
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autoremplir
@@ -3113,42 +3113,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Remplit
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}Débogage d'IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nom de l'IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nom de l'IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recharger IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Tuer l'IA, recharger le script et relancer l'IA
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Tuer l'IA, recharger le script et relancer l'IA
 
-STR_AI_NO_AI_FOUND                                              :Aucune IA n'a été trouvée.{}Cette IA est factice et ne fera rien.{}Vous pouvez télécharger diverses IA via le système de 'Contenu en ligne'.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}L'une des IA a rencontré un problème. Merci de rapporter ceci à l'auteur de l'IA avec une capture d'écran de la fenêtre de débogage d'IA.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}La fenêtre de débogage d'IA n'est disponible que pour le serveur
+STR_ERROR_AI_NO_AI_FOUND                                        :Aucune IA n'a été trouvée.{}Cette IA est factice et ne fera rien.{}Vous pouvez télécharger diverses IA via le système de 'Contenu en ligne'.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}L'une des IA a rencontré un problème. Merci de rapporter ceci à l'auteur de l'IA avec une capture d'écran de la fenêtre de débogage d'IA.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}La fenêtre de débogage d'IA n'est disponible que pour le serveur
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuration IA
-STR_AI_LIST_TIP                                                 :{BLACK}Toutes les IA qui seront chargées pendant la prochaine partie
-STR_AI_HUMAN_PLAYER                                             :Joueur Humain
-STR_AI_RANDOM_AI                                                :IA aléatoire
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Toutes les IA qui seront chargées pendant la prochaine partie
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Joueur Humain
+STR_AI_CONFIG_RANDOM_AI                                         :IA aléatoire
 
-STR_AI_CHANGE                                                   :{BLACK}Sélection IA
-STR_AI_CHANGE_TIP                                               :{BLACK}Charger une autre IA
-STR_AI_CONFIGURE                                                :{BLACK}Configurer
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configurer les paramètres de l'IA
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Sélection IA
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Charger une autre IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurer
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurer les paramètres de l'IA
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}IAs disponibles
-STR_AI_AILIST_TIP                                               :{BLACK}Cliquer pour sélectionner une IA
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Cliquer pour sélectionner une IA
 
-STR_AI_AUTHOR                                                   :{BLACK}Auteur: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Version: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Auteur: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Accepte
-STR_AI_ACCEPT_TIP                                               :{BLACK}Sélectionner l'IA en surbrillance
-STR_AI_CANCEL                                                   :{BLACK}Annuler
-STR_AI_CANCEL_TIP                                               :{BLACK}Ne pas modifier l'IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accepte
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Sélectionner l'IA en surbrillance
+STR_AI_LIST_CANCEL                                              :{BLACK}Annuler
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne pas modifier l'IA
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Paramètres IA
-STR_AI_CLOSE                                                    :{BLACK}Fermer
-STR_AI_RESET                                                    :{BLACK}Réinitialiser
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fermer
+STR_AI_SETTINGS_RESET                                           :{BLACK}Réinitialiser
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3169,8 +3169,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Coût Es
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Revenu Estimé: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Sauvegarde en cours,{}Veuillez attendre la fin du processus!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Enregistrement automatique échoué
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Sauvegarde en cours,{}Veuillez attendre la fin du processus!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Enregistrement automatique échoué
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Impossible d'accéder au disque
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}La sauvegarde à échoué{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Impossible de supprimer le fichier
@@ -3181,22 +3181,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Sauvegarde modi
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Fichier illisibble
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Fichier non modifiable
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Échec du contrôle d'intégrité des données
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Partie sauvegardée avec une version sans support des tramways. Tous les tramways ont été supprimés.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Partie sauvegardée avec une version sans support des tramways. Tous les tramways ont été supprimés.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Génération de la carte annulée...{}... pas d'emplacements valables pour une ville
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... il n'y a pas de ville dans ce scenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Génération de la carte annulée...{}... pas d'emplacements valables pour une ville
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... il n'y a pas de ville dans ce scenario
 
-STR_PNGMAP_ERROR                                                :{WHITE}Chargement du paysage depuis PNG impossible...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... fichier non trouvé.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}... ne peut pas convertir le type d'image. Image PNG 8 ou 24-bit nécessaire.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}... quelque chose s'est mal passé. Désolé. (le fichier est probablement corrompu)
+STR_ERROR_PNGMAP                                                :{WHITE}Chargement du paysage depuis PNG impossible...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... fichier non trouvé.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... ne peut pas convertir le type d'image. Image PNG 8 ou 24-bit nécessaire.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... quelque chose s'est mal passé. Désolé. (le fichier est probablement corrompu)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Chargement du paysage depuis BMP impossible...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... ne peut pas convertir le type d'image.
+STR_ERROR_BMPMAP                                                :{WHITE}Chargement du paysage depuis BMP impossible...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... ne peut pas convertir le type d'image.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Avertissement de redimensionnement
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Trop redimensionner la carte source n'est pas recommandé. Continuer la génération ?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Avertissement de redimensionnement
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Trop redimensionner la carte source n'est pas recommandé. Continuer la génération ?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Copie d'écran enregistrée avec succès sous '{STRING}'
@@ -3219,15 +3219,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... site
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... déjà construit
 STR_ERROR_OWNED_BY                                              :{WHITE}... appartient à {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... appartient à une autre compagnie
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Le nom doit être unique
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} présente
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Le nom doit être unique
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} présente
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}La municipalité de {TOWN} refuse cette opération
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}La municipalité de {TOWN} refuse la construction d'un autre aéroport dans la ville
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}La municipalité de {TOWN} refuse la permission pour cet aéroport, en raison de nuisances sonores
-STR_BRIBE_FAILED                                                :{WHITE}Votre tentative de corruption à été
-STR_BRIBE_FAILED_2                                              :{WHITE}révélée à la presse par un journaliste régional.
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}La municipalité de {TOWN} refuse la permission pour cet aéroport, en raison de nuisances sonores
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Votre tentative de corruption à été
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}révélée à la presse par un journaliste régional.
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Impossible d'élever le terrain ici...
@@ -3236,7 +3236,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Impossib
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}L'excavation endommagerait le tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... déjà au niveau de la mer
 STR_ERROR_TOO_HIGH                                              :{WHITE}... trop élevé
-STR_ALREADY_LEVELLED                                            :{WHITE}... déjà à niveau
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... déjà à niveau
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Impossible de changer le nom de compagnie...
@@ -3247,29 +3247,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Impossib
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... emprunt déjà remboursé
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... {CURRENCY} nécessaires
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Impossible de rembourser...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}On ne peut pas distribuer de l'argent qui est emprunté à la banque...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}On ne peut pas distribuer de l'argent qui est emprunté à la banque...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Impossible d'acheter la compagnie...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Impossible de construire le siège...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Impossible d'acheter des parts...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Impossible de vendre des parts...
-STR_PROTECTED                                                   :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
+STR_ERROR_PROTECTED                                             :{WHITE}Cette compagnie ne vend pas d'actions pour le moment...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ne peut plus bâtir de villes
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Ne peut plus bâtir de villes
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Impossible de renommer la ville...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Impossible de construire une ville ici...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... trop près du bord de la carte
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... trop près d'une autre ville
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... trop de villes
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}... il n'y a plus d'emplacement sur la carte
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}La ville ne construira pas de routes. Vous pouvez activer la construction des routes sous Options avancées->Economie->Villes.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Route en travaux
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... il n'y a plus d'emplacement sur la carte
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}La ville ne construira pas de routes. Vous pouvez activer la construction des routes sous Options avancées->Economie->Villes.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Route en travaux
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Ne peut pas générer les industries...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Ne peut pas générer les industries...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Impossible de construire {STRING} ici...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Impossible de construire cette industrie ici...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... trop proche d'une autre industrie
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... trop proche d'une autre industrie
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}... une ville doit d'abord être construite
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... droit à un par ville seulement
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... peut seulement être construit dans des villes ayant une population d'au moins 1200 habitants
@@ -3290,7 +3290,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Impossib
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Adjacent à plus d'une gare à la fois
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... gare trop étendue
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... stations non-uniformes désactivées
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... stations non-uniformes désactivées
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Trop de gares
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Trop de parties de gare
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Trop d'arrêts d'autobus
@@ -3300,12 +3300,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Trop prÃ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Trop près d'un autre port
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Trop près d'un autre aéroport
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Impossible de renommer la gare...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... cette route appartient à une ville
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... mauvaise orientation de la route
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... cette route appartient à une ville
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... mauvaise orientation de la route
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Impossible de supprimer une partie de la gare...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Vous devez d'abord retirer la gare
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Impossible de supprimer une partie de la gare...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Vous devez d'abord retirer la gare
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Impossible de supprimer la station de bus...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Impossible de supprimer la station de camions...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Impossible de retirer la station de tramway pour passagers...
@@ -3323,14 +3323,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Vous dev
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Adjacent à plus d'un point de contrôle
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Trop près d'un autre point de contrôle
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Impossible de construire point de contrôle ici...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Impossible de construire point de contrôle ici...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Impossible de placer une bouée ici...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Impossible de modifier le nom du point de contrôle...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Impossible de modifier le nom du point de contrôle...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Impossible de retirer point de contrôle ici...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Vous devez d'abord retirer le point de contrôle
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Impossible de retirer point de contrôle ici...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Vous devez d'abord retirer le point de contrôle
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... bouée présente
-STR_BUOY_IS_IN_USE                                              :{WHITE}... bouée utilisée !
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bouée utilisée !
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Impossible de construire un dépôt ferroviaire ici...
@@ -3347,14 +3347,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Les trai
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Train trop long
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossible de changer la direction du véhicule...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Impossible de faire faire demi-tour aux unités multiples
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Types de rail incompatibles
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Types de rail incompatibles
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Impossible de déplacer le véhicule...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}L'engin de queue suivra toujours sa contre-partie avant
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Impossible de trouver la route jusqu'au dépôt
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossible de trouver le dépôt
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Dépôt incompatible
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Dépôt incompatible
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} est trop long après remplacement
@@ -3365,14 +3365,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(limite d'argen
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Combinaison de rail impossible
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Aucuns rails convenables
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Vous devez d'abord enlever les rails
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}La route est à sens unique ou bloquée
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}La route est à sens unique ou bloquée
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Impossible de construire des signaux ici...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Impossible de construire des rails ici...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Impossible de retirer les rails d'ici...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Impossible de retirer les signaux d'ici...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Impossible de convertir les signaux...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Impossible de convertir les signaux...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Impossible de convertir le type de rail...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Impossible de convertir le type de rail...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Vous devez d'abord retirer la route
@@ -3383,13 +3383,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Impossib
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Impossible de retirer la section de tramway d'ici...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Impossible de construire un canal ici...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Impossible de construire un écluse ici...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Impossible de construire une rivière ici...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Impossible de construire un canal ici...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Impossible de construire un écluse ici...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Impossible de construire une rivière ici...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... doit être construit sur l'eau
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... impossible de construire sur l'eau
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Vous devez d'abord détruire le canal
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Impossible de construire un aqueduc ici...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Vous devez d'abord détruire le canal
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Impossible de construire un aqueduc ici...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... il y a déjà des arbres
@@ -3398,9 +3398,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Plantati
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Impossible de construire un pont ici...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Vous devez d'abord démolir le pont
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Impossible de commencer et de terminer au même endroit
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Les extrémités du pont ne sont pas au même niveau
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Le pont est trop bas pour le terrain
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Impossible de commencer et de terminer au même endroit
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Les extrémités du pont ne sont pas au même niveau
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Le pont est trop bas pour le terrain
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Le début et la fin doivent être alignés
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... les deux extrémités du pont doivent être sur la terre ferme
 
@@ -3409,7 +3409,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Impossib
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Le site pour l'entrée du tunnel ne convient pas
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Vous devez d'abord démolir le tunnel
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Autre tunnel présent
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Le tunnel finirait en dehors de la carte
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Le tunnel finirait en dehors de la carte
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Impossible de creuser pour faire déboucher le tunnel
 
 # Unmovable related errors
@@ -3419,12 +3419,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Impossib
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... il vous appartient déjà!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Impossible de créer le groupe...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Impossible de supprimer ce groupe...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Impossible de renommer le groupe...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Impossible de retirer tous les véhicules de ce groupe...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Impossible d'ajouter le véhicule à ce groupe...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Impossible d'ajouter les véhicules partagés à ce groupe...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Impossible de créer le groupe...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Impossible de supprimer ce groupe...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Impossible de renommer le groupe...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Impossible de retirer tous les véhicules de ce groupe...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Impossible d'ajouter le véhicule à ce groupe...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Impossible d'ajouter les véhicules partagés à ce groupe...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Train présent
@@ -3467,21 +3467,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Impossib
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Impossible de vendre navire...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Impossible de vendre l'aéronef...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Véhicule non disponible
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Véhicule non disponible
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Navire non disponible
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aéronef non disponible
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Véhicule non disponible
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Véhicule non disponible
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Navire non disponible
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aéronef non disponible
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Trop de véhicules en jeu
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Impossible de modifier l'intervalle de service...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Impossible de vendre le véhicule détruit...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Impossible de réaménager un véhicule détruit...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Impossible de vendre le véhicule détruit...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Impossible de réaménager un véhicule détruit...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Impossible de forcer le train à avancer sous le danger...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Impossible de faire faire demi-tour...
-STR_TRAIN_START_NO_CATENARY                                     :Cette voie n'a pas de caténaire, le train ne peut pas démarrer
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Cette voie n'a pas de caténaire, le train ne peut pas démarrer
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Impossible de faire rebrousser chemin au véhicule routier...
 
@@ -3500,14 +3500,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... le v
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... le véhicule ne peut pas aller dans cette station
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... un véhicule partageant cet ordre ne peut pas aller dans cette station
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Impossible de partager les ordres...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Impossible de copier les ordres...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Impossible de partager les ordres...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Impossible de copier les ordres...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... trop loin de la destination précédente
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Impossible d'affecter un horaire au véhicule...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Les véhicules ne peuvent attendre qu'aux stations.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Ce véhicule ne s'arrête pas à cette station.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Impossible d'affecter un horaire au véhicule...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Les véhicules ne peuvent attendre qu'aux stations.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Ce véhicule ne s'arrête pas à cette station.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... trop de panneaux
@@ -3897,35 +3897,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :Bouée de {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Bouée de {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Bouée de {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Bouée de {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Compagnie {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Groupe {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :Point de contrôle de {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Point de contrôle de {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Point de contrôle de {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Point de contrôle de {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :station inconnue
-STR_SIGN_DEFAULT                                                :Panneau
+STR_DEFAULT_SIGN_NAME                                           :Panneau
 STR_COMPANY_SOMEONE                                             :quelqu'un{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spectateur, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Spectateur, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3943,7 +3943,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3957,25 +3957,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/galician.txt b/src/lang/galician.txt
index 69843cefd..abbf6bad6 100644
--- a/src/lang/galician.txt
+++ b/src/lang/galician.txt
@@ -119,7 +119,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} de tof
 STR_QUANTITY_BATTERIES                                          :{COMMA} pila{P "" s}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bebida{P "" s} gaseosa{P "" s}
-STR_CARGO_N_A                                                   :N/D{SKIP}
+STR_QUANTITY_N_A                                                :N/D{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -209,26 +209,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Selecciona o modo de ordeamento(descendente/ascendente)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selecciona o criterio de orde
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecciona o criterio de filtrado
-STR_SORT_BY                                                     :{BLACK}Ordear por
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selecciona o modo de ordeamento(descendente/ascendente)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selecciona o criterio de orde
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selecciona o criterio de filtrado
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordear por
 STR_BUTTON_LOCATION                                             :{BLACK}Situación
-STR_QUERY_RENAME                                                :{BLACK}Renomear
+STR_BUTTON_RENAME                                               :{BLACK}Renomear
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Pechar fiestra
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título da fiestra - arrástrao para move-la fiestra
-STR_STICKY_BUTTON                                               :{BLACK}Marcar esta fiestra coma non pechable pola tecla de 'Pechar tódalas fiestras'
-STR_RESIZE_BUTTON                                               :{BLACK}Pincha e arrastra para redimensiona-la fiestra
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Intercambiar entre fiestra grande/pequena
+STR_TOOLTIP_STICKY                                              :{BLACK}Marcar esta fiestra coma non pechable pola tecla de 'Pechar tódalas fiestras'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Pincha e arrastra para redimensiona-la fiestra
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Intercambiar entre fiestra grande/pequena
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de desprazamento - despraza a lista hacia arriba/abaixo
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de desprazamento - despraza a lista a esquerda/dereita
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demoler edificios, etc. nun cadrado de terreo
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Por defecto
-STR_QUERY_CANCEL                                                :{BLACK}Cancelar
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Por defecto
+STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -315,7 +315,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Colocar
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Grabar Escenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Cargar Escenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Cargar mapa de altura
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Cargar mapa de altura
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Saír do editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Saír
@@ -506,7 +506,7 @@ STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLAC
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Lenda das gráficas da compañía
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Pincha aquí para amosar/ocultar a entrada da compañía na gráfica
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Pincha aquí para amosar/ocultar a entrada da compañía na gráfica
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Tabla da Liga de Compañías
@@ -541,16 +541,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Diñeiro
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Crédito:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Número de vehículos; inclúe camións/buses, trens, barcos e avións
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Número de partes de estacións. Cóntase cada parte dunha estación (p.e. tren, autobús, aeroporto), incluso aínda que estén conectadas coma unha estación
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Beneficios do vehículo con menos ingresos (de tódolos vehículos de máis de 2 anos)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Cantidade de diñeiro ganado no mes co beneficio máis baixo nos últimos 12 cuartos
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Cantidade de diñeiro ganado no mes co beneficio máis alto nos últimos 12 cuartos
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unidades de carga levadas nos últimos catro quartos
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Número de tipos de carga levados no último cuarto
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Cantidade de diñeiro que esta compañía ten no banco
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Valor do préstamo que ten a compañía
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Puntos totais de puntos posibles
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Número de vehículos; inclúe camións/buses, trens, barcos e avións
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de partes de estacións. Cóntase cada parte dunha estación (p.e. tren, autobús, aeroporto), incluso aínda que estén conectadas coma unha estación
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Beneficios do vehículo con menos ingresos (de tódolos vehículos de máis de 2 anos)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Cantidade de diñeiro ganado no mes co beneficio máis baixo nos últimos 12 cuartos
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Cantidade de diñeiro ganado no mes co beneficio máis alto nos últimos 12 cuartos
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unidades de carga levadas nos últimos catro quartos
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Número de tipos de carga levados no último cuarto
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Cantidade de diñeiro que esta compañía ten no banco
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Valor do préstamo que ten a compañía
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Puntos totais de puntos posibles
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jazz Jukebox
@@ -668,8 +668,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Amosar/o
 STR_SMALLMAP_CENTER                                             :{BLACK}Centra-lo mapa pequeno na posición actual
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Desactivar todo
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activar todo
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desactivar todo
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activar todo
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Amosa-la última mesaxe ou noticia
@@ -680,8 +680,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  GRAB
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Historial de Mensaxes
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Unha lista das mensaxes e noticias recentes
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Unha lista das mensaxes e noticias recentes
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mensaxe
@@ -914,32 +914,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Seleccio
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} arquivo{P "" s} inexistente{P "" s}/erróneo{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional sobre o conxunto de gráficos básico
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}O modo de pantalla completa fallou
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}O modo de pantalla completa fallou
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda persoalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de cambio: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Disminuí-la cantidade da túa moeda por unha Libra Esterlina (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Incrementa-la cantidade da túa moeda por unha Libra Esterlina (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{G=n}{BLACK}Configura-lo cambio da túa moeda por unha Libra Esterlina (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Disminuí-la cantidade da túa moeda por unha Libra Esterlina (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Incrementa-la cantidade da túa moeda por unha Libra Esterlina (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{G=n}{BLACK}Configura-lo cambio da túa moeda por unha Libra Esterlina (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Configura-lo separador para a túa moeda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Configura-lo separador para a túa moeda
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefixo: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Configura-la cadea de prefixo para a túa moeda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Configura-la cadea de prefixo para a túa moeda
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufixo: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Configura-la cadea de sufixo para a túa moeda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Configura-la cadea de sufixo para a túa moeda
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Cambiar a Euro: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Camiar a Euro: {ORANGE}nunca
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Selecciona o ano no que se cambiará ó Euro
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Cambiar ó Euro máis pronto
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Cambiar ó Euro máis tarde
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Selecciona o ano no que se cambiará ó Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Cambiar ó Euro máis pronto
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Cambiar ó Euro máis tarde
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Vista previa: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Libras Esterlinas (£) na túa moeda
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Libras Esterlinas (£) na túa moeda
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Cambia-lo parámetro de moeda personalizada
 
 # Difficulty level window
@@ -953,7 +953,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Persoal
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Mostra-la lista das mellores puntuacións
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Grabar
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Grabar
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Nº máximo de opoñentes: {ORANGE}{COMMA}
@@ -1019,7 +1019,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permisiva
 STR_CITY_APPROVAL_TOLERANT                                      :Tolerante
 STR_CITY_APPROVAL_HOSTILE                                       :Hostil
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Esta acción cambiou o nivel de dificultade a Personalizado
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Esta acción cambiou o nivel de dificultade a Personalizado
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Opcións Avanzadas
@@ -1252,7 +1252,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Non
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Tamaño X do mapa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Tamaño Y do mapa: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Cambia-lo valor
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Cambia-lo valor
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1294,9 +1294,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Saír 'O
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Saír
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}¿Estás seguro de querer saír e volver a {STRING}?
-STR_YES                                                         :{BLACK}Si
-STR_NO                                                          :{BLACK}Non
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}¿Estás seguro de querer saír e volver a {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Si
+STR_QUIT_NO                                                     :{BLACK}Non
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1312,11 +1312,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Saír ó menú principal
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}¿Está seguro de que desexa saír da partida?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}¿Estás seguro de que desexas saír deste escenario?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}¿Estás seguro de que desexas saír deste escenario?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Trampas
-STR_CHEATS_TIP                                                  :{BLACK}As caixas de confirmación indican se usaches esta trampa antes
+STR_CHEATS_TOOLTIP                                              :{BLACK}As caixas de confirmación indican se usaches esta trampa antes
 STR_CHEATS_WARNING                                              :{BLACK}¡Advertencia! Estás a piques de traizoa-los teus opoñentes. Ten en conta que unha desgraza coma esta lembrarase eternamente.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementa-lo diñeiro en {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Xogando coma compañía: {ORANGE}{COMMA}
@@ -1325,24 +1325,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Os tune
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Permiti-la construción en modo pausa: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Os avións jet non se estrelarán (frecuentemente) nos aeroportos pequenos: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Cambiar clima: {ORANGE} {STRING}
-STR_TEMPERATE_LANDSCAPE                                         :Escenario temperado
-STR_SUB_ARCTIC_LANDSCAPE                                        :Escenario sub-ártico
-STR_SUB_TROPICAL_LANDSCAPE                                      :Escenario sub-tropical
-STR_TOYLAND_LANDSCAPE                                           :Escenario xoguetelandia
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Escenario temperado
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Escenario sub-ártico
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Escenario sub-tropical
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Escenario xoguetelandia
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Cambiar data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permiti-la modificación dos valores de producción: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Novo Esquema de Cor
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Mostra-los esquemas de cor xerais
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Mostra-los esquemas de cor dos trens
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Mostra-los esquemas de cor dos vehículos de estrada
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Mostra-los esquemas de cor dos barcos
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Mostra-los esquemas de cor dos avións
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Elixe a cor primaria para o esquema seleccionado
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Elixe a cor secundaria para o esquema seleccionado
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Selecciona un esquema de cor para cambialo, ou múltiples esquemas con CTRL+click. Pincha na caixa para cambia lo uso do esquema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Mostra-los esquemas de cor xerais
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Mostra-los esquemas de cor dos trens
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Mostra-los esquemas de cor dos vehículos de estrada
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Mostra-los esquemas de cor dos barcos
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Mostra-los esquemas de cor dos avións
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Elixe a cor primaria para o esquema seleccionado
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Elixe a cor secundaria para o esquema seleccionado
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selecciona un esquema de cor para cambialo, ou múltiples esquemas con CTRL+click. Pincha na caixa para cambia lo uso do esquema
 
 STR_LIVERY_DEFAULT                                              :Esquema de Cor Estándar
 STR_LIVERY_STEAM                                                :Máquina de Vapor
@@ -1380,19 +1380,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Seleccio
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nova Cara
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Xerar unha nova cara aleatoriamente
 STR_FACE_ADVANCED                                               :{BLACK}Avanzado
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Selección avanzada de cara.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selección avanzada de cara.
 STR_FACE_SIMPLE                                                 :{BLACK}Simple
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Selección simple de cara.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selección simple de cara.
 STR_FACE_LOAD                                                   :{BLACK}Cargar
-STR_FACE_LOAD_TIP                                               :{BLACK}Carga-la cara favorita
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Carga-la cara favorita
 STR_FACE_LOAD_DONE                                              :{WHITE}A túa cara favorita cargouse dende o arquivo de configuración de OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Nº de cara
-STR_FACE_FACECODE_TIP                                           :{BLACK}Ver e/ou establecer o número da cara do xogador
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Ver e/ou establecer o número da cara do xogador
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Ver e/ou establecer o número da cara do xogador
 STR_FACE_FACECODE_SET                                           :{WHITE}Estableceuse o novo número de código da cara.
 STR_FACE_FACECODE_ERR                                           :{WHITE}¡Non se pode axustar o número da cara - debe estar entre 0 e 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Grabar
-STR_FACE_SAVE_TIP                                               :{BLACK}Grabar a cara favorita
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Grabar a cara favorita
 STR_FACE_SAVE_DONE                                              :{WHITE}Esta cara grabaráse como a túa favorita no ficheiro de configuración de OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europea
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Seleccionar caras europeas
@@ -1400,120 +1400,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Africana
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Seleccionar caras africanas
 STR_FACE_YES                                                    :Si
 STR_FACE_NO                                                     :Non
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Activar bigote ou pendentes
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Activar bigote ou pendentes
 STR_FACE_HAIR                                                   :Pelo:
-STR_FACE_HAIR_TIP                                               :{BLACK}Cambiar pelo
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Cambiar pelo
 STR_FACE_EYEBROWS                                               :Cellas:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Cambia-las cellas
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Cambia-las cellas
 STR_FACE_EYECOLOUR                                              :Cor de ollos:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Cambia-la cor de ollos
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Cambia-la cor de ollos
 STR_FACE_GLASSES                                                :Lentes:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Poñer lentes
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Cambia-las lentes
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Poñer lentes
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Cambia-las lentes
 STR_FACE_NOSE                                                   :Nariz:
-STR_FACE_NOSE_TIP                                               :{BLACK}Cambia-lo nariz
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Cambia-lo nariz
 STR_FACE_LIPS                                                   :Labios:
 STR_FACE_MOUSTACHE                                              :Bigote:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Cambia-los labios ou o bigote
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Cambia-los labios ou o bigote
 STR_FACE_CHIN                                                   :Barbela:
-STR_FACE_CHIN_TIP                                               :{BLACK}Cambia-la barbela
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Cambia-la barbela
 STR_FACE_JACKET                                                 :Chaqueta:
-STR_FACE_JACKET_TIP                                             :{BLACK}Cambia-la chaqueta
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Cambia-la chaqueta
 STR_FACE_COLLAR                                                 :Colo:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Cambia-lo colo
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Cambia-lo colo
 STR_FACE_TIE                                                    :Lazo:
 STR_FACE_EARRING                                                :Pendentes:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Cambia-lo lazo ou os pendentes
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambia-lo lazo ou os pendentes
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multixogador
-STR_NETWORK_CONNECTION                                          :{BLACK}Conexión:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Escolle entre unha partida en Internet ou unha partida na rede de área local
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nome do xogador:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Este é o nome polo que te identificarán os outros xogadores
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nome
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nome da partida
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes conectados / clientes máx.{}Compañías conectadas / compañías máx.
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Tamaño do mapa
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Tamaño do mapa da partida{}Pincha para ordear por área
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data actual
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anos
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Número de anos que{}leva a partida funcionando
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versión do servidor, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Pincha nunha partida da lista para seleccionala
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}O servidor público o que te uniches a última vez:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Pincha para selecciona-lo servidor no que xogaches a última vez
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMACIÓN DA PARTIDA
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Set de Terreo: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión do servidor: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección do servidor: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data de comezo: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}¡Protexido con clave!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR DESCONECTADO
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR CHEO
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIÓN INCORRECTA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}PROBLEMA CON NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Unirse á partida
-STR_NETWORK_REFRESH                                             :{BLACK}Actualizar servidor
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualiza-la información do servidor
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Buscar servidor
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Buscar un servidor na rede
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Engadir servidor
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Engade un servidor á lista que será comprobado sempre para buscar partidas.
-STR_NETWORK_START_SERVER                                        :{BLACK}Iniciar servidor
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Comezar un servidor propio
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Escribe o teu nome
-STR_NETWORK_ENTER_IP                                            :{BLACK}Introduce a dirección IP do servidor
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multixogador
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Conexión:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Escolle entre unha partida en Internet ou unha partida na rede de área local
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+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
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nome
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nome da partida
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clientes
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clientes conectados / clientes máx.{}Compañías conectadas / compañías máx.
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Tamaño do mapa
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Tamaño do mapa da partida{}Pincha para ordear por área
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Data actual
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Anos
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Número de anos que{}leva a partida funcionando
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Idioma, versión do servidor, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Pincha nunha partida da lista para seleccionala
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}O servidor público o que te uniches a última vez:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Pincha para selecciona-lo servidor no que xogaches a última vez
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFORMACIÓN DA PARTIDA
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Set de Terreo: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Tamaño: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versión do servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Dirección do servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data de comezo: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data actual: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}¡Protexido con clave!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR DESCONECTADO
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR CHEO
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIÓN INCORRECTA
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}PROBLEMA CON NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Unirse á partida
+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}Buscar 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
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Comezar un servidor propio
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Escribe o teu nome
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Introduce a dirección IP do servidor
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Comezar nova partida
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nome:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}O nome da partida mostraráse a outros xogadores no menú de selección de partida multixogador
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Establecer contrasinal
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protexe a túa partida cun contrasinal se non queres que outras persoas se unan
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selecciona un mapa:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}¿Qué mapa queres xogar?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Xerar unha nova partida aleatoriamente
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (anunciar)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Máximo de clientes:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Escolle o máximo número de clientes. Non tódolas liñas teñen que estar cubertas
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compañía{P "" s}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Nº máx. de compañías:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limita-lo servidor a unha certa cantidade de compañías
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Nº máx. de espectadores:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limita-lo servidor a unha certa cantidade de espectadores
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma falado:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Outros xogadores sabrán cal é o idioma que se fala no servidor
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Iniciar Partida
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Comezar unha nova partida en rede a partires dun mapa aleatorio, ou un escenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Cargar Partida
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Resumir unha partida multixogador anterior (asegúrate de conectarte coma o xogador correcto)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Escribe o nome para a partida en rede
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Comezar nova partida
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nome:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome da partida mostraráse a outros xogadores no menú de selección de partida multixogador
+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 que outras persoas se unan
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Selecciona un mapa:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}¿Qué mapa queres xogar?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Xerar unha nova partida aleatoriamente
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (anunciar)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Máximo de clientes:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Escolle o máximo número de clientes. Non tódolas liñas teñen que estar cubertas
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compañía{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Nº máx. de compañías:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limita-lo servidor a unha certa cantidade de compañías
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Nº máx. de espectadores:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limita-lo servidor a unha certa cantidade de espectadores
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Idioma falado:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Outros xogadores sabrán cal é o idioma que se fala no servidor
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Iniciar Partida
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Comezar unha nova partida en rede a partires dun mapa aleatorio, ou un escenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Cargar Partida
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Resumir unha partida multixogador anterior (asegúrate de conectarte coma o xogador correcto)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Escribe o nome para a partida en rede
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1556,32 +1556,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Letón
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Sala de espera de partida multixogador
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparando para unirse: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Unha lista de tódalas compañías nesta patida. Podes unirte a unha ou empezar unha nova se hai algún lugar libre
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMACIÓN DA COMPAÑ�A
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da compañía: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguración: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valor da compañía: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balance actual: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingresos do ano pasado: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendemento: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estacións: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Xogadores: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova compañía
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Abrir unha nova compañía
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Observar partida
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Observa-la partida coma espectador
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Unirse a compañía
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Axudar a manexar compañía
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Sala de espera de partida multixogador
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparando para unirse: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Unha lista de tódalas compañías nesta patida. Podes unirte a unha ou empezar unha nova se hai algún lugar libre
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFORMACIÓN DA COMPAÑ�A
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nome da compañía: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguración: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valor da compañía: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balance actual: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Ingresos do ano pasado: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Rendemento: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vehículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Estacións: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Xogadores: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova compañía
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Abrir unha nova compañía
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Observar partida
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Observa-la partida coma espectador
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Unirse a compañía
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Axudar a manexar compañía
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Conectando...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Conectando..
@@ -1597,13 +1597,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Descarga
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} diante de ti
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} descargados
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectar
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconectar
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}O servidor está protexido. Introduce clave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A compañía está protexida. Introduce clave
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de Clientes
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de Clientes
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observar
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Compañía
 
@@ -1625,18 +1625,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduc
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Non graba lo contrasinal introducido
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Asignar á compañía o novo contrasinal
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Contrasinal da compañía
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Contrasinal por defecto para a compañía
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Usar o contrasinal desta compañía por defecto para as novas compañías
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Contrasinal por defecto para a compañía
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usar o contrasinal desta compañía por defecto para as novas compañías
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Unirse
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Unirse e xogar coma esta compañía
-STR_COMPANY_PASSWORD                                            :{BLACK}Contrasinal
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Protexe a túa compañía cun contrasinal para evitar que usuarios non autorizados se unan
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Establece o contrasinal da compañía
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Unirse
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Unirse e xogar coma esta compañía
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Contrasinal
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Protexe a túa compañía cun contrasinal para evitar que usuarios non autorizados se unan
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Establece o contrasinal da compañía
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Enviar
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Enviar
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Equipo] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privado] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Todos] :
@@ -1649,40 +1649,40 @@ STR_NETWORK_CHAT_ALL                                            :[Todos] {STRING
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Escribe o texto para a charla en rede
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Non se atoparon dispositivos de rede ou compilouse sen ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Non se atoparon xogos en rede
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} O servidor non respondeu á solicitude
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Non se pode conectar debido a un problema cos NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Sincronización da partida en rede fallida
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Perdeuse a conexión da partida en rede
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Non se pode carga-la partida
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Non se pode arranca-lo servidor
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Non se pode conectar
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Conexión #{NUM} fóra de tempo
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Produciuse un erro de protocolo e pechouse a conexión
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}A revisión deste cliente non é igual ca revisión do servidor.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Contrasinal errónea
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}O servidor está cheo
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Non se che permite o acceso a este servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Fuches pateado da partida
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Non se permite facer trampas neste servidor
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Non se atoparon dispositivos de rede ou compilouse sen ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Non se atoparon xogos en rede
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} O servidor non respondeu á solicitude
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Non se pode conectar debido a un problema cos NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Sincronización da partida en rede fallida
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Perdeuse a conexión da partida en rede
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Non se pode carga-la partida
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Non se pode arranca-lo servidor
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Non se pode conectar
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Conexión #{NUM} fóra de tempo
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Produciuse un erro de protocolo e pechouse a conexión
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}A revisión deste cliente non é igual ca revisión do servidor.
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Contrasinal errónea
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}O servidor está cheo
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Non se che permite o acceso a este servidor
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Fuches pateado da partida
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Non se permite facer trampas neste servidor
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :erro xeral
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :erro de descincronización
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :no se pode carga-lo mapa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :perdeuse a conexión
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erro de protocolo
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF erróneo
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :non autorizado
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :recibiuse un paquete extraño
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisión errónea
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :o nome xa está en uso
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contrasinal incorrecta
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :company-id erróneo en DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :pateado polo servidor
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :intentaba usar unha trampa
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheo
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :erro xeral
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :erro de descincronización
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :no se pode carga-lo mapa
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :perdeuse a conexión
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :erro de protocolo
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF erróneo
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :non autorizado
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :recibiuse un paquete extraño
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :revisión errónea
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :o nome xa está en uso
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :contrasinal incorrecta
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :company-id erróneo en DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :pateado polo servidor
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :intentaba usar unha trampa
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheo
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1694,36 +1694,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Partida en paus
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Partida funcionando (cliente conectado)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Partida funcionando (o cliente non pudio conectar)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :saíndo
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} uniuse á partida
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} uniuse a compañía #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} uniuse ós espectadores
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} comezou unha nova compañía (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} saiu da partida ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} cambiou o seu nome a {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} deu a túa companía {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Diches a {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} O servidor pechou a conexión
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} O servidor estase a reiniciar...{}Espera por favor...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :saíndo
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} uniuse á partida
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} uniuse a compañía #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} uniuse ós espectadores
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} comezou unha nova compañía (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} saiu da partida ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} cambiou o seu nome a {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} deu a túa companía {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Diches a {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} O servidor pechou a conexión
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} O servidor estase a reiniciar...{}Espera por favor...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Descargar contido
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipo
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipo do contido
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipo do contido
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nome
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nome do contido
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Pincha nunha liña para ve-los detalles{}Pincha na caixa para marcalo para descargar
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nome do contido
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Pincha nunha liña para ve-los detalles{}Pincha na caixa para marcalo para descargar
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Seleccionar todo
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marcar todo o contido para descargar
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marcar todo o contido para descargar
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Seleccionar actualizacións
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marcar todo o contido que é unha actualización do existente para descargar
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marcar todo o contido que é unha actualización do existente para descargar
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Deseleccionar todo
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Marcar todo o contido para non descargar
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marcar todo o contido para non descargar
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Introducir cadea de filtrado
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Introduce unha palabra pola que filtra la lista
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Introduce unha palabra pola que filtra la lista
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtro etiqueta/nome:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Descargar
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Comezar a descarga-lo contido seleccionado
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Comezar a descarga-lo contido seleccionado
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Tamaño total da descarga: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMACIÓN DO CONTIDO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Non seleccionaches isto para descargar
@@ -1767,17 +1767,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... arqu
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Non se puido descomprimi-lo arquivo descargado
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opcións de Transparencia
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Habilitar transparencia para as sinais das estacións. CTRL+Click para bloquear.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Habilitar transparencia para árbores CTRL+Click para bloquear.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Habilitar transparencia para casas. CTRL+Click para bloquear.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Habilitar transparencia para industrias. CTRL+Click para bloquear.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Habilitar transparencia para estacións, depósitos e puntos de ruta. CTRL+Click para bloquear.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Habilitar transparencia para pontes. CTRL+Click para bloquear.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Habilitar transparencia para estruturas coma faros e antenas. CTRL+Click para bloquear.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Activar a transparencia para a catenaria. CTRL+Click para bloquear.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Activar transparencia para os indicadores de carga. CTRL+Click para bloquear.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Facer os obxectos invisibles en lugar de transparentes
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcións de Transparencia
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Habilitar transparencia para as sinais das estacións. CTRL+Click para bloquear.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Habilitar transparencia para árbores CTRL+Click para bloquear.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Habilitar transparencia para casas. CTRL+Click para bloquear.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Habilitar transparencia para industrias. CTRL+Click para bloquear.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Habilitar transparencia para estacións, depósitos e puntos de ruta. CTRL+Click para bloquear.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Habilitar transparencia para pontes. CTRL+Click para bloquear.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Habilitar transparencia para estruturas coma faros e antenas. CTRL+Click para bloquear.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Activar a transparencia para a catenaria. CTRL+Click para bloquear.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Activar transparencia para os indicadores de carga. CTRL+Click para bloquear.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Facer os obxectos invisibles en lugar de transparentes
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Resaltar área de cobertura
@@ -1789,8 +1789,8 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Acepta:
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Suministros: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Unir estación
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construír unha estación separada
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Unir estación
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construír unha estación separada
 
 
 # Rail construction toolbar
@@ -1815,8 +1815,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orient.
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selecciona-la orientación do depósito de ferrocarrís
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Punto de ruta
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selecciona-lo tipo de punto de ruta
+STR_WAYPOINT_CAPTION                                            :{WHITE}Punto de ruta
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Selecciona-lo tipo de punto de ruta
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Selección da Estación
@@ -1829,36 +1829,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Seleccio
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Arrastrar e Soltar
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construír estación arrastrando e soltando
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecciona a clase de estación a mostrar
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecciona o tipo da estación a construir
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Selecciona a clase de estación a mostrar
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Selecciona o tipo da estación a construir
 
-STR_STAT_CLASS_DFLT                                             :Estación por defecto
-STR_STAT_CLASS_WAYP                                             :Puntos de ruta
+STR_STATION_CLASS_DFLT                                          :Estación por defecto
+STR_STATION_CLASS_WAYP                                          :Puntos de ruta
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Selección de Sinais
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Sinal De Bloque (semáforo){}Este é o tipo máis básico de sinal, só permite un tren no mesmo bloque ó mesmo tempo.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sinal de Entrada(semáforo){}Verde mentras haxa unha ou máis sinais de saída verdes na seguinte sección de vía. Noutro caso estará vermella.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Sinal de Saída (semáforo){}Actúa igual que unha sinal de bloque pero é necesaria para activar a cor correcta nas sinais de entrada e nas pre-sinais combo.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Sinal Combo (semáforo){}A sinal combo funciona coma unha sinal de entrada e saída. Esto permíteche crear "árbores" grandes de presinais.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Sinal De Ruta (semáforo){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As sinais de ruta estándar poden pasarse en sentido contrario.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Sinal De Ruta Dun Sentido (semáforo){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As dun sentido non se poden atravesar en sentido contrario.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Sinal De Bloque (eléctrica){}Este é o tipo máis básico de sinal, permite só un tren no mesmo bloque ó mesmo tempo.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sinal de Entrada (eléctrica){}Verde mentras haxa unha ou máis sinais de saída verdes na seguinte sección de vía. Noutro caso estará vermella.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Sinal de Saída (eléctrica){}Actúa igual que unha sinal de bloque pero é necesaria para activar o color correcto nas sinais de entrada e nas pre-sinais combo.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Sinal Combo (eléctrica){}A sinal combo funciona coma unha sinal de entrada e saída. Esto permíteche crear "árbores" grandes de presinais.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Sinal De Ruta (eléctrica){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As sinais de ruta estándar poden pasarse en sentido contrario.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Sinal De Ruta Dun Sentido (eléctrica){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As dun sentido non se poden atravesar en sentido contrario.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Convertir Sinal{}Cando está seleccionado, convertirá o sinal no que se pinche ó tipo e variante seleccionados, CTRL+click cambiará a variante existente.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densidade de sinais ó arrastrar
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Diminuír a densidade de sinais ó arrastrar
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Aumentar a densidade de sinais ó arrastrar
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Selección de Sinais
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Sinal De Bloque (semáforo){}Este é o tipo máis básico de sinal, só permite un tren no mesmo bloque ó mesmo tempo.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sinal de Entrada(semáforo){}Verde mentras haxa unha ou máis sinais de saída verdes na seguinte sección de vía. Noutro caso estará vermella.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Sinal de Saída (semáforo){}Actúa igual que unha sinal de bloque pero é necesaria para activar a cor correcta nas sinais de entrada e nas pre-sinais combo.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Sinal Combo (semáforo){}A sinal combo funciona coma unha sinal de entrada e saída. Esto permíteche crear "árbores" grandes de presinais.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Sinal De Ruta (semáforo){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As sinais de ruta estándar poden pasarse en sentido contrario.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Sinal De Ruta Dun Sentido (semáforo){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As dun sentido non se poden atravesar en sentido contrario.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Sinal De Bloque (eléctrica){}Este é o tipo máis básico de sinal, permite só un tren no mesmo bloque ó mesmo tempo.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sinal de Entrada (eléctrica){}Verde mentras haxa unha ou máis sinais de saída verdes na seguinte sección de vía. Noutro caso estará vermella.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Sinal de Saída (eléctrica){}Actúa igual que unha sinal de bloque pero é necesaria para activar o color correcto nas sinais de entrada e nas pre-sinais combo.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Sinal Combo (eléctrica){}A sinal combo funciona coma unha sinal de entrada e saída. Esto permíteche crear "árbores" grandes de presinais.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Sinal De Ruta (eléctrica){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As sinais de ruta estándar poden pasarse en sentido contrario.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Sinal De Ruta Dun Sentido (eléctrica){}Unha sinal de ruta permite entrar a máis dun tren nun bloque ó mesmo tempo, se o tren pode atopar unha ruta a un punto de parada seguro. As dun sentido non se poden atravesar en sentido contrario.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Convertir Sinal{}Cando está seleccionado, convertirá o sinal no que se pinche ó tipo e variante seleccionados, CTRL+click cambiará a variante existente.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Densidade de sinais ó arrastrar
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Diminuír a densidade de sinais ó arrastrar
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Aumentar a densidade de sinais ó arrastrar
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selecciona a Ponte do Ferrocarril
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selecciona a Ponte
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Selección de pontes - picha na ponte seleccionada para construíla
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selección de pontes - picha na ponte seleccionada para construíla
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Colgante, Aceiro
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Vigas, Aceiro
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Voladizo, Aceiro
@@ -1892,9 +1892,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Cambia e
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orient. do Depósito
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Seleciona-la orientación do depósito de vehículos de estrada
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Seleciona-la orientación do depósito de vehículos de estrada
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientación do Depósito de Tranvías
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Selecciona a orientación do depósito de tranvías
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Selecciona a orientación do depósito de tranvías
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientación da Estación
@@ -1915,8 +1915,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}ConstruÃ
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construír peirao para barcos
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Boia de posición, pódese utilizar para marcar puntos de ruta adicionais
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construír acueducto
-STR_CREATE_LAKE                                                 :{BLACK}Define a área de auga.{}Fai un canal, a non ser que manteñas pulsado CTRL ó nivel do mar, entonces inundaránse os arredores do lugar
-STR_CREATE_RIVER                                                :{BLACK}Colocar ríos.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Define a área de auga.{}Fai un canal, a non ser que manteñas pulsado CTRL ó nivel do mar, entonces inundaránse os arredores do lugar
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Colocar ríos.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orient. do Depósito de Barcos
@@ -1948,20 +1948,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroport
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroportos centrais
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Aeroportos para helicópteros
 
-STR_STATION_NOISE                                               :{BLACK}Ruído xerado: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído xerado: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Modifica-lo terreo
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Baixar unha esquina de terreo
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Elevar unha esquina de terreo
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivelar terreo
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Comprar terreo para futuro uso
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Baixar unha esquina de terreo
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Elevar unha esquina de terreo
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivelar terreo
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Comprar terreo para futuro uso
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}�rbores
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecciona-lo tipo de árbore a plantar
 STR_TREES_RANDOM_TYPE                                           :{BLACK}�rbores de tipo aleatorio
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Colocar árbores dun tipo aleatorio
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Colocar árbores dun tipo aleatorio
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}�rbores aleatorias
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Plantar árbores aleatoriamente sobre a paisaxe
 
@@ -1974,9 +1974,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Colocar
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Aumenta-lo tamaño de terreo a baixar/subir
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Disminuí-lo tamaño de terreo a baixar/subir
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Xerar terreo aleatorio
-STR_SE_NEW_WORLD                                                :{BLACK}Crear novo escenario
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Crear novo escenario
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Reiniciar paisaxe
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Quitar tódalas propiedades do xogador do mapa
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Quitar tódalas propiedades do xogador do mapa
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Reiniciar Paisaxe
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}¿Estás seguro de querer quitar tódalas propiedades do xogador?
@@ -1987,34 +1987,34 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nova Cid
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Construír nova cidade
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Cidade Aleatoria
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construír cidade en emprazamento aleatorio
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Moitas cidades aleatorias
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Cubri-lo mapa con cidades colocadas aleatoriamente
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Moitas cidades aleatorias
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cubri-lo mapa con cidades colocadas aleatoriamente
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Tamaño da cidade:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Pequeno
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mediano
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grande
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Aleatorio
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Aleatorio
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selecciona o tamaño da cidade:
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Disposición das estradas das poboacións:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selecciona a disposición das estradas para esta poboación
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Orixinal
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Mellores estradas
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Grella 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Grella 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Aleatoria
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposición das estradas das poboacións:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selecciona a disposición das estradas para esta poboación
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orixinal
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Mellores estradas
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Grella 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Grella 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aleatoria
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Fundar unha nova industria
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Elixe a industria apropiada desta lista
-STR_MANY_RANDOM_INDUSTRIES                                      :Moitas industrias aleatorias
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Cubri-lo mapa con industrias colocadas aleatoriamente
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Custo: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospección
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construír
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fundar
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Elixe a industria apropiada desta lista
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Moitas industrias aleatorias
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Cubri-lo mapa con industrias colocadas aleatoriamente
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Custo: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospección
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construír
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fundar
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Información dunha área de terreo
@@ -2027,104 +2027,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Propieta
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Propietario da vía: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoridade local: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ningún
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Construído: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Clase da estación: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipo de estación: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordinadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construído: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Clase da estación: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipo de estación: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceptada: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rochas
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Terra Quebrada
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Terra Deserta
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Herba
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Campos
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Terra cuberta de neve
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Deserto
-
-STR_RAILROAD_TRACK                                              :Vía de ferrocarril
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Vía de tren con sinais de bloque
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Vía de ferrocarril con pre-sinais
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Vía de ferrocarril con sinais de saída
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Vía de tren con sinais combo
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Vía de tren con sinais de ruta
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Vía de tren con sinais de ruta dun sentido
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Vía de tren con sinais de bloque e presinalización
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Vía de tren con sinais de bloque e de saída
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Vía de tren con sinais de bloque e combo
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Vía de tren con sinais de bloque e de ruta
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Vía de tren con sinais de bloque e de ruta dun sentido
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Vía de tren con presinalización e sinais de saída
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Vía de tren con presinalización e sinais combo
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Vía de tren con presinalización e sinais de ruta
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Vía de tren con presinalización e sinais de ruta dun sentido
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Vía de tren con sinais de saída e sinais combo
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Vía de tren con sinais de saída e de ruta
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Vía de tren con sinais de saída e de ruta dun sentido
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Vía de tren con sinais combo e de ruta
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Vía de tren con sinais combo e de ruta dun sentido
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Vía de tren con sinais de ruta e de ruta dun sentido
-STR_RAILROAD_TRAIN_DEPOT                                        :Depósito para trens
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Estrada
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Estrada con iluminación
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Estrada con árbores
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depósito de vehículos de estrada
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Paso a nivel para estrada/ferrocarril
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Vía de tranvía
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rochas
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Terra Quebrada
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terra Deserta
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Herba
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campos
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Terra cuberta de neve
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deserto
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Vía de ferrocarril
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Vía de tren con sinais de bloque
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Vía de ferrocarril con pre-sinais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Vía de ferrocarril con sinais de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Vía de tren con sinais combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Vía de tren con sinais de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Vía de tren con sinais de ruta dun sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Vía de tren con sinais de bloque e presinalización
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Vía de tren con sinais de bloque e de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Vía de tren con sinais de bloque e combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Vía de tren con sinais de bloque e de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Vía de tren con sinais de bloque e de ruta dun sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Vía de tren con presinalización e sinais de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Vía de tren con presinalización e sinais combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Vía de tren con presinalización e sinais de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Vía de tren con presinalización e sinais de ruta dun sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Vía de tren con sinais de saída e sinais combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Vía de tren con sinais de saída e de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Vía de tren con sinais de saída e de ruta dun sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Vía de tren con sinais combo e de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Vía de tren con sinais combo e de ruta dun sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Vía de tren con sinais de ruta e de ruta dun sentido
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depósito para trens
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Estrada
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Estrada con iluminación
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Estrada con árbores
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depósito de vehículos de estrada
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Paso a nivel para estrada/ferrocarril
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Vía de tranvía
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (en construción)
-
-STR_TREE_NAME_TREES                                             :�rbores
-STR_TREE_NAME_RAINFOREST                                        :Selva tropical
-STR_TREE_NAME_CACTUS_PLANTS                                     :Plantas cactus
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Estación de ferrocarril
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar de avións
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeroporto
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :�rea de carga de camións
-STR_STATION_DESCRIPTION_BUS_STATION                             :Estación de autobús
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Peirao para barco
-STR_STATION_DESCRIPTION_BUOY                                    :Boia
-STR_LANDINFO_WAYPOINT                                           :Punto de control
-
-STR_WATER_DESCRIPTION_WATER                                     :Auga
-STR_LANDINFO_CANAL                                              :Canal
-STR_LANDINFO_LOCK                                               :Peche
-STR_LANDINFO_RIVER                                              :Río
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Costa ou beiramar
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Depósito de barcos
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (en construción)
+
+STR_LAI_TREE_NAME_TREES                                         :�rbores
+STR_LAI_TREE_NAME_RAINFOREST                                    :Selva tropical
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Plantas cactus
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Estación de ferrocarril
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar de avións
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeroporto
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :�rea de carga de camións
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Estación de autobús
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Peirao para barco
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boia
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Punto de control
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Auga
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Peche
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Río
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Costa ou beiramar
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Depósito de barcos
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Túnel de ferrocarril
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Túnel de estrada
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Túnel de ferrocarril
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel de estrada
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ponte colgante de aceiro para ferrocarrís
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ponte de vigas de aceiro para ferrocarrís
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ponte voladiza de aceiro para ferrocarrís
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Ponte colgante de cemento reforzado para ferrocarrís
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Ponte de madeira para ferrocarrís
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Ponte de cemento para ferrocarrís
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Ponte tubular para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ponte colgante de aceiro para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ponte de vigas de aceiro para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ponte voladiza de aceiro para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Ponte colgante de cemento reforzado para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ponte de madeira para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Ponte de cemento para ferrocarrís
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Ponte tubular para ferrocarrís
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ponte colgante de aceiro para estradas
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ponte de vigas de aceiro para estradas
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ponte voladiza de aceiro para estradas
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Ponte colgante de cemento reforzado para estradas
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Ponte de madeira para estradas
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Ponte de cemento para estradas
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Ponte tubular para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ponte colgante de aceiro para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ponte de vigas de aceiro para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ponte voladiza de aceiro para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Ponte colgante de cemento reforzado para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ponte de madeira para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Ponte de cemento para estradas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Ponte tubular para estradas
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Acueducto
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Acueducto
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmisor
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Faro
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Cuartel Xeral de Compañía
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Terreo propiedade dunha compañía
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmisor
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Faro
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Cuartel Xeral de Compañía
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Terreo propiedade dunha compañía
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Acerca de OpenTTD
@@ -2137,7 +2137,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Grabar P
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Cargar Partida
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Grabar Escenario
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Cargar Escenario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Cargar Mapa de Altitude
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Cargar Mapa de Altitude
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Pincha aquí para ir o directorio por defecto actual para grabar/cargar
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} libre{P "" s}
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de unidades, directorios e arquivos de partida
@@ -2147,119 +2147,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Borra-lo
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Grabar
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Salva-la partida actual, usando o nome seleccionado
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Escribe un nome para a partida
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Escribe un nome para a partida
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Xeración do mundo
-STR_MAPSIZE                                                     :{BLACK}Tamaño do mapa:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Num. de cidades:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Num. de industrias:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altura da liña de neve:
-STR_SNOW_LINE_UP                                                :{BLACK}Subir a altura da liña de neve
-STR_SNOW_LINE_DOWN                                              :{BLACK}Baixar a altura da liña de neve
-STR_RANDOM_SEED                                                 :{BLACK}Semente Aleatoria:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Pincha para introducir unha semilla
-STR_RANDOM                                                      :{BLACK}Aleatorio
-STR_RANDOM_HELP                                                 :{BLACK}Cambia-la semente aleatoria usada para a Xeración de Terreo
-STR_LAND_GENERATOR                                              :{BLACK}Xerador de terreo:
-STR_TREE_PLACER                                                 :{BLACK}Algoritmo para árbores:
-STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreo:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivel do mar:
-STR_SMOOTHNESS                                                  :{BLACK}Suavidade:
-STR_GENERATE                                                    :{WHITE}Xerar
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Xeración do mundo
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Tamaño do mapa:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Num. de cidades:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Num. de industrias:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Altura da liña de neve:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Subir a altura da liña de neve
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Baixar a altura da liña de neve
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Semente Aleatoria:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Pincha para introducir unha semilla
+STR_MAPGEN_RANDOM                                               :{BLACK}Aleatorio
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Cambia-la semente aleatoria usada para a Xeración de Terreo
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Xerador de terreo:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritmo para árbores:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipo de terreo:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nivel do mar:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Suavidade:
+STR_MAPGEN_GENERATE                                             :{WHITE}Xerar
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Bordes do mapa:
-STR_NORTHWEST                                                   :{BLACK}Noroeste
-STR_NORTHEAST                                                   :{BLACK}Noreste
-STR_SOUTHEAST                                                   :{BLACK}Sureste
-STR_SOUTHWEST                                                   :{BLACK}Suroeste
-STR_BORDER_FREEFORM                                             :{BLACK}Forma Libre
-STR_BORDER_WATER                                                :{BLACK}Auga
-STR_BORDER_RANDOM                                               :{BLACK}Aleatorio
-STR_BORDER_RANDOMIZE                                            :{BLACK}Aleatorio
-STR_BORDER_MANUAL                                               :{BLACK}Manual
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotación do mapa de altura:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nome do mapa de altura:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Tamaño: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Introduce a semente aleatoria
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Cambiar a altura da liña de neve
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Cambia-lo ano de inicio
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Bordes do mapa:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Noroeste
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Noreste
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sureste
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Suroeste
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Forma Libre
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Auga
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleatorio
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleatorio
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotación do mapa de altura:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome do mapa de altura:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Tamaño: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Introduce a semente aleatoria
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Cambiar a altura da liña de neve
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Cambia-lo ano de inicio
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Tipo de escenario
-STR_SE_FLAT_WORLD                                               :{WHITE}Terreo Chan
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Xerar terreo chan
-STR_SE_RANDOM_LAND                                              :{WHITE}Terreo aleatorio
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Altura do terreo chan:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Subir a altura do terreo chan un nivel
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Baixar a altura do terreo chan un nivel
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipo de escenario
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Terreo Chan
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Xerar terreo chan
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Terreo aleatorio
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Altura do terreo chan:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Subir a altura do terreo chan un nivel
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Baixar a altura do terreo chan un nivel
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Cambiar a altura do terreo chan
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Cambiar a altura do terreo chan
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Xerando mundo...
 STR_GENERATION_ABORT                                            :{BLACK}Cancelar
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Cancelar Xeración De Mundo
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}¿Estás seguro de querer terminar a xeración?
-STR_PROGRESS                                                    :{WHITE}{NUM}% completado
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Xeración do mundo
-STR_TREE_GENERATION                                             :{BLACK}Xeración de árbores
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Xeración inamovible
-STR_CLEARING_TILES                                              :{BLACK}Xeración de áreas rocosas e quebradas
-STR_SETTINGUP_GAME                                              :{BLACK}Configurando partida
-STR_PREPARING_TILELOOP                                          :{BLACK}Executando tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Preparando partida
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% completado
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Xeración do mundo
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Xeración de árbores
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Xeración inamovible
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Xeración de áreas rocosas e quebradas
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Configurando partida
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Executando tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparando partida
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configuración NewGRF
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Carga la programación seleccionada
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Grabar programación
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Graba-la lista actual como programación
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Escribe un nome para a programación
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Borrar programación
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Borra-la programación seleccionada actualmente
-STR_NEWGRF_ADD                                                  :{BLACK}Engadir
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Engadir un novo arquivo NewGRF á lista
-STR_NEWGRF_REMOVE                                               :{BLACK}Eliminar
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Elimina-lo arquivo NewGRF seleccionado da lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Subir
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Move-lo arquivo NewGRF seleccionado arriba na lista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Baixar
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Move-lo arquivo NewGRF seleccionado abaixo na lista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Lista dos ficheiros NewGRF instalados. Pincha nun ficheiro para cambiar os parámetros
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Conf. parámetros
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Cambiar paleta
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Cambia-la paleta para o NewGRF seleccionado.{}Faino cando os gráficos deste NewGRF se vexan rosa no xogo
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplica-los cambios
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Busca-lo contido que falta en liña
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Comprobar se o contido que falta pode atoparse en liña
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Ficheiro: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}Suma MD5: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parámetros: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Non hai información dispoñible
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ficheiro non atopado
-STR_NEWGRF_DISABLED                                             :{RED}Desactivado
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Introduce os parámetros do NewGRF
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Carga la programación seleccionada
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Grabar programación
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Graba-la lista actual como programación
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Escribe un nome para a programación
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Borrar programación
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Borra-la programación seleccionada actualmente
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Engadir
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Engadir un novo arquivo NewGRF á lista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Eliminar
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Elimina-lo arquivo NewGRF seleccionado da lista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Subir
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Move-lo arquivo NewGRF seleccionado arriba na lista
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Baixar
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move-lo arquivo NewGRF seleccionado abaixo na lista
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos ficheiros NewGRF instalados. Pincha nun ficheiro para cambiar os parámetros
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Conf. parámetros
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Cambiar paleta
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Cambia-la paleta para o NewGRF seleccionado.{}Faino cando os gráficos deste NewGRF se vexan rosa no xogo
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplica-los cambios
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Busca-lo contido que falta en liña
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Comprobar se o contido que falta pode atoparse en liña
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Ficheiro: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}Suma MD5: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parámetros: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Non hai información dispoñible
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ficheiro non atopado
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivado
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Introduce os parámetros do NewGRF
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Arquivos NewGRF dispoñibles
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Engadir á selección
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Engadi-lo arquivo NewGRF seleccionado a túa configuración
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Actualizar ficheiros
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Actualiza a lista dos ficheiros NewGRF dispoñibles
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Engadi-lo arquivo NewGRF seleccionado a túa configuración
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Actualizar ficheiros
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Actualiza a lista dos ficheiros NewGRF dispoñibles
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2282,7 +2282,7 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Intento de usar
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contén un sprite corrupto. Tódolos sprites corruptos mostraránse coma una interrogación vermella (?).
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}¡Atención!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}¡Atención!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vas realizar cambios nunha partida en execución; esto pode cerrar OpenTTD.{}¿Estás completamente seguro de querer facelo?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Non se pode engadir o ficheiro: ID do GRF duplicado
@@ -2306,10 +2306,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edita lo texto do sinal
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Ir ó sinal seguinte
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Ir ó sinal anterior
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ir ó sinal seguinte
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ir ó sinal anterior
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Escribe un nome para o sinal
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Escribe un nome para o sinal
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Cidades
@@ -2323,8 +2323,8 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Poboación: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Pasaxeiros último mes: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Correo último mes: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} necesario{P "" s}
-STR_NOISE_IN_TOWN                                               :{BLACK}Límite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} necesario{P "" s}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Límite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centra-la vista principal na situación da cidade
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Aut. Local
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Mostra-la información sobre a autoridade local
@@ -2371,18 +2371,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Ningún
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Servizos que xa teñen subsidio:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} dende {STATION} ata {STATION}{YELLOW} ({COMPANY}{YELLOW}, ata {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Pincha no servizo para centra-la vista na industria/poboación
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Pincha no servizo para centra-la vista na industria/poboación
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nomes das estacións - pincha nun nome para centra-la vista principal na estación
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Presiona CTRL para seleccionar máis dun ítem
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Presiona CTRL para seleccionar máis dun ítem
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Estacións
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Ningún -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar tódolos edificios
-STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar tódolos tipos de carga (incluso os que non están a esperar)
-STR_NO_WAITING_CARGO                                            :{BLACK}Non queda ningún tipo de carga en espera
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleccionar tódolos edificios
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Seleccionar tódolos tipos de carga (incluso os que non están a esperar)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Non queda ningún tipo de carga en espera
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2413,16 +2413,16 @@ STR_CARGO_RATING_OUTSTANDING                                    :Excepcional
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centra-la vista principal na situación da estación
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Cambia-lo nome da estación
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar tódolos trens que teñen esta estación nas súas ordes
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar tódolos vehículos de estrada que teñen esta estación nas súas ordes
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostrar tódolos avións que teñen esta estación nas súas ordes
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostrar tódolos barcos que teñen esta estación nas súas ordes
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostrar tódolos trens que teñen esta estación nas súas ordes
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostrar tódolos vehículos de estrada que teñen esta estación nas súas ordes
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostrar tódolos avións que teñen esta estación nas súas ordes
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostrar tódolos barcos que teñen esta estación nas súas ordes
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Renomear estación/área de carga
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Renomear estación/área de carga
 
 # Waypoint/buoy view window
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Cambia lo nome do punto de ruta
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Cambiar o nome da boia
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Cambia lo nome do punto de ruta
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Cambiar o nome da boia
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Edita-lo nome do punto de control
 
@@ -2448,7 +2448,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balance do Banco
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Préstamo
-STR_MAX_LOAN                                                    :{WHITE}Préstamo Máx: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Préstamo Máx: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Solicitar {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Incrementar o préstamo. CTRL+Click solicita o máximo posible
@@ -2462,10 +2462,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Esquema de Cor:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehículos:
-STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} vehículo{P "" s} de estrada
-STR_AIRCRAFT                                                    :{WHITE}Aeronaves {COMMA}
-STR_SHIPS                                                       :{WHITE}{COMMA} barco{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} vehículo{P "" s} de estrada
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}Aeronaves {COMMA}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} barco{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ningún
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da Compañía: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propiedade de {COMPANY})
@@ -2473,8 +2473,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construír CX
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Ve-lo CX
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construír/ver cuartel xeral da compañía
-STR_RELOCATE_HQ                                                 :{BLACK}Reposicionar CX
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Recontruí-lo cuartel xeral da compañía en calquer lugar cun custo do 1% do valor da compañía
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Reposicionar CX
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Recontruí-lo cuartel xeral da compañía en calquer lugar cun custo do 1% do valor da compañía
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nova Cara
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Selecciona-la nova cara do presidente
@@ -2490,17 +2490,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender u
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar un 25% das accións nesta compañía
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender un 25% das accións desta compañía
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nome da Compañía
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nome Do Presidente
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nome da Compañía
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome Do Presidente
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Buscamos unha compañía de transporte para adquiri-la nosa compañía{}{}¿Queres comprar {COMPANY} por {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes das industrias - pincha nun nome para centra-la vista nela
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrias
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomes das industrias - pincha nun nome para centra-la vista nela
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2536,26 +2536,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Avións
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Beneficio este ano: {CURRENCY} (ano pasado: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trens Dispoñibles
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehículos Dispoñibles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Dispoñibles
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronaves Dispoñibles
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ve-la lista das máquinas dispoñibles para este tipo de vehículo.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trens Dispoñibles
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Vehículos Dispoñibles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Barcos Dispoñibles
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aeronaves Dispoñibles
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Ve-la lista das máquinas dispoñibles para este tipo de vehículo.
 
-STR_MANAGE_LIST                                                 :{BLACK}Xestionar lista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Envia-las instruccións a tódolos vehículos desta lista
-STR_REPLACE_VEHICLES                                            :Reemplazar Vehículos
-STR_SEND_FOR_SERVICING                                          :Enviar para Servizo
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Xestionar lista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Envia-las instruccións a tódolos vehículos desta lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Reemplazar Vehículos
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Enviar para Servizo
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Enviar ó Depósito
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar ó Depósito
-STR_SEND_SHIP_TO_DEPOT                                          :Enviar ó Depósito
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar ó Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar ó Depósito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar ó Depósito
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar ó Depósito
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar ó Hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Pincha para parar tódolos vehículos da lista
-STR_MASS_START_LIST_TIP                                         :{BLACK}Pincha para iniciar tódolos vehículos da lista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Pincha para parar tódolos vehículos da lista
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Pincha para iniciar tódolos vehículos da lista
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordes compartidas de {COMMA} Vehículo{P "" s}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordes compartidas de {COMMA} Vehículo{P "" s}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Tódolos trens
@@ -2568,11 +2568,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Vehículos de e
 STR_GROUP_DEFAULT_SHIPS                                         :Barcos sen agrupar
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Avións sen agrupar
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupos - Pincha nun grupo para ver unha lista de tódolos vehículos dese grupo
-STR_GROUP_CREATE_TIP                                            :{BLACK}Pincha para crear un grupo
-STR_GROUP_DELETE_TIP                                            :{BLACK}Borrar o grupo seleccionado
-STR_GROUP_RENAME_TIP                                            :{BLACK}Renomear o grupo seleccionado
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Pincha para protexer a este grupo da autosubstitución global
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos - Pincha nun grupo para ver unha lista de tódolos vehículos dese grupo
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Pincha para crear un grupo
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Borrar o grupo seleccionado
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renomear o grupo seleccionado
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Pincha para protexer a este grupo da autosubstitución global
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Engadir vehículos compartidos
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Borrar tódolos vehículos
@@ -2595,7 +2595,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocida
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Mantemento: {GOLD}{CURRENCY}/ano
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidade: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(reax.)
+STR_PURCHASE_INFO_REFITTABLE                                    :(reax.)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Deseñado: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} anos
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidade Máx.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Custo: {GOLD}{CURRENCY}
@@ -2659,17 +2659,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrastra
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arrastra o barco aquí para vendelo
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arrastra o avión aquí para vendelo
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Arrastra a máquina do tren aquí para vender todo o tren
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Arrastra a máquina do tren aquí para vender todo o tren
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender tódolos trens do depósito
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vender tódolos vehículos que hai no depósito
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vender tódolos barcos no depósito
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vender tódolos avións do hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vender tódolos trens do depósito
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vender tódolos vehículos que hai no depósito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vender tódolos barcos no depósito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vender tódolos avións do hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autosubstituír tódolos trens no depósito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autosubstituír tódolos vehículos no depósito
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autosubstituír tódolos barcos no depósito
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autosubstituír tódolos avións no hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autosubstituír tódolos trens no depósito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autosubstituír tódolos vehículos no depósito
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autosubstituír tódolos barcos no depósito
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autosubstituír tódolos avións no hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Novos Vehículos
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Novos Vehículos
@@ -2681,35 +2681,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}ConstruÃ
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Costruír novo barco
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construír novo avión
 
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar Tren
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Vehículo
-STR_CLONE_SHIP                                                  :{BLACK}Clonar Barco
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clonar Tren
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clonar Vehículo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonar Barco
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonar Aeronave
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esto construirá unha copia dun tren incluídos os vagóns. Pincha neste botón e despois nun tren dentro ou fóra do depósito. CTRL+Click comparte as ordes
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esto construirá unha copia do vehículo. Pincha neste botón e despois nun vehículo dentro ou fóra do depósito. CTRL+Click compartirá as ordes
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esto construíra unha copia do barco. Pincha neste botón e despois nun barco dentro ou fóra do depósito. CTRL+Click compartirá as ordes
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esto construirá unha copia do avión. Pincha neste botón e nun avión que estea dentro ou fóra do hangar. CTRL+Click compartirá as ordes
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Esto construirá unha copia dun tren incluídos os vagóns. Pincha neste botón e despois nun tren dentro ou fóra do depósito. CTRL+Click comparte as ordes
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esto construirá unha copia do vehículo. Pincha neste botón e despois nun vehículo dentro ou fóra do depósito. CTRL+Click compartirá as ordes
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Esto construíra unha copia do barco. Pincha neste botón e despois nun barco dentro ou fóra do depósito. CTRL+Click compartirá as ordes
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Esto construirá unha copia do avión. Pincha neste botón e nun avión que estea dentro ou fóra do hangar. CTRL+Click compartirá as ordes
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centra-la vista principal na situación do depósito de trens
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centra-la vista principal na situación do depósito de vehículos de estrada
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centra-la vista principal na situación do depósito de barcos
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra-la vista principal na situación do hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obter a lista de tódolos trens co depósito actual nas súas ordes
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Obter a lista de tódolos vehículos de estrada co depósito actual nas súas ordes
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Obter a lista de tódolos barcos co depósito actual nas súas ordes
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Obter una lista de tódolos avións con algún hangar deste aeroporto nas súas ordes
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Obter a lista de tódolos trens co depósito actual nas súas ordes
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Obter a lista de tódolos vehículos de estrada co depósito actual nas súas ordes
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Obter a lista de tódolos barcos co depósito actual nas súas ordes
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Obter una lista de tódolos avións con algún hangar deste aeroporto nas súas ordes
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pincha para parar tódolos trens que hai no depósito
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Pincha para parar tódolos vehículos que hai no depósito
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Pincha para parar tódolos barcos que hai no depósito
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Pincha para parar tódolos avións que hai no hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Pincha para parar tódolos trens que hai no depósito
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Pincha para parar tódolos vehículos que hai no depósito
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Pincha para parar tódolos barcos que hai no depósito
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Pincha para parar tódolos avións que hai no hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Pincha para iniciar tódolos trens que hai no depósito
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Pincha para iniciar tódolos vehículos que hai no depósito
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Pincha para iniciar tódolos barcos que hai no depósito
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Pincha para iniciar tódolos avións que hai no hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Pincha para iniciar tódolos trens que hai no depósito
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Pincha para iniciar tódolos vehículos que hai no depósito
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Pincha para iniciar tódolos barcos que hai no depósito
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Pincha para iniciar tódolos avións que hai no hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Vas vender tódolos vehículos do depósito. ¿Estás seguro?
 
@@ -2723,38 +2723,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :barco
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotora de monoraíl
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotora de maglev
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potencia: {POWER}{}Custo de Mantemento: {CURRENCY}/ano{}Capacidade: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO}, {CARGO}{}Custo Mantemento: {CURRENCY}/ano
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO}{}Custo Mantemento: {CURRENCY}/ano
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potencia: {POWER}{}Custo de Mantemento: {CURRENCY}/ano{}Capacidade: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO}, {CARGO}{}Custo Mantemento: {CURRENCY}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Custo: {CURRENCY} Velocidade Máx.: {VELOCITY}{}Capacidade: {CARGO}{}Custo Mantemento: {CURRENCY}/ano
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituír {STRING}
-STR_VEHICLE_TRAIN                                               :Tren
-STR_VEHICLE_ROAD_VEHICLE                                        :Vehículo de estrada
-STR_VEHICLE_SHIP                                                :Barco
-STR_VEHICLE_AIRCRAFT                                            :Aeronave
+STR_REPLACE_VEHICLE_TRAIN                                       :Tren
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Vehículo de estrada
+STR_REPLACE_VEHICLE_SHIP                                        :Barco
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeronave
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selecciona o tipo de máquina a substituír
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selecciona o tipo da nova máquina que queres usar en lugar do tipo de máquina seleccionada a esquerda
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Comezar a Substituír Vehículos
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Presiona para comezar a substituír o tipo de máquina da esquerda co seleccionado na dereita
-STR_NOT_REPLACING                                               :{BLACK}Non substituír
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Non hai vehículos seleccionados
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Non substituír
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Non hai vehículos seleccionados
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar de Substituír Vehículos
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Presiona para parar a substitución do tipo de máquina seleccionada na esquerda
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituíndo: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Cambia entre as fiestras de substitución de máquinas e vagóns
-STR_ENGINES                                                     :Máquinas
-STR_WAGONS                                                      :Vagóns
+STR_REPLACE_ENGINES                                             :Máquinas
+STR_REPLACE_WAGONS                                              :Vagóns
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecciona o tipo de raíl para o que queres substituír as máquinas
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Mostra qué máquina seleccionada a esquerda vai ser substituída, se é algunha.
-STR_RAIL_VEHICLES                                               :Vehículos Raíl
-STR_ELRAIL_VEHICLES                                             :Vehículos de Raíl Electrificados
-STR_MONORAIL_VEHICLES                                           :Vehículos Monoraíl
-STR_MAGLEV_VEHICLES                                             :Vehículos Maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Vehículos Raíl
+STR_REPLACE_ELRAIL_VEHICLES                                     :Vehículos de Raíl Electrificados
+STR_REPLACE_MONORAIL_VEHICLES                                   :Vehículos Monoraíl
+STR_REPLACE_MAGLEV_VEHICLES                                     :Vehículos Maglev
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Eliminar os vagóns: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Facer que a autosubstitución manteña a lonxitude do tren quitando vagóns (empezando polo principio), se ó substituír a máquina o tren é máis longo.
@@ -2772,10 +2772,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Envia-lo
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Envia-lo barco o depósito
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Envia-lo avión ó hangar
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Esto construirá unha copia do tren incluídos os vagóns. CTRL+Click compartirá as ordes
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto construirá unha copia do vehículo. CTRL+Click compartirá as ordes
-STR_CLONE_SHIP_INFO                                             :{BLACK}Esto construirá unha copia do barco. CTRL+Click compartirá as ordes
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esto construirá una copia do avión. CTRL+Click compartirá as ordes
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Esto construirá unha copia do tren incluídos os vagóns. CTRL+Click compartirá as ordes
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Esto construirá unha copia do vehículo. CTRL+Click compartirá as ordes
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Esto construirá unha copia do barco. CTRL+Click compartirá as ordes
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Esto construirá una copia do avión. CTRL+Click compartirá as ordes
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Obliga-lo tren a continuar sen esperar a que o sinal o indique
 
@@ -2808,36 +2808,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Saíndo
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}¡Estrelado!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Roto
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
-STR_TRAIN_STOPPING                                              :{RED}Parando
-STR_TRAIN_STOPPING_VEL                                          :{RED}Parando, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Sen enerxía
-STR_TRAIN_STUCK                                                 :{ORANGE}Esperando camiño libre
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Diríxese a {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Diríxese a {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sen ordes
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sen ordes, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Diríxese a {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Diríxese a {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}En camiño ó Depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}En camiño ó Depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Diríxese o depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Diríxese o depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Diríxese ó hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servizo no Depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servizo no Depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servizo no Hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servizo no Hangar de {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Parando
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Parando, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sen enerxía
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Esperando camiño libre
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Diríxese a {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Diríxese a {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sen ordes
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sen ordes, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Diríxese a {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Diríxese a {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}En camiño ó Depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}En camiño ó Depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Diríxese o depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Diríxese o depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Diríxese o Depósito de Barcos de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Diríxese ó hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Diríxese ó hangar de {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servizo no Depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Servizo no Depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servizo no Depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servizo no Depósito de Barcos de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Servizo no Hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Servizo no Hangar de {STATION}, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalles)
@@ -2850,8 +2850,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Cambia-l
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo Mantemento: {LTBLUE}{CURRENCY}/ano
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} ano{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ano{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ano{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ano{P "" s} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Velocidade máx.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potencia: {LTBLUE}{POWER}{BLACK} Velocidade máx.: {LTBLUE}{VELOCITY}
@@ -2865,7 +2865,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacida
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacidade: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacidade: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transferir Créditos: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transferir Créditos: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de Servizo: {LTBLUE}{COMMA}days{BLACK}   Último Servizo: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo servizo: {LTBLUE}{COMMA}%{BLACK}   Últ. Servizo: {LTBLUE}{DATE_LONG}
@@ -2881,9 +2881,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Cambia-l
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacidade total de carga deste tren:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Capacidade total de carga deste tren:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Valeiro
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de {STATION}
@@ -2898,7 +2898,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Mostra-l
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Carga Total
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Mostra-la capacidade total do tren, dividida por tipos de carga
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacidade: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacidade: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Reaxustar)
@@ -2922,15 +2922,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Reaxusta
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordes)
-STR_TIMETABLE_VIEW                                              :{BLACK}Horario
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Cambiar á vista de horarios
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horario
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Cambiar á vista de horarios
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Lista de Ordes - Pincha nunha orde para seleccionala
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin das Ordes - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin das ordes compartidas - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fin das ordes compartidas - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Sen parar
@@ -2954,14 +2954,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transferir
 STR_ORDER_DROP_NO_UNLOADING                                     :Non descargar
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Cambia-lo comportamento de descarga da orde seleccionada
 
-STR_REFIT                                                       :{BLACK}Reaxustar
-STR_REFIT_TIP                                                   :{BLACK}Selecciona o tipo de carga para reaxustar nesta orde. CTRL+click para quita la instrución de reaxuste
+STR_ORDER_REFIT                                                 :{BLACK}Reaxustar
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecciona o tipo de carga para reaxustar nesta orde. CTRL+click para quita la instrución de reaxuste
 
-STR_SERVICE                                                     :{BLACK}Servizo
+STR_ORDER_SERVICE                                               :{BLACK}Servizo
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ir sempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Facer servizo se é necesario
 STR_ORDER_DROP_HALT_DEPOT                                       :Parar
-STR_SERVICE_HINT                                                :{BLACK}Saltar esta orde a non ser que sexa necesario o servizo
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Saltar esta orde a non ser que sexa necesario o servizo
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Datos do vehículo para basa lo salto
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Porcentaxe de carga
@@ -2982,7 +2982,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :é verdadeiro
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :é falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}O valor co que se compararán os datos do vehículo
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Escribe o valor co que comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
@@ -2996,13 +2996,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir ó depósito
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir ó hangar máis cercano
 STR_ORDER_CONDITIONAL                                           :Salto de orde condicional
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Insertar unha nova orde despois da seleccionada, o insertar unha nova orde ó final da lista
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Insertar unha orde avanzada
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Insertar unha orde avanzada
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostrar tódolos vehículos que comparten esta planificación
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostrar tódolos vehículos que comparten esta planificación
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Ir vía {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sen parar vía {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ir vía {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ir sen parar vía {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Servizo en
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Servizo sen parada en
@@ -3012,15 +3012,15 @@ STR_ORDER_NEAREST_HANGAR                                        :o Hangar máis
 STR_ORDER_TRAIN_DEPOT                                           :Depósito de Trens
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de Vehículos de Estrada
 STR_ORDER_SHIP_DEPOT                                            :Depósito de Barcos
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} Hangar de {STATION}
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} Hangar de {STATION}
 
-STR_REFIT_ORDER                                                 :(Reaxustar a {STRING})
-STR_REFIT_STOP_ORDER                                            :(Reaxustar a {STRING} e parar)
-STR_STOP_ORDER                                                  :(Parar)
+STR_ORDER_REFIT_ORDER                                           :(Reaxustar a {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Reaxustar a {STRING} e parar)
+STR_ORDER_STOP_ORDER                                            :(Parar)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Carga completa)
 STR_ORDER_FULL_LOAD_ANY                                         :(Carga completa de calquera carga)
@@ -3039,16 +3039,16 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Non descargar
 
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[medio]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Saltar á orde {COMMA}
-STR_CONDITIONAL_NUM                                             :Saltar á orde {COMMA} cando {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Saltar á orde {COMMA} cando {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Saltar á orde {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Saltar á orde {COMMA} cando {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Saltar á orde {COMMA} cando {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Orde Inválida)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horario)
-STR_ORDER_VIEW                                                  :{BLACK}Ordes
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Cambiar á vista de ordes
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordes
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Cambiar á vista de ordes
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horario - pincha nunha orde para seleccionala
 
@@ -3070,10 +3070,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Este veh
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambiar Tempo
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia-la cantidade de tempo que debería levar a orde seleccionada
 
-STR_CLEAR_TIME                                                  :{BLACK}Borrar Tempo
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Borrar Tempo
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Quita-la cantidade de tempo para a orde seleccionada
 
-STR_RESET_LATENESS                                              :{BLACK}Reiniciar Contador de Retraso
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reiniciar Contador de Retraso
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reinicia-lo contador de retraso, para que o vehículo vaia en punto
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Autoencher
@@ -3081,41 +3081,41 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Enche-lo
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}Depuración IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nome da IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome da IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recargar IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Mata-la IA, recargar o script, e reinicia-la IA
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Mata-la IA, recargar o script, e reinicia-la IA
 
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Fallou unha das IA en execución. Por favor, informa ó autor desta IA cunha captura da Fiestra de Depuración de IA.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}A fiestra de Depuración de IA só está dispoñible para o servidor
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Fallou unha das IA en execución. Por favor, informa ó autor desta IA cunha captura da Fiestra de Depuración de IA.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}A fiestra de Depuración de IA só está dispoñible para o servidor
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuración IA
-STR_AI_LIST_TIP                                                 :{BLACK}Tódalas IA que se cargarán na próxima partida
-STR_AI_HUMAN_PLAYER                                             :Xogador humano
-STR_AI_RANDOM_AI                                                :IA Aleatoria
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Tódalas IA que se cargarán na próxima partida
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Xogador humano
+STR_AI_CONFIG_RANDOM_AI                                         :IA Aleatoria
 
-STR_AI_CHANGE                                                   :{BLACK}IA seleccionada
-STR_AI_CHANGE_TIP                                               :{BLACK}Cargar outra IA
-STR_AI_CONFIGURE                                                :{BLACK}Configurar
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configura-los parámetros da IA
+STR_AI_CONFIG_CHANGE                                            :{BLACK}IA seleccionada
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Cargar outra IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura-los parámetros da IA
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}IA Dispoñibles
-STR_AI_AILIST_TIP                                               :{BLACK}Pincha para seleccionar unha IA
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Pincha para seleccionar unha IA
 
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versión: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versión: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Aceptar
-STR_AI_ACCEPT_TIP                                               :{BLACK}Selecciona-la IA marcada
-STR_AI_CANCEL                                                   :{BLACK}Cancelar
-STR_AI_CANCEL_TIP                                               :{BLACK}Non cambia-la IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Aceptar
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecciona-la IA marcada
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Non cambia-la IA
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parámetros IA
-STR_AI_CLOSE                                                    :{BLACK}Pechar
-STR_AI_RESET                                                    :{BLACK}Reiniciar
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Pechar
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reiniciar
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3136,8 +3136,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Custo Es
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Ingreso Estimado: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}¡Grabación en progreso,{}por favor espera ata que termine!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autograbado fallido
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}¡Grabación en progreso,{}por favor espera ata que termine!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autograbado fallido
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}No se pode lee-la unidade
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Grabación da partida fallida{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Non se pode borra-lo arquivo
@@ -3148,21 +3148,21 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :A partida grabo
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Ficheiro ilexible
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Non se pode escribir no ficheiro
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Fallou a comprobación de integridade dos datos
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}A partida grabouse nunha versión sen soporte para tranvías. Quitáronse tódolos tranvías.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}A partida grabouse nunha versión sen soporte para tranvías. Quitáronse tódolos tranvías.
 
 # Map generation messages
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...non hai cidades neste escenario
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...non hai cidades neste escenario
 
-STR_PNGMAP_ERROR                                                :{WHITE}Non se pode cargar o mapa desde o PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...arquivo non atopado.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...non se puido convertir o tipo de imaxe. Necesítase unha imaxe PNG de 8 ou 24 bit.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...algo saíu mal. Síntoo. (probablemente o ficheiro esté corrupto)
+STR_ERROR_PNGMAP                                                :{WHITE}Non se pode cargar o mapa desde o PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...arquivo non atopado.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...non se puido convertir o tipo de imaxe. Necesítase unha imaxe PNG de 8 ou 24 bit.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...algo saíu mal. Síntoo. (probablemente o ficheiro esté corrupto)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Non se pode carga-la paisaxe desde o BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...non se puido convertí-lo tipo de imaxe.
+STR_ERROR_BMPMAP                                                :{WHITE}Non se pode carga-la paisaxe desde o BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...non se puido convertí-lo tipo de imaxe.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Aviso de escala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Non se recomenda redimensionar moito o mapa de orixe. ¿Continuar coa xeración?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Aviso de escala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Non se recomenda redimensionar moito o mapa de orixe. ¿Continuar coa xeración?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Captura de pantalla grabada con éxito no disco como '{STRING}'
@@ -3185,14 +3185,14 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...empra
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...xa está construído
 STR_ERROR_OWNED_BY                                              :{WHITE}...é propiedade de {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...a área é propiedade doutra compañía
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}O nome debe ser único
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} no camiño
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}O nome debe ser único
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} no camiño
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN}: a autoridade local négase a permitilo
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}A autoridade local de {TOWN} négase a permiti-la construción doutro aeroporto
-STR_BRIBE_FAILED                                                :{WHITE}O tento de suborno foi
-STR_BRIBE_FAILED_2                                              :{WHITE}descuberto por un investigador rexional
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}O tento de suborno foi
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}descuberto por un investigador rexional
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Non se pode subi-lo terreo aí...
@@ -3201,7 +3201,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Non se p
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}A excavación danaría un tunel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Xa está a nivel do mar
 STR_ERROR_TOO_HIGH                                              :{WHITE}Demasiado alto
-STR_ALREADY_LEVELLED                                            :{WHITE}... xa é plana
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... xa é plana
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Non se pode cambia-lo nome da compañía...
@@ -3212,28 +3212,28 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Non se p
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...non queda préstamo a pagar
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...necesitas {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Non se pode paga-lo préstamo...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Non podes da-lo diñeiro prestado do banco...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Non podes da-lo diñeiro prestado do banco...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Non se pode compra-la compañía...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Non se pode construí-lo cuartel xeral...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Non se pode comprar un 25% das accións nesta compañía...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Non se pode vender un 25% das accións desta compañía...
-STR_PROTECTED                                                   :{WHITE}Esta compañía todavía non comercia con accións...
+STR_ERROR_PROTECTED                                             :{WHITE}Esta compañía todavía non comercia con accións...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Non se pode construír cidades
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Non se pode construír cidades
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Non se pode renomea-la cidade...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Non se pode construí-la cidade aí...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...demasiado cerca do borde do mapa
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...demasiado cerca doutra cidade
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...hai demasiadas cidades
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...non queda máis espacio no mapa
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Traballos na estrada en progreso
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...non queda máis espacio no mapa
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Traballos na estrada en progreso
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Non se poden xera-las industrias...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Non se poden xera-las industrias...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Non se pode construír {STRING} aquí...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Non se pode construír ese tipo de industria aí...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cerca doutra industria
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...demasiado cerca doutra industria
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}...debes construír unha cidade primeiro
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}...só se permite un por cidade
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...só se pode construír en cidades con polo menos 1200 hab.
@@ -3254,7 +3254,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Non se p
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Xunta máis dunha estación/área de carga existente
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...a estación ocupa demasiado
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...estacións non uniformes deshabilitadas
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...estacións non uniformes deshabilitadas
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Hay demasiadas estacións/áreas de carga
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paradas de bus
 STR_ERROR_TOO_MANY_TRUCK_STOPS                                  :{WHITE}Demasiadas estacións de camións
@@ -3263,12 +3263,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Demasiad
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Demasiado cerca doutro peirao
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Demasiado cerca doutro aeroporto
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Non se pode renomea-la estación...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...esta rúa pertenece á cidade
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...a estrada vai na dirección incorrecta
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...esta rúa pertenece á cidade
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...a estrada vai na dirección incorrecta
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Non se pode eliminar parte da estación...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}debes quita-la estación de tren primeiro
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Non se pode eliminar parte da estación...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}debes quita-la estación de tren primeiro
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Non se pode borrar a estación de autobús...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Non se pode borra-la estación de camións...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Non se pode quita-la estación de tranvía de pasaxeiros...
@@ -3284,13 +3284,13 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Debes de
 
 # Waypoint related errors
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Non se pode construír un punto de control de tren aí...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Non se pode construír un punto de control de tren aí...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Non se pode coloca-la boia aquí...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Non se pode cambia-lo nome do punto de control...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Non se pode cambia-lo nome do punto de control...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Non se pode eliminar-lo punto de control...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Non se pode eliminar-lo punto de control...
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boia no camiño
-STR_BUOY_IS_IN_USE                                              :{WHITE}...a boia está en uso!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...a boia está en uso!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Non se pode construír un depósito aí...
@@ -3307,14 +3307,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Os trens
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}O tren é demasiado longo
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Non se pode inverti-la dirección do vehículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Non se poden xira-los vehículos consistentes de múltiples unidades
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipos de vías incompatibles
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Tipos de vías incompatibles
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}No se pode move-lo vehículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A máquina traseira sempre seguirá a dianteira
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}No se pode atopar unha ruta a un depósito local
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}No se pode atopar unha ruta ó depósito local
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito erróneo
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipo de depósito erróneo
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} é demasiado longo despois do reemprazo
@@ -3325,14 +3325,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(límite de diÃ
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Combinación de pistas imposible
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Non hay vía de ferrocarril adecuada
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Debes elimina-la pista de ferrocarril primeiro
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}A estrada é dun sentido ou está bloqueada
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}A estrada é dun sentido ou está bloqueada
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Non se poden construí-los sinais aí...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Non se pode construí-la pista do ferrocarril aí...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Non se pode elimina-la pista de ferrocarril de aí...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Non se pode elimina-los sinais de aí...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Non se poden convertí-las sinais aquí...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Non se poden convertí-las sinais aquí...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Non se pode converti-lo tipo de vía aí...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Non se pode converti-lo tipo de vía aí...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Debes elimina-la estrada primeiro
@@ -3343,13 +3343,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Non se p
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Non se pode quitar o tranvía aquí...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Non se pode construí-los canais aí...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Non se pode construí-lo peche aí...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Non se poden colocar ríos aquí...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Non se pode construí-los canais aí...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Non se pode construí-lo peche aí...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Non se poden colocar ríos aquí...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...debes construí-lo na auga
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Non se pode construír na auga
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Debes demole-lo canal primeiro
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Non se pode construír un acueducto aquí...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Debes demole-lo canal primeiro
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Non se pode construír un acueducto aquí...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...xa hai unha árbore aí
@@ -3358,9 +3358,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Non se p
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}No se pode construí-la ponte aí...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Debes demole-la ponte primeiro
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Non pode empezar e rematar na mesma posición
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Os comezos da ponte non están o mesmo nivel
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}A ponte é demasiado baixa para o terreo
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Non pode empezar e rematar na mesma posición
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Os comezos da ponte non están o mesmo nivel
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}A ponte é demasiado baixa para o terreo
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}O inicio e o final deben estar aliñados
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...os finais da ponte deben estar ambos en terra
 
@@ -3369,7 +3369,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Non se p
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Emprazamento inadecuado para a entrada do túnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Debes demole-lo túnel primeiro
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Hai outro túnel no camiño
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}O túnel terminaría fóra do mapa
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}O túnel terminaría fóra do mapa
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Non se pode excava-lo terreo no outro lado do túnel
 
 # Unmovable related errors
@@ -3379,12 +3379,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Non se p
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...¡xa é da túa propiedade!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Non se pode crear o grupo...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Non se pode borrar este grupo...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Non se pode renomear o grupo...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Non se pode borrar tódolos vehículos deste grupo...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Non se pode engadir o vehículo a este grupo...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Non se poden engadir vehículos compartidos ó grupo...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Non se pode crear o grupo...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Non se pode borrar este grupo...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Non se pode renomear o grupo...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Non se pode borrar tódolos vehículos deste grupo...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Non se pode engadir o vehículo a este grupo...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Non se poden engadir vehículos compartidos ó grupo...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Hai un tren no camiño
@@ -3427,21 +3427,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Non se p
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No se pode vende-lo barco...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Non se pode vende-lo avión...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}O vehículo non está dispoñible
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}O vehículo non está dispoñible
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}O barco non está dispoñible
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronave non dispoñible
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}O vehículo non está dispoñible
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}O vehículo non está dispoñible
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}O barco non está dispoñible
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aeronave non dispoñible
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Hay demasiados vehículos na partida
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Non se pode cambia-lo intervalo de servizo...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Non se pode vender un vehículo destruido...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Non se pode actualizar un vehículo destruido...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Non se pode vender un vehículo destruido...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Non se pode actualizar un vehículo destruido...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Non se pode face-lo tren pasar unha sinal de perigo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}No se pode cambia-lo sentido do tren...
-STR_TRAIN_START_NO_CATENARY                                     :Esta vía non ten catenaria, polo que o tren non pode arrancar
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Esta vía non ten catenaria, polo que o tren non pode arrancar
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Non se pode xira-lo vehículo...
 
@@ -3460,14 +3460,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}o vehíc
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}o vehículo non pode ir a esa estación
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un vehículo que comparte esta orde non pode ir a esa estación
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Non se pode comparti-la lista de ordes...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Non se pode copia-la lista de ordes...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Non se pode comparti-la lista de ordes...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Non se pode copia-la lista de ordes...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...demasiado lonxe do destino anterior
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Non se pode axusta-lo horario do vehículo...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Os vehículos só poden parar nas estacións.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Este vehículo non para nesta estación.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Non se pode axusta-lo horario do vehículo...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Os vehículos só poden parar nas estacións.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Este vehículo non para nesta estación.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...demasiados sinais
@@ -3857,35 +3857,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :Boia de {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Boia de {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Boia de {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Boia de {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Compañía {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Grupo {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN}: {STRING}
-STR_WAYPOINTNAME_CITY                                           :Punto de Ruta de {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Punto de Ruta de {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Punto de Ruta de {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Punto de Ruta de {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :estación descoñecida
-STR_SIGN_DEFAULT                                                :Sinal
+STR_DEFAULT_SIGN_NAME                                           :Sinal
 STR_COMPANY_SOMEONE                                             :alguén{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Espectador, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3903,7 +3903,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3917,25 +3917,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/german.txt b/src/lang/german.txt
index b888961fa..eabb2b566 100644
--- a/src/lang/german.txt
+++ b/src/lang/german.txt
@@ -119,7 +119,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} Karame
 STR_QUANTITY_BATTERIES                                          :{COMMA} Batterie{P "" n}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} Plastik
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} Limonade{P "" n}
-STR_CARGO_N_A                                                   :k.A.{SKIP}
+STR_QUANTITY_N_A                                                :k.A.{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -209,26 +209,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Sortierreihenfolge auswählen (absteigend/aufsteigend)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Sortierkriterium auswählen
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Filterkriterien auswählen
-STR_SORT_BY                                                     :{BLACK}Sortieren
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Sortierreihenfolge auswählen (absteigend/aufsteigend)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Sortierkriterium auswählen
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Filterkriterien auswählen
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortieren
 STR_BUTTON_LOCATION                                             :{BLACK}Standort
-STR_QUERY_RENAME                                                :{BLACK}Umbenennen
+STR_BUTTON_RENAME                                               :{BLACK}Umbenennen
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fenster schließen
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titelleiste klicken und ziehen, um das Fenster zu verschieben
-STR_STICKY_BUTTON                                               :{BLACK}Fenster wird nicht durch die "schließe alle Fenster"-Taste geschlossen
-STR_RESIZE_BUTTON                                               :{BLACK}Klicken und Ziehen zum Ändern der Größe des Fensters
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Schalter für großes/kleines Fenster
+STR_TOOLTIP_STICKY                                              :{BLACK}Fenster wird nicht durch die "schließe alle Fenster"-Taste geschlossen
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klicken und Ziehen zum Ändern der Größe des Fensters
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Schalter für großes/kleines Fenster
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bildlaufleiste: Liste auf- und abwärts blättern
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bildlaufleiste: Liste nach links und rechts blättern
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Gebäude usw. auf einem Planquadrat abreißen
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Standard
-STR_QUERY_CANCEL                                                :{BLACK}Abbrechen
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Standard
+STR_BUTTON_CANCEL                                               :{BLACK}Abbrechen
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :^1234567890ß'€qwertzuiopü+asdfghjklöä#<yxcvbnm,.- .
@@ -317,7 +317,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Schild a
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Szenario speichern
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Szenario laden
-STR_MENU_LOAD_HEIGHTMAP                                         :Reliefkarte laden
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Reliefkarte laden
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Editor verlassen
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Beenden
@@ -505,11 +505,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Diagrammschalter für Frachttyp ein/aus
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Zeige detailierte Leistungsaufschlüsselung
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Zeige detailierte Leistungsaufschlüsselung
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legende des Firmendiagramms
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Graph der Firma ein-/ausblenden
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Graph der Firma ein-/ausblenden
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Firmentabelle
@@ -544,16 +544,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Geld:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Kredit:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Gesamt:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Anzahl an Fahrzeugen (Straßenfahrzeuge, Züge, Schiffe und Flugzeuge/Hubschrauber)
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Anzahl an Stationen (Jeder Teil einer Station zählt einzeln: Bahnhof, Ladeplatz, Busbahnhof, Flugplatz, Hafen)
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Geringster Gewinn der Fahrzeuge, die älter als 2 Jahre sind
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Geringste Monatseinnahmen in den letzten 12 Quartalen
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Höchste Monatseinnahmen in den letzten 12 Quartalen
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}In den letzten 4 Quartalen gelieferte Frachteinheiten
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Im letzten Quartal gelieferte Frachttypen
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Kontostand dieser Firma
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Der von dieser Firma in Anspruch genommene Kredit
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Erreichte Punkte von der maximal erreichbaren Anzahl
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Anzahl an Fahrzeugen (Straßenfahrzeuge, Züge, Schiffe und Flugzeuge/Hubschrauber)
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Anzahl an Stationen (Jeder Teil einer Station zählt einzeln: Bahnhof, Ladeplatz, Busbahnhof, Flugplatz, Hafen)
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Geringster Gewinn der Fahrzeuge, die älter als 2 Jahre sind
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Geringste Monatseinnahmen in den letzten 12 Quartalen
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Höchste Monatseinnahmen in den letzten 12 Quartalen
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}In den letzten 4 Quartalen gelieferte Frachteinheiten
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Im letzten Quartal gelieferte Frachttypen
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Kontostand dieser Firma
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Der von dieser Firma in Anspruch genommene Kredit
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Erreichte Punkte von der maximal erreichbaren Anzahl
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Musikbox
@@ -671,8 +671,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Städten
 STR_SMALLMAP_CENTER                                             :{BLACK}Zusatzansicht zur akutellen Position scrollen
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Alles deaktivieren
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Alles aktivieren
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Alles deaktivieren
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Alles aktivieren
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Letzte Nachricht oder letzten Bericht anzeigen
@@ -683,8 +683,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SPEI
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Vergangene Nachrichten
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Eine Liste der aktuellen Nachrichten
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Eine Liste der aktuellen Nachrichten
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mitteilung
@@ -918,32 +918,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zu benut
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fehlende/ fehlerhafte Datei{P "" en}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Zusatzinformationen zu den Basisgrafiken
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Vollbildmodus nicht möglich
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Vollbildmodus nicht möglich
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Eigene Währung
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wechselkurs: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Eigene Währung gegenüber dem Pfund (£) verteuern
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Eigene Währung gegenüber dem Pfund (£) verbilligen
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Umrechnungskurs der eigenen Währung gegenüber dem Pfund (£) setzen
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Eigene Währung gegenüber dem Pfund (£) verteuern
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Eigene Währung gegenüber dem Pfund (£) verbilligen
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Umrechnungskurs der eigenen Währung gegenüber dem Pfund (£) setzen
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Trennsymbol: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Das Tausender-Trennzeichen für die eigene Währung setzen
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Das Tausender-Trennzeichen für die eigene Währung setzen
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Präfix: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Das Zeichen für die eigene Währung setzen (Prefix)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Das Zeichen für die eigene Währung setzen (Prefix)
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Suffix: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Das Zeichen für die Eigene Währung setzen (Suffix)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Das Zeichen für die Eigene Währung setzen (Suffix)
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Umstellung auf Euro: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Umstellung auf Euro: {ORANGE}nie
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Einführungsjahr des Euros festlegen
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Früher den Euro einführen
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Später den Euro einführen
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Einführungsjahr des Euros festlegen
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Früher den Euro einführen
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Später den Euro einführen
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Vorschau: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pfund (£) in der eigenen Währung
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pfund (£) in der eigenen Währung
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Parameter für eigene Währung ändern
 
 # Difficulty level window
@@ -957,7 +957,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}benutzer
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Highscoretabelle zeigen
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Speichern
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Speichern
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Max. Gegenspielerzahl: {ORANGE}{COMMA}
@@ -1023,7 +1023,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Hoch
 STR_CITY_APPROVAL_TOLERANT                                      :Mäßig
 STR_CITY_APPROVAL_HOSTILE                                       :Gering
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Hierdurch wurde der Schwierigkeitsgrad auf "benutzerdefiniert" gestellt.
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Hierdurch wurde der Schwierigkeitsgrad auf "benutzerdefiniert" gestellt.
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Erweiterte Einstellungen
@@ -1272,7 +1272,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(nich
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}X-Abmessung des Spielfeldes: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-Abmessung des Spielfeldes: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Wert der Einstellung ändern
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Wert der Einstellung ändern
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1314,9 +1314,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Verlassen
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}OpenTTD wirklich beenden und zu {}{STRING} zurückkehren?
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nein
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}OpenTTD wirklich beenden und zu {}{STRING} zurückkehren?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nein
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1332,11 +1332,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Spiel beenden
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Das Spiel wirklich beenden?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Soll das Szenario wirklich verlassen werden?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Soll das Szenario wirklich verlassen werden?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Cheats
-STR_CHEATS_TIP                                                  :{BLACK}Die Kontrollkästchen zeigen an, ob dieser Cheat schonmal verwendet worden ist.
+STR_CHEATS_TOOLTIP                                              :{BLACK}Die Kontrollkästchen zeigen an, ob dieser Cheat schonmal verwendet worden ist.
 STR_CHEATS_WARNING                                              :{BLACK}Achtung! Hiermit betrügt man seine Mitspieler. Man sollte bedenken, dass sie das niemals verzeihen werden.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Kontostand um {CURRENCY} erhöhen
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spiele die Firma: {ORANGE}{COMMA}
@@ -1345,24 +1345,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunnel
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Bauen im Pausenmodus: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Düsenflugzeuge stürzen auf kleinen Flughäfen nicht häufiger ab: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Wechsle Klima: {ORANGE} {STRING}
-STR_TEMPERATE_LANDSCAPE                                         :Gemäßigt
-STR_SUB_ARCTIC_LANDSCAPE                                        :Subarktisch
-STR_SUB_TROPICAL_LANDSCAPE                                      :Subtropisch
-STR_TOYLAND_LANDSCAPE                                           :Fantastisch
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Gemäßigt
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Subarktisch
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Subtropisch
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Fantastisch
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ändere Datum: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiviere Veränderung der Produktionswerte: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Neues Farbschema
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Allgemeines Farbschema anzeigen
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Zugfarbschema anzeigen
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Fahrzeugfarbschema anzeigen
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Schiffsfarbschema anzeigen
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Flugzeugfarbschema anzeigen
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Wähle die Hauptfarbe für das gewählte Schema aus.
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Wähle die Nebenfarbe für das ausgewählte Schema.
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Wähle ein Farbschema oder mehrere Farbschemata mittels Strg+Klick aus, um diese zu ändern. Klicke in das Kästchen um ein Schema zu aktivieren.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Allgemeines Farbschema anzeigen
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Zugfarbschema anzeigen
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Fahrzeugfarbschema anzeigen
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Schiffsfarbschema anzeigen
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Flugzeugfarbschema anzeigen
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Wähle die Hauptfarbe für das gewählte Schema aus.
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Wähle die Nebenfarbe für das ausgewählte Schema.
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Wähle ein Farbschema oder mehrere Farbschemata mittels Strg+Klick aus, um diese zu ändern. Klicke in das Kästchen um ein Schema zu aktivieren.
 
 STR_LIVERY_DEFAULT                                              :Standardlackierung
 STR_LIVERY_STEAM                                                :Dampflok
@@ -1400,19 +1400,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Wähle w
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Neues Gesicht
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Wähle zufälliges neues Gesicht
 STR_FACE_ADVANCED                                               :{BLACK}Detailliert
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Umfangreichere Wahl des Gesichts
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Umfangreichere Wahl des Gesichts
 STR_FACE_SIMPLE                                                 :{BLACK}Einfach
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Einfache Wahl des Gesichts
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Einfache Wahl des Gesichts
 STR_FACE_LOAD                                                   :{BLACK}Laden
-STR_FACE_LOAD_TIP                                               :{BLACK}Lade bevorzugtes Gesicht
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Lade bevorzugtes Gesicht
 STR_FACE_LOAD_DONE                                              :{WHITE}Das bevorzugte Gesicht wurde aus der OpenTTD-Konfigurationsdatei geladen.
 STR_FACE_FACECODE                                               :{BLACK}Gesichtsnummer
-STR_FACE_FACECODE_TIP                                           :{BLACK}Nummer des Gesichts anschauen / setzen
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Nummer des Gesichts anschauen / setzen
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Nummer des Gesichts anschauen / setzen
 STR_FACE_FACECODE_SET                                           :{WHITE}Neue Nummer wurde für das Gesicht registriert.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Konnte keine Nummer für das Gesicht registrieren, sie muss zwischen 0 und 4.294.967.295 liegen!
 STR_FACE_SAVE                                                   :{BLACK}Speichern
-STR_FACE_SAVE_TIP                                               :{BLACK}Speichere bevorzugtes Gesicht
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Speichere bevorzugtes Gesicht
 STR_FACE_SAVE_DONE                                              :{WHITE}Dieses Gesicht wird als bevorzugtes Gesicht in der OpenTTD-Konfigurationsdatei gespeichert.
 STR_FACE_EUROPEAN                                               :{BLACK}Europäisch
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Auswahl europäischer Gesichter
@@ -1420,120 +1420,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikani
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Auswahl afrikanischer Gesichter
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nein
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Schnauzbart oder Ohrring erlauben
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Schnauzbart oder Ohrring erlauben
 STR_FACE_HAIR                                                   :Frisur:
-STR_FACE_HAIR_TIP                                               :{BLACK}Frisur ändern
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Frisur ändern
 STR_FACE_EYEBROWS                                               :Augenbrauen:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Augenbrauen ändern
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Augenbrauen ändern
 STR_FACE_EYECOLOUR                                              :Augenfarbe:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Augenfarbe ändern
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Augenfarbe ändern
 STR_FACE_GLASSES                                                :Brille:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Brille aufsetzen
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Brille ändern
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Brille aufsetzen
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Brille ändern
 STR_FACE_NOSE                                                   :Nase:
-STR_FACE_NOSE_TIP                                               :{BLACK}Nase ändern
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Nase ändern
 STR_FACE_LIPS                                                   :Lippen:
 STR_FACE_MOUSTACHE                                              :Schnauzbart:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Lippen oder Schnauzbart ändern
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Lippen oder Schnauzbart ändern
 STR_FACE_CHIN                                                   :Kinn:
-STR_FACE_CHIN_TIP                                               :{BLACK}Kinn ändern
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Kinn ändern
 STR_FACE_JACKET                                                 :Jackett:
-STR_FACE_JACKET_TIP                                             :{BLACK}Jackett ändern
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Jackett ändern
 STR_FACE_COLLAR                                                 :Kragen:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Kragen ändern
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Kragen ändern
 STR_FACE_TIE                                                    :Krawatte:
 STR_FACE_EARRING                                                :Ohrring:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Krawatte oder Ohrring ändern
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Krawatte oder Ohrring ändern
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Mehrspieler
-STR_NETWORK_CONNECTION                                          :{BLACK}Verbindung:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Zwischen Spiel im Internet und LAN wählen
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spielername:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Dieser Name dient zur Indentifizierung anderen Spielern gegenüber
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Name
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Name des Spiels
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Teilnehmer
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Teilnehmer anwesend / max.{}Firmen anwesend / max.
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Spielfeldgröße
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Spielfeldgröße{}Klick sortiert nach Fläche
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Momentanes Spieljahr
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jahre
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Jahre seit Spielbeginn
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Sprache, Server-Version, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Ein Spiel der Liste durch Anklicken wählen
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Zuletzt besuchtes Spiel:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Zuletzt besuchten Server auswählen
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPIEL-INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Teilnehmer: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Sprache: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Landschaft: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Spielfeldgröße: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradresse: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Startdatum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aktuelles Datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Passwortgeschützt!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOLL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIONSKONFLIKT
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF-KONFLIKT
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Spiel betreten
-STR_NETWORK_REFRESH                                             :{BLACK}Aktualisieren
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Aktualisiert die Serverinformationen
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Server suchen
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Netzwerk nach einem Server durchsuchen
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Server hinzufügen
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Fügt einen Server zu der Liste von Servern hinzu, die immer nach laufenden Spielen kontrolliert werden.
-STR_NETWORK_START_SERVER                                        :{BLACK}Server starten
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Einen eigenen Server starten
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Bitte eigenen Name eingeben
-STR_NETWORK_ENTER_IP                                            :{BLACK}IP-Adresse des Servers eingeben
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Mehrspieler
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Verbindung:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Zwischen Spiel im Internet und LAN wählen
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spielername:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Dieser Name dient zur Indentifizierung anderen Spielern gegenüber
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Name
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Name des Spiels
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Teilnehmer
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Teilnehmer anwesend / max.{}Firmen anwesend / max.
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Spielfeldgröße
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Spielfeldgröße{}Klick sortiert nach Fläche
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Momentanes Spieljahr
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Jahre
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Jahre seit Spielbeginn
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Sprache, Server-Version, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Ein Spiel der Liste durch Anklicken wählen
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Zuletzt besuchtes Spiel:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Zuletzt besuchten Server auswählen
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPIEL-INFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Teilnehmer: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Sprache: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Landschaft: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Spielfeldgröße: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Serverversion: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serveradresse: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Startdatum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Aktuelles Datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Passwortgeschützt!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER VOLL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIONSKONFLIKT
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF-KONFLIKT
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Spiel betreten
+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
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Einen eigenen Server starten
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Bitte eigenen Name eingeben
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}IP-Adresse des Servers eingeben
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Neues Mehrspieler-Spiel beginnen
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spielname:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Der Name des Spieles wird anderen Spielern im Mehrspielerdialog angezeigt
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Passwort setzen
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Ein Passwort verhindert, dass unbefugte Leute beitreten.
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Spielfeld auswählen:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Welches Spielfeld soll verwendet werden?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Spiel nach Zufallsprinzip erstellen
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (ankündigen)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} Teilnehmer
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max. Teilnehmeranzahl:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Auswahl der maximal erlaubten Anzahl von Teilnehmern. Nicht alle Slots müssen belegt werden.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Firm{P a en}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max. Firmenanzahl:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begrenzt den Server auf eine gewisse Anzahl an Firmen
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} Zuschauer
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max. Zuschaueranzahl:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begrenzt den Server auf eine gewisse Anzahl an Zuschauern
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Gesprochene Sprache:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Damit andere Spieler wissen, welche Sprache auf diesem Server gesprochen wird.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Spiel beginnen
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Startet ein neues Mehrspielerspiel auf einem zufällig generierten Spielfeld oder einem Szenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Spiel Laden
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Lädt ein gespeichertes Spiel
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Namen für das Netzwerkspiel eingeben
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Neues Mehrspieler-Spiel beginnen
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spielname:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Der Name des Spieles wird anderen Spielern im Mehrspielerdialog angezeigt
+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_SELECT_MAP                             :{BLACK}Spielfeld auswählen:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Welches Spielfeld soll verwendet werden?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Spiel nach Zufallsprinzip erstellen
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (ankündigen)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} Teilnehmer
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max. Teilnehmeranzahl:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Auswahl der maximal erlaubten Anzahl von Teilnehmern. Nicht alle Slots müssen belegt werden.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Firm{P a en}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max. Firmenanzahl:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Begrenzt den Server auf eine gewisse Anzahl an Firmen
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} Zuschauer
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max. Zuschaueranzahl:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Begrenzt den Server auf eine gewisse Anzahl an Zuschauern
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Gesprochene Sprache:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Damit andere Spieler wissen, welche Sprache auf diesem Server gesprochen wird.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Spiel beginnen
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Startet ein neues Mehrspielerspiel auf einem zufällig generierten Spielfeld oder einem Szenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Spiel Laden
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Lädt ein gespeichertes Spiel
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Namen für das Netzwerkspiel eingeben
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1576,32 +1576,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Lettisch
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Mehrspielerlobby
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Spieleintritt vorbereiten: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Eine Liste aller Firmen, die sich im Spiel befinden. Man kann einer Firma beitreten oder eine eigene Firma gründen, sofern ein Platz frei ist.
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}Firmenprofil
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Firmenname: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Gründung: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Firmenwert: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Kontostand: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Einkommen (letzes Jahr): {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Leistung: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Fahrzeuge: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spieler: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Neue Firma
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Eine neue Firma gründen
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Beim Spiel zusehen
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Als Zuschauer dem Spiel zusehen
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Firma beitreten
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Beim Verwalten der ausgewählten Firma helfen
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Mehrspielerlobby
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Spieleintritt vorbereiten: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Eine Liste aller Firmen, die sich im Spiel befinden. Man kann einer Firma beitreten oder eine eigene Firma gründen, sofern ein Platz frei ist.
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}Firmenprofil
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Firmenname: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Gründung: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Firmenwert: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Kontostand: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Einkommen (letzes Jahr): {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Leistung: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Fahrzeuge: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stationen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spieler: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Neue Firma
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Eine neue Firma gründen
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Beim Spiel zusehen
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Als Zuschauer dem Spiel zusehen
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Firma beitreten
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Beim Verwalten der ausgewählten Firma helfen
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Verbinden...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Verbinden...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Verbinden...
@@ -1617,13 +1617,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Firmenin
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Teilnehmer vor Ihnen
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} bisher heruntergeladen
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Trennen
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Trennen
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server ist geschützt. Passwort eingeben:
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ist geschützt. Passwort eingeben:
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Teilnehmerliste
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Teilnehmerliste
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Zuschauen
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Neue Firma
 
@@ -1645,18 +1645,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Wieviel
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Eingegebenes Passwort nicht speichern
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Passwort der Firma zuweisen
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Firmenpasswort
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standard-Firmenpasswort
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Benutze dieses Firmenpasswort als Standard für neue Firmen
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standard-Firmenpasswort
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Benutze dieses Firmenpasswort als Standard für neue Firmen
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Beitreten
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Dieser Firma beitreten und sie unterstützen
-STR_COMPANY_PASSWORD                                            :{BLACK}Passwort
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Die Firma durch ein Passwort schützen, sodass nur ausgewählte Spieler beitreten können.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Firmenpasswort setzen
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Beitreten
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Dieser Firma beitreten und sie unterstützen
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Passwort
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Die Firma durch ein Passwort schützen, sodass nur ausgewählte Spieler beitreten können.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Firmenpasswort setzen
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Abschicken
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Abschicken
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privat] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Alle] :
@@ -1669,40 +1669,40 @@ STR_NETWORK_CHAT_ALL                                            :[Alle] {STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Chattext eingeben
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Keine Netzwerkschnittstellen gefunden oder ohne ENABLE_NETWORK kompiliert
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Keine Netzwerkspiele gefunden
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Der Server antwortet nicht
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Verbindung konnte nicht hergestellt werden, da die NewGRF-Versionen nicht übereinstimmen.
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Synchronisation des Netzwerkspiels fehlgeschlagen
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Verbindung zum Netzwerkspiel verloren
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Spielstand konnte nicht vom Server geladen werden
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Server konnte nicht gestartet werden
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Verbindung konnte nicht hergestellt werden
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Verbindung #{NUM} hat das Zeitlimit überschritten
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Protokollfehler: Die Verbindung musste getrennt werden
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Diese Version des Spiels entspricht nicht der des Servers
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Falsches Passwort
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Der Server ist voll
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sie sind auf diesem Server gesperrt
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Sie wurden vom Server hinausgeworfen
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Mogeln ist auf diesem Server nicht erlaubt
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Keine Netzwerkschnittstellen gefunden oder ohne ENABLE_NETWORK kompiliert
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Keine Netzwerkspiele gefunden
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Der Server antwortet nicht
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Verbindung konnte nicht hergestellt werden, da die NewGRF-Versionen nicht übereinstimmen.
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Synchronisation des Netzwerkspiels fehlgeschlagen
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Verbindung zum Netzwerkspiel verloren
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Spielstand konnte nicht vom Server geladen werden
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Server konnte nicht gestartet werden
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Verbindung konnte nicht hergestellt werden
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Verbindung #{NUM} hat das Zeitlimit überschritten
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Protokollfehler: Die Verbindung musste getrennt werden
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Diese Version des Spiels entspricht nicht der des Servers
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Falsches Passwort
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Der Server ist voll
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sie sind auf diesem Server gesperrt
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sie wurden vom Server hinausgeworfen
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Mogeln ist auf diesem Server nicht erlaubt
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :Allgemeiner Fehler
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :Synchronisationsfehler
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :Spielfeld konnte nicht geladen werden.
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :Verbindung verloren
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :Protokollfehler
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-Versionen stimmen nicht überein
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nicht autorisiert
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :Unerwartetes Datenpaket empfangen
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :Falsche Version
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :Name wird bereits verwendet
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :Falsches Spielpasswort
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :Falsche Firmen-ID in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :vom Server hinausgeworfen
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :hat versucht zu mogeln
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :Server voll
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :Allgemeiner Fehler
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :Synchronisationsfehler
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :Spielfeld konnte nicht geladen werden.
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :Verbindung verloren
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :Protokollfehler
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF-Versionen stimmen nicht überein
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nicht autorisiert
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :Unerwartetes Datenpaket empfangen
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :Falsche Version
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :Name wird bereits verwendet
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :Falsches Spielpasswort
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :Falsche Firmen-ID in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :vom Server hinausgeworfen
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :hat versucht zu mogeln
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :Server voll
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1714,36 +1714,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spiel angehalte
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spiel fortgesetzt (Teilnehmer ist angemeldet)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spiel fortgesetzt (Teilnehmer konnte nicht angemeldet werden)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :geht
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} ist dem Spiel beigetreten
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} ist der Firma #{2:NUM} beigetreten
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} ist den Zuschauern beigetreten
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} hat eine neue Firma gegründet (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} hat das Spiel verlassen ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} hat seinen/ihren Namen in {STRING} geändert
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gab der eigenen Firma {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Die eigene Firma übergab {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE}Der Server hat das Spiel beendet
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE}Der Server startet neu...{}Bitte warten...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :geht
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ist dem Spiel beigetreten
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ist der Firma #{2:NUM} beigetreten
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ist den Zuschauern beigetreten
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} hat eine neue Firma gegründet (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} hat das Spiel verlassen ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} hat seinen/ihren Namen in {STRING} geändert
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gab der eigenen Firma {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Die eigene Firma übergab {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Der Server hat das Spiel beendet
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Der Server startet neu...{}Bitte warten...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Herunterladen von Erweiterungen
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Art
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Art der Erweiterung
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Art der Erweiterung
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Name
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Name der Erweiterung
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Auf eine Zeile klicken, um Details zu sehen{}Kontrollkästchen anklicken, um zum Herunterladen auszuwählen
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Name der Erweiterung
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Auf eine Zeile klicken, um Details zu sehen{}Kontrollkästchen anklicken, um zum Herunterladen auszuwählen
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Alles wählen
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Alle Erweiterungen zum Herunterladen auswählen
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Alle Erweiterungen zum Herunterladen auswählen
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Upgrades auswählen
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Alle Erweiterungen, die einen bestehenden Inhalt verbessern, auswählen
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Alle Erweiterungen, die einen bestehenden Inhalt verbessern, auswählen
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Alles abwählen
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Keine Erweiterung zum Herunterladen auswählen
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Keine Erweiterung zum Herunterladen auswählen
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Filter eingeben
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Stichwort eingeben, mit dem die Liste gefiltert werden soll
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Stichwort eingeben, mit dem die Liste gefiltert werden soll
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filter für Stichworte oder Namen:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Herunterladen
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Beginne die ausgewählten Erweiterung(en) herunterzuladen
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Beginne die ausgewählten Erweiterung(en) herunterzuladen
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Gesamtgröße der ausgewählten Erweiterungen: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}Beschreibung der Erweiterung
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Diese ist nicht zum Herunterladen ausgewählt
@@ -1787,17 +1787,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... Date
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kann heruntergeladene Datei nicht entpacken
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Transparenzeinstellungen
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Transparenz für Stationsschilder einstellen.  Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Transparenz für Bäume einstellen. Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Transparenz für Häuser einstellen. Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Transparenz für Industrien einstellen.  Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Transparenz für Gebäude wie Bahnhöfe, Depots und Wegpunkte einstellen.  Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Transparenz für Brücken einstellen. Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Transparenz für Bauten wie Leuchttürme und Sendemasten einstellen. Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Transparenz für Oberleitungen. Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Transparenz für Ladestandsanzeige einstellen. Strg+Klick, um Umschalten zu verhindern.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Objekte unsichtbar statt transparent machen
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparenzeinstellungen
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Transparenz für Stationsschilder einstellen.  Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Transparenz für Bäume einstellen. Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Transparenz für Häuser einstellen. Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Transparenz für Industrien einstellen.  Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Transparenz für Gebäude wie Bahnhöfe, Depots und Wegpunkte einstellen.  Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Transparenz für Brücken einstellen. Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Transparenz für Bauten wie Leuchttürme und Sendemasten einstellen. Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Transparenz für Oberleitungen. Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Transparenz für Ladestandsanzeige einstellen. Strg+Klick, um Umschalten zu verhindern.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Objekte unsichtbar statt transparent machen
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Einzugsgebiet anzeigen
@@ -1809,11 +1809,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Akzeptie
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Liefert: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Verbinde die Station
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Errichte eine getrennte Station
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Verbinde die Station
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Errichte eine getrennte Station
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Verbinde den Wegpunkt
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Errichte einen getrennten Wegpunkt
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Verbinde den Wegpunkt
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Errichte einen getrennten Wegpunkt
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Gleis- / Bahnhofsbau
@@ -1837,8 +1837,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Ausricht
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Ausrichtung des Zugdepots auswählen
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Wegpunkt
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Wegpunkttyp auswählen
+STR_WAYPOINT_CAPTION                                            :{WHITE}Wegpunkt
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Wegpunkttyp auswählen
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Bahnhof bauen
@@ -1851,36 +1851,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Bahnstei
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bahnhof mittels 'Drag & Drop' bauen
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Wähle eine Stationsart zum anzeigen
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Wähle die Stationsart aus, die gebaut werden soll
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Wähle eine Stationsart zum anzeigen
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Wähle die Stationsart aus, die gebaut werden soll
 
-STR_STAT_CLASS_DFLT                                             :Standardstation
-STR_STAT_CLASS_WAYP                                             :Wegpunkte
+STR_STATION_CLASS_DFLT                                          :Standardstation
+STR_STATION_CLASS_WAYP                                          :Wegpunkte
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Signalauswahl
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Blocksignal (Formsignal){}Dieses ist der einfachste Signaltyp. Er erlaubt nur einem Zug zu einem gegebenen Zeitpunkt den Signalabschnitt zu durchfahren.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Einfahrsignal (Formsignal){}Zeigt grün, wenn im nächsten Block mindestens ein Ausfahrsignal grün zeigt. Andernfalls zeigt es rot.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Ausfahrsignal (Formsignal){}Verhält sich wie ein Blocksignal, wird jedoch benötigt, um den Einfahr- oder Kombinationssignalen des Blockes "frei" zu melden.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinationssignal (Formsignal){}Das Kombinationssignal ist gleichzeitig Aus- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Pfadsignal (Formsignal){}Erlaubt mehreren Zügen gleichzeitig, einen Signalabschnitt zu befahren, sofern der Bremsweg genügend lang ist. Pfadsignale können von hinten durchfahren werden.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Einseitiges Pfadsignal (Formsignal):{}Erlaubt mehreren Zügen, einen Signalabschnitt zu befahren, sofern der Bremsweg genügend lang ist. Einseitige Pfadsignale können nicht von hinten durchfahren werden.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Blocksignal (Lichtsignal){}Signale ermöglichen den unfallfreien Betrieb mehrerer Züge in einem Gleissystem.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Einfahrsignal (Lichtsignal){}Zeigt grün, wenn im folgenden Block mindestens ein Ausfahrsignal grün zeigt. Andernfalls zeigt es rot.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Ausfahrsignal (Lichtsignal){}Verhält sich wie ein Blocksignal, gibt jedoch das Signal an Einfahr- und Kombinationssignale im vorherliegenden Block weiter.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinationssignal (Lichtsignal){}Das Kombinationssignal ist gleichzeitig Aus- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Pfadsignal (Lichtsignal){}Erlaubt mehreren Zügen gleichzeitig, einen Signalbereich zu befahren, sofern ein Pfad zum nächsten Signal reserviert werden kann. Normale Pfadsignale können von hinten durchfahren werden.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Einseitiges Pfadsignal (Lichtsignal):{}Erlaubt mehreren Zügen, einen Signalbereich zu befahren, sofern ein Pfad reserviert werden kann. Einseitige Pfadsignale können nicht von hinten durchfahren werden.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signalumbau{}Wenn ausgewählt, werden bestehende Signale durch Anklicken zum ausgewählten Signaltyp umgebaut. Strg+Klick ändert die bestehende Bauform.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Abstand der Signale beim automatischen Bau durch Ziehen
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Signalabstand verringern
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Signalabstand erhöhen
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalauswahl
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Blocksignal (Formsignal){}Dieses ist der einfachste Signaltyp. Er erlaubt nur einem Zug zu einem gegebenen Zeitpunkt den Signalabschnitt zu durchfahren.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Einfahrsignal (Formsignal){}Zeigt grün, wenn im nächsten Block mindestens ein Ausfahrsignal grün zeigt. Andernfalls zeigt es rot.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Ausfahrsignal (Formsignal){}Verhält sich wie ein Blocksignal, wird jedoch benötigt, um den Einfahr- oder Kombinationssignalen des Blockes "frei" zu melden.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinationssignal (Formsignal){}Das Kombinationssignal ist gleichzeitig Aus- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Pfadsignal (Formsignal){}Erlaubt mehreren Zügen gleichzeitig, einen Signalabschnitt zu befahren, sofern der Bremsweg genügend lang ist. Pfadsignale können von hinten durchfahren werden.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Einseitiges Pfadsignal (Formsignal):{}Erlaubt mehreren Zügen, einen Signalabschnitt zu befahren, sofern der Bremsweg genügend lang ist. Einseitige Pfadsignale können nicht von hinten durchfahren werden.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blocksignal (Lichtsignal){}Signale ermöglichen den unfallfreien Betrieb mehrerer Züge in einem Gleissystem.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Einfahrsignal (Lichtsignal){}Zeigt grün, wenn im folgenden Block mindestens ein Ausfahrsignal grün zeigt. Andernfalls zeigt es rot.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Ausfahrsignal (Lichtsignal){}Verhält sich wie ein Blocksignal, gibt jedoch das Signal an Einfahr- und Kombinationssignale im vorherliegenden Block weiter.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinationssignal (Lichtsignal){}Das Kombinationssignal ist gleichzeitig Aus- und Einfahrsignal. Somit werden umfangreiche Signalverschaltungen möglich.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Pfadsignal (Lichtsignal){}Erlaubt mehreren Zügen gleichzeitig, einen Signalbereich zu befahren, sofern ein Pfad zum nächsten Signal reserviert werden kann. Normale Pfadsignale können von hinten durchfahren werden.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Einseitiges Pfadsignal (Lichtsignal):{}Erlaubt mehreren Zügen, einen Signalbereich zu befahren, sofern ein Pfad reserviert werden kann. Einseitige Pfadsignale können nicht von hinten durchfahren werden.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signalumbau{}Wenn ausgewählt, werden bestehende Signale durch Anklicken zum ausgewählten Signaltyp umgebaut. Strg+Klick ändert die bestehende Bauform.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Abstand der Signale beim automatischen Bau durch Ziehen
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Signalabstand verringern
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Signalabstand erhöhen
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Eisenbahnbrücke auswählen
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Straßenbrücke wählen
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brückenauswahl - Klicke auf die gewünschte Brücke, um sie zu bauen
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brückenauswahl - Klicke auf die gewünschte Brücke, um sie zu bauen
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Stahlhängebrücke
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Stahlträgerbrücke
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Auslegerbrücke (Stahl)
@@ -1914,9 +1914,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Umschalt
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Ausrichtung Depot
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Ausrichtung des Fahrzeugdepots wählen
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Ausrichtung des Fahrzeugdepots wählen
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Ausrichtung Depot
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Ausrichtung des Straßenbahndepots auswählen
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Ausrichtung des Straßenbahndepots auswählen
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Ausrichtung Busbahnhof
@@ -1937,8 +1937,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Werft ba
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Hafen bauen
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Positionsboje, wird als Wegpunkt benötigt
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Aquädukt bauen
-STR_CREATE_LAKE                                                 :{BLACK}Wasser erzeugen.{}Baut einen Kanal. Auf Meereshöhe wird bei gedrückter Strg-Taste ein Wasserfeld erzeugt, welches umliegendes Land flutet.
-STR_CREATE_RIVER                                                :{BLACK}Flüsse platzieren.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Wasser erzeugen.{}Baut einen Kanal. Auf Meereshöhe wird bei gedrückter Strg-Taste ein Wasserfeld erzeugt, welches umliegendes Land flutet.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Flüsse platzieren.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Ausrichtung der Werft
@@ -1970,20 +1970,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Große F
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Luftfahrt-Drehkreuze
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Flughäfen für Hubschrauber
 
-STR_STATION_NOISE                                               :{BLACK}Lärmbelastung: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Lärmbelastung: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landschaftsbau
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Land absenken
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Land anheben
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Land ausgleichen
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Land für künftige Nutzung kaufen
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Land absenken
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Land anheben
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Land ausgleichen
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Land für künftige Nutzung kaufen
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Bäume
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wähle die zu pflanzende Baumart
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Zufällige Baumart
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Zufällige Baumart pflanzen
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Zufällige Baumart pflanzen
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Zufällige Bäume
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Bäume zufällig über die Landschaft verteilen
 
@@ -1996,9 +1996,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Sendemas
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Landfläche zum Anheben / Absenken vergrößern
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Landfläche zum Anheben / Absenken verkleinern
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Erzeuge Land durch Zufall
-STR_SE_NEW_WORLD                                                :{BLACK}Neues Szenario erzeugen
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Neues Szenario erzeugen
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Landfläche wiederherstellen
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Das gesamte Spielereigentum vom Spielfeld entfernen
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Das gesamte Spielereigentum vom Spielfeld entfernen
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Landfläche wiederherstellen
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Soll wirklich das gesamte Spielereigentum entfernt werden?
@@ -2009,41 +2009,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Neue Sta
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Neue Stadt gründen
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Zufällige Stadt
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Stadt an zufälligem Platz gründen
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Viele zufällige Städte
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Das Spielfeld mit zufällig platzierten Städten füllen
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Viele zufällige Städte
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Das Spielfeld mit zufällig platzierten Städten füllen
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Stadtgröße:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Klein
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mittel
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Groß
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Zufällig
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Zufällig
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Stadtgröße festlegen
 STR_FOUND_TOWN_CITY                                             :{BLACK}Großstadt
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Großstädte wachsen schneller als normale Städte und sind (abhängig von den Einstellungen) bereits bei der Gründung größer
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Städtischer Straßenbauplan:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Straßenbauplan für diese Stadt auswählen
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bessere Straßen
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 Muster
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 Muster
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Zufall
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Städtischer Straßenbauplan:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Straßenbauplan für diese Stadt auswählen
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bessere Straßen
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 Muster
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 Muster
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Zufall
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Neue Industrie finanzieren
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Gewünschte Industrie aus der Liste auswählen
-STR_MANY_RANDOM_INDUSTRIES                                      :Viele zufällige Industrien
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Das Spielfeld mit zufällig platzierten Industrien füllen
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kosten: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospektieren
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bauen
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finanzieren
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Gewünschte Industrie aus der Liste auswählen
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Viele zufällige Industrien
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Das Spielfeld mit zufällig platzierten Industrien füllen
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kosten: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospektieren
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bauen
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finanzieren
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Gebietsinformation
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Räumungskosten: {LTBLUE}k.A.
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Räumungskosten: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Einnahmen beim Abriss: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Einnahmen beim Abriss: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :k.A.
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigentümer: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Straßenbesitzer: {LTBLUE}{STRING}
@@ -2051,104 +2051,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Straßen
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Gleisbesitzer: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Gehört zur Gemeinde: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Keine
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinaten: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Errichtet am: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stationsklasse: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stationstyp: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinaten: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Errichtet am: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stationsklasse: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stationstyp: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akzeptierte Fracht: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Felsen
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Unebenes Land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Kahles Land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gras
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Ackerland
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Schneebedecktes Land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Wüste
-
-STR_RAILROAD_TRACK                                              :Gleis
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Gleis mit Blocksignalen
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Gleis mit Einfahrsignalen
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Gleis mit Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Gleis mit Kombinationssignalen
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Gleis mit Pfadsignal
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Gleis mit einseitigem Pfadsignal
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Gleis mit Block- und Einfahrsignalen
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Gleis mit Block- und Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Gleis mit Block- und Kombinationssignalen
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Gleis mit Blocksignal und Pfadsignal
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Gleis mit Blocksignal und einseitigem Pfadsignal
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Gleis mit Ein- und Ausfahrsignalen
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Gleis mit Einfahr- und Kombinationssignalen
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Gleis mit Einfahr- und Pfadsignal
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Gleis mit Einfahr- und einseitigem Pfadsignal
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Gleis mit Ausfahr- und Kombinationssignalen
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Gleis mit Ausfahr- und Pfadsignal
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Gleis mit Ausfahr- und einseitigem Pfadsignal
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Gleis mit Kombinations- und Pfadsignal
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Gleis mit Kombinations- und einseitigem Pfadsignal
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Gleis mit Pfadsignal und einseitigem Pfadsignal
-STR_RAILROAD_TRAIN_DEPOT                                        :Zugdepot
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Straße
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Straße mit Laternen
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Straße mit Bäumen
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Fahrzeugdepot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Bahnübergang
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Straßenbahn
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Felsen
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Unebenes Land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Kahles Land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Ackerland
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Schneebedecktes Land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Wüste
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Gleis
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Gleis mit Blocksignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Gleis mit Einfahrsignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Gleis mit Ausfahrsignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Gleis mit Kombinationssignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Gleis mit Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Gleis mit einseitigem Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Gleis mit Block- und Einfahrsignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Gleis mit Block- und Ausfahrsignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Gleis mit Block- und Kombinationssignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Gleis mit Blocksignal und Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Gleis mit Blocksignal und einseitigem Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Gleis mit Ein- und Ausfahrsignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Gleis mit Einfahr- und Kombinationssignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Gleis mit Einfahr- und Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Gleis mit Einfahr- und einseitigem Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Gleis mit Ausfahr- und Kombinationssignalen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Gleis mit Ausfahr- und Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Gleis mit Ausfahr- und einseitigem Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Gleis mit Kombinations- und Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Gleis mit Kombinations- und einseitigem Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Gleis mit Pfadsignal und einseitigem Pfadsignal
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Zugdepot
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Straße
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Straße mit Laternen
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Straße mit Bäumen
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Fahrzeugdepot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Bahnübergang
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Straßenbahn
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (im Bau)
-
-STR_TREE_NAME_TREES                                             :Bäume
-STR_TREE_NAME_RAINFOREST                                        :Regenwald
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kakteen
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Bahnhof
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Flugzeughangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Flughafen
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Lkw-Ladeplatz
-STR_STATION_DESCRIPTION_BUS_STATION                             :Busbahnhof
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Hafen
-STR_STATION_DESCRIPTION_BUOY                                    :Boje
-STR_LANDINFO_WAYPOINT                                           :Wegpunkt
-
-STR_WATER_DESCRIPTION_WATER                                     :Wasser
-STR_LANDINFO_CANAL                                              :Kanal
-STR_LANDINFO_LOCK                                               :Schleuse
-STR_LANDINFO_RIVER                                              :Fluss
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Küste oder Flussufer
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Werft
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (im Bau)
+
+STR_LAI_TREE_NAME_TREES                                         :Bäume
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regenwald
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kakteen
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Bahnhof
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Flugzeughangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Flughafen
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lkw-Ladeplatz
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Busbahnhof
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Hafen
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boje
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Wegpunkt
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Wasser
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Schleuse
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Fluss
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Küste oder Flussufer
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Werft
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Eisenbahntunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Straßentunnel
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Eisenbahntunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Straßentunnel
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Stahlhängebrücke
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Stahlträgerbrücke
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Auslegerbrücke (Stahl)
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Stahlbetonbrücke
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Holzbrücke
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonbrücke
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Rundstahlbrücke
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Stahlhängebrücke
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Stahlträgerbrücke
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Auslegerbrücke (Stahl)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Stahlbetonbrücke
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Holzbrücke
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonbrücke
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Rundstahlbrücke
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Stahlhängebrücke
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Stahlträgerbrücke
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Auslegerbrücke (Stahl)
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Stahlbetonbrücke
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Holzbrücke
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonbrücke
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Rundstahlbrücke
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Stahlhängebrücke
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Stahlträgerbrücke
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Auslegerbrücke (Stahl)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Stahlbetonbrücke
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Holzbrücke
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonbrücke
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Rundstahlbrücke
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aquädukt
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aquädukt
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Sendemast
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Leuchtturm
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Firmensitz
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Firmeneigenes Gelände
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Sendemast
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Leuchtturm
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Firmensitz
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Firmeneigenes Gelände
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}OpenTTD
@@ -2161,7 +2161,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spiel sp
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Spiel laden
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Szenario speichern
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Szenario laden
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Reliefkarte laden
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Reliefkarte laden
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Hier klicken, um zum Standardverzeichnis für Spielstände zu gehen
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} frei
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Liste der Laufwerke, Verzeichnisse und gespeicherten Spiele
@@ -2171,119 +2171,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Lösche
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Speichern
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Speichere das Spiel unter dem gewählten Namen
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Namen für den Spielstand eingeben
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Namen für den Spielstand eingeben
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Welterstellung
-STR_MAPSIZE                                                     :{BLACK}Spielfeldgröße:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Städteanzahl:
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Industriedichte:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Schneegrenze:
-STR_SNOW_LINE_UP                                                :{BLACK}Schneegrenze um eine Stufe erhöhen
-STR_SNOW_LINE_DOWN                                              :{BLACK}Schneegrenze um eine Stufe senken
-STR_RANDOM_SEED                                                 :{BLACK}Zufallsstartwert:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Gib einen Zufallsstartwert ein
-STR_RANDOM                                                      :{BLACK}Zufällig
-STR_RANDOM_HELP                                                 :{BLACK}Ändere den Zufallsstartwert für die Landschaftsgenerierung
-STR_LAND_GENERATOR                                              :{BLACK}Landgenerator:
-STR_TREE_PLACER                                                 :{BLACK}Baumalgorithmus:
-STR_TERRAIN_TYPE                                                :{BLACK}Landschaftstyp:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Gewässermenge:
-STR_SMOOTHNESS                                                  :{BLACK}Weichheit:
-STR_GENERATE                                                    :{WHITE}Erzeugen
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Welterstellung
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Spielfeldgröße:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Städteanzahl:
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Industriedichte:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Schneegrenze:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Schneegrenze um eine Stufe erhöhen
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Schneegrenze um eine Stufe senken
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Zufallsstartwert:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Gib einen Zufallsstartwert ein
+STR_MAPGEN_RANDOM                                               :{BLACK}Zufällig
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Ändere den Zufallsstartwert für die Landschaftsgenerierung
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landgenerator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Baumalgorithmus:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Landschaftstyp:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Gewässermenge:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Weichheit:
+STR_MAPGEN_GENERATE                                             :{WHITE}Erzeugen
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Spielfeldränder:
-STR_NORTHWEST                                                   :{BLACK}Nordwesten
-STR_NORTHEAST                                                   :{BLACK}Nordosten
-STR_SOUTHEAST                                                   :{BLACK}Südosten
-STR_SOUTHWEST                                                   :{BLACK}Südwesten
-STR_BORDER_FREEFORM                                             :{BLACK}Beliebig
-STR_BORDER_WATER                                                :{BLACK}Wasser
-STR_BORDER_RANDOM                                               :{BLACK}Zufällig
-STR_BORDER_RANDOMIZE                                            :{BLACK}Zufällig
-STR_BORDER_MANUAL                                               :{BLACK}Manuell
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Reliefkarte drehen:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Reliefkartenname:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Größe: {ORANGE}{NUM} × {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Zufallsstartwert eingeben
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Höhe der Schneegrenze ändern
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Startjahr ändern
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Spielfeldränder:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordwesten
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordosten
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Südosten
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Südwesten
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Beliebig
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Wasser
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Zufällig
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Zufällig
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuell
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Reliefkarte drehen:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Reliefkartenname:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Größe: {ORANGE}{NUM} × {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Zufallsstartwert eingeben
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Höhe der Schneegrenze ändern
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Startjahr ändern
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Szenariotyp
-STR_SE_FLAT_WORLD                                               :{WHITE}Flache Landschaft
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Flache Landschaft erzeugen
-STR_SE_RANDOM_LAND                                              :{WHITE}Zufällige Landschaft
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Höhe des Flachlands:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Flachland um eine Stufe senken
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Flachland um eine Stufe erhöhen
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Szenariotyp
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Flache Landschaft
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Flache Landschaft erzeugen
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Zufällige Landschaft
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Höhe des Flachlands:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Flachland um eine Stufe senken
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Flachland um eine Stufe erhöhen
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Flachlandhöhe ändern
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Flachlandhöhe ändern
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Spielfeld wird generiert...
 STR_GENERATION_ABORT                                            :{BLACK}Abbrechen
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Spielfeldgenerierung abbrechen
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Soll die Spielfeldgenerierung wirklich abgebrochen werden?
-STR_PROGRESS                                                    :{WHITE}{NUM}% abgeschlossen
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Spielfeldgenerierung
-STR_TREE_GENERATION                                             :{BLACK}Baumerzeugung
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Unbewegliche Objekte werden erzeugt
-STR_CLEARING_TILES                                              :{BLACK}Raue, felsige Landschaft wird erzeugt
-STR_SETTINGUP_GAME                                              :{BLACK}Spiel wird vorbereitet
-STR_PREPARING_TILELOOP                                          :{BLACK}Spielfeld wird belebt
-STR_PREPARING_GAME                                              :{BLACK}Spiel wird vorbereitet
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% abgeschlossen
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Spielfeldgenerierung
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Baumerzeugung
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Unbewegliche Objekte werden erzeugt
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Raue, felsige Landschaft wird erzeugt
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Spiel wird vorbereitet
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Spielfeld wird belebt
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Spiel wird vorbereitet
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-Einstellungen
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Gespeicherte Voreinstellung aus Liste auswählen
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Set speichern
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Aktuelle Liste als Voreinstellung speichern
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Name der Voreinstellung
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Set löschen
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Ausgewählte Voreinstellung löschen
-STR_NEWGRF_ADD                                                  :{BLACK}Hinzufügen
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Eine neue NewGRF-Datei zur Liste hinzufügen
-STR_NEWGRF_REMOVE                                               :{BLACK}Entfernen
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Die ausgewählte NewGRF-Datei von der Liste entfernen
-STR_NEWGRF_MOVEUP                                               :{BLACK}Nach oben
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Die ausgewählte NewGRF-Datei in der Liste nach oben verschieben
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Nach unten
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Die ausgewählte NewGRF-Datei in der Liste nach unten verschieben
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Eine Liste der installierten NewGRF-Dateien. Zum Ändern der Parameter Datei auswählen
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Parameter setzen
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Palette ändern
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Farbpalette des ausgewählten NewGRF ändern.{}Nutze dieses, wenn die Grafiken des NewGRF im Spiel pink dargestellt werden
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Ãœbernehmen
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Fehlende Erweiterungen online suchen
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Versuchen, fehlende Erweiterungen online zu finden
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Dateiname: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}NewGRF-ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5-Summe: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palette: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameter: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Keine Informationen verfügbar
-STR_NEWGRF_NOT_FOUND                                            :{RED}Zugehörige Datei nicht gefunden
-STR_NEWGRF_DISABLED                                             :{RED}Deaktiviert
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF-Parameter eingeben
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Gespeicherte Voreinstellung aus Liste auswählen
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Set speichern
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Aktuelle Liste als Voreinstellung speichern
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Name der Voreinstellung
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Set löschen
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Ausgewählte Voreinstellung löschen
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Hinzufügen
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Eine neue NewGRF-Datei zur Liste hinzufügen
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Entfernen
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Die ausgewählte NewGRF-Datei von der Liste entfernen
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Nach oben
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Die ausgewählte NewGRF-Datei in der Liste nach oben verschieben
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Nach unten
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Die ausgewählte NewGRF-Datei in der Liste nach unten verschieben
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Eine Liste der installierten NewGRF-Dateien. Zum Ändern der Parameter Datei auswählen
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parameter setzen
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palette ändern
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Farbpalette des ausgewählten NewGRF ändern.{}Nutze dieses, wenn die Grafiken des NewGRF im Spiel pink dargestellt werden
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Ãœbernehmen
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Fehlende Erweiterungen online suchen
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Versuchen, fehlende Erweiterungen online zu finden
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Dateiname: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}NewGRF-ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5-Summe: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameter: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Keine Informationen verfügbar
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Zugehörige Datei nicht gefunden
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Deaktiviert
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF-Parameter eingeben
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Verfügbare NewGRF-Dateien
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Zur Auswahl hinzufügen
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Ausgewählte NewGRF-Datei zur Konfiguration hinzufügen
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Dateiliste aktualisieren
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Liste der verfügbaren NewGRF-Dateien aktualisieren
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Ausgewählte NewGRF-Datei zur Konfiguration hinzufügen
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Dateiliste aktualisieren
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Liste der verfügbaren NewGRF-Dateien aktualisieren
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2307,7 +2307,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Enthält mehrere "Action 8" Einträge.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Achtung!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Achtung!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Änderungen während eines laufenden Spiels können zum Absturz von OpenTTD führen.{}Trotzdem fortfahren?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Datei kann nicht hinzugefügt werden: NewGRF-ID bereits vergeben
@@ -2332,10 +2332,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Schilder
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Schildtext ändern
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Zum nächsten Schild wechseln
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Zum vorherigen Schild wechseln
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Zum nächsten Schild wechseln
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Zum vorherigen Schild wechseln
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Einen Namen für dieses Schild eingeben
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Einen Namen für dieses Schild eingeben
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Städte
@@ -2349,10 +2349,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Bevölkerung: {ORANGE}{COMMA}{BLACK}  Häuser: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passagiere letzten Monat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Postsäcke letzten Monat: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Für Stadtwachstum benötigte Fracht:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} benötigt
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} angeliefert im letzten Monat
-STR_NOISE_IN_TOWN                                               :{BLACK}Lärmbelastung in der Stadt: {ORANGE}{COMMA}{BLACK}  Grenzwert: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Für Stadtwachstum benötigte Fracht:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} benötigt
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} angeliefert im letzten Monat
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Lärmbelastung in der Stadt: {ORANGE}{COMMA}{BLACK}  Grenzwert: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Hauptansicht zur Stadt scrollen
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Stadtverwaltung
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Öffnet Fenster zur Interaktion mit der Stadtverwaltung
@@ -2399,18 +2399,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Keine
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Bereits vergebene Subventionen:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} von {STATION} nach {STATION}{YELLOW} ({COMPANY}{YELLOW}, bis {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klick auf Dienstleistung scrollt Hauptansicht zur Industrie/Stadt
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klick auf Dienstleistung scrollt Hauptansicht zur Industrie/Stadt
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stationsnamen - Klicke auf den Namen, um die Hauptansicht zur Station zu scrollen
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Strg gedrückt halten, um mehrere Einträge auszuwählen
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Strg gedrückt halten, um mehrere Einträge auszuwählen
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Haltestelle{P "" n}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Keine -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alle Anlagen auswählen
-STR_SELECT_ALL_TYPES                                            :{BLACK}Alle Frachtarten auswählen (einschließlich keine Fracht)
-STR_NO_WAITING_CARGO                                            :{BLACK}Keine Fracht im Wartezustand
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Alle Anlagen auswählen
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Alle Frachtarten auswählen (einschließlich keine Fracht)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Keine Fracht im Wartezustand
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2441,18 +2441,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Hervorragend
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Hauptansicht zur Station scrollen
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Namen der Station ändern
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Alle Züge, die diesen Bahnhof anfahren, anzeigen
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Alle Fahrzeuge, die diese Station anfahren, anzeigen
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Alle Flugzeuge, die diesen Flughafen anfliegen, anzeigen
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Alle Schiffe, die diesen Hafen ansteuern, anzeigen
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Alle Züge, die diesen Bahnhof anfahren, anzeigen
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Alle Fahrzeuge, die diese Station anfahren, anzeigen
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Alle Flugzeuge, die diesen Flughafen anfliegen, anzeigen
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Alle Schiffe, die diesen Hafen ansteuern, anzeigen
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Station/Ladeplatz umbenennen
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Station/Ladeplatz umbenennen
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Hauptansicht zum Wegpunkt scrollen
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Namen des Wegpunkts ändern
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Namen des Wegpunkts ändern
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Hauptansicht zur Boje scrollen
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Namen der Boje ändern
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Namen der Boje ändern
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Namen des Wegpunkts ändern
 
@@ -2478,7 +2478,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Gesamt:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Kontostand
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Kredit
-STR_MAX_LOAN                                                    :{WHITE}Maximaler Kredit: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maximaler Kredit: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}{SKIP}{SKIP}{CURRENCY} leihen
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Kredit aufnehmen. Strg+Klick, um maximalen Kredit aufzunehmen
@@ -2492,10 +2492,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Gegründet: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Farbschema
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Fahrzeuge:
-STR_TRAINS                                                      :{WHITE}{COMMA} Z{P ug üge}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} Fahrzeug{P "" e}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} Flugzeug{P "" e}
-STR_SHIPS                                                       :{WHITE}{COMMA} Schiff{P "" e}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} Z{P ug üge}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} Fahrzeug{P "" e}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} Flugzeug{P "" e}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} Schiff{P "" e}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Keine
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmenwert: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% Eigentum von {COMPANY})
@@ -2503,8 +2503,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Firmensitz bauen
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Firmensitz
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Firmensitz bauen / anzeigen
-STR_RELOCATE_HQ                                                 :{BLACK}verlegen
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Errichte Firmensitz für 1% des Firmenwertes an anderer Stelle neu.
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}verlegen
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Errichte Firmensitz für 1% des Firmenwertes an anderer Stelle neu.
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Neues Gesicht
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Neues Portrait für Manager aussuchen
@@ -2520,17 +2520,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}25% der
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}25% der Aktien dieser Firma kaufen
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}25% der Aktien dieser Firma verkaufen
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Firmenname
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Name des Managers
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Firmenname
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Name des Managers
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Wir suchen eine Transportfirma, die unsere Firma übernimmt.{}{}Besteht Interesse daran, {COMPANY}  für {CURRENCY} zu übernehmen?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrien
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportiert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportiert)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrienamen - Klick auf den Namen scrollt Hauptansicht zur Industrie
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrien
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportiert)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportiert)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industrienamen - Klick auf den Namen scrollt Hauptansicht zur Industrie
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2566,26 +2566,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Flugzeug
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Gewinn im laufenden Jahr: {CURRENCY} (vergangenes Jahr: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Verfügbare Züge
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Verfügbare Fahrzeuge
-STR_AVAILABLE_SHIPS                                             :{BLACK}Verfügbare Schiffe
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Verfügbare Flugzeuge
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Verfügbare Fahrzeuge für diesen Fahrzeugtyp auflisten
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Verfügbare Züge
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Verfügbare Fahrzeuge
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Verfügbare Schiffe
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Verfügbare Flugzeuge
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Verfügbare Fahrzeuge für diesen Fahrzeugtyp auflisten
 
-STR_MANAGE_LIST                                                 :{BLACK}Liste verwalten
-STR_MANAGE_LIST_TIP                                             :{BLACK}Aufträge an alle Fahrzeuge in der Liste verschicken
-STR_REPLACE_VEHICLES                                            :Fahrzeuge ersetzen
-STR_SEND_FOR_SERVICING                                          :Zur Wartung schicken
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Liste verwalten
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Aufträge an alle Fahrzeuge in der Liste verschicken
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Fahrzeuge ersetzen
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Zur Wartung schicken
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Ins Depot schicken
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Ins Depot schicken
-STR_SEND_SHIP_TO_DEPOT                                          :In die Werft schicken
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :In den Hangar schicken
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Ins Depot schicken
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Ins Depot schicken
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :In die Werft schicken
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :In den Hangar schicken
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Alle Fahrzeuge in der Liste anhalten
-STR_MASS_START_LIST_TIP                                         :{BLACK}Alle Fahrzeuge in der Liste losschicken
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Alle Fahrzeuge in der Liste anhalten
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Alle Fahrzeuge in der Liste losschicken
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gemeinsamer Fahrplan von {COMMA} Fahrzeug{P "" en}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Gemeinsamer Fahrplan von {COMMA} Fahrzeug{P "" en}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Alle Züge
@@ -2598,11 +2598,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ungruppierte Fa
 STR_GROUP_DEFAULT_SHIPS                                         :Ungruppierte Schiffe
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ungruppierte Flugzeuge
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Gruppen - Klick auf eine Gruppe zeigt Liste aller Fahrzeuge der Gruppe an
-STR_GROUP_CREATE_TIP                                            :{BLACK}Neue Gruppe erstellen
-STR_GROUP_DELETE_TIP                                            :{BLACK}Ausgewählte Gruppe löschen
-STR_GROUP_RENAME_TIP                                            :{BLACK}Ausgewählte Gruppe umbenennen
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Diese Gruppe von der automatischen Fahrzeugersetzung ausschließen
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruppen - Klick auf eine Gruppe zeigt Liste aller Fahrzeuge der Gruppe an
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Neue Gruppe erstellen
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Ausgewählte Gruppe löschen
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Ausgewählte Gruppe umbenennen
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Diese Gruppe von der automatischen Fahrzeugersetzung ausschließen
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Gemeinsame F. hinzufügen
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Liste leeren
@@ -2625,7 +2625,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Geschw.:
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Geschwindigkeit: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Betriebskosten: {GOLD}{CURRENCY} pro Jahr
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapazität: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(umrüstbar)
+STR_PURCHASE_INFO_REFITTABLE                                    :(umrüstbar)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Entwurf: {GOLD}{NUM}{BLACK} Betriebsdauer: {GOLD}{COMMA} Jahr{P "" e}
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Max. Zuverlässigkeit: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Kosten: {GOLD}{CURRENCY}
@@ -2689,17 +2689,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Ziehe Fa
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Ziehe Schiff hierher, um es zu verkaufen
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Zum Verkauf des Flugzeuges hierher ziehen
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Lok hierher ziehen, um den ganzen Zug zu verkaufen
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Lok hierher ziehen, um den ganzen Zug zu verkaufen
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Alle Züge im Depot verkaufen
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Alle Fahrzeuge im Depot verkaufen
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Alle Schiffe in der Werft verkaufen
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Alle Flugzeuge im Hangar verkaufen
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Alle Züge im Depot verkaufen
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Alle Fahrzeuge im Depot verkaufen
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Alle Schiffe in der Werft verkaufen
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Alle Flugzeuge im Hangar verkaufen
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Alle Züge im Depot automatisch ersetzen
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Alle Fahrzeuge im Depot automatisch ersetzen
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Alle Schiffe in der Werft automatisch ersetzen
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Alle Flugzeuge im Hangar automatisch ersetzen
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Alle Züge im Depot automatisch ersetzen
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Alle Fahrzeuge im Depot automatisch ersetzen
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Alle Schiffe in der Werft automatisch ersetzen
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Alle Flugzeuge im Hangar automatisch ersetzen
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Neue Fahrzeuge
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Neue Fahrzeuge
@@ -2711,35 +2711,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Neues Fa
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Neues Schiff kaufen
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Neues Flugzeug kaufen
 
-STR_CLONE_TRAIN                                                 :{BLACK}Zug kopieren
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Fahrzeug kopieren
-STR_CLONE_SHIP                                                  :{BLACK}Schiff kopieren
-STR_CLONE_AIRCRAFT                                              :{BLACK}Flugzeug kopieren
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Zug kopieren
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Fahrzeug kopieren
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Schiff kopieren
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Flugzeug kopieren
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Baut eine Kopie des Zuges mit allen Waggons. Klicke diese Schaltfläche und dann auf einen Zug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Baut eine Kopie des Fahrzeuges. Klicke diese Schaltfläche und dann auf ein Fahrzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Baut eine Kopie des Schiffes. Klicke diese Schaltfläche und dann auf eine Schiff innerhalb oder außerhalb der Werft. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Baut eine Kopie des Flugzeuges. Klicke auf diese Schaltfläche und dann auf ein Flugzeug innerhalb oder außerhalb des Hangars. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Baut eine Kopie des Zuges mit allen Waggons. Klicke diese Schaltfläche und dann auf einen Zug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Baut eine Kopie des Fahrzeuges. Klicke diese Schaltfläche und dann auf ein Fahrzeug innerhalb oder außerhalb des Depots. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Baut eine Kopie des Schiffes. Klicke diese Schaltfläche und dann auf eine Schiff innerhalb oder außerhalb der Werft. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Baut eine Kopie des Flugzeuges. Klicke auf diese Schaltfläche und dann auf ein Flugzeug innerhalb oder außerhalb des Hangars. Strg+Klick erzeugt gemeinsamen Fahrplan
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Hauptansicht zum Zugdepot scrollen
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Hauptansicht zum Fahrzeugdepot scrollen
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Hauptansicht zur Werft scrollen
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Hauptansicht zum Hangar scrollen
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Alle Züge, die dieses Depot anfahren, auflisten
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Alle Fahrzeuge, die dieses Depot anfahren, auflisten
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Alle Schiffe, die diese Werft anfahren, auflisten
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Alle Flugzeuge, die einen Hangar dieses Flughafens ansteuern, auflisten
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Alle Züge, die dieses Depot anfahren, auflisten
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Alle Fahrzeuge, die dieses Depot anfahren, auflisten
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Alle Schiffe, die diese Werft anfahren, auflisten
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Alle Flugzeuge, die einen Hangar dieses Flughafens ansteuern, auflisten
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Alle Züge im Depot anhalten
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Alle Fahrzeuge im Depot anhalten
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Alle Schiffe in der Werft anhalten
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Alle Flugzeuge im Hangar anhalten
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Alle Züge im Depot anhalten
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Alle Fahrzeuge im Depot anhalten
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Alle Schiffe in der Werft anhalten
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Alle Flugzeuge im Hangar anhalten
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Alle Züge im Depot losschicken
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Alle Fahrzeuge im Depot losschicken
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Alle Schiffe in der Werft losschicken
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Alle Flugzeuge im Hangar losschicken
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Alle Züge im Depot losschicken
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Alle Fahrzeuge im Depot losschicken
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Alle Schiffe in der Werft losschicken
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Alle Flugzeuge im Hangar losschicken
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Sollen alle Fahrzeuge in diesem Depot verkauft werden?
 
@@ -2753,38 +2753,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :{G=n}Schiff
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :{G=w}Einschienenbahn
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :{G=w}Magnetschwebebahn
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kosten: {CURRENCY}   Gewicht: {WEIGHT_S}{}Geschwindigk.: {VELOCITY} Leistung: {POWER}{}Betriebskosten: {CURRENCY} pro Jahr{}Kapazität: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Preis: {CURRENCY} Max. Geschw.: {VELOCITY}{}Kapazität: {CARGO}, {CARGO}{}Betriebskosten: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Preis: {CURRENCY} Max. Geschw.: {VELOCITY}{}Kapazität: {CARGO}{}Betriebskosten: {CURRENCY}/Jahr
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kosten: {CURRENCY}   Gewicht: {WEIGHT_S}{}Geschwindigk.: {VELOCITY} Leistung: {POWER}{}Betriebskosten: {CURRENCY} pro Jahr{}Kapazität: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Preis: {CURRENCY} Max. Geschw.: {VELOCITY}{}Kapazität: {CARGO}, {CARGO}{}Betriebskosten: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Preis: {CURRENCY} Max. Geschw.: {VELOCITY}{}Kapazität: {CARGO}{}Betriebskosten: {CURRENCY}/Jahr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} ersetzen
-STR_VEHICLE_TRAIN                                               :Zug
-STR_VEHICLE_ROAD_VEHICLE                                        :Straßenfahrzeug
-STR_VEHICLE_SHIP                                                :Schiff
-STR_VEHICLE_AIRCRAFT                                            :Flugzeug
+STR_REPLACE_VEHICLE_TRAIN                                       :Zug
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Straßenfahrzeug
+STR_REPLACE_VEHICLE_SHIP                                        :Schiff
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Flugzeug
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Zu ersetzenden Loktyp auswählen
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Loktyp auswählen, der anstelle des links gewählten Loktyps verwendet werden soll
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Fahrzeugersetzung an
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Klick zum Ersetzen des Loktyps auf der linken Seite mit dem auf der rechten Seite
-STR_NOT_REPLACING                                               :{BLACK}Keine Ersetzung
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Kein Fahrzeug gewählt
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Keine Ersetzung
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Kein Fahrzeug gewählt
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Fahrzeugersetzung aus
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klick zum Abbrechen der Ersetzung des Loktyps auf der linken Seite
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Ersetzen: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Umschalter für Lok- oder Waggonersetzung
-STR_ENGINES                                                     :Loks
-STR_WAGONS                                                      :Waggons
+STR_REPLACE_ENGINES                                             :Loks
+STR_REPLACE_WAGONS                                              :Waggons
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Gleistyp auswählen, für den Loks ersetzt werden sollen
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Hier wird angezeigt, gegen welche Lok die auf der linken Seite gewählte ersetzt wird
-STR_RAIL_VEHICLES                                               :Eisenbahn
-STR_ELRAIL_VEHICLES                                             :E-Loks
-STR_MONORAIL_VEHICLES                                           :Einschienenbahn
-STR_MAGLEV_VEHICLES                                             :Magnetschwebebahn
+STR_REPLACE_RAIL_VEHICLES                                       :Eisenbahn
+STR_REPLACE_ELRAIL_VEHICLES                                     :E-Loks
+STR_REPLACE_MONORAIL_VEHICLES                                   :Einschienenbahn
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magnetschwebebahn
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Waggon-Entfernung: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ursprüngliche Länge des Zugs beibehalten, indem (vorne beginnend) Waggons entfernt werden, falls das Ersetzen der Lokomotive den Zug verlängern würde.
@@ -2802,10 +2802,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Das Fahr
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Das Schiff zur Werft schicken. Strg+Klick, um dort nur Wartung durchzuführen.
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Das Flugzeug in den Hangar schicken. Strg+Klick, um dort nur Wartung durchzuführen.
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Baut eine Kopie des Zuges mit allen Waggons. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Baut eine Kopie des Fahrzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_SHIP_INFO                                             :{BLACK}Baut eine Kopie des Schiffes. Strg+Klick erzeugt gemeinsamen Fahrplan
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Baut eine Kopie des Flugzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Baut eine Kopie des Zuges mit allen Waggons. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Baut eine Kopie des Fahrzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Baut eine Kopie des Schiffes. Strg+Klick erzeugt gemeinsamen Fahrplan
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Baut eine Kopie des Flugzeuges. Strg+Klick erzeugt gemeinsamen Fahrplan
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Zug zur Weiterfahrt zwingen, ohne das Signal zu beachten
 
@@ -2838,36 +2838,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Abfahrt
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Unfall!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Panne
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Angehalten
-STR_TRAIN_STOPPING                                              :{RED}Halte an
-STR_TRAIN_STOPPING_VEL                                          :{RED}Halte an, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Keine Energie
-STR_TRAIN_STUCK                                                 :{ORANGE}Warte auf freie Wege
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Unterwegs nach {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Unterwegs nach {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Keine Aufträge
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Keine Aufträge, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Fahre zu {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Fahre zu {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Unterwegs zu {TOWN} Zugdepot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Unterwegs zu {TOWN} Zugdepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Unterwegs zum Fahrzeugdepot {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Unterwegs zum Fahrzeugdepot {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Unterwegs zur Werft {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Unterwegs zur Werft {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Unterwegs zu {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Unterwegs zu {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Wartung in {TOWN} Zugdepot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Wartung in {TOWN} Zugdepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Wartung in der Werft {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Wartung in der Werft {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Wartung in {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Wartung in {STATION} Hangar, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Halte an
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Halte an, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Keine Energie
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Warte auf freie Wege
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Unterwegs nach {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Unterwegs nach {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Keine Aufträge
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Keine Aufträge, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Fahre zu {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Fahre zu {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Unterwegs zu {TOWN} Zugdepot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Unterwegs zu {TOWN} Zugdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Unterwegs zum Fahrzeugdepot {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Unterwegs zum Fahrzeugdepot {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Unterwegs zur Werft {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Unterwegs zur Werft {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Unterwegs zu {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Unterwegs zu {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Wartung in {TOWN} Zugdepot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Wartung in {TOWN} Zugdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Wartung im Fahrzeugdepot {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Wartung in der Werft {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Wartung in der Werft {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Wartung in {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Wartung in {STATION} Hangar, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Details)
@@ -2880,8 +2880,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Flugzeug
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}   Betriebskosten: {LTBLUE}{CURRENCY}/Jahr
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} Jahr{P "" e} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} Jahr{P "" e} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} Jahr{P "" e} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} Jahr{P "" e} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. Geschw.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewicht: {LTBLUE}{WEIGHT_S} {BLACK}Leistung: {LTBLUE}{POWER}{BLACK} Max. Geschw.: {LTBLUE}{VELOCITY}
@@ -2895,7 +2895,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}KapazitÃ
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Kapazität: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Kapazität: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer-Einnahmen: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer-Einnahmen: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Wartungsintervall: {LTBLUE}{COMMA}Tag{P "" e} {BLACK} Letzte Wartung: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Wartungsintervall: {LTBLUE}{COMMA}%{BLACK}   Letzte Wartung: {LTBLUE}{DATE_LONG}
@@ -2911,9 +2911,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Flugzeug
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebaut: {LTBLUE}{NUM}{BLACK}  Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} Wert: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Frachtkapazität dieses Zuges:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}{CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Frachtkapazität dieses Zuges:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}{CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Leer
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} von {STATION}
@@ -2928,7 +2928,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Zeige Ka
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Frachtübersicht
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Frachtübersicht des Zuges anzeigen, aufgeteilt nach Frachttyp
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapazität: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapazität: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Umrüsten)
@@ -2952,15 +2952,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Flugzeug
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Aufträge)
-STR_TIMETABLE_VIEW                                              :{BLACK}Fahrplan
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Zur Fahrplanansicht wechseln
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Fahrplan
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Zur Fahrplanansicht wechseln
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Auftragsliste - zum Markieren hier anklicken. Strg+Klick springt zum Bahnhof
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Ende der Aufträge - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Ende des gemeinsam genutzten Fahrplans - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Ende des gemeinsam genutzten Fahrplans - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}ohne Halt
@@ -2984,14 +2984,14 @@ STR_ORDER_DROP_TRANSFER                                         :Umladen
 STR_ORDER_DROP_NO_UNLOADING                                     :Nicht entladen
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ändert Entladeverhalten des ausgewählten Auftrags
 
-STR_REFIT                                                       :{BLACK}Umrüsten
-STR_REFIT_TIP                                                   :{BLACK}Frachtart auswählen, auf die umgerüstet werden soll. Strg+Klick, um einen Umrüstungsauftrag wieder zu entfernen
+STR_ORDER_REFIT                                                 :{BLACK}Umrüsten
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Frachtart auswählen, auf die umgerüstet werden soll. Strg+Klick, um einen Umrüstungsauftrag wieder zu entfernen
 
-STR_SERVICE                                                     :{BLACK}Wartung
+STR_ORDER_SERVICE                                               :{BLACK}Wartung
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Gehe immer
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Wartung, wenn nötig
 STR_ORDER_DROP_HALT_DEPOT                                       :Stopp
-STR_SERVICE_HINT                                                :{BLACK}Überspringe diesen Auftrag, sofern keine Wartung benötigt wird
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Überspringe diesen Auftrag, sofern keine Wartung benötigt wird
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Fahrzeuginformation, welche für den Sprung ausgewertet wird
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Ladezustand (Prozent)
@@ -3012,7 +3012,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :wahr
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :falsch
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Wert der mit Farzeuginformation verglichen wird
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Wert für den Vergleich eingeben
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Ãœberspringen
@@ -3026,13 +3026,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Nächstes Depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Nächster Hangar
 STR_ORDER_CONDITIONAL                                           :Bedingter Sprung zu Auftrag
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Füge einen neuen Auftrag vor dem markierten Auftrag ein, oder setze ihn ans Ende der Liste
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Erweiterten Befehl einfügen
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Erweiterten Befehl einfügen
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Alle Fahrzeuge mit demselben Fahrplan anzeigen
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Alle Fahrzeuge mit demselben Fahrplan anzeigen
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Fahre über {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Fahre ohne Halt über {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Fahre über {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Fahre ohne Halt über {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Falls nötig, Wartung in
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Fahre ohne Halt Zwecks Wartung zu
@@ -3042,15 +3042,15 @@ STR_ORDER_NEAREST_HANGAR                                        :dem nächsten H
 STR_ORDER_TRAIN_DEPOT                                           :{G=n}Zugdepot
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :{G=n}Straßenfahrzeugdepot
 STR_ORDER_SHIP_DEPOT                                            :{G=w}Werft
-STR_GO_TO_DEPOT                                                 :{STRING}{G 2 "m" "r" "m" " den"} {2:STRING} {1:TOWN}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING}{G 2 m r m " den"} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING}{G 2 "m" "r" "m" " den"} {2:STRING} {1:TOWN}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING}{G 2 m r m " den"} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
-STR_REFIT_ORDER                                                 :(auf {STRING} umrüsten)
-STR_REFIT_STOP_ORDER                                            :(auf {STRING} umrüsten und stoppen)
-STR_STOP_ORDER                                                  :(Stopp)
+STR_ORDER_REFIT_ORDER                                           :(auf {STRING} umrüsten)
+STR_ORDER_REFIT_STOP_ORDER                                      :(auf {STRING} umrüsten und stoppen)
+STR_ORDER_STOP_ORDER                                            :(Stopp)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Voll beladen)
 STR_ORDER_FULL_LOAD_ANY                                         :(Mit einer Fracht voll beladen)
@@ -3071,16 +3071,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[am Anfang]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[in der Mitte]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[am Ende]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Springe zu Auftrag {COMMA}
-STR_CONDITIONAL_NUM                                             :Springe zu Auftrag {COMMA}, wenn {STRING} {STRING} {COMMA} ist
-STR_CONDITIONAL_TRUE_FALSE                                      :Springe zu Auftrag {COMMA}, wenn {STRING} {STRING} ist
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Springe zu Auftrag {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Springe zu Auftrag {COMMA}, wenn {STRING} {STRING} {COMMA} ist
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Springe zu Auftrag {COMMA}, wenn {STRING} {STRING} ist
 
 STR_INVALID_ORDER                                               :{RED} (Ungültiger Auftrag)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Fahrplan)
-STR_ORDER_VIEW                                                  :{BLACK}Aufträge
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Zur Auftragsanzeige wechseln
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Aufträge
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Zur Auftragsanzeige wechseln
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Fahrplan - Einträge anklicken um sie zu markieren.
 
@@ -3102,10 +3102,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Dieses F
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Zeit ändern
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Zeitrahmen für den markierten Auftrag ändern
 
-STR_CLEAR_TIME                                                  :{BLACK}Zeit löschen
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Zeit löschen
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zeitrahmen für den markierten Auftrag löschen
 
-STR_RESET_LATENESS                                              :{BLACK}Verspätung löschen
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Verspätung löschen
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Verspätungsmelder zurücksetzen (das Fahrzeug gilt dann als pünktlich).
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Erfassen
@@ -3113,42 +3113,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Zeiten a
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}KI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Name der KI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Name der KI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}KI erneut laden
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Stoppe die KI, lade das Script neu und starte de KI erneut
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Stoppe die KI, lade das Script neu und starte de KI erneut
 
-STR_AI_NO_AI_FOUND                                              :Keine passende KI gefunden.{}Diese KI ist ein Platzhalter und wird nichts tun.{}KIs können im Hauptmenü als Erweiterung heruntergeladen werden.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Einer der laufenden KIs ist abgestürzt. Es ist nett, den Fehler dem Autor der KI mittels eines Screenshots vom KI-Debug-Fenster unter Angabe der OpenTTD-Versionsnummer zu melden.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}KI Debug-Fenster ist nur auf dem Server verfügbar
+STR_ERROR_AI_NO_AI_FOUND                                        :Keine passende KI gefunden.{}Diese KI ist ein Platzhalter und wird nichts tun.{}KIs können im Hauptmenü als Erweiterung heruntergeladen werden.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Einer der laufenden KIs ist abgestürzt. Es ist nett, den Fehler dem Autor der KI mittels eines Screenshots vom KI-Debug-Fenster unter Angabe der OpenTTD-Versionsnummer zu melden.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}KI Debug-Fenster ist nur auf dem Server verfügbar
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}KI einstellen
-STR_AI_LIST_TIP                                                 :{BLACK}Liste aller KIs, die im nächsten Spiel geladen werden
-STR_AI_HUMAN_PLAYER                                             :menschlicher Spieler
-STR_AI_RANDOM_AI                                                :Zufällige KI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Liste aller KIs, die im nächsten Spiel geladen werden
+STR_AI_CONFIG_HUMAN_PLAYER                                      :menschlicher Spieler
+STR_AI_CONFIG_RANDOM_AI                                         :Zufällige KI
 
-STR_AI_CHANGE                                                   :{BLACK}KI wählen
-STR_AI_CHANGE_TIP                                               :{BLACK}Eine andere KI für diesen Eintrag auswählen
-STR_AI_CONFIGURE                                                :{BLACK}Einstellungen
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Einstellungen für die KI anzeigen und / oder ändern
+STR_AI_CONFIG_CHANGE                                            :{BLACK}KI wählen
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Eine andere KI für diesen Eintrag auswählen
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Einstellungen
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Einstellungen für die KI anzeigen und / oder ändern
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Verfügbare KIs
-STR_AI_AILIST_TIP                                               :{BLACK}Klicken, um eine KI auszuwählen
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klicken, um eine KI auszuwählen
 
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Version: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Anwenden
-STR_AI_ACCEPT_TIP                                               :{BLACK}Ausgewählte KI verwenden
-STR_AI_CANCEL                                                   :{BLACK}Abbrechen
-STR_AI_CANCEL_TIP                                               :{BLACK}KI nicht wechseln
+STR_AI_LIST_ACCEPT                                              :{BLACK}Anwenden
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Ausgewählte KI verwenden
+STR_AI_LIST_CANCEL                                              :{BLACK}Abbrechen
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}KI nicht wechseln
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}KI Parameter
-STR_AI_CLOSE                                                    :{BLACK}Schließen
-STR_AI_RESET                                                    :{BLACK}Rücksetzen
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Schließen
+STR_AI_SETTINGS_RESET                                           :{BLACK}Rücksetzen
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3169,8 +3169,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Geschät
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Geschätzte Einnahmen: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Speichern läuft,{}bitte warten, bis es beendet ist!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autosicherung fehlgeschlagen
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Speichern läuft,{}bitte warten, bis es beendet ist!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autosicherung fehlgeschlagen
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Laufwerk nicht betriebsbereit
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Spielspeicherung fehlgeschlagen{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Datei kann nicht gelöscht werden
@@ -3181,22 +3181,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Spielstand wurd
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Datei kann nicht gelesen werden
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Datei kann nicht geschrieben werden
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Prüfung der Datenintegrität fehlgeschlagen
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spiel wurde in einer Version ohne Straßenbahnunterstützung gespeichert. Alle Straßenbahnen wurden entfernt.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spiel wurde in einer Version ohne Straßenbahnunterstützung gespeichert. Alle Straßenbahnen wurden entfernt.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Spielfeldgenerierung wurde abgebrochen... {} ...kein brauchbarer Platz für eine Stadt gefunden
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...in diesem Szenario gibt es keine Stadt
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Spielfeldgenerierung wurde abgebrochen... {} ...kein brauchbarer Platz für eine Stadt gefunden
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...in diesem Szenario gibt es keine Stadt
 
-STR_PNGMAP_ERROR                                                :{WHITE}Landschaft kann nicht aus PNG-Datei geladen werden...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...Datei nicht gefunden.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...Bildtyp kann nicht umgewandelt werden. 8- oder 24-bit-PNG-Datei erforderlich.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...irgendetwas ging schief. Sorry. (Vielleicht eine kaputte Datei?)
+STR_ERROR_PNGMAP                                                :{WHITE}Landschaft kann nicht aus PNG-Datei geladen werden...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...Datei nicht gefunden.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...Bildtyp kann nicht umgewandelt werden. 8- oder 24-bit-PNG-Datei erforderlich.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...irgendetwas ging schief. Sorry. (Vielleicht eine kaputte Datei?)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Landschaft kann nicht aus BMP-Datei geladen werden...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...Bildtyp kann nicht umgewandelt werden.
+STR_ERROR_BMPMAP                                                :{WHITE}Landschaft kann nicht aus BMP-Datei geladen werden...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...Bildtyp kann nicht umgewandelt werden.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skalierungswarnung
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Zu starke Skalierung des Spielfeldes wird nicht empfohlen. Generierung dennoch fortsetzen?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalierungswarnung
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Zu starke Skalierung des Spielfeldes wird nicht empfohlen. Generierung dennoch fortsetzen?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot gespeichert als '{STRING}'
@@ -3219,15 +3219,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...ungee
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...ist bereits gebaut
 STR_ERROR_OWNED_BY                                              :{WHITE}...Eigentum von {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...Gelände gehört jemand anderem
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Name bereits vergeben
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} im Weg
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Name bereits vergeben
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} im Weg
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}Die Stadtverwaltung von {TOWN} erteilt keine Genehmigung
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Die Stadtverwaltung von {TOWN} verweigert die Genehmigung für den Bau eines weiteren Flughafens in der Stadt
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}Die Stadtverwaltung von {TOWN} verweigert aus Lärmschutzgründen den Bau des Flughafens
-STR_BRIBE_FAILED                                                :{WHITE}Der Bestechungsversuch wurde
-STR_BRIBE_FAILED_2                                              :{WHITE}von einem regionalen Untersuchungsbeamten aufgedeckt.
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}Die Stadtverwaltung von {TOWN} verweigert aus Lärmschutzgründen den Bau des Flughafens
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Der Bestechungsversuch wurde
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}von einem regionalen Untersuchungsbeamten aufgedeckt.
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Land kann nicht angehoben werden...
@@ -3236,7 +3236,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kann die
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Die Ausschachtung würde den Tunnel zerstören
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Ist bereits auf Meereshöhe
 STR_ERROR_TOO_HIGH                                              :{WHITE}Zu hoch
-STR_ALREADY_LEVELLED                                            :{WHITE}... ist schon flach
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... ist schon flach
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Firmenname kann nicht geändert werden...
@@ -3247,29 +3247,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Weitere
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...Kredit bereits zurückgezahlt
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...erfordert {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kredit kann nicht getilgt werden...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Von der Bank geliehenes Geld kann nicht abgegeben werden...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Von der Bank geliehenes Geld kann nicht abgegeben werden...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Firmenkauf nicht möglich...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Firmensitz kann nicht gebaut werden ...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kauf von 25% der Aktien dieser Firma nicht möglich...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Verkauf von 25% der Aktien dieser Firma nicht möglich...
-STR_PROTECTED                                                   :{WHITE}Diese Firma ist noch nicht alt genug, um an der Börse gehandelt zu werden...
+STR_ERROR_PROTECTED                                             :{WHITE}Diese Firma ist noch nicht alt genug, um an der Börse gehandelt zu werden...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Bau von Städten unmöglich
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Bau von Städten unmöglich
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Die Stadt kann nicht umbenannt werden...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Stadt kann hier nicht gegründet werden...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...zu dicht am Spielfeldrand
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...zu dicht an einer anderen Stadt
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...zu viele Städte
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...es ist kein Platz mehr auf dem Spielfeld.
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Städte bauen im Moment keine Straßen. Städtischer Straßenbau kann mittels Erweiterte Einstellungen->Wirtschaft->Städte eingestellt werden.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Straßenarbeiten sind im Gange
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...es ist kein Platz mehr auf dem Spielfeld.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Städte bauen im Moment keine Straßen. Städtischer Straßenbau kann mittels Erweiterte Einstellungen->Wirtschaft->Städte eingestellt werden.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Straßenarbeiten sind im Gange
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Industrie kann nicht erzeugt werden...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Industrie kann nicht erzeugt werden...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}{STRING} kann hier nicht gebaut werden...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Industrie kann hier nicht gebaut werden...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zu nah an einer anderen Industrie
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...zu nah an einer anderen Industrie
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}...erst muss eine Stadt gegründet werden
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}...pro Stadt nur einmal erlaubt
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kann nur in Städten mit mehr als 1200 Einwohnern gebaut werden
@@ -3290,7 +3290,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Flughafe
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Grenzt an mehr als eine vorhandene Station/Ladeplatz
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...Bahnhof ist zu groß
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ungleichförmige Stationen deaktiviert
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...ungleichförmige Stationen deaktiviert
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Zu viele Stationen/Ladeplätze im Umkreis
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Zu viele Bahnsteigteile
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Zu viele Busbahnhöfe
@@ -3300,12 +3300,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Statione
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Zu dicht an einem anderen Hafen
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Zu dicht an einem anderen Flughafen
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Station kann nicht umbenannt werden...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...diese Straße ist in kommunaler Trägerschaft
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...Straße verläuft in die falsche Richtung
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...diese Straße ist in kommunaler Trägerschaft
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...Straße verläuft in die falsche Richtung
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Dieser Teil des Bahnhofs kann nicht entfernt werden...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Bahnhof muss erst abgerissen werden
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Dieser Teil des Bahnhofs kann nicht entfernt werden...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Bahnhof muss erst abgerissen werden
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Bushaltestelle kann nicht entfernt werden...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}LKW-Ladestelle kann nicht entfernt werden...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Straßenbahnhaltestelle kann nicht entfernt werden...
@@ -3323,14 +3323,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Flughafe
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Grenzt an mehr als einen vorhandenen Wegpunkt
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Zu nahe an einem anderen Wegpunkt
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Wegpunkt kann hier nicht gebaut werden...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Wegpunkt kann hier nicht gebaut werden...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Boje kann hier nicht platziert werden...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Wegpunktname kann nicht geändert werden...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Wegpunktname kann nicht geändert werden...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Wegpunkt kann hier nicht entfernt werden...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Wegpunkt muss erst abgerissen werden
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Wegpunkt kann hier nicht entfernt werden...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Wegpunkt muss erst abgerissen werden
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...Boje ist im Weg
-STR_BUOY_IS_IN_USE                                              :{WHITE}... Boje ist in Benutzung
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... Boje ist in Benutzung
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Zugdepot kann hier nicht gebaut werden...
@@ -3347,14 +3347,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Züge kÃ
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Zug zu lang
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Fahrzeug kann nicht umgedreht werden...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Fahrzeuge, die aus mehreren Einheiten bestehen, können nicht umgedreht werden.
-STR_INCOMPATIBLE_RAIL_TYPES                                     :inkompatible Gleistypen
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :inkompatible Gleistypen
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Fahrzeug kann nicht bewegt werden...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Hintere Lok folgt immer der vorderen Lok
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Weg zum Depot kann nicht gefunden werden
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Fahrzeugdepot unauffindbar
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Falsche Art von Depot
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Falsche Art von Depot
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} ist nach Ersetzung zu lang
@@ -3365,14 +3365,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(Geld fehlt)
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Unmögliche Gleisverbindung
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Keine geeigneten Gleise
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Gleise müssen erst abgerissen werden
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Einbahnstraße oder blockierter Weg
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Einbahnstraße oder blockierter Weg
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Signal kann hier nicht aufgestellt werden...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Gleise können hier nicht verlegt werden...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Gleise können nicht abgerissen werden...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Signale können hier nicht entfernt werden...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kann Signale hier nicht umbauen...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kann Signale hier nicht umbauen...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Gleistyp kann hier nicht verändert werden...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Gleistyp kann hier nicht verändert werden...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Straße muss erst entfernt werden
@@ -3383,13 +3383,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Diese St
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Straßenbahn kann hier nicht entfernt werden...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kanal kann hier nicht gebaut werden...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Schleuse kann hier nicht gebaut werden...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kann hier keine Flüsse platzieren...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kanal kann hier nicht gebaut werden...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Schleuse kann hier nicht gebaut werden...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kann hier keine Flüsse platzieren...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...muss auf Wasser gebaut werden
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...kann nicht auf Wasser gebaut werden
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Kanal muss erst abgerissen werden
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kann hier kein Aquädukt bauen...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Kanal muss erst abgerissen werden
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kann hier kein Aquädukt bauen...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...hier sind bereits Bäume
@@ -3398,9 +3398,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Baum kan
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Brücke kann hier nicht gebaut werden...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Die Brücke muss erst abgerissen werden
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Anfang und Ende können nicht im selben Feld liegen
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Brückenköpfe nicht auf einer Höhe
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Die Brücke ist zu niedrig für diese Umgebung
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Anfang und Ende können nicht im selben Feld liegen
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Brückenköpfe nicht auf einer Höhe
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Die Brücke ist zu niedrig für diese Umgebung
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Anfang und Ende müssen auf einer Linie liegen
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...Brücke muss an beiden Seiten auf Land enden
 
@@ -3409,7 +3409,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tunnel k
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Platz ist nicht für einen Tunnel geeignet
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Der Tunnel muss zuerst abgerissen werden
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Ein anderer Tunnel ist im Weg
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnel würde außerhalb des Spielfelds enden
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnel würde außerhalb des Spielfelds enden
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Land kann am anderen Ende des Tunnels nicht angehoben werden
 
 # Unmovable related errors
@@ -3419,12 +3419,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Das Land
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...ist bereits im Besitz der eigenen Firma!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Gruppe kann nicht erstellt werden...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Gruppe kann nicht gelöscht werden...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Gruppe kann nicht umbenannt werden...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Entfernen aller Fahrzeuge dieser Gruppe nicht möglich...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Fahrzeug kann nicht zu dieser Gruppe hinzugefügt werden...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Fahrzeuge mit gemeinsamen Fahrplan können nicht zur Gruppe hinzugefügt werden...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Gruppe kann nicht erstellt werden...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Gruppe kann nicht gelöscht werden...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Gruppe kann nicht umbenannt werden...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Entfernen aller Fahrzeuge dieser Gruppe nicht möglich...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Fahrzeug kann nicht zu dieser Gruppe hinzugefügt werden...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Fahrzeuge mit gemeinsamen Fahrplan können nicht zur Gruppe hinzugefügt werden...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Zug ist im Weg
@@ -3467,21 +3467,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Fahrzeug
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Schiff kann nicht verkauft werden...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Flugzeug kann nicht verkauft werden...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Fahrzeug nicht verfügbar
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Fahrzeug nicht verfügbar
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Schiff nicht verfügbar
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Flugzeug nicht verfügbar
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Fahrzeug nicht verfügbar
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Fahrzeug nicht verfügbar
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Schiff nicht verfügbar
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Flugzeug nicht verfügbar
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Zu viele Fahrzeuge im Spiel
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Das Wartungsintervall kann nicht geändert werden...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kann dieses Schrottfahrzeug nicht mehr verkaufen ...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kann zerstörtes Fahrzeug nicht umrüsten...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kann dieses Schrottfahrzeug nicht mehr verkaufen ...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kann zerstörtes Fahrzeug nicht umrüsten...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Der Zug kann das Signal nicht ohne Gefahr passieren...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Die Zugbewegung kann nicht umgekehrt werden...
-STR_TRAIN_START_NO_CATENARY                                     :Wegen fehlender Oberleitung kann der Zug nicht starten.
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Wegen fehlender Oberleitung kann der Zug nicht starten.
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Das Fahrzeug kann nicht wenden...
 
@@ -3500,14 +3500,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}Fahrzeug
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}Fahrzeug kann diese Station nicht erreichen
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}Ein Fahrzeug, welches diesen gemeinsamen Fahrplan nutzt, kann die Station nicht erreichen
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Fehler beim Erstellen eines gemeinsam genutzten Fahrplans...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Fahrplan kann nicht kopiert werden...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Fehler beim Erstellen eines gemeinsam genutzten Fahrplans...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Fahrplan kann nicht kopiert werden...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...zu weit vom vorherigen Bestimmungsort entfernt
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kein Fahrplan für das Fahrzeug...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Fahrzeuge halten nur an Stationen.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Das Fahrzeug hält nicht an dieser Station.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kein Fahrplan für das Fahrzeug...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Fahrzeuge halten nur an Stationen.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Das Fahrzeug hält nicht an dieser Station.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...zu viele Schilder
@@ -3897,35 +3897,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Boje
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boje #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Boje
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boje #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Gruppe {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :Wegpunkt {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Wegpunkt {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Wegpunkt {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Wegpunkt {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :unbekannte Station
-STR_SIGN_DEFAULT                                                :Schild
+STR_DEFAULT_SIGN_NAME                                           :Schild
 STR_COMPANY_SOMEONE                                             :Jemand{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Zuschauer, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Zuschauer, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3943,7 +3943,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3957,25 +3957,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt
index a74fe3f61..e3b7c832d 100644
--- a/src/lang/hebrew.txt
+++ b/src/lang/hebrew.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}{STRING}
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}�פשרויות משחק
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}הודעה
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}{STRING} -הודעה מ
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}!�זהרה
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}!�זהרה
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE} ...ל� ניתן לעשות ז�ת
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}...ל� ניתן לפנות �זור זה
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}כל הזכויות שמורות , {COPYRIGHT}1995 כריס סויר - {NBSP}זכויות יוצרי� מקוריות
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}{REV} ×’
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}צ�
-STR_YES                                                         :{BLACK}כן
-STR_NO                                                          :{BLACK}ל�
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}?{STRING} �תה בטוח שברצונך לצ�ת ולחזור ל
+STR_QUIT_YES                                                    :{BLACK}כן
+STR_QUIT_NO                                                     :{BLACK}ל�
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}?{STRING} �תה בטוח שברצונך לצ�ת ולחזור ל
 
 STR_JUST_NOTHING                                                :כלו�
 STR_COLOUR_DARK_BLUE                                            :כחול כהה
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}מדבר
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}שלג
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}הודעה
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}בחירת מחדל
-STR_QUERY_CANCEL                                                :{BLACK}ביטול
-STR_QUERY_OK                                                    :{BLACK}�ישור
-STR_QUERY_RENAME                                                :{BLACK}שנה ש�
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}בחירת מחדל
+STR_BUTTON_CANCEL                                               :{BLACK}ביטול
+STR_BUTTON_OK                                                   :{BLACK}�ישור
+STR_BUTTON_RENAME                                               :{BLACK}שנה ש�
 
 STR_OSNAME_WINDOWS                                              :חלונות
 STR_OSNAME_DOS                                                  :דוס
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}מש�
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}מידע
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}קיבולות
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}סה"כ סחורה
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}:סה"כ קיבולת הסחורה ברכבת ז�ת
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}:סה"כ קיבולת הסחורה ברכבת ז�ת
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}משחק חדש
 STR_INTRO_LOAD_GAME                                             :{BLACK}טען משחק
 STR_INTRO_MULTIPLAYER                                           :{BLACK}משחק מרובה שחקני�
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}עורך השלבי�
 
-STR_MAPSIZE                                                     :{BLACK}:גודל המפה
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}:גודל המפה
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}�פשרויות
 
 STR_COMPANY_SOMEONE                                             :{SKIP}{SKIP}מישהו
@@ -309,9 +309,9 @@ STR_FILE_MENU_QUIT_GAME                                         :עזוב משח
 STR_FILE_MENU_EXIT                                              :יצי�ה
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}?ה�� �תה בטוח שברצונך לעזוב �ת המשחק
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}עזוב משחק
-STR_SORT_ORDER_TIP                                              :{BLACK}(בחר(י) סדר מיון (עולה\יורד
-STR_SORT_CRITERIA_TIP                                           :{BLACK}בחר\י קרטריון מיון
-STR_SORT_BY                                                     :{BLACK}מיון לפי
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}(בחר(י) סדר מיון (עולה\יורד
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}בחר\י קרטריון מיון
+STR_BUTTON_SORT_BY                                              :{BLACK}מיון לפי
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}�כלוסיה
@@ -341,24 +341,24 @@ STR_SORT_BY_RUNNING_COST                                        :עלות הפע
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :כח/עלות הפעלה
 STR_SORT_BY_CARGO_CAPACITY                                      :קיבולת סחורה
 
-STR_NO_WAITING_CARGO                                            :{BLACK}שו� סחורה ל� מחכה
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}בחר �ת כל המתקני�
-STR_SELECT_ALL_TYPES                                            :{BLACK}(ברח �ת כל סוגי הסחורה (כולל סחורה של� מחכה
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK} ר�ה רשימה של קטרי� זמיני� לסוג כלי הרכב הזה
-STR_MANAGE_LIST                                                 :{BLACK}נהל רשימה
-STR_MANAGE_LIST_TIP                                             :{BLACK}שלח הור�ות לכל כלי הרכב ברשימה זו
-STR_REPLACE_VEHICLES                                            :החלף כלי רכב
-STR_SEND_FOR_SERVICING                                          :שלח לטיפול
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}רכבות זמינות
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}רכבי� זמיני�
-STR_AVAILABLE_SHIPS                                             :{BLACK}כלי שייט זמינות
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}כלי טייס זמיני�
-
-STR_SEND_TRAIN_TO_DEPOT                                         :שלח רכבת למוסך
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :שלח כלי רכב למוסך
-STR_SEND_SHIP_TO_DEPOT                                          :שלח �וניה למוסך
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :שלך כלי תעופה להנגר
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}שו� סחורה ל� מחכה
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}בחר �ת כל המתקני�
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}(ברח �ת כל סוגי הסחורה (כולל סחורה של� מחכה
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK} ר�ה רשימה של קטרי� זמיני� לסוג כלי הרכב הזה
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}נהל רשימה
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}שלח הור�ות לכל כלי הרכב ברשימה זו
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :החלף כלי רכב
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :שלח לטיפול
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}רכבות זמינות
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}רכבי� זמיני�
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}כלי שייט זמינות
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}כלי טייס זמיני�
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :שלח רכבת למוסך
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :שלח כלי רכב למוסך
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :שלח �וניה למוסך
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :שלך כלי תעופה להנגר
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -388,12 +388,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}�פשר
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}...ל� ניתן לשנות �ת מרווחי הטיפול
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}סגור חלון
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}כותרת החלון - גרור להזזה
-STR_STICKY_BUTTON                                               :{BLACK}'סמן חלון זה כחלון מוגן מפני מקש 'סגור �ת כל החלונות
-STR_RESIZE_BUTTON                                               :{BLACK}לחץ ומשוך כדי לשנות �ת גודל החלון
+STR_TOOLTIP_STICKY                                              :{BLACK}'סמן חלון זה כחלון מוגן מפני מקש 'סגור �ת כל החלונות
+STR_TOOLTIP_RESIZE                                              :{BLACK}לחץ ומשוך כדי לשנות �ת גודל החלון
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}לחץ כ�ן כדי לעבור לתיקית בחירת מחדל של שמירות
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}הסרת בנייני� וכו' ממשבצת קרקע
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}הנמכת משבצת קרקע
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}הגבהת משבצת קרקע
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}הנמכת משבצת קרקע
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}הגבהת משבצת קרקע
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}כפתור גלילה - גולל רשימה מעלה/מטה
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}פס הגלילה - גלילה של רשימות ימינה\שמ�לה
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}הצג מת�ר פני השטח
@@ -406,21 +406,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}הצג/×
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}{1:CURRENCY} :בשנה שעברה{NBSP} {0:CURRENCY}) :רווח השנה
 
 ############ range for service numbers starts
-STR_AGE                                                         :({1:COMMA}) שני� {NBSP}{0:COMMA}
-STR_AGE_RED                                                     :{RED}({1:COMMA}) שני� {NBSP}{0:COMMA}
+STR_VEHICLE_INFO_AGE                                            :({1:COMMA}) שני� {NBSP}{0:COMMA}
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}({1:COMMA}) שני� {NBSP}{0:COMMA}
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :רכבת
-STR_VEHICLE_ROAD_VEHICLE                                        :רכב
-STR_VEHICLE_SHIP                                                :כלי שייט
-STR_VEHICLE_AIRCRAFT                                            :כלי טייס
+STR_REPLACE_VEHICLE_TRAIN                                       :רכבת
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :רכב
+STR_REPLACE_VEHICLE_SHIP                                        :כלי שייט
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :כלי טייס
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}מתיישן {VEHICLE}
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}מתיישן מ�וד {VEHICLE}
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}מתיישן מ�וד, וזקוק להחלפה בדחיפות {VEHICLE}
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}מידע על שטח קרקע
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{LTBLUE}ל� זמין {BLACK}:עלות פינוי
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{RED}{CURRENCY}{BLACK} :עלות פינוי
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}ההכנסה �חרי שפונה: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}ההכנסה �חרי שפונה: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :ל� זמין
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}{LTBLUE}{STRING} :בעלי�
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}בעלי הכביש: {LTBLUE}{STRING}
@@ -429,7 +429,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}בעלי
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{LTBLUE}{STRING}{BLACK} :רשות מקומית
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :�ין
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}ש�
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -541,7 +541,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}(לחץ
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}(לחץ על רצועה כדי להסיר �ותה מהתוכנית הנוחכית(מות�� �ישית 1 �ו מות�� �ישית 2 בלבד
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}עירבוב תוכניות פועל/כבוי
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}הצג �ת חלון בחירת המנגינה
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}לחץ על שירות כדי להתמקד על עיר/תעשייה
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}לחץ על שירות כדי להתמקד על עיר/תעשייה
 STR_INTRO_DIFFICULTY                                            :{BLACK}({STRING})דרגת קושי
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :הודעה �חרונה/מבזק חדשות �חרון
@@ -590,7 +590,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}הקטן
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}צור קרקע �קר�ית
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}�פס קרקע
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}�פס קרקע
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}מחק מהמפה �ת כל רכוש השחקן
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}מחק מהמפה �ת כל רכוש השחקן
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}ה�� �תה בטוח ש�תה רוצה למחוק �ת כל רכושו של השחקן?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}יצירת קרקע
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}יצירת ערי�
@@ -604,8 +604,8 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...קר×
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...קרוב מידי לעיירה �חרת
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...�זור ל� מת�י�
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...יותר מידי עיירות
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}ל� ניתן לבנות ערי�
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...�ין יותר מקו� על המפה
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}ל� ניתן לבנות ערי�
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...�ין יותר מקו� על המפה
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK} הרחב �ת העיירה
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}הרחב
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}עיר �קר�ית
@@ -621,13 +621,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}מק×� ×
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}מק� מיגדלור
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}מק� משדר
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}.הגדר �זור מדברי{}{NBSP}.להסרה {NBSP}CRTL לחץ והחזק
-STR_CREATE_LAKE                                                 :{BLACK}הגדר �ת שטח המי�.{}הכן תעלה, �לה �� כן CTRL לחוץ בגובה הי�, ו�ז זה יציף �ת הסביבה במקו�
-STR_CREATE_RIVER                                                :{BLACK}מק� נחלי�.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}הגדר �ת שטח המי�.{}הכן תעלה, �לה �� כן CTRL לחוץ בגובה הי�, ו�ז זה יציף �ת הסביבה במקו�
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}מק� נחלי�.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}מחק
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}מחק �ת העיר
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :שמור סצנריו
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :פתח סצנריו
-STR_MENU_LOAD_HEIGHTMAP                                         :טען מפת גובה
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :טען מפת גובה
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :צ� מהעורך
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :יצי�ה
@@ -637,7 +637,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}שמור
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}שחק סצנריו
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}שחק במפת גובה
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}התחל משחק חדש בשימוש מפת גובה כנוף.
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}?ה�� �תה בטוח שברצונך לצ�ת משלב זה
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}?ה�� �תה בטוח שברצונך לצ�ת משלב זה
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...ניתן לבנות בערי� ע� �וכלוסיה של לפחות 1200 �יש
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}שנה �ת שנת ההתחלה לשנה 1 פחות
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}שנה �ת שנת ההתחלה לשנה 1 יותר
@@ -645,16 +645,16 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...קצ×
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}קטן
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}בינוני
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}גדול
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}�קר�י
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}�קר�י
 STR_FOUND_TOWN_CITY                                             :{BLACK}עיר
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}בחר �ת גודל העיר
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}:גודל העיר
 
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}מקורי
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}כבישי� טובי� יותר
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}�קר�י
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}מקורי
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}כבישי� טובי� יותר
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}�קר�י
 
-STR_NEWS_MESSAGE                                                :{1:STRING}  -  {0:STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{1:STRING}  -  {0:STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}הצג הודעה �ו חדשות �חרוני�
 STR_NEWS_MESSAGES_OFF                                           :כבוי
 STR_NEWS_MESSAGES_SUMMARY                                       :תמצית
@@ -754,10 +754,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ×”
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}'{STRING}- 'התמונה נשמרה בהצלחה כ
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}!ל� יכול ליצור תמונה
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}קנה �דמה לשימוש עתידי
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}קנה �דמה לשימוש עתידי
 STR_STATUSBAR_AUTOSAVE                                          :{RED}שמירה �וטומטית
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  שומר משחק  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}!שמירה מתבצעת,{} �נ� המתן עד לסיו� השמירה
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}!שמירה מתבצעת,{} �נ� המתן עד לסיו� השמירה
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}בחר בתוכנית מנגינה בסגנון קליל
 
 ############ start of townname region
@@ -820,7 +820,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}בחר ×
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}מסך מל�
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}סמן תיבה זו כדי לשחק OpenTTD על כל המסך
-STR_FULLSCREEN_FAILED                                           :{WHITE}נכשל בשינויי למסך מל�
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}נכשל בשינויי למסך מל�
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}רזלוציית המסך
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}בחר �ת רזולוציית המסך
@@ -831,12 +831,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}בחר ×
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}סט גרפיקה בסיסי
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}בחר בסט גרפיקה בסיסי לשימוש
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}שמירה �וטומטית נכשלה
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}שמירה �וטומטית נכשלה
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}פונה �ל {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}פונה �ל {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}�ין הור�ות
-STR_NO_ORDERS_VEL                                               :{LTBLUE}�ין הור�ות, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}פונה �ל {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}פונה �ל {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}�ין הור�ות
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}�ין הור�ות, {VELOCITY}
 
 STR_PASSENGERS                                                  :נוסעי�
 STR_BAGS                                                        :שקי�
@@ -847,9 +847,9 @@ STR_CRATES                                                      :�רגזי�
 STR_RES_OTHER                                                   :�חר
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}ל� ניתן לצמד יעדי�...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}ל� ניתן להעתיק יעדי�...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - סוף של הור�ות משותפות - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}ל� ניתן לצמד יעדי�...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}ל� ניתן להעתיק יעדי�...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - סוף של הור�ות משותפות - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :�יננה יכולה למצו� נתיב המשכה {WHITE}{VEHICLE}
 STR_NEWS_TRAIN_IS_LOST                                          :הלכה ל�יבוד {WHITE}{VEHICLE}
@@ -1109,15 +1109,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-גו×
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :מבוטל
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}שנה ערך
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}שנה ערך
 
-STR_TEMPERATE_LANDSCAPE                                         :�קלי� ממוזג
-STR_SUB_ARCTIC_LANDSCAPE                                        :�קלי� קר
-STR_SUB_TROPICAL_LANDSCAPE                                      :�קלי� טרופי
-STR_TOYLAND_LANDSCAPE                                           :�רץ הצעצועי�
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :�קלי� ממוזג
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :�קלי� קר
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :�קלי� טרופי
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :�רץ הצעצועי�
 
 STR_CHEATS                                                      :{WHITE}(cheats) טריקי�
-STR_CHEATS_TIP                                                  :{BLACK}תיבות הסימון מציינות ה�� השתמשת בטריק הנתון בעבר
+STR_CHEATS_TOOLTIP                                              :{BLACK}תיבות הסימון מציינות ה�� השתמשת בטריק הנתון בעבר
 STR_CHEATS_WARNING                                              :{BLACK}�זהרה ! �תה עומד לבגוד בחבריך למשחק. נו נו נו
 STR_CHEAT_MONEY                                                 :{LTBLUE}{CURRENCY}- הגדל �ת כמות הכסף במ�זנך ל
 STR_CHEAT_CHANGE_COMPANY                                        :{ORANGE}{COMMA}{LTBLUE} :שחק כבעלי החברה
@@ -1129,176 +1129,176 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{ORANGE}{STRING
 STR_CHEAT_CHANGE_DATE                                           :{ORANGE} {DATE_SHORT}{LTBLUE} :שנה ת�ריך
 STR_CHEAT_SETUP_PROD                                            :{ORANGE}{STRING}{LTBLUE} :�פשר שינוי של התפוקה עבור תעשיות
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}{WAYPOINT} :בדרך �ל
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE} {1:VELOCITY},{0:WAYPOINT} :בדרך �ל
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}{WAYPOINT} :בדרך �ל
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE} {1:VELOCITY},{0:WAYPOINT} :בדרך �ל
 
-STR_GO_TO_WAYPOINT                                              :{WAYPOINT} :עבור דרך
-STR_GO_NON_STOP_TO_WAYPOINT                                     :{WAYPOINT} :עבור לל� עצירה דרך
+STR_ORDER_GO_TO_WAYPOINT                                        :{WAYPOINT} :עבור דרך
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :{WAYPOINT} :עבור לל� עצירה דרך
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN}נקודות ציון
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} #{COMMA}נקות ציון
-STR_LANDINFO_WAYPOINT                                           :נקודת ציון
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN}נקודות ציון
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} #{COMMA}נקות ציון
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :נקודת ציון
 
-STR_WAYPOINT                                                    :{WHITE}נקודת ציון
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}בחר �ת סוג נקודות הציון
+STR_WAYPOINT_CAPTION                                            :{WHITE}נקודת ציון
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}בחר �ת סוג נקודות הציון
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}ערוך ש� נקודת ציון
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}שינוי ש� היעד נכשל...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}שינוי ש� היעד נכשל...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}הפוך מסילה לנקודת ציון
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}ל� ניתן לבנות תחנת רכבת ב�תר זה
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}ל� ניתן להסיר תחנת רכבת מ�תר זה
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}ל� ניתן לבנות תחנת רכבת ב�תר זה
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}ל� ניתן להסיר תחנת רכבת מ�תר זה
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}בנה מסילה במצב �וטומטי
 
-STR_NO_TOWN_IN_SCENARIO                                         ::{WHITE}�ין ערי� בסצנריו זה...
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   ::{WHITE}�ין ערי� בסצנריו זה...
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}ערי� �קר�יות
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}פזר על המפה ערי� ב�ופן �קר�י
-STR_MANY_RANDOM_INDUSTRIES                                      :תעשיות �קר�יות
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}פזר על המפה תעשיות ב�ופן �קר�י
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}ניסיון ליצור תעשיות נכשל
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}ערי� �קר�יות
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}פזר על המפה ערי� ב�ופן �קר�י
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :תעשיות �קר�יות
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}פזר על המפה תעשיות ב�ופן �קר�י
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}ניסיון ליצור תעשיות נכשל
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}'הצג �ת סרגל פני השטח לעיצוב פני הקרקע, נטיעת עצי� וכו
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}שינוי פני השטח
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}שיטוח הקרקע
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}שיטוח הקרקע
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}עצי� מסוגי� שוני�
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}נטע עצי� מסוג �קר�י במקו� זה
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}נטע עצי� מסוג �קר�י במקו� זה
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}ל� ניתן לבנות כ�ן תעלה
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}ל� ניתן לבנות כ�ן תעלה
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}בנה תעלות
-STR_LANDINFO_CANAL                                              :תעלה
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :תעלה
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}ל� ניתן לבנות כ�ן שער ימי
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}ל� ניתן לבנות כ�ן שער ימי
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}בניית שערי� ימיי�
-STR_LANDINFO_LOCK                                               :ת� שייט
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :ת� שייט
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}...ל� ניתן לבנות כ�ן נהר
-STR_LANDINFO_RIVER                                              :נהר
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}...ל� ניתן לבנות כ�ן נהר
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :נהר
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...המצוף בשימוש
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...המצוף בשימוש
 
-STR_LANDINFO_COORDS                                             :{LTBLUE}{NUM}x{NUM}x{NUM} ({STRING}) {BLACK} :קו�ורדינטות
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{LTBLUE}{NUM}x{NUM}x{NUM} ({STRING}) {BLACK} :קו�ורדינטות
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}...ל� ניתן לבטל חלק מהתחנה
-STR_CANT_CONVERT_RAIL                                           :{WHITE}...ל� ניתן לשנות �ת סוג המסילה
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}...ל� ניתן לבטל חלק מהתחנה
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}...ל� ניתן לשנות �ת סוג המסילה
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}שנה/שדרג �ת המסילה
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}גרור �ת הקטר לכ�ן כדי למכור �ת הרכבת
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}גרור �ת הקטר לכ�ן כדי למכור �ת הרכבת
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}גרירה ושחרור
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}בניית תחנה ע"י גרירה ושחרור
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}בחר �ת סוג התחנה שיוצג
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}בחר �ת סוג התחנה לבנייה
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}בחר �ת סוג התחנה שיוצג
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}בחר �ת סוג התחנה לבנייה
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}הרץ �ת הזמן במהירות
 STR_MESSAGE_HISTORY                                             :{WHITE}היסטוריית ההודעות
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}רשימת ההודעות ה�חרונות
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}השתק �ת כולן
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}הצג �ת כולן
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}רשימת ההודעות ה�חרונות
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}השתק �ת כולן
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}הצג �ת כולן
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}תעשיות
-STR_INDUSTRYDIR_ITEM                                            :{YELLOW}(שונעו {NBSP}{3:COMMA}%){BLACK} ({1:CARGO}{2:STRING}) {ORANGE}{0:INDUSTRY}
-STR_INDUSTRYDIR_ITEM_TWO                                        :{YELLOW}(שונעו {NBSP} {6:COMMA}%/{5:COMMA}%) {BLACK} ({3:CARGO}{4:STRING}/{1:CARGO}{2:STRING}) {ORANGE}{0:INDUSTRY}
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}רשימת תעשיות – לחץ על ש� להתמקדות
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}תעשיות
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{YELLOW}(שונעו {NBSP}{3:COMMA}%){BLACK} ({1:CARGO}{2:STRING}) {ORANGE}{0:INDUSTRY}
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{YELLOW}(שונעו {NBSP} {6:COMMA}%/{5:COMMA}%) {BLACK} ({3:CARGO}{4:STRING}/{1:CARGO}{2:STRING}) {ORANGE}{0:INDUSTRY}
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}רשימת תעשיות – לחץ על ש� להתמקדות
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}קרוב מידי לתעשיה �חרת
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}קרוב מידי לתעשיה �חרת
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}שנה תפוקה
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}משחק רשת
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK} :ש� השחקן
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}זהו שמך כפי שיצפה ע"י המשתתפי� ה�חרי�
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK} :שמך
-STR_NETWORK_CONNECTION                                          :{BLACK} :חיבור
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK} :(LAN)בחר משחק ב�ינטרנט/רשת מקומית
-
-STR_NETWORK_START_SERVER                                        :{BLACK}הפעל שרת
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}הפעל שרת חדש
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}ש�
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}ש� המשחק
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}'שפה, גירסת שרת וכו
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}בחר משחק מהרשימה
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}השרת �ליו התחברת ל�חרונה
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}לחץ להתחברות חוזרת לשרת �ליו התחברת ל�חרונה
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}�תר שרת
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}סרוק �ת הרשת ל�יתור שרת
-STR_NETWORK_ADD_SERVER                                          :{BLACK}הוסף שרת
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}מוסיף שרת לרשימה שתמיד יבדק למשחקי� פעילי�.
-STR_NETWORK_ENTER_IP                                            :{BLACK}הזן �ת הכתובת של השרת
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}לקוחות
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}לקוחות מחוברי� / מקסימו� לקוחות{}חברות מחוברות / מקסימו� חברות
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}גודל המפה
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}גודל המפה במשחק{}לחץ למיון לפי שטח
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}ת�ריך
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}ת�ריך נוכחי
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}שני�
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}מספר שני�{}המשחק נמשך
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}מידע על המשחק
-STR_NETWORK_CLIENTS                                             :{SILVER}לקוחות:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}שפה:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{WHITE}{STRING}{SILVER} :סוג הקרקע
-STR_NETWORK_MAP_SIZE                                            :{SILVER}גודל המפה:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}גרסת השרת:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}כתובת השרת:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}ת�ריך התחלה:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}ת�ריך נוכחי:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}מוגן בסיסמה!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}שרת מנותק
-STR_NETWORK_SERVER_FULL                                         :{SILVER}שרת מל�
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}גרסה ל� תו�מת
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}�י הת�מת קבצי� גרפיי�
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}הצטרף למשחק
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}התחל משחק רב-משתתפי� חדש
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}ש� המשחק:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}הש� שיוצג למשתתפי� �חרי� בתפריט משחק רשת
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}הזן ש� למשחק רשת
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}קבע סיסמה
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}הגן על המשחק שלך ע� סיסמה �� �תה ל� רוצה שהו� יהיה זמין לכול�
-STR_NETWORK_SELECT_MAP                                          :{BLACK}בחר מפה:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}ב�יזה מפה �תה רוצה לשחק?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :�ינטרנט
-STR_NETWORK_LAN_INTERNET                                        :LAN / �ינטרנט
-STR_NETWORK_INTERNET_ADVERTISE                                  :(�ינטרנט (פרס�
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} לקוח{P "" ות}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}מקסימו� לקוחות:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK} :מספר משתתפי� מירבי
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} חבר{P ה ות}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}מקסימו� חברות:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}הגבל �ת השרת למספר מסויי� של חברות
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}צופי� {NUM}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK} :מספר צופי� מירבי
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}הגבלת השרת למספר צופי� מסויי�
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}שפת דיבור:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}שחקני� �חרי� ידעו �יו שפה מדוברת בשרת
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}התחל משחק
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}התחל משחק רשת ע� מפה �קר�ית
-STR_NETWORK_LOAD_GAME                                           :{BLACK}טען משחק
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}טען משחק רשת שנשמר בעבר
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}משחק רשת
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK} :ש� השחקן
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}זהו שמך כפי שיצפה ע"י המשתתפי� ה�חרי�
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK} :שמך
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK} :חיבור
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK} :(LAN)בחר משחק ב�ינטרנט/רשת מקומית
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}הפעל שרת
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}הפעל שרת חדש
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}ש�
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}ש� המשחק
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}'שפה, גירסת שרת וכו
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}בחר משחק מהרשימה
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}השרת �ליו התחברת ל�חרונה
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}הזן �ת הכתובת של השרת
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}לקוחות
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}לקוחות מחוברי� / מקסימו� לקוחות{}חברות מחוברות / מקסימו� חברות
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}גודל המפה
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}גודל המפה במשחק{}לחץ למיון לפי שטח
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}ת�ריך
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}ת�ריך נוכחי
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}שני�
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}מספר שני�{}המשחק נמשך
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}מידע על המשחק
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}לקוחות:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}שפה:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{WHITE}{STRING}{SILVER} :סוג הקרקע
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}גודל המפה:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}גרסת השרת:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}כתובת השרת:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}ת�ריך התחלה:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}ת�ריך נוכחי:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}מוגן בסיסמה!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}שרת מנותק
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}שרת מל�
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}גרסה ל� תו�מת
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}�י הת�מת קבצי� גרפיי�
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}הצטרף למשחק
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}התחל משחק רב-משתתפי� חדש
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}ש� המשחק:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}הש� שיוצג למשתתפי� �חרי� בתפריט משחק רשת
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}הזן ש� למשחק רשת
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}קבע סיסמה
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}הגן על המשחק שלך ע� סיסמה �� �תה ל� רוצה שהו� יהיה זמין לכול�
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}בחר מפה:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}ב�יזה מפה �תה רוצה לשחק?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :�ינטרנט
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / �ינטרנט
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :(�ינטרנט (פרס�
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} לקוח{P "" ות}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}מקסימו� לקוחות:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK} :מספר משתתפי� מירבי
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} חבר{P ה ות}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}מקסימו� חברות:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}הגבל �ת השרת למספר מסויי� של חברות
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}צופי� {NUM}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK} :מספר צופי� מירבי
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}הגבלת השרת למספר צופי� מסויי�
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}שפת דיבור:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}שחקני� �חרי� ידעו �יו שפה מדוברת בשרת
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}התחל משחק
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}התחל משחק רשת ע� מפה �קר�ית
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}טען משחק
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}טען משחק רשת שנשמר בעבר
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :כלשהו
@@ -1339,33 +1339,33 @@ STR_NETWORK_LANG_GREEK                                          :יוונית
 STR_NETWORK_LANG_LATVIAN                                        :לטבית
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}לובי של משחק רשת
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}לובי של משחק רשת
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{ORANGE}{STRING} {BLACK} :מתכונן להצטרף �ל
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}רשימת החברות המשתתפות במשחק. ניתן להצטרף לחברה קיימת �ו ליצור חברה חדשה במידה וקיי� מקו� פנוי
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}חברה חדשה
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}יצירת חברה חדשה
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}צפה במשחק
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}הצטרף למשחק כצופה
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}הצטרף לחברה
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}הצטרף להנהלת חברה זו
-STR_NETWORK_REFRESH                                             :{BLACK}רענן שרת
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}רענן �ת המידע המוצג לגבי השרת
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{ORANGE}{STRING} {BLACK} :מתכונן להצטרף �ל
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}רשימת החברות המשתתפות במשחק. ניתן להצטרף לחברה קיימת �ו ליצור חברה חדשה במידה וקיי� מקו� פנוי
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}חברה חדשה
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}יצירת חברה חדשה
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}צפה במשחק
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}הצטרף למשחק כצופה
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}הצטרף לחברה
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}הצטרף להנהלת חברה זו
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}רענן שרת
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}רענן �ת המידע המוצג לגבי השרת
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}פרטי חברה
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}פרטי חברה
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}ש� החברה:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{WHITE}{NUM}{SILVER} :שנת הקמה
-STR_NETWORK_VALUE                                               :{SILVER}ערך החברה:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{WHITE}{CURRENCY}{SILVER} :מ�זן נוכחי
-STR_NETWORK_LAST_YEARS_INCOME                                   :{WHITE}{CURRENCY}{SILVER} :הכנסות בשנה ה�חרונה
-STR_NETWORK_PERFORMANCE                                         :{WHITE}{NUM}{SILVER} :מדד הביצועי�
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}ש� החברה:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{WHITE}{NUM}{SILVER} :שנת הקמה
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}ערך החברה:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{WHITE}{CURRENCY}{SILVER} :מ�זן נוכחי
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{WHITE}{CURRENCY}{SILVER} :הכנסות בשנה ה�חרונה
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{WHITE}{NUM}{SILVER} :מדד הביצועי�
 
-STR_NETWORK_VEHICLES                                            :{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP} {SILVER} :כלי תעבורה
-STR_NETWORK_STATIONS                                            :{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP} {SILVER} :תחנות
-STR_NETWORK_PLAYERS                                             :{WHITE}{STRING} {SILVER} :שחקני�
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP} {SILVER} :כלי תעבורה
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP} {SILVER} :תחנות
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{WHITE}{STRING} {SILVER} :שחקני�
 
-STR_NETWORK_CONNECTING                                          :{WHITE}...מתחבר
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}...מתחבר
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6)...מתחבר
@@ -1381,49 +1381,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}...טו×
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK} שחקני� {NUM} לפניך
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} :הורדו
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}התנתק
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}התנתק
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}הכנס סכו� כסף שברצונך לתת
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}שרת מוגן. הזן סיסמה
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}חברה מוגנת. הזן סיסמה
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}רשימת משתתפי�
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}רשימת משתתפי�
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}צפה
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}חברה חדשה
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} ל� נמצ�ה רשת
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} ל� נמצ�ו משחקי� ברשת
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} השרת �ינו מגיב
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Newgrf ל� ניתן להתחבר עקב �י הת�מת קבצי
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} סינכרון משחק רשת נכשל
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} הקשר לשרת נותק
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} טעינת משחק מקובץ נכשלה
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} הפעלת השרת נכשלה
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} ניסיון חיבור נכשל
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} נכשל #{NUM} ניסיון התקשרות
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} שגי�ת התקשרות
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} �י הת�מה לגרסת השרת
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} ססמה שגוייה
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} השרת מל�
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} הינך מודח משרת זה
-STR_NETWORK_ERR_KICKED                                          :{WHITE} נזרקת מהמשחק ע"י המשתתפי� ה�חרי�
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} שימוש בטריקי� �סור בשרת זה
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} ל� נמצ�ה רשת
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} ל� נמצ�ו משחקי� ברשת
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} השרת �ינו מגיב
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Newgrf ל� ניתן להתחבר עקב �י הת�מת קבצי
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} סינכרון משחק רשת נכשל
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} הקשר לשרת נותק
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} טעינת משחק מקובץ נכשלה
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} הפעלת השרת נכשלה
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} ניסיון חיבור נכשל
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} נכשל #{NUM} ניסיון התקשרות
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} שגי�ת התקשרות
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} �י הת�מה לגרסת השרת
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} ססמה שגוייה
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} השרת מל�
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} הינך מודח משרת זה
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} נזרקת מהמשחק ע"י המשתתפי� ה�חרי�
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} שימוש בטריקי� �סור בשרת זה
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :שגי�ה כללית
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :שגירת סינכרון
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :טעינת מפה נכשלה
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :הקשר נותק
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :בעיה בפרוטוקול
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF חוסר הת�מת
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :�ין �ישור
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :קיבל פ�קט ל� מוכר
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :גרס� שונה
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :הש� שבחרת תפוס
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :סיסמ� שגוייה
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :המספר המזהה של החברה שגוי
-STR_NETWORK_ERR_CLIENT_KICKED                                   :נזרקת על ידי הסרבר
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :ניסית להשתמש בקודי�
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :השרת מל�
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :שגי�ה כללית
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :שגירת סינכרון
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :טעינת מפה נכשלה
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :הקשר נותק
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :בעיה בפרוטוקול
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF חוסר הת�מת
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :�ין �ישור
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :קיבל פ�קט ל� מוכר
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :גרס� שונה
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :הש� שבחרת תפוס
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :סיסמ� שגוייה
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :המספר המזהה של החברה שגוי
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :נזרקת על ידי הסרבר
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :ניסית להשתמש בקודי�
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :השרת מל�
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1433,15 +1433,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :(המשחק ×”×
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :(המשחק הופשר (משתמש התחבר
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :(המשחק הופשר (חיבור משתמש נכשל
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :עוזב
-STR_NETWORK_CLIENT_JOINED                                       :הצטרף למשחק {STRING} ***
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :{2:NUM} .הצטרף לחברה מס {NBSP}{0:STRING} ***
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :.הצטרף למשחק כצופה {STRING} ***
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :{2:NUM} הקי� חברה חדשה {NBSP}{0:STRING} ***
-STR_NETWORK_CLIENT_LEFT                                         :({2:STRING}) עזב �ת המשחק {NBSP}{0:STRING} ***
-STR_NETWORK_NAME_CHANGE                                         :{STRING} שינה �ת שמו ל {STRING} ***
-STR_NETWORK_GIVE_MONEY                                          :{2:CURRENCY} נתן לחברתך {NBSP}{0:STRING} ***
-STR_NETWORK_GAVE_MONEY_AWAY                                     :{2:CURRENCY} {1:STRING} נתת ל ***
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :עוזב
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :הצטרף למשחק {STRING} ***
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :{2:NUM} .הצטרף לחברה מס {NBSP}{0:STRING} ***
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :.הצטרף למשחק כצופה {STRING} ***
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :{2:NUM} הקי� חברה חדשה {NBSP}{0:STRING} ***
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :({2:STRING}) עזב �ת המשחק {NBSP}{0:STRING} ***
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :{STRING} שינה �ת שמו ל {STRING} ***
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :{2:CURRENCY} נתן לחברתך {NBSP}{0:STRING} ***
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :{2:CURRENCY} {1:STRING} נתת ל ***
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[קבוצה] :
 STR_NETWORK_CHAT_COMPANY                                        :[קבוצה] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[קובץ] To {STRING}: {WHITE}{STRING}
@@ -1451,8 +1451,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[פרטי] ל {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[לכול�] :
 STR_NETWORK_CHAT_ALL                                            :[לכול�] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}הקלד טקסט לצ�ט ברשת
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} השרת סגר �ת המשחק
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} השרת עושה הפעלה מחדש{}�נ� המתן...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} השרת סגר �ת המשחק
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} השרת עושה הפעלה מחדש{}�נ� המתן...
 
 STR_NETWORK_SERVER                                              :שרת
 STR_NETWORK_CLIENT                                              :לקוח
@@ -1466,19 +1466,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :דבר לחבר
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :הודעה פרטית
 
 
-STR_NETWORK_SEND                                                :{BLACK}שלח
+STR_NETWORK_CHAT_SEND                                           :{BLACK}שלח
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}ל� יכול לטעון שטח �דמה מקובץ...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...הקובץ ל� נמצ�
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ל� יכול לשנות �ת סוג התמונה. צריך תמונה של 8 �ו24-ביט
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...משהו ל� הלך כשורה (כנר�ה קובץ מקולקל(
+STR_ERROR_PNGMAP                                                :{WHITE}ל� יכול לטעון שטח �דמה מקובץ...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...הקובץ ל� נמצ�
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...ל� יכול לשנות �ת סוג התמונה. צריך תמונה של 8 �ו24-ביט
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...משהו ל� הלך כשורה (כנר�ה קובץ מקולקל(
 
-STR_BMPMAP_ERROR                                                :{WHITE}ל� יכול לטעון קרקע מתמונה...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ל� יכול לשנות סוג תמונה
+STR_ERROR_BMPMAP                                                :{WHITE}ל� יכול לטעון קרקע מתמונה...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...ל� יכול לשנות סוג תמונה
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}{CURRENCY} :מחיר
@@ -1492,13 +1492,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE} {CURREN
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}...ל� ניתן להגביה �ת הקרקע
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}...ל� ניתן להנמיך �ת הקרקע
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}ל� ניתן לשטח �ת פני הקרקע
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :סלעי�
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :�דמה קשה
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :קרקע חשופה
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :עשבייה
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :שדות
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :�דמה מכוסה בשלג
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :מדבר
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :סלעי�
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :�דמה קשה
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :קרקע חשופה
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :עשבייה
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :שדות
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :�דמה מכוסה בשלג
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :מדבר
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}שיפוע הקרקע בכיוון ל� נכון
@@ -1506,11 +1506,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}שילו
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}חפירה תפגע במנהרה
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... כבר בגובה י�
 STR_ERROR_TOO_HIGH                                              :{WHITE}... גבוה מידי
-STR_ALREADY_LEVELLED                                            :{WHITE}...הקרקע כבר שטוחה
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}...הקרקע כבר שטוחה
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE} �ין מסילת רכבת מת�ימה
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...כבר בנוי
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}יש לבטל �ת המסילה הקיימת
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}כביש חד סיטרי �ו חסו�
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}כביש חד סיטרי �ו חסו�
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}בניית מסילות
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}בניית מסילות חשמליות
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}בניית מסילות חד פסיות
@@ -1534,41 +1534,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}בניי
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}בניית גשרי� למסילות
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}חציבת מנהרות למסילות
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}החלף בנייה/הסרה של פסי רכבת ורמזורי�
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK} בחירת סוג הגשר – בחר �ת הסוג שברצונך לבנות
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK} בחירת סוג הגשר – בחר �ת הסוג שברצונך לבנות
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}בחר �ת הכיוון של מוסך הרכבת
-STR_RAILROAD_TRACK                                              :מסילת רכבת
-STR_RAILROAD_TRAIN_DEPOT                                        :מוסך רכבת
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :מסילת רכבת
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :מוסך רכבת
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...השטח בבעלותה של חברה �חרת
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :מסילת רכבת ע� רמזורי בלוק
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :מסילת רכבת ע� רמזורי� מקדימי�
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :מסילת רכבת ע� רמזורי יצי�ה
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :מסילת רכבת ע� רמזורי� משולבי�
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :מסילת רכבת ע� רמזורי נתיב
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :מסילת רכבת ע� רמזורי מסלול חד סיטרי
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :מסילת רכבת ע� רמזורי בלוק ורמזורי� מקדימי�
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :מסילת רכבת ע� רמזורי יצי�ה ובלוק
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :מסילת רכבת ע� רמזורי יצי�ה ורמזורי� משולבי�
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :מסילת רכבת ע� רמזורי בלוק ורמזורי נתיב
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :מסילת רכבת ע� רמזורי בלוק ורמזורי נתיב חד סיטרי
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי יצי�ה
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי� משולבי�
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי נתיב
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי נתיב חד סיטרי
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :מסילת רכבת ע� רמזורי יצי�ה ורמזורי� משולבי�
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :מסילת רכבת ע� רמזורי יצי�ה ורמזורי נתיב
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :מסילת רכבת ע� רמזורי יצי�ה ורמזורי נתיב חד-סיטרי
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :מסילת רכבת ע� רמזורי� משולבי� ורמזורי נתיב
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :מסילת רכבת ע� רמזורי� משולבי� ורמזורי נתיב חד-סיטרי
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :מסילת רכבת ע� רמזורי נתיב ונתיב חד-סיטרי
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}חייב למחוק תחנת רכבת קוד�
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}בנה תחנה נפרדת
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}חבר לתחנה קיימת
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :מסילת רכבת ע� רמזורי בלוק
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :מסילת רכבת ע� רמזורי� מקדימי�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :מסילת רכבת ע� רמזורי יצי�ה
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :מסילת רכבת ע� רמזורי� משולבי�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :מסילת רכבת ע� רמזורי נתיב
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :מסילת רכבת ע� רמזורי מסלול חד סיטרי
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :מסילת רכבת ע� רמזורי בלוק ורמזורי� מקדימי�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :מסילת רכבת ע� רמזורי יצי�ה ובלוק
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :מסילת רכבת ע� רמזורי יצי�ה ורמזורי� משולבי�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :מסילת רכבת ע� רמזורי בלוק ורמזורי נתיב
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :מסילת רכבת ע� רמזורי בלוק ורמזורי נתיב חד סיטרי
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי יצי�ה
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי� משולבי�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי נתיב
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :מסילת רכבת ע� רמזורי� מקדימי� ורמזורי נתיב חד סיטרי
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :מסילת רכבת ע� רמזורי יצי�ה ורמזורי� משולבי�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :מסילת רכבת ע� רמזורי יצי�ה ורמזורי נתיב
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :מסילת רכבת ע� רמזורי יצי�ה ורמזורי נתיב חד-סיטרי
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :מסילת רכבת ע� רמזורי� משולבי� ורמזורי נתיב
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :מסילת רכבת ע� רמזורי� משולבי� ורמזורי נתיב חד-סיטרי
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :מסילת רכבת ע� רמזורי נתיב ונתיב חד-סיטרי
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}חייב למחוק תחנת רכבת קוד�
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}בנה תחנה נפרדת
+STR_JOIN_STATION_CAPTION                                        :{BLACK}חבר לתחנה קיימת
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}יש להסיר �ת הכביש תחילה
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}עבודות כביש בפעולה
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}עבודות כביש בפעולה
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}סלילת כבישי�
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}בניה של רכבת קלה\חשמלית
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}בחירת גשר לכביש
@@ -1604,14 +1604,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}בנה ×
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}הפעל\כבה כבישי� חד סיטריי�
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}שנה מצב בנה/הסר כבישי�
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}שנה מצב בנה\מחק למבני חשמלית
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}כיוון המוסך
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}בחר התמצ�ות למוסכי חשמלית
-STR_ROAD_DESCRIPTION_ROAD                                       :כביש
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :כביש ע� ת�ורת רחוב
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :שדירה
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :מוסך לרכבי�
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :מפגש כביש/פסי רכבת
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :חשמלית
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}כיוון המוסך
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}בחר התמצ�ות למוסכי חשמלית
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :כביש
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :כביש ע� ת�ורת רחוב
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :שדירה
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :מוסך לרכבי�
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :מפגש כביש/פסי רכבת
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :חשמלית
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}...ל� ניתן להסיר תחנת �וטובוס
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}...ל� ניתן להסיר תחנת מש�יות
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}...ל� ניתן להסיר תחנת חשמלית לנוסעי�
@@ -1619,12 +1619,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}...ל�
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}ערי�
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}יש להסיר �ת הבניין תחילה
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (עיר)
@@ -1637,7 +1637,7 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}מקד ×
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}שנה �ת ש� העיר
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{ORANGE}{1:COMMA}{BLACK} :מספר מירבי {ORANGE}{0:COMMA}{BLACK} :נוסעי� בחודש שעבר
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{ORANGE}{1:COMMA}{BLACK} :מספר מירבי {ORANGE}{0:COMMA}{BLACK} :שקי דו�ר בחודש שעבר
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}המטען שצריך בשביל גידול עיר
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}המטען שצריך בשביל גידול עיר
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :בניין משרדי� גבוה
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :בניין משרדי�
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :בניין דירות
@@ -1672,7 +1672,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}!{0:STRING} סובסידיה לשירות הניתן ע"י {}{}{NBSP}!תזכה לתוספת תשלו� בת 200% לשנה הקרובה{NBSP} {3:STATION} ל {NBSP}{2:STATION} מ{NBSP}{1:STRING} הובלת
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}!{0:STRING} סובסידיה לשירות הניתן ע"י {}{}{NBSP}!תזכה לתוספת תשלו� בת 300% לשנה הקרובה{NBSP} {3:STATION} ל {NBSP}{2:STATION} מ{NBSP}{1:STRING} הובלת
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} הרשות המקומית מתנגדת לבניית שדה תעופה נוסף בעיר ז�ת
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}מתנגדת להקמת שדה תעופה בשל חשש מהרעש {TOWN} הרשות המקומית ב
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}מתנגדת להקמת שדה תעופה בשל חשש מהרעש {TOWN} הרשות המקומית ב
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :קוטג'י�
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :בתי�
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :דירות
@@ -1708,7 +1708,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}!{TOWN} פקקי תנועה ענקיי� ב{NBSP} {}{} !מבי�ה לקטסטרופת תנועה לשישה חודשי� {STRING} תכנית לשיפוץ מקיף של הכבישי� במימון
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :(בבניה) {STRING}
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :(בבניה) {STRING}
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :�יגלו
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :טיפי
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :בית-ספל
@@ -1721,17 +1721,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :מק� סימנ
 STR_PLANT_TREE_CAPTION                                          :{WHITE}עצי�
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...קיימי� עצי� במשבצת זו
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}...ל� יכול לטעת עצי� במשבצת זו
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...יותר מידי סימניות
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}ל� ניתן להציב כ�ן סימניה...
-STR_SIGN_DEFAULT                                                :סימניה
+STR_DEFAULT_SIGN_NAME                                           :סימניה
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}שנה �ת המלל של הסימניה
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}... ניתן לשנות �ת ש� הסימניה
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}...ל� ניתן למחוק סימניה
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}בחר סוג עץ לנטיעה
-STR_TREE_NAME_TREES                                             :עצי�
-STR_TREE_NAME_RAINFOREST                                        :יערות הגש�
-STR_TREE_NAME_CACTUS_PLANTS                                     :צמחי קקטוס
+STR_LAI_TREE_NAME_TREES                                         :עצי�
+STR_LAI_TREE_NAME_RAINFOREST                                    :יערות הגש�
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :צמחי קקטוס
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}בחירת תחנת רכבת
@@ -1751,7 +1751,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}חייב
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}קרוב מידי לשדה תעופה �חר
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}חייב לפנות שדה תעופה קוד�
 
-STR_QUERY_RENAME_STATION_CAPTION                                :שנה ש� של תחנה/�זור טעינה
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :שנה ש� של תחנה/�זור טעינה
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}...ל� ניתן לשנות ש� תחנה
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}דירוג
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}מקבל
@@ -1769,10 +1769,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :מדהי�
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}הצג �ת כל הרכבות העוברות דרך תחנה זו
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}הצג �ת כל הרכבי� העוברי� דרך תחנה זו
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}הצג �ת כל כלי הטייס העוברי� דרך תחנה זו
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}הצג �ת כל כלי השייט העוברי� דרך תחנה זו
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}הצג �ת כל הרכבות העוברות דרך תחנה זו
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}הצג �ת כל הרכבי� העוברי� דרך תחנה זו
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}הצג �ת כל כלי הטייס העוברי� דרך תחנה זו
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}הצג �ת כל כלי השייט העוברי� דרך תחנה זו
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{1:STRING} ל� מקבלת יותר {NBSP}{0:STATION}
@@ -1805,47 +1805,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}שנה ×
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}הצג רשימת סוגי המטען שהתחנה מקבלת
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}שמות תחנות -לחץ על הש� כדי להתמקד בתחנה
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}בחר �ת גודל/סוג שדה התעופה
-STR_STATION_SIGN                                                :{1:STATIONFEATURES}{0:STATION}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :תחנת רכבת
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :סככת מטוסי�
-STR_STATION_DESCRIPTION_AIRPORT                                 :שדה תעופה
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :�זור טעינה למש�יות
-STR_STATION_DESCRIPTION_BUS_STATION                             :תחנת �וטובוס
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :מזח
+STR_VIEWPORT_STATION                                            :{1:STATIONFEATURES}{0:STATION}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :תחנת רכבת
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :סככת מטוסי�
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :שדה תעופה
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :�זור טעינה למש�יות
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :תחנת �וטובוס
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :מזח
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}הדגש �ת השטח המכוסה ע"י התחנה
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}בטל הדגשת השטח המכוסה ע"י התחנה
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}הדגשת שטח הכיסוי
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}מזח
-STR_STATION_DESCRIPTION_BUOY                                    :מצוף
+STR_LAI_STATION_DESCRIPTION_BUOY                                :מצוף
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...מצוף חוס� �ת הדרך
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...פריסת התחנה חורגת מהמותר
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...תחנות הטרוגניות �סורות
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}לחץ והחזק מקש קונטרל כדי לבחור יותר מפריט �חד
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...תחנות הטרוגניות �סורות
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}לחץ והחזק מקש קונטרל כדי לבחור יותר מפריט �חד
 
 STR_UNDEFINED                                                   :(מחרוזת ל� ידועה)
-STR_STAT_CLASS_DFLT                                             :תחנת בחירת מחדל
-STR_STAT_CLASS_WAYP                                             :נקודות דרך
+STR_STATION_CLASS_DFLT                                          :תחנת בחירת מחדל
+STR_STATION_CLASS_WAYP                                          :נקודות דרך
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}כיוון המבדוק
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...חייב להיבנות על מי�
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE} ...ל� ניתן לבנות כ�ן מבדוק
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}בחר �ת כיוון המבדוק
-STR_WATER_DESCRIPTION_WATER                                     :מי�
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :חוף �ו גדה
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :מבדוק
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :�קוודוקט
+STR_LAI_WATER_DESCRIPTION_WATER                                 :מי�
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :חוף �ו גדה
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :מבדוק
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :�קוודוקט
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...ל� ניתן לבנות על מי�
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}חובה למחוק �ת התעלה קוד�
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}חובה למחוק �ת התעלה קוד�
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}שמור משחק
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}טען משחק
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}שמור
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}מחק
-STR_DEFAULT_SAVEGAME_NAME                                       :{1:STRING} ,{0:COMPANY}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :{SKIP}{STRING},צופה
+STR_SAVEGAME_NAME_DEFAULT                                       :{1:STRING} ,{0:COMPANY}
+STR_SAVEGAME_NAME_SPECTATOR                                     :{SKIP}{STRING},צופה
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}בתי� פנויי� {BYTES}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}ל� ניתן לקרו� מהדיסק
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}שמירת המשחק נכשלה{}{STRING}
@@ -1861,12 +1861,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}רשימ
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}הש� שנבחר לשמירה
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}מחק �ת קובץ השמירה שנבחר
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}שמור �ת המשחק הנוכחי ע� הש� שנבחר
-STR_NETWORK_SERVER_RANDOM_GAME                                  :צור משחק �קר�י חדש
-STR_LOAD_HEIGHTMAP                                              :{WHITE}טען מפת גובה
-STR_SAVE_OSKTITLE                                               :{BLACK}הכנס ש� לשמירה
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :צור משחק �קר�י חדש
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}טען מפת גובה
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}הכנס ש� לשמירה
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}חוס� �ת הדרך {STRING}
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}חוס� �ת הדרך {STRING}
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :מכרה פח�
 STR_INDUSTRY_NAME_POWER_STATION                                 :תחנת חשמל
@@ -1924,7 +1924,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{BLACK}(הוב×
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}מקד �ת התצוגה הר�שית על התעשיה
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}! {1:TOWN} חדש/ה בבניה בסמוך ל {NBSP}{0:STRING}
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}! {1:TOWN} חדש/ה ננטע בסמוך ל {NBSP}{0:STRING}
-STR_INDUSTRY_BUILD_COST                                         :{YELLOW}{CURRENCY}{BLACK} :מחיר
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{YELLOW}{CURRENCY}{BLACK} :מחיר
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}ל� ניתן לבנות כ�ן תעשיה מסוג זה
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...יער יכול להנטע רק מעל קו השלג
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}!הכריז/ה על סגירה בקרוב {STRING}
@@ -1942,16 +1942,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}מנהרה �חרת מפריעה
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE} התעלה תסתיי� מחוץ למפה
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE} התעלה תסתיי� מחוץ למפה
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}ל� ניתן היה לפנות �ת השטח בקצה השני של המנהרה
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}חובה קוד� לבטל �ת המנהרה
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}חוברה קוד� לפרק �ת הגשר
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}ל� ניתן להתחיל ולסיי� ב�ותה הנקודה
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE} צדדי הגשר ל� ב�ותו הגובה
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}הגשר נמוך מידי  עבור השטח
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}ל� ניתן להתחיל ולסיי� ב�ותה הנקודה
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE} צדדי הגשר ל� ב�ותו הגובה
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}הגשר נמוך מידי  עבור השטח
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}התחלה וסיו� חייבי� להיות ב�ותו הקו
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}�זור ל� מת�י� לכניסה למנהרה
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :גשר תלוי, ברזל
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :גשר קורות, ברזל
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :גשר זיז, פלדה
@@ -1962,30 +1962,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :צינורי, ×
 STR_BRIDGE_TUBULAR_SILICON                                      :צינורי, סיליקון
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE} ...ל� ניתן לבנות גשר ב�תר זה
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}...ל� ניתן לבנות מנהרה ב�תר זה
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :מנהרה למעבר רכבות
-STR_TUNNEL_DESCRIPTION_ROAD                                     :מנהרה למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :גשר פלדה תלוי למעבר רכבות
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :גשר קורות פלדה למעבר רכבות
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :גשר זיז מפלדה למעבר רכבות
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :גשר תלוי מבטון מזויין למעבר רכבות
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :גשר עץ למעבר רכבות
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :גשר בטון למעבר רכבות
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :גשר פלדה תלוי למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :גשר קורות פלדה למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :גשר זיז מפלדה למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :גשר תלוי מבטון מזויין למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :גשר עץ למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :גשר בטון למעבר רכבי�
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :גשר צינורי למעבר רכבות
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :גשר צינורי למעבר רכבי�
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :מנהרה למעבר רכבות
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :מנהרה למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :גשר פלדה תלוי למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :גשר קורות פלדה למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :גשר זיז מפלדה למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :גשר תלוי מבטון מזויין למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :גשר עץ למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :גשר בטון למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :גשר פלדה תלוי למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :גשר קורות פלדה למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :גשר זיז מפלדה למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :גשר תלוי מבטון מזויין למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :גשר עץ למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :גשר בטון למעבר רכבי�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :גשר צינורי למעבר רכבות
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :גשר צינורי למעבר רכבי�
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}עצ� חוס� �ת הדרך
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :�נטנה
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :מיגדלור
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :מטה החברה
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :�נטנה
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :מיגדלור
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :מטה החברה
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...מטה חברה חוס� �ת הדרך
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :שטח בבעלות חברה
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :שטח בבעלות חברה
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}...ל� ניתן לקנות שטח זה
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}!!!שטח זה כבר בבעלותך
 
@@ -2031,7 +2031,7 @@ STR_SV_STNAME_FALLBACK                                          :{0:STRING}  ב
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}דרגת קושי
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}שמירה
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}שמירה
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}קל
@@ -2104,8 +2104,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}:הגדר
 STR_LIVERY_CAPTION                                              :{WHITE}הגדרות צבע חדשות
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}ש� החברה
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}ש� המנהל
-STR_QUERY_COMPANY_NAME_CAPTION                                  :ש� החברה
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :ש� המנהל
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :ש� החברה
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :ש� המנהל
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}... ל� ניתן לשנות �ת ש� החברה
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}... ל� ניתן לשנות �ת ש� המנהל
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} נתוני� כלכליי� {BLACK}{COMPANYNUM}
@@ -2129,11 +2129,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}:סה�כ
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}גרף הכנסות
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}גרף רווח תפעולי
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}חשבון הבנק
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}הלוו�ה
-STR_MAX_LOAN                                                    :{BLACK}{CURRENCY}{WHITE} : הלוו�ה מירבית
+STR_FINANCES_MAX_LOAN                                           :{BLACK}{CURRENCY}{WHITE} : הלוו�ה מירבית
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{SKIP}{SKIP}{CURRENCY} {BLACK}לווה
 STR_FINANCES_REPAY_BUTTON                                       :{SKIP}{SKIP}{CURRENCY} {BLACK}החזר
@@ -2142,7 +2142,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}ל×� × ×
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...ההלוו�ה כבר הוחזרה במלו�ה
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} דרושי�
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}...ל� ניתן להחזיר �ת ההלוו�ה
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}...ל� ניתן למסור כסף שנלווה מהבנק
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}...ל� ניתן למסור כסף שנלווה מהבנק
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}בחר פני� חדשות למנהל
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}שנה �ת צבעי כלי הרכב שבבעלות החברה
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}שנה �ת ש� המנהל
@@ -2152,10 +2152,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}החזר
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(מנהל)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{WHITE}{NUM} {GOLD} :שנת הקמה
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD} :כלי רכב
-STR_TRAINS                                                      :{WHITE}רכבות {COMMA}
-STR_ROAD_VEHICLES                                               :{WHITE}רכבי� {COMMA}
-STR_AIRCRAFT                                                    :{WHITE}מטוסי� {COMMA}
-STR_SHIPS                                                       :{WHITE}כלי שייט {COMMA}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}רכבות {COMMA}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}רכבי� {COMMA}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}מטוסי� {COMMA}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}כלי שייט {COMMA}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}�ין
 STR_FACE_CAPTION                                                :{WHITE}בחירת תווי פני�
 STR_FACE_MALE_BUTTON                                            :{BLACK}גבר
@@ -2169,7 +2169,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}צור ×
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}הצג מפתחות לגרפי�
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}מפתחות להשוו�ה בין החברות
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}לחץ כ�ן בכדי להוסיף/להסיר �ת החברה מהגרף
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}לחץ כ�ן בכדי להוסיף/להסיר �ת החברה מהגרף
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}יחידות מטען ששונעו
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}(מדד הביצועי� (הציון המירבי = 1000
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}שווי החברות
@@ -2203,23 +2203,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :נשי�
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :טייקון
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}בנה בניין מטה
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}בנה/צפה במטה החברה
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}מק� מחדש �ת מטה החברה תמורת 1% משווי החברה
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}מק� מחדש �ת מטה החברה תמורת 1% משווי החברה
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}ל� ניתן לבנות �ת מטה החברה ב�תר זה
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}צפה במטה
-STR_RELOCATE_HQ                                                 :{BLACK}שנה מיקו� המטה
-STR_COMPANY_JOIN                                                :{BLACK}הצטרף
-STR_COMPANY_JOIN_TIP                                            :{BLACK}הצטרף ושחק כשותף בחברה
-STR_COMPANY_PASSWORD                                            :{BLACK}ססמה
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}הגן על חברתך בסיסמה בכדי למנוע הצטרפות בלתי-מורשי�
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}קבע סיסמה לחברה
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}שנה מיקו� המטה
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}הצטרף
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}הצטרף ושחק כשותף בחברה
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}ססמה
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}הגן על חברתך בסיסמה בכדי למנוע הצטרפות בלתי-מורשי�
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}קבע סיסמה לחברה
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}בטל שמירת הסיסמה החדשה
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}שמור �ת הסיסמה החדשה
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}סיסמת החברה
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}ברירת המחדל לסיסמה
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}השתמש בסיסמה זו כברירת מחדל עבור חברות חדשות
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}ברירת המחדל לסיסמה
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}השתמש בסיסמה זו כברירת מחדל עבור חברות חדשות
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}!מיתון עולמי {NBSP}{} כלכלני� בכירי� צופי� שחורות בעת שהכלכלה העולמית הולכת וקורסת
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}!המיתון מ�חורינו {NBSP}{} עליה במכירות משפיעה לטובה על כל החברות
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}החלף בין גודל חלון קטן/גדול
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}החלף בין גודל חלון קטן/גדול
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}{CURRENCY}{WHITE} :שווי החברה
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}קנה 25% ממניות החברה
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}מכור 25% ממניות החברה שברשותך
@@ -2229,7 +2229,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE} �ין
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}�ין ב�פשרותך למכור 25% ממניות חברה זו
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({1:COMPANY} נמצ�י� בבעלות{NBSP} {0:COMMA}%)
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}!{STRING} רכשה �ת {STRING}
-STR_PROTECTED                                                   :{WHITE}חברה זו צעירה מידי ו�ינה יכולה לסחור במניותיה
+STR_ERROR_PROTECTED                                             :{WHITE}חברה זו צעירה מידי ו�ינה יכולה לסחור במניותיה
 
 STR_LIVERY_DEFAULT                                              :צבע כללי
 STR_LIVERY_STEAM                                                :קטר קיטור
@@ -2255,14 +2255,14 @@ STR_LIVERY_LARGE_PLANE                                          :מטוס גדו
 STR_LIVERY_PASSENGER_TRAM                                       :חשמלית נוסעי�
 STR_LIVERY_FREIGHT_TRAM                                         :חשמלית מש�
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}הצג הגדרות צבע כלליות
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}הצג הגדרות צבע לרכבות
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}הצג הגדרות צבע לרכבי�
-STR_LIVERY_SHIP_TIP                                             :{BLACK}הצג הגדרות צבע לכלי שייט
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}הצג הגדרות צבע לכלי טייס
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}בחר צבע עיקרי להגדרת צבעי� זו
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}בחר צבע מישני להגדרת צבעי� זו
-STR_LIVERY_PANEL_TIP                                            :{BLACK} .CTRL+click בחר הגדרת צבע שברצונך לערוך �ו מספר הגדרות ע"י
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}הצג הגדרות צבע כלליות
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}הצג הגדרות צבע לרכבות
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}הצג הגדרות צבע לרכבי�
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}הצג הגדרות צבע לכלי שייט
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}הצג הגדרות צבע לכלי טייס
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}בחר צבע עיקרי להגדרת צבעי� זו
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}בחר צבע מישני להגדרת צבעי� זו
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK} .CTRL+click בחר הגדרת צבע שברצונך לערוך �ו מספר הגדרות ע"י
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :(קירבי-פ�ול' (קיטור'
@@ -2567,9 +2567,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(×�ל תפרו×
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}שנה �ת דפוס העצירה ביעד שנבחר
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}שנה �ת דפוס ההעמסה ביעד שנבחר
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}שנה �ת דפוס הפריקה ביעד שנבחר
-STR_GO_TO_STATION                                               :{2:STRING} {1:STATION} {0:STRING}
+STR_ORDER_GO_TO_STATION                                         :{2:STRING} {1:STATION} {0:STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}הכנס יעד מורכב
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}הכנס יעד מורכב
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :עבור דרך המוסך הקרוב
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :עבור דרך סככת המטוסי� הקרובה
 STR_ORDER_NEAREST_DEPOT                                         :הקרוב
@@ -2579,9 +2579,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :טיפול לל
 STR_ORDER_TRAIN_DEPOT                                           :מוסך רכבות
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :מוסך רכבי�
 STR_ORDER_SHIP_DEPOT                                            :מבדוק ספינות
-STR_GO_TO_DEPOT                                                 :{2:STRING} {1:TOWN} {0:STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{2:STRING} {1:STRING} {0:STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} סככת המטוסי� ב
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{2:STRING} {1:TOWN} {0:STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{2:STRING} {1:STRING} {0:STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} סככת המטוסי� ב
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :עבור תמיד דרך
 STR_ORDER_DROP_SERVICE_DEPOT                                    :טפל במידת הצורך
@@ -2606,10 +2606,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :גדול מ
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :גדול �ו שווה
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :�מת
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :שקר
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :{COMMA} :דלג ליעד
-STR_CONDITIONAL_NUM                                             :{3:COMMA} {2:STRING} {1:STRING} כ�שר {NBSP}{0:COMMA}{NBSP} דלג ליעד
-STR_CONDITIONAL_TRUE_FALSE                                      :{2:STRING} {1:STRING} כ�שר {NBSP}{0:COMMA} דלג ליעד
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :{COMMA} :דלג ליעד
+STR_ORDER_CONDITIONAL_NUM                                       :{3:COMMA} {2:STRING} {1:STRING} כ�שר {NBSP}{0:COMMA}{NBSP} דלג ליעד
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :{2:STRING} {1:STRING} כ�שר {NBSP}{0:COMMA} דלג ליעד
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}לל�  מסע
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}(מסע (לל� לוח זמני�
@@ -2632,18 +2632,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}ניתן
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}דלג
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}מחק
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}עבור �ל
-STR_REFIT                                                       :{BLACK}הת�� מחדש
-STR_REFIT_TIP                                                   :{BLACK}בחר �ת סוג המיטען �ליו יות�� הכלי ביעד זה
-STR_REFIT_ORDER                                                 :({STRING} הת�� לנשי�ת)
-STR_REFIT_STOP_ORDER                                            :(ועצור {STRING} הת�� לנשי�ת)
-STR_STOP_ORDER                                                  :(עצור)
-STR_TIMETABLE_VIEW                                              :{BLACK}לוח זמני�
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}עבור להצגת לוח זמני�
-STR_ORDER_VIEW                                                  :{BLACK}יעדי�
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}עבור להצגת יעדי�
+STR_ORDER_REFIT                                                 :{BLACK}הת�� מחדש
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}בחר �ת סוג המיטען �ליו יות�� הכלי ביעד זה
+STR_ORDER_REFIT_ORDER                                           :({STRING} הת�� לנשי�ת)
+STR_ORDER_REFIT_STOP_ORDER                                      :(ועצור {STRING} הת�� לנשי�ת)
+STR_ORDER_STOP_ORDER                                            :(עצור)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}לוח זמני�
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}עבור להצגת לוח זמני�
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}יעדי�
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}עבור להצגת יעדי�
 STR_ORDERS_CAPTION                                              :{WHITE} (יעדי�) {VEHICLE}
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - סוף רשימת היעדי� - -
-STR_SERVICE                                                     :{BLACK}טיפול
+STR_ORDER_SERVICE                                               :{BLACK}טיפול
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{2:CURRENCY}{BLACK}  :ערך {LTBLUE}{1:NUM}{BLACK}  :נבנה {LTBLUE}{0:ENGINE}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{1:CURRENCY}{BLACK} :שווי {LTBLUE}{0:ENGINE}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2663,7 +2663,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE} הכל×
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE} הכלי �ינו מסוגל להגיע לתחנה זו
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}...ל� ניתן להזיז �ת כלי הרכב
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}הקטר ה�חורי עוקב תמיד �חר הקטר הקידמי
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}ל� מוצ� נתיב למוסך מקומי
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{LTBLUE}{1:DATE_LONG} :טיפול �חרוןֿ {BLACK}{LTBLUE}{0:COMMA}% {BLACK} :מרווח בין טיפולי�
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{LTBLUE}{1:DATE_LONG} :טיפול �חרוןֿ {BLACK}{LTBLUE}{0:COMMA}% {BLACK} :מרווח בין טיפולי�
@@ -2683,8 +2683,8 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}לוח ×
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}שנה �ת פרק הזמן לשהייה ביעד שנבחר
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}�פס �ת פרק הזמן לשהייה ביעד שנבחר
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}�פס �ת מונה ה�יחורי� על מנת ל�פשר לכלי להגיע בזמן
-STR_SERVICE_HINT                                                :{BLACK}דלג על היעד שנבחר �ל� �� הכלי זקוק לטיפול
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}{1:WEIGHT_S} :משקל  {NBSP}{0:CURRENCY}  :מחיר {}  {NBSP}{3:POWER} :עצמת מנוע   {NBSP}{2:VELOCITY} :מהירות {NBSP}{}{5:CARGO} : קיבולת {NBSP} לשנה  {NBSP}{4:CURRENCY} :עלות תפעולית
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}דלג על היעד שנבחר �ל� �� הכלי זקוק לטיפול
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}{1:WEIGHT_S} :משקל  {NBSP}{0:CURRENCY}  :מחיר {}  {NBSP}{3:POWER} :עצמת מנוע   {NBSP}{2:VELOCITY} :מהירות {NBSP}{}{5:CARGO} : קיבולת {NBSP} לשנה  {NBSP}{4:CURRENCY} :עלות תפעולית
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}נעצרה
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}ל� ניתן להכריח �ת הרכבת לעבור ברמזור בעת סכנה
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}!התרסק/הֿ
@@ -2692,27 +2692,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}!התרס×
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK} !התנגשות רכבות {}{NBSP} נספו בפיצוץ כתוצ�ה מהת�ונה {COMMA}
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}ל� ניתן לשנות �ת כיוון  הנסיעה של הרכבת
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}.ל� ניתן לסובב כלי רכב מורכבי�
-STR_CLEAR_TIME                                                  :{BLACK}�פס זמן
-STR_RESET_LATENESS                                              :{BLACK}�פס מונה �יחורי�
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}שנה ש� נקודת ציון
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}�פס זמן
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}�פס מונה �יחורי�
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}שנה ש� נקודת ציון
 
-STR_TRAIN_STOPPING                                              :{RED}עוצרת
-STR_TRAIN_STOPPING_VEL                                          :{RED}{VELOCITY} ,עוצרת
-STR_INCOMPATIBLE_RAIL_TYPES                                     :סוג הפסי� �ינו מת�י�
-STR_TRAIN_NO_POWER                                              :{RED}סוג מסילה ל� מת�י� לרכבת זו
-STR_TRAIN_START_NO_CATENARY                                     :סוג מסילה ל� מת�י� לרכבת זו
-STR_TRAIN_STUCK                                                 :{ORANGE}...ממתינה לנתיב פנוי
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}עוצרת
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}{VELOCITY} ,עוצרת
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :סוג הפסי� �ינו מת�י�
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}סוג מסילה ל� מת�י� לרכבת זו
+STR_ERROR_TRAIN_START_NO_CATENARY                               :סוג מסילה ל� מת�י� לרכבת זו
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}...ממתינה לנתיב פנוי
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}!חדש זמין {STRING}
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}! חדש זמין כעת {STRING}  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}...הכלי הושמד, ל� ניתן למכרו
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}... הכלי הושמד, ל� ניתן להת�ימו
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}...הכלי הושמד, ל� ניתן למכרו
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}... הכלי הושמד, ל� ניתן להת�ימו
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE} ל� ניתן ליצור לוח זמני� עבור רכב זה
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}.כלי תעבורה יכולי� להמתין בתחנות בלבד
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}הכלי �ינו עובר ביעד זה
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE} ל� ניתן ליצור לוח זמני� עבור רכב זה
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}.כלי תעבורה יכולי� להמתין בתחנות בלבד
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}הכלי �ינו עובר ביעד זה
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}שנה זמן
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}כלי זה פועל לפי לוח זמני�
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}{STRING} רכב זה מ�חר ב
@@ -2726,7 +2726,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK} מל�
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...חייב לעצור בתוך מוסך לכלי רכב
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}ל� ניתן ל�תר מוסך כלי רכב מקומי
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}הכרח �ת כלי הרכב להסתובב
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK} :קיבולת {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK} :קיבולת {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{0:ENGINE}{1:STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK} {1:STRING} כלי�  {NBSP}{0:NUM}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2752,11 +2752,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}מק� מצוף שיכול לשמש כנקודת ציון לכלי שייט
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}ל� ניתן למק� מצוף במשבצת זו
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}בנה �קוודוקט
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}...ל� ניתן לבנות �קוודוקט ב�תר זה
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}...ל� ניתן לבנות �קוודוקט ב�תר זה
 STR_REFIT_CAPTION                                               :{WHITE}(הת��) {VEHICLE}
 STR_REFIT_TITLE                                                 :{GOLD}בחר �ת סוג המטען עבור כלי שייט זה
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{GOLD}{1:CURRENCY}{BLACK} :עלות ההת�מה {}{GOLD}{0:CARGO}{BLACK} :קיבולת
-STR_REFITTABLE                                                  :(ניתן להת�מה)
+STR_PURCHASE_INFO_REFITTABLE                                    :(ניתן להת�מה)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}שדות תעופה
@@ -2769,7 +2769,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}בנה ×
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}!{STATION} התושבי� חוגגי�... {}מטוס ר�שון הגיע ל
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK} !התרסקות מטוס {}{NBSP}{1:STATION} נספו בפיצוץ בשדה התעופה {NBSP}{0:COMMA}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}!התרסקות מטוס{} {NBSP}נספו בפיצוץ {COMMA} ,הדלק �זל במהלך הטיסה
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE} (לוח זמני�){VEHICLE}
 
@@ -2782,13 +2782,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK} רק שרידי פח� נותרו למזכרת !{TOWN} פיצוץ עז במכרה הפח� סמוך ל
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}נעדרי�,חשש גדול לחייה� {COMMA} מבול ! שיטפון ! לפחות
 
-STR_BRIBE_FAILED                                                :{WHITE}ניסיונך לשחד �ת הרשות המקומית
-STR_BRIBE_FAILED_2                                              :{WHITE}נחשף ע"י מבקר המדינה
-STR_BUILD_DATE                                                  :{LTBLUE}{DATE_LONG}{BLACK} : ת�ריך בניה
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}ניסיונך לשחד �ת הרשות המקומית
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}נחשף ע"י מבקר המדינה
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{LTBLUE}{DATE_LONG}{BLACK} : ת�ריך בניה
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}{LTBLUE}{STRING}: �ופי התחנה
-STR_TILEDESC_STATION_TYPE                                       :{BLACK} {LTBLUE}{STRING}: סוג התחנה
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}{LTBLUE}{STRING}: שדרוג גר�פי
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}{LTBLUE}{STRING}: �ופי התחנה
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK} {LTBLUE}{STRING}: סוג התחנה
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}{LTBLUE}{STRING}: שדרוג גר�פי
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}ניתוח ביצועי� מפורט
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}סעיף
@@ -2808,27 +2808,27 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}: מ�ז
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK} : הלוו�ה
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}: סה"כ
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}מספר כלי תחבורה לרבות רכבי�,כלי טייס, כלי שייט ורכבות
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}מספר התחנות לרבות תחנות המחוברות זו לזו
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}(הרווח התפעולי של כלי התעבורה בעל ההכנסה הנמוכה ביותר (רק כלי� בני שנתיי� ויותר נלקחי� בחשבון
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}כמות הכסף שהרוויחה החברה בחודש הגרוע ביותר ב -12 הריבעוני� ה�חרוני�
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}כמות הכסף שהרוויחה החברה בחודש המוצלח ביותר ב -12 הריבעוני� ה�חרוני�
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}מספר יחידות המטען ששונעו ב�רבעת הריבעוני� ה�רוני�
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}מספר יחידות המטען ששונעו בריבעון ה�חרון
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}מ�זן חשבון הבנק של החברה
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}גודל ההלוו�ה שלקחה החברה
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}סה"כ נקודות מתוך 1000 נקודות �פשריות
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}מספר כלי תחבורה לרבות רכבי�,כלי טייס, כלי שייט ורכבות
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}מספר התחנות לרבות תחנות המחוברות זו לזו
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}(הרווח התפעולי של כלי התעבורה בעל ההכנסה הנמוכה ביותר (רק כלי� בני שנתיי� ויותר נלקחי� בחשבון
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}כמות הכסף שהרוויחה החברה בחודש הגרוע ביותר ב -12 הריבעוני� ה�חרוני�
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}כמות הכסף שהרוויחה החברה בחודש המוצלח ביותר ב -12 הריבעוני� ה�חרוני�
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}מספר יחידות המטען ששונעו ב�רבעת הריבעוני� ה�רוני�
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}מספר יחידות המטען ששונעו בריבעון ה�חרון
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}מ�זן חשבון הבנק של החברה
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}גודל ההלוו�ה שלקחה החברה
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}סה"כ נקודות מתוך 1000 נקודות �פשריות
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}(NewGRF)הגדרות שדרוג גר�פי
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}(NewGRF)הגדרות שדרוג גר�פי
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}החל הגדרות
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}החלף פלטת צבעי�
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}מחליף �ת פלטת הצבעי� עבור קובץ השדרוג הגר�פי שנבחר. השתמש ב�פשרות זו �� הצבעי� שהתקבלו �ינ� די ברורי�
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}קבע ערכי�
-STR_NEWGRF_FILENAME                                             :{SILVER}{STRING}{BLACK}: ש� קובץ
-STR_NEWGRF_PALETTE                                              :{SILVER}{STRING}{BLACK}: פלטת צבעי�
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}החל הגדרות
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}החלף פלטת צבעי�
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}מחליף �ת פלטת הצבעי� עבור קובץ השדרוג הגר�פי שנבחר. השתמש ב�פשרות זו �� הצבעי� שהתקבלו �ינ� די ברורי�
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}קבע ערכי�
+STR_NEWGRF_SETTINGS_FILENAME                                    :{SILVER}{STRING}{BLACK}: ש� קובץ
+STR_NEWGRF_SETTINGS_PALETTE                                     :{SILVER}{STRING}{BLACK}: פלטת צבעי�
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}?הנך עומד לשנות �ת הגר�פיקה תוך כדי משחק. פעולה זו עשויה לגרו� לקריסה של התוכנה. ה�� ברצונך להמשיך
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2851,34 +2851,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contains a corrupt sprite. All corrupt sprites will be shown as a red question mark (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}טען סביבה גר�פית
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}שמור סביבה גר�פית
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}שמור �ת הרשימה הנוכחית כהגדרת סביבה גר�פית
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}תן ש� לסביבה
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}מחק סביבה גר�פית
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}מוחק �ת הסביבה הגר�פית שנבחרה
-STR_NEWGRF_ADD                                                  :{BLACK}הוסף
-STR_NEWGRF_ADD_TIP                                              :{BLACK}מוסיף קובץ שדרוג גר�פי חדשה לרשימה
-STR_NEWGRF_REMOVE                                               :{BLACK}הסר
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}מסיר �ת הקובץ שנבחר מהרשימה
-STR_NEWGRF_MOVEUP                                               :{BLACK}העבר למעלה
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}מעביר �ת הקובץ שנבחר כלפי מעלה ברשימה
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}העבר למטה
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}מעביר �ת הקובץ שנבחר כלפי מטה ברשימה
-STR_NEWGRF_FILE_TIP                                             :{BLACK} רשימת קבצי שדרוג גר�פי מותקני�
-STR_NEWGRF_PARAMETER                                            :{SILVER}{STRING}{BLACK} :פרמטריֿ�
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}הכנס פרמטרי�
-STR_NEWGRF_NO_INFO                                              :{BLACK}ל� קיי� מידע
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}טען סביבה גר�פית
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}שמור סביבה גר�פית
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}שמור �ת הרשימה הנוכחית כהגדרת סביבה גר�פית
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}תן ש� לסביבה
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}מחק סביבה גר�פית
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}מוחק �ת הסביבה הגר�פית שנבחרה
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}הוסף
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}מוסיף קובץ שדרוג גר�פי חדשה לרשימה
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}הסר
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}מסיר �ת הקובץ שנבחר מהרשימה
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}העבר למעלה
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}מעביר �ת הקובץ שנבחר כלפי מעלה ברשימה
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}העבר למטה
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}מעביר �ת הקובץ שנבחר כלפי מטה ברשימה
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK} רשימת קבצי שדרוג גר�פי מותקני�
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{SILVER}{STRING}{BLACK} :פרמטריֿ�
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}הכנס פרמטרי�
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}ל� קיי� מידע
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}קבצי שדרוג גר�פי זמיני�
 STR_NEWGRF_ADD_FILE                                             :{BLACK}הוסף לבחירה
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}מוסיף �ת הקובץ שנבחר לרשימה
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}רענן רשימת קבצי�
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}מרענן �ת רשימת הקבצי� הזמיני�
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}מוסיף �ת הקובץ שנבחר לרשימה
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}רענן רשימת קבצי�
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}מרענן �ת רשימת הקבצי� הזמיני�
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Can't add file: duplicate GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}ל� נמצ� קובץ מת�י�
-STR_NEWGRF_DISABLED                                             :{RED}מושתק
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}ל� נמצ� קובץ מת�י�
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}מושתק
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}הקובץ ל� נמצ�, הוטען קובץ תו��
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}קבצי� תו�מי� נטענו במקו� קבצי� חסרי�
@@ -2891,7 +2891,7 @@ STR_NEWGRF_BROKEN_VEHICLE_LENGTH                                :{WHITE}It chang
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Train '{VEHICLE}' belonging to '{COMPANY}' has invalid length. It is probably caused by problems with NewGRFs. Game may desync or crash.
 
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Game was saved in version without tram support. All trams have been removed.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Game was saved in version without tram support. All trams have been removed.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}מטבע מות�� �ישית
 STR_CURRENCY_EXCHANGE_RATE                                      :{ORANGE}{0:CURRENCY} =£{1:COMMA} {LTBLUE} :שער חליפין
@@ -2899,7 +2899,7 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{ORANGE} לל� {LTBLUE} :החלפה ליורו
 STR_CURRENCY_PREVIEW                                            :{ORANGE}{6:CURRENCY}{LTBLUE} :צפיה מקדימה
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}שנה פרמטר עבור מטבע מות�� �ישית
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 ליש"ט (£) במטבע שלך
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 ליש"ט (£) במטבע שלך
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2918,8 +2918,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}כלי ×
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}כלי שייט {NBSP}{1:COMMA} - {0:STRING}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               ::{WHITE}כלי טייס {NBSP}{1:COMMA} - {0:STRING}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}רכבי� ע� יעדי� מצומדי� {COMMA}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}הצג �ת כל הרכבי� �שר עבור� יעד זה הו� מצומד
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}רכבי� ע� יעדי� מצומדי� {COMMA}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}הצג �ת כל הרכבי� �שר עבור� יעד זה הו� מצומד
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}ממתין/ממתינה במוסך {VEHICLE}
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ממתין במוסך כלי הרכב
@@ -3026,39 +3026,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}הת��
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}הת�� כלי שייט לנשי�ת מטען נתון
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}הת�� כלי טייס לנשי�ת מטען נתון
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} בדרך �ל המוסך ב
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך �ל המוסך ב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} בדרך �ל מוסך הרכבי� ב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE} {1:VELOCITY}  במהירות , {NBSP}{0:TOWN} בדרך �ל מוסך הרכבי� ב
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE} {TOWN} בדרך �ל המבדוק ב
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:TOWN} בדרך �ל המבדוק ב
-STR_HEADING_FOR_HANGAR                                          :{ORANGE} {STATION} בדרך �ל סככת המטוסי� ב
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:STATION} בדרך �ל סככת המטוסי� ב
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} בדרך לטיפול במוסך
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך לטיפול במוסך
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE} {TOWN} טיפול במוסך ב
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE} {1:VELOCITY}  במהירות ,{NBSP} {0:TOWN} טיפול במוסך הרכבי� ב
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} טיפול במבדוק
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:TOWN} טיפול במבדוק
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION} טיפול בסככת המטוסי�
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} טיפול בסככת המטוסי�
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}שכפל רכבת
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}שכפל רכב
-STR_CLONE_SHIP                                                  :{BLACK}שכפל כלי שייט
-STR_CLONE_AIRCRAFT                                              :{BLACK}שכפל כלי טייס
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}.פעולה זו תיצור עותק נוסף של כלי הרכב
-STR_CLONE_SHIP_INFO                                             :{BLACK}פעולה זו תיצור עותק של כלי השייט
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}פעולה זו תיצור עותק של כלי הטייס
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK} .פעולה זו תיצור עותק נוסף של כלי הרכב
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}פעולה זו תיצור עותק של כלי השייט
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}פעולה זו תיצור עותק של כלי הטייס
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}{TOWN} בדרך �ל המוסך ב
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך �ל המוסך ב
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}{TOWN} בדרך �ל מוסך הרכבי� ב
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE} {1:VELOCITY}  במהירות , {NBSP}{0:TOWN} בדרך �ל מוסך הרכבי� ב
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE} {TOWN} בדרך �ל המבדוק ב
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:TOWN} בדרך �ל המבדוק ב
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE} {STATION} בדרך �ל סככת המטוסי� ב
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}{1:VELOCITY} מהירות ,  {NBSP}{0:STATION} בדרך �ל סככת המטוסי� ב
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}{TOWN} בדרך לטיפול במוסך
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}{1:VELOCITY}במהירות {NBSP}{0:TOWN} בדרך לטיפול במוסך
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE} {TOWN} טיפול במוסך ב
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE} {1:VELOCITY}  במהירות ,{NBSP} {0:TOWN} טיפול במוסך הרכבי� ב
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}{TOWN} טיפול במבדוק
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:TOWN} טיפול במבדוק
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}{STATION} טיפול בסככת המטוסי�
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}{1:VELOCITY} מהירות , {NBSP}{0:STATION} טיפול בסככת המטוסי�
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}שכפל רכבת
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}שכפל רכב
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}שכפל כלי שייט
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}שכפל כלי טייס
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}.פעולה זו תיצור עותק נוסף של כלי הרכב
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}פעולה זו תיצור עותק של כלי השייט
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}פעולה זו תיצור עותק של כלי הטייס
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}פעולה זו תיצור עותק נוסף של הרכבת וכל קרונותיה
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK} .פעולה זו תיצור עותק נוסף של כלי הרכב
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}פעולה זו תיצור עותק של כלי השייט
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}פעולה זו תיצור עותק של כלי הטייס
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}רכבות חדשות
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}רכבות חשמליות חדשות
@@ -3128,28 +3128,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}מקד ×
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}?�תה עומד למכור �ת כל כלי הרכב במוסך. להמשיך
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :סוג מוסך שגוי
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :סוג מוסך שגוי
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}מכור �ת כל הרכבות שבמוסך
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}מכור �ת כל כלי הרכב שבמוסך
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}מכור �ת כל כלי השייט שבמבדוק
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}מכור �ת כל כלי הטייס שבסככה
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}מכור �ת כל הרכבות שבמוסך
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}מכור �ת כל כלי הרכב שבמוסך
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}מכור �ת כל כלי השייט שבמבדוק
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}מכור �ת כל כלי הטייס שבסככה
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}מציג �ת רשימת הרכבות העוברות במוסך זה
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}מציג �ת כל הרכבי� העוברי� במוסך זה
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}מציג �ת כל ה�וניות העוברות במבדוק זה
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}מציג �ת כל כלי הטייס העוברי� בסככת המטוסי� בשדה תעופה זה
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}מציג �ת רשימת הרכבות העוברות במוסך זה
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}מציג �ת כל הרכבי� העוברי� במוסך זה
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}מציג �ת כל ה�וניות העוברות במבדוק זה
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}מציג �ת כל כלי הטייס העוברי� בסככת המטוסי� בשדה תעופה זה
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}החלף �וטומטית �ת כל הרכבות שבמוסך
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}החלף �וטומטית �ת כל הרכבי� שבמוסך
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}החלף �וטומטית �ת כל כלי השייט שבמבדוק
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}החלף �וטומ�טית �ת כל כלי הטייס שבסככה
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}החלף �וטומטית �ת כל הרכבות שבמוסך
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}החלף �וטומטית �ת כל הרכבי� שבמוסך
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}החלף �וטומטית �ת כל כלי השייט שבמבדוק
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}החלף �וטומ�טית �ת כל כלי הטייס שבסככה
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} החלף
 STR_REPLACE_VEHICLES_START                                      :{BLACK}החל בהחלפת הכלי�
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}הפסק �ת החלפת הכלי�
-STR_NOT_REPLACING                                               :{BLACK}ל� מחליף
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}ל� נבחר כלי
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}ל� מחליף
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}ל� נבחר כלי
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}בחר �ת סוג המנוע/קטר שברצונך להחליף
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}בחר �ת הקטר/מנוע שברצונך לבנות במקו� הקטר/מנוע הקיי�
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}לחץ כ�ן להפסיק �ת ההחלפה
@@ -3160,26 +3160,26 @@ STR_REPLACE_REMOVE_WAGON                                        :{ORANGE}{SKIP}{
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}הסר קרונות מהסוף על מנת לשמור על ה�ורך המקורי של הרכבת
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{ORANGE}{SKIP}{SKIP}{STRING}{BLACK} : מחליף
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}קטר ל� זמין
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}רכב ל� זמין
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}כלי שייט ל� זמין
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}כלי טייס ל� זמין
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}קטר ל� זמין
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}רכב ל� זמין
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}כלי שייט ל� זמין
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}כלי טייס ל� זמין
 
-STR_ENGINES                                                     :מנועי�/קטרי�
-STR_WAGONS                                                      :קרונות
+STR_REPLACE_ENGINES                                             :מנועי�/קטרי�
+STR_REPLACE_WAGONS                                              :קרונות
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}לחץ כדי לעצור �ת כל הרכבות במוסך
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}לחץ כדי לעצור �ת כל הרכבי� במוסך
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}לחץ כדי לעצור �ת כל כלי השייט במבדוק
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}לחץ כדי לעצור �ת כל כלי הטייס בסככה
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}לחץ כדי לעצור �ת כל הרכבות במוסך
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}לחץ כדי לעצור �ת כל הרכבי� במוסך
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}לחץ כדי לעצור �ת כל כלי השייט במבדוק
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}לחץ כדי לעצור �ת כל כלי הטייס בסככה
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}לחץ כדי לשחרר �ת כל הרכבות מהמוסך
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}לחץ כדי לשחרר �ת כל הרכבי� מהמוסך
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}לחץ כדי לשחרר �ת כל כלי השייט מהמבדוק
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}לחץ כדי לשחרר �ת כל כלי הטייס מהסככה
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}לחץ כדי לשחרר �ת כל הרכבות מהמוסך
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}לחץ כדי לשחרר �ת כל הרכבי� מהמוסך
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}לחץ כדי לשחרר �ת כל כלי השייט מהמבדוק
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}לחץ כדי לשחרר �ת כל כלי הטייס מהסככה
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}לחץ כדי לעצור �ת כל הכלי� ברשימה
-STR_MASS_START_LIST_TIP                                         :{BLACK}לחץ כדי לשחרר �ת כל הכלי� ברשימה
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}לחץ כדי לעצור �ת כל הכלי� ברשימה
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}לחץ כדי לשחרר �ת כל הכלי� ברשימה
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}סימניות {COMMA} - רשימת סימניות
@@ -3188,14 +3188,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :רכבות
-STR_ELRAIL_VEHICLES                                             :רכבות חשמליות
-STR_MONORAIL_VEHICLES                                           :רכבות חד-פס
-STR_MAGLEV_VEHICLES                                             :רכבות פס-מגנטי
+STR_REPLACE_RAIL_VEHICLES                                       :רכבות
+STR_REPLACE_ELRAIL_VEHICLES                                     :רכבות חשמליות
+STR_REPLACE_MONORAIL_VEHICLES                                   :רכבות חד-פס
+STR_REPLACE_MAGLEV_VEHICLES                                     :רכבות פס-מגנטי
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{GOLD}{1:WEIGHT_S}{BLACK} :משקל {GOLD}{0:CURRENCY}{BLACK} :מחיר
 STR_PURCHASE_INFO_SPEED_POWER                                   :{GOLD}{1:POWER}{BLACK} :עוצמת מנוע {GOLD}{0:VELOCITY}{BLACK} :מהירות
@@ -3221,70 +3221,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}יצירת קרקע
-STR_RANDOM                                                      :{BLACK}�קר�ית
-STR_RANDOM_HELP                                                 :{BLACK}בחר מספר �קר�י שישמש בסיס ליצירת הקרקע
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}יצור עול�
-STR_RANDOM_SEED                                                 :{BLACK} :מספר �קר�י
-STR_RANDOM_SEED_HELP                                            :{BLACK}הכנס מספר �קר�י כלשהו�
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}מספר �קר�י
-STR_LAND_GENERATOR                                              :{BLACK} :יצירת קרקע
-STR_TREE_PLACER                                                 :{BLACK}�לגורית� העצי�:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK} :סיבוב מפת הגבהי�
-STR_TERRAIN_TYPE                                                :{BLACK} :סוג הקרקע
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK} :כמות ימי�/�גמי�
-STR_SMOOTHNESS                                                  :{BLACK} :חלקלקות
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}גובה קו השלג
-STR_DATE                                                        :{BLACK} :ת�ריך
-STR_NUMBER_OF_TOWNS                                             :{BLACK} :מספר העיירות
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK} :מספר התעשיות
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}הגבה �ת קו השלג
-STR_SNOW_LINE_DOWN                                              :{BLACK}הנמך �ת קו השלג
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}שנה �ת גובה קו השלג
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}שנה �ת שנת הפתיחה
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}�זהרת קנה מידה
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}?שינוי גדול של גודל המפה המקורית �ינו מומלץ. להמשיך
-STR_HEIGHTMAP_NAME                                              :{BLACK} :ש� מפת הגבהי�
-STR_HEIGHTMAP_SIZE                                              ::{ORANGE}{NUM} x {NUM} {BLACK} :גודל
+STR_MAPGEN_GENERATE                                             :{WHITE}יצירת קרקע
+STR_MAPGEN_RANDOM                                               :{BLACK}�קר�ית
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}בחר מספר �קר�י שישמש בסיס ליצירת הקרקע
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}יצור עול�
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK} :מספר �קר�י
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}הכנס מספר �קר�י כלשהו�
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}מספר �קר�י
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK} :יצירת קרקע
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}�לגורית� העצי�:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK} :סיבוב מפת הגבהי�
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK} :סוג הקרקע
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK} :כמות ימי�/�גמי�
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK} :חלקלקות
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}גובה קו השלג
+STR_MAPGEN_DATE                                                 :{BLACK} :ת�ריך
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK} :מספר העיירות
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK} :מספר התעשיות
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}הגבה �ת קו השלג
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}הנמך �ת קו השלג
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}שנה �ת גובה קו השלג
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}שנה �ת שנת הפתיחה
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}�זהרת קנה מידה
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}?שינוי גדול של גודל המפה המקורית �ינו מומלץ. להמשיך
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK} :ש� מפת הגבהי�
+STR_MAPGEN_HEIGHTMAP_SIZE                                       ::{ORANGE}{NUM} x {NUM} {BLACK} :גודל
 STR_GENERATION_WORLD                                            :{WHITE}... יוצר עול�
 STR_GENERATION_ABORT                                            :{BLACK}הפסק
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}הפסק יצירת עול� חדש
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}?בטוח שברצונך לעצור
-STR_PROGRESS                                                    :{WHITE}{NUM}% :הושל�
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}יצור עול�
-STR_TREE_GENERATION                                             :{BLACK}יצירת עצי�
-STR_UNMOVABLE_GENERATION                                        :{BLACK}יצירת מבני� בלתי ניידי�
-STR_CLEARING_TILES                                              :{BLACK}יצירת �יזורי� סלעיי�
-STR_SETTINGUP_GAME                                              :{BLACK}קביעת הגדרות המשחק
-STR_PREPARING_TILELOOP                                          :{BLACK}מריץ לול�ה על כל המשבצות
-STR_PREPARING_GAME                                              :{BLACK}מכין �ת המשחק לפעולה
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}פעולה זו קבעה רמת קושי מות�מת �ישית
-STR_SE_FLAT_WORLD                                               :{WHITE}קרקע שטוחה
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}צור קרקע שטוחה
-STR_SE_RANDOM_LAND                                              :{WHITE}קרקע �קר�ית
-STR_SE_NEW_WORLD                                                :{BLACK}צור סצנריו חדש
-STR_SE_CAPTION                                                  :{WHITE}סוג הסצנריו
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}הקטן  �ת עומק הקרקע
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}הגדל �ת עומק הקרקע
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}שינוי עומק הקרקע
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK} :עומק הקרקע
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% :הושל�
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}יצור עול�
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}יצירת עצי�
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}יצירת מבני� בלתי ניידי�
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}יצירת �יזורי� סלעיי�
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}קביעת הגדרות המשחק
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}מריץ לול�ה על כל המשבצות
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}מכין �ת המשחק לפעולה
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}פעולה זו קבעה רמת קושי מות�מת �ישית
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}קרקע שטוחה
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}צור קרקע שטוחה
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}קרקע �קר�ית
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}צור סצנריו חדש
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}סוג הסצנריו
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}הקטן  �ת עומק הקרקע
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}הגדל �ת עומק הקרקע
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}שינוי עומק הקרקע
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK} :עומק הקרקע
 
 STR_SMALLMAP_CENTER                                             :{BLACK}מרכז �ת המפה על המיקו� הנוכחי
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}({1:NUM}){0:STRING}
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK} :שולי המפה
-STR_NORTHWEST                                                   :{BLACK}צפון-מערב
-STR_NORTHEAST                                                   :{BLACK}צפון-מזרח
-STR_SOUTHEAST                                                   :{BLACK}דרו� מזרח
-STR_SOUTHWEST                                                   :{BLACK}דרו�-מערב
-STR_BORDER_FREEFORM                                             :{BLACK}יד חופשית
-STR_BORDER_WATER                                                :{BLACK}מי�
-STR_BORDER_RANDOM                                               :{BLACK}�קר�י
-STR_BORDER_RANDOMIZE                                            :{BLACK}�קר�י
-STR_BORDER_MANUAL                                               :{BLACK}ידני
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK} :שולי המפה
+STR_MAPGEN_NORTHWEST                                            :{BLACK}צפון-מערב
+STR_MAPGEN_NORTHEAST                                            :{BLACK}צפון-מזרח
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}דרו� מזרח
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}דרו�-מערב
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}יד חופשית
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}מי�
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}�קר�י
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}�קר�י
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}ידני
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}קטן
@@ -3309,21 +3309,21 @@ STR_MEASURE_AREA                                                :{BLACK}{NUM} x
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}  {NUM}  :�ורך {}   {NBSP}'מ {NUM} :הפרש גובה
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}  {NUM} x {NUM} :שטח {}   {NBSP}'מ {NUM} :הפרש גובה
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...כביש זה בבעלות עירונית
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}הכביש פונה לכיוון ל� נכון...
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}הגדרות שקיפות
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK} שנה שקיפות עבור שלטי תחנות
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}שנה שקיפות עבור עצי�
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}שנה שקיפות עבור בנייני�
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}שנה שקיפות עבור תעשיות
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}שנה שקיפות עבור מבני תחבורה
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}שנה שקיפות עבור גשרי�
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}שנה שקיפות עבור מבני� כגון מיגדלור/�נטנה
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}שנה שקיפות עבור עמודי חשמל
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}שנה שקיפות עבור מצביעי הטענה
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}הסתר במקו� הפוך לשקוף
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...כביש זה בבעלות עירונית
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}הכביש פונה לכיוון ל� נכון...
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}הגדרות שקיפות
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK} שנה שקיפות עבור שלטי תחנות
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}שנה שקיפות עבור עצי�
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}שנה שקיפות עבור בנייני�
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}שנה שקיפות עבור תעשיות
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}שנה שקיפות עבור מבני תחבורה
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}שנה שקיפות עבור גשרי�
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}שנה שקיפות עבור מבני� כגון מיגדלור/�נטנה
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}שנה שקיפות עבור עמודי חשמל
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}שנה שקיפות עבור מצביעי הטענה
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}הסתר במקו� הפוך לשקוף
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3333,7 +3333,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :כל הרכבות
 STR_GROUP_ALL_ROAD_VEHICLES                                     :כל הרכבי�
 STR_GROUP_ALL_SHIPS                                             :כל כלי השייט
@@ -3342,24 +3342,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :רכבות ל�
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :רכבי� ל� משוייכי�
 STR_GROUP_DEFAULT_SHIPS                                         :כלי שייט ל� משוייכי�
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :כלי טייס ל� משוייכי�
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :הוסף כלי�
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :הסר �ת כל הכלי� מהקבוצה
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}שנה ש� קבוצה
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}... ל� ניתן ליצור קבוצה
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}... ל� ניתן למחוק קבוצה זו
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}... ל� ניתן לשנות ש� קבוצה
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}... ל� ניתן למחוק �ת כל הכלי� מקבוצה זו
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}... ל� ניתן להוסיף כלי זה לקבוצה זו
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}... ל� ניתן להוסיף כלי� מצומדי� לרשימה זו
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}... ל� ניתן ליצור קבוצה
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}... ל� ניתן למחוק קבוצה זו
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}... ל� ניתן לשנות ש� קבוצה
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}... ל� ניתן למחוק �ת כל הכלי� מקבוצה זו
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}... ל� ניתן להוסיף כלי זה לקבוצה זו
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}... ל� ניתן להוסיף כלי� מצומדי� לרשימה זו
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}קבוצות כלי� – לחץ על קבוצה לצפייה בכל הכלי� השייכי� �ליה
-STR_GROUP_CREATE_TIP                                            :{BLACK}לחץ ליצירת קבוצה חדשה
-STR_GROUP_DELETE_TIP                                            :{BLACK}מחק �ת הקבוצה שנבחרה
-STR_GROUP_RENAME_TIP                                            :{BLACK}שנה �ת ש� הקבוצה
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}לחץ על מנת להגן על הכלי� בקבוצה בפני החלפה �וטומטית
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}קבוצות כלי� – לחץ על קבוצה לצפייה בכל הכלי� השייכי� �ליה
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}לחץ ליצירת קבוצה חדשה
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}מחק �ת הקבוצה שנבחרה
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}שנה �ת ש� הקבוצה
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}לחץ על מנת להגן על הכלי� בקבוצה בפני החלפה �וטומטית
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3420,35 +3420,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}הש� חייב להיות ייחודי
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}הש� חייב להיות ייחודי
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}עבור לסימניה הב�ה
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}עבור לסימניה הקודמת
-STR_SIGN_OSKTITLE                                               :{BLACK}הכנס ש� סימניה
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}עבור לסימניה הב�ה
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}עבור לסימניה הקודמת
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}הכנס ש� סימניה
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}ממן
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}צפה
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}בנה
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}בחר תעשיה מהרשימה
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}ממן
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}צפה
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}בנה
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}בחר תעשיה מהרשימה
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}מתקד�
-STR_FACE_ADVANCED_TIP                                           :{BLACK}בחירת תוי פני� מתקדמת
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}בחירת תוי פני� מתקדמת
 STR_FACE_SIMPLE                                                 :{BLACK}פשוט
-STR_FACE_SIMPLE_TIP                                             :{BLACK}בחירה בסיסית של תוי פני�
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}בחירה בסיסית של תוי פני�
 STR_FACE_LOAD                                                   :{BLACK}טען
-STR_FACE_LOAD_TIP                                               :{BLACK}טען פני� מקובץ
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}טען פני� מקובץ
 STR_FACE_LOAD_DONE                                              :{WHITE}הפני� החביבות עליך הוטענו מהקובץ
 STR_FACE_FACECODE                                               :{BLACK}תוי פני� מספר
-STR_FACE_FACECODE_TIP                                           :{BLACK}צפה/שנה מספר סידורי של תוי הפני�
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}צפה/שנה מספר סידורי של תוי הפני�
 STR_FACE_FACECODE_CAPTION                                       ::{WHITE}צפה/שנה מספר סידורי של תוי הפני�
 STR_FACE_FACECODE_SET                                           :{WHITE}המפר הסידורי של תוי הפני� הוחלף
 STR_FACE_FACECODE_ERR                                           :{WHITE}?�ל תגזי� – פשוט בחר מספר בין �חד למיליון, טוב
 STR_FACE_SAVE                                                   :{BLACK}שמור
-STR_FACE_SAVE_TIP                                               :{BLACK}שמור �ת הפני� לקובץ
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}שמור �ת הפני� לקובץ
 STR_FACE_SAVE_DONE                                              :{WHITE}פני� �לה ישמרו כהעדפה �ישית שלך בקובץ ההגדרות של המשחק
 STR_FACE_EUROPEAN                                               :{BLACK}�ירופ�י
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}בחר תוי פני� �ירופ�יי�
@@ -3456,51 +3456,51 @@ STR_FACE_AFRICAN                                                :{BLACK}�פרי
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}בחר תוי פני� �פריקניי�
 STR_FACE_YES                                                    :כן
 STR_FACE_NO                                                     :ל�
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}�פשר זקן/עגילי�
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}�פשר זקן/עגילי�
 STR_FACE_HAIR                                                   ::שיער
-STR_FACE_HAIR_TIP                                               :{BLACK}שנה שיער
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}שנה שיער
 STR_FACE_EYEBROWS                                               ::גבות
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}שנה גבות
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}שנה גבות
 STR_FACE_EYECOLOUR                                              ::צבע עיניי�
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}שנה צבע עיניי�
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}שנה צבע עיניי�
 STR_FACE_GLASSES                                                ::משקפיי�
-STR_FACE_GLASSES_TIP                                            :{BLACK}�פשר משקפיי�
-STR_FACE_GLASSES_TIP_2                                          :{BLACK} שנה משקפיי�
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}�פשר משקפיי�
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK} שנה משקפיי�
 STR_FACE_NOSE                                                   :: �ף
-STR_FACE_NOSE_TIP                                               :{BLACK}שנה �ף
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}שנה �ף
 STR_FACE_LIPS                                                   ::שפתיי�
 STR_FACE_MOUSTACHE                                              ::שפ�
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}שנה שפתיי� �ו שפ�
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}שנה שפתיי� �ו שפ�
 STR_FACE_CHIN                                                   ::סנטר
-STR_FACE_CHIN_TIP                                               :{BLACK}שנה סנטר
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}שנה סנטר
 STR_FACE_JACKET                                                 ::חליפה
-STR_FACE_JACKET_TIP                                             :{BLACK}שנה חליפה
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}שנה חליפה
 STR_FACE_COLLAR                                                 ::צוו�רון
-STR_FACE_COLLAR_TIP                                             :{BLACK}שנה צוו�רון
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}שנה צוו�רון
 STR_FACE_TIE                                                    ::עניבה
 STR_FACE_EARRING                                                ::עגילי�
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK} שנה עניבה/עגילי�
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK} שנה עניבה/עגילי�
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}בחירת רמזורי�
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}ל� ניתן להחלף רמזורי�
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}(רמזורי בלוק (מכ�ניי�{NBSP}{}�לו הרמזורי� הפשוטי� ביותר, מ�פשרי� לרכבת �חת בלבד להמצ� בבלוק מסויי� בזמן נתון
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}(רמזורי כניסה (מכ�ניי� {}{NBSP}ירוקי� כל עוד יש לפחות רמזור יצי�ה ירוק הקטע המסילה העוקב. �חרת-�דומי�
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}(רמזורי יצי�ה (מכ�ניי� {}{NBSP} מתנהגי� בדומה לרמזורי הבלוק, �בל מחייבי� שינוי ה�ור ברמזור בעת כניסה
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}(רמזורי� משולבי� (מכ�ניי�){}{NBSP}מתפקדי� כרמזורי כניסה ויצי�ה במשולב, מ�פשרי� יצירת "עצי�" מורכבי� של רמזורי�
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}(רמזורי נתיב (מכ�ניי�{}{NBSP} מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה בטוח
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}(רמזורי נתיב חד-סיטרי (מכ�ניי�{}{NBSP} מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}(רמזורי בלוק (חשמליי�{NBSP}{}�לו הרמזורי� הפשוטי� ביותר, מ�פשרי� לרכבת �חת בלבד להמצ� בבלוק מסויי� בזמן נתון
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}(רמזורי כניסה (חשמליי� {}{NBSP}ירוקי� כל עוד יש לפחות רמזור יצי�ה ירוק הקטע המסילה העוקב. �חרת-�דומי�
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}(רמזורי יצי�ה (חשמליי� {}{NBSP} מתנהגי� בדומה לרמזורי הבלוק, �בל מחייבי� שינוי ה�ור ברמזור בעת כניסה
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}(רמזורי� משולבי� (חשמליי�){}{NBSP}מתפקדי� כרמזורי כניסה ויצי�ה במשולב, מ�פשרי� יצירת "עצי�" מורכבי� של רמזורי�
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}(רמזורי נתיב (חשמליי�{}{NBSP} מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה בטוח
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}(רמזורי נתיב חד-סיטרי (חשמליי�{}{NBSP}מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}החלפת סוג הרמזור – בחר סוג חדש ולחץ על רמזור קיי� להחלפה
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}צפיפות הרמזורי� הנוצרי� בעת גרירה
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}הקטן צפיפות
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}הגדל צפיפות
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}בחירת רמזורי�
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}ל� ניתן להחלף רמזורי�
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}(רמזורי בלוק (מכ�ניי�{NBSP}{}�לו הרמזורי� הפשוטי� ביותר, מ�פשרי� לרכבת �חת בלבד להמצ� בבלוק מסויי� בזמן נתון
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}(רמזורי כניסה (מכ�ניי� {}{NBSP}ירוקי� כל עוד יש לפחות רמזור יצי�ה ירוק הקטע המסילה העוקב. �חרת-�דומי�
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}(רמזורי יצי�ה (מכ�ניי� {}{NBSP} מתנהגי� בדומה לרמזורי הבלוק, �בל מחייבי� שינוי ה�ור ברמזור בעת כניסה
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}(רמזורי� משולבי� (מכ�ניי�){}{NBSP}מתפקדי� כרמזורי כניסה ויצי�ה במשולב, מ�פשרי� יצירת "עצי�" מורכבי� של רמזורי�
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}(רמזורי נתיב (מכ�ניי�{}{NBSP} מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה בטוח
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}(רמזורי נתיב חד-סיטרי (מכ�ניי�{}{NBSP} מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}(רמזורי בלוק (חשמליי�{NBSP}{}�לו הרמזורי� הפשוטי� ביותר, מ�פשרי� לרכבת �חת בלבד להמצ� בבלוק מסויי� בזמן נתון
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}(רמזורי כניסה (חשמליי� {}{NBSP}ירוקי� כל עוד יש לפחות רמזור יצי�ה ירוק הקטע המסילה העוקב. �חרת-�דומי�
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}(רמזורי יצי�ה (חשמליי� {}{NBSP} מתנהגי� בדומה לרמזורי הבלוק, �בל מחייבי� שינוי ה�ור ברמזור בעת כניסה
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}(רמזורי� משולבי� (חשמליי�){}{NBSP}מתפקדי� כרמזורי כניסה ויצי�ה במשולב, מ�פשרי� יצירת "עצי�" מורכבי� של רמזורי�
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}(רמזורי נתיב (חשמליי�{}{NBSP} מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה בטוח
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}(רמזורי נתיב חד-סיטרי (חשמליי�{}{NBSP}מ�פשרי� ליותר מרכבת �חת להכנס ל�ותו הבלוק בו זמנית, כל עוד קיי� נתיב פנוי למקו� עצירה
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}החלפת סוג הרמזור – בחר סוג חדש ולחץ על רמזור קיי� להחלפה
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}צפיפות הרמזורי� הנוצרי� בעת גרירה
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}הקטן צפיפות
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}הגדל צפיפות
 ########
 
 ############ on screen keyboard
@@ -3511,32 +3511,32 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 ############ AI GUI
 STR_INTRO_AI_SETTINGS                                           :{BLACK}הגדרות בינה מל�כותית
 STR_AI_DEBUG                                                    :{WHITE}דה-ב�ג לבינה מל�כותית
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}ש� הבינה המל�כותית
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}ש� הבינה המל�כותית
 STR_AI_DEBUG_RELOAD                                             :{BLACK}טען מחדש בינה מל�כותית
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK} הטען מחדש �ת הסקריפט ו�תחל בינה מל�כותית
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}חלון הדה-ב�ג זמין רק עבור השרת
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK} הטען מחדש �ת הסקריפט ו�תחל בינה מל�כותית
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}חלון הדה-ב�ג זמין רק עבור השרת
 STR_AI_CONFIG_CAPTION                                           :{WHITE}הגדרות בינה מל�כותית
-STR_AI_CHANGE                                                   :{BLACK}בחר בינה מל�כותית
-STR_AI_CONFIGURE                                                :{BLACK}שנה הגדרות
-STR_AI_CHANGE_TIP                                               :{BLACK}טען בינה מל�כותית נוספת
-STR_AI_CONFIGURE_TIP                                            :{BLACK}שנה הגדרות בינה מל�כותית
-STR_AI_LIST_TIP                                                 :{BLACK}כל הבינות המל�כותיות שיוטענו במשחק הב�
+STR_AI_CONFIG_CHANGE                                            :{BLACK}בחר בינה מל�כותית
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}שנה הגדרות
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}טען בינה מל�כותית נוספת
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}שנה הגדרות בינה מל�כותית
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}כל הבינות המל�כותיות שיוטענו במשחק הב�
 STR_AI_LIST_CAPTION                                             :{WHITE}בינות מל�כותיות זמינות
-STR_AI_AILIST_TIP                                               :{BLACK} לחץ לבחירת בינה מל�כותית
-STR_AI_ACCEPT                                                   :{BLACK}�שר
-STR_AI_ACCEPT_TIP                                               :{BLACK} בחר סוג בינה מל�כותית שהודגש
-STR_AI_CANCEL                                                   :{BLACK}בטל
-STR_AI_CANCEL_TIP                                               :{BLACK}�ל תשנה בינה מל�כותית
-STR_AI_CLOSE                                                    :{BLACK}סגור
-STR_AI_RESET                                                    :{BLACK}�תחל
-STR_AI_HUMAN_PLAYER                                             :שחקן �נושי
-STR_AI_RANDOM_AI                                                :בינה מל�כותית �קר�ית
+STR_AI_LIST_TOOLTIP                                             :{BLACK} לחץ לבחירת בינה מל�כותית
+STR_AI_LIST_ACCEPT                                              :{BLACK}�שר
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK} בחר סוג בינה מל�כותית שהודגש
+STR_AI_LIST_CANCEL                                              :{BLACK}בטל
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�ל תשנה בינה מל�כותית
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}סגור
+STR_AI_SETTINGS_RESET                                           :{BLACK}�תחל
+STR_AI_CONFIG_HUMAN_PLAYER                                      :שחקן �נושי
+STR_AI_CONFIG_RANDOM_AI                                         :בינה מל�כותית �קר�ית
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}פרמטרי� של בינה מל�כותית
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{ORANGE}{1:COMMA}{BLACK} :מירבית {ORANGE}{0:COMMA}{BLACK} :רמת הרעש המותרת בעיר זו
-STR_STATION_NOISE                                               :{GOLD}{COMMA}{BLACK} :רמת הרעש
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{ORANGE}{1:COMMA}{BLACK} :מירבית {ORANGE}{0:COMMA}{BLACK} :רמת הרעש המותרת בעיר זו
+STR_STATION_BUILD_NOISE                                         :{GOLD}{COMMA}{BLACK} :רמת הרעש
 ########
 
 ############ Downloading of content from the central server
@@ -3550,19 +3550,19 @@ STR_CONTENT_TYPE_SCENARIO                                       :סצנריו
 STR_CONTENT_TYPE_HEIGHTMAP                                      :מפת גבהי�
 STR_CONTENT_TITLE                                               :{WHITE}הורדת תוכן
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}סוג
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK} סוג התוכן
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK} סוג התוכן
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}ש�
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK} ש� התוכן
-STR_CONTENT_MATRIX_TIP                                          :{BLACK} לחץ על פריט לצפייה במידע, סמן להורדה
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK} ש� התוכן
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK} לחץ על פריט לצפייה במידע, סמן להורדה
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK} בחר הכל
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK} בחר �ת כל התכני� להורדה
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK} בחר �ת כל התכני� להורדה
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK} בחר שידרוגי�
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK} בחר רת כל התכני� המהווי� שדרוג לבחירה קיימת
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK} בחר רת כל התכני� המהווי� שדרוג לבחירה קיימת
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK} בטל בחירה
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK} בטל �ת כל הבחירות להורדה
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK} בטל �ת כל הבחירות להורדה
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}סינון תוית\ש�:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK} הורד
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK} החל בהורדת התכני� שנבחרו
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK} החל בהורדת התכני� שנבחרו
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{WHITE}{BYTES}{SILVER} :גודל ההורדה
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER} פרטי תוכן
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}ל� בחרת בפריט זה להורדה
@@ -3595,6 +3595,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE} נכש×
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK} בדוק תוכן מקוון
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK} חפש תוכן חדש/מעודכן להורדה
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK} מצ� תוכן חסר �ונליין
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK} בדוק ה�� ניתן ל�תר �ת התוכן החסר בשרת
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK} מצ� תוכן חסר �ונליין
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK} בדוק ה�� ניתן ל�תר �ת התוכן החסר בשרת
 ########
diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt
index c7a19c4c9..62a2c3575 100644
--- a/src/lang/hungarian.txt
+++ b/src/lang/hungarian.txt
@@ -191,7 +191,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Térkép
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Beállítások
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Ãœzenet
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}{STRING} üzenete
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Figyelem!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Figyelem!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Nem teheted ezt...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Nem tisztíthatod meg a területet...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyright {COPYRIGHT} 1995 Chris Sawyer, Minden jog fenntartva
@@ -199,9 +199,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Az OpenTTD csapat
 
 STR_QUIT_CAPTION                                                :{WHITE}Kilépés
-STR_YES                                                         :{BLACK}Igen
-STR_NO                                                          :{BLACK}Nem
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Biztosan bezárod ezt a programot és kilépsz a {STRING}ba ?
+STR_QUIT_YES                                                    :{BLACK}Igen
+STR_QUIT_NO                                                     :{BLACK}Nem
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Biztosan bezárod ezt a programot és kilépsz a {STRING}ba ?
 
 STR_JUST_NOTHING                                                :semmi
 STR_COLOUR_DARK_BLUE                                            :Sötétkék
@@ -263,11 +263,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}SIVATAG
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}HÓ
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Ãœzenet
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Alapértelmezett
-STR_QUERY_CANCEL                                                :{BLACK}Mégsem
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}�tnevez
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Alapértelmezett
+STR_BUTTON_CANCEL                                               :{BLACK}Mégsem
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}�tnevez
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -284,16 +284,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Rakomán
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Információ
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapacitás
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Teljes rakomány
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Teljes rakomány-kapacitása ennek a vonatnak:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Teljes rakomány-kapacitása ennek a vonatnak:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Új játék
 STR_INTRO_LOAD_GAME                                             :{BLACK}Játék betöltése
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Hálózati játék
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Pályaszerkesztő
 
-STR_MAPSIZE                                                     :{BLACK}Méret:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Méret:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Beállítások
 
 STR_COMPANY_SOMEONE                                             :valaki{SKIP}{SKIP}
@@ -342,10 +342,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Kilépés a já
 STR_FILE_MENU_EXIT                                              :Kilépés
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Biztosan kilépsz ebből a játékból ?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Kilépés a játékból
-STR_SORT_ORDER_TIP                                              :{BLACK}Csökkenő/növekvő sorbarendezés
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Sorbarendezési feltétel
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Szűrési feltétel kiválasztása
-STR_SORT_BY                                                     :{BLACK}Rendezés
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Csökkenő/növekvő sorbarendezés
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Sorbarendezési feltétel
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Szűrési feltétel kiválasztása
+STR_BUTTON_SORT_BY                                              :{BLACK}Rendezés
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Lakosság
@@ -377,24 +377,24 @@ STR_SORT_BY_RUNNING_COST                                        :Üzemeltetési
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Telj./Üzemeltetési k.
 STR_SORT_BY_CARGO_CAPACITY                                      :Teherkapacitás
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Semmilyen áru nem várakozik
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Minden szállítóegység kiválasztása
-STR_SELECT_ALL_TYPES                                            :{BLACK}Minden rakománytípus mutatása (beleértve ha nincs várakozó rakomány)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Tekintsd meg az ehhez a járműtípushoz választható mozdonyok listáját
-STR_MANAGE_LIST                                                 :{BLACK}Lista kezelése
-STR_MANAGE_LIST_TIP                                             :{BLACK}A listán szereplő járműveknek utasítás küldése
-STR_REPLACE_VEHICLES                                            :Járművek lecserélése
-STR_SEND_FOR_SERVICING                                          :Javításra küld
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Elérhető vonatok
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Elérhető közúti járművek
-STR_AVAILABLE_SHIPS                                             :{BLACK}Elérhető hajók
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Elérhető repülők
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Elküldi járműtelepre
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Elküldi garázsba
-STR_SEND_SHIP_TO_DEPOT                                          :Elküldi dokkba
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Elküldi hangárba
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Semmilyen áru nem várakozik
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Minden szállítóegység kiválasztása
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Minden rakománytípus mutatása (beleértve ha nincs várakozó rakomány)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Tekintsd meg az ehhez a járműtípushoz választható mozdonyok listáját
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Lista kezelése
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}A listán szereplő járműveknek utasítás küldése
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Járművek lecserélése
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Javításra küld
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Elérhető vonatok
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Elérhető közúti járművek
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Elérhető hajók
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Elérhető repülők
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Elküldi járműtelepre
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Elküldi garázsba
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Elküldi dokkba
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Elküldi hangárba
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -424,12 +424,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Beállí
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nem változtathatod meg a javítási időközt...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Az ablak bezárása
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Az ablak címsora - húzd ezt a mozgatáshoz
-STR_STICKY_BUTTON                                               :{BLACK}Ez az ablak akkor se záródjon be, ha a DEL billentyűvel az összes ablakot bezatjuk
-STR_RESIZE_BUTTON                                               :{BLACK}Fogd és húzd hogy átméretezd az ablakot
+STR_TOOLTIP_STICKY                                              :{BLACK}Ez az ablak akkor se záródjon be, ha a DEL billentyűvel az összes ablakot bezatjuk
+STR_TOOLTIP_RESIZE                                              :{BLACK}Fogd és húzd hogy átméretezd az ablakot
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kattints ide az aktuális mentési könyvtárra való ugráshoz
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Tárgyak lerombolása egy mezőről
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Egy pont lesüllyesztése
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Egy pont megemelése
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Egy pont lesüllyesztése
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Egy pont megemelése
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Görgetősáv - fel/le görgeti a listát
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Görgetősáv - jobbra/balra görgeti a listát
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Domborzat mutatása a térképen
@@ -442,21 +442,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Városne
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}IDEI NYERESÉG: {CURRENCY} (TAVALYI: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} év ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} év ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} év ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} év ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :vonat
-STR_VEHICLE_ROAD_VEHICLE                                        :közúti jármű
-STR_VEHICLE_SHIP                                                :hajó
-STR_VEHICLE_AIRCRAFT                                            :repülőgép
+STR_REPLACE_VEHICLE_TRAIN                                       :vonat
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :közúti jármű
+STR_REPLACE_VEHICLE_SHIP                                        :hajó
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :repülőgép
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} elöregedett
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} nagyon elöregedett
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} nagyon elöregedett, sürgősen le kell cserélni
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Terület-információ
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}{LTBLUE}Nem lehet lerombolni
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}A megtisztítás költsége: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Bevétel lerombolás esetén: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Bevétel lerombolás esetén: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Nincs
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Tulajdonos: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Az út tulajdonosa: {LTBLUE}{STRING}
@@ -465,7 +465,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}A vasút
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Helyi önkormányzat: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nincs
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Név
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -577,7 +577,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Egy szá
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kattints a zeneszámra annak aktuális listából való eltávolításához (csak Egyéni 1 és Egyéni 2 esetén)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}A műsor megkeverése be/ki
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}A zenekiválasztó ablak megjelenítése
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Kattints egy sorra a város/gazdasági épület megnézéséhez
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Kattints egy sorra a város/gazdasági épület megnézéséhez
 STR_INTRO_DIFFICULTY                                            :{BLACK}Nehézség ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Legutóbbi üzenet/újsághír
@@ -626,7 +626,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Az emele
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Véletlenszerű táj készítése
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}A táj törlése
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Táj törlése
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Eltávolít minden, játékos által birtokolt elemet a térképről
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Eltávolít minden, játékos által birtokolt elemet a térképről
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Biztos vagy benne, hogy el akarod távolítani a játékosokat?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Táj szerkesztése
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Városkészítés
@@ -640,11 +640,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...túl
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...túl közel van egy másik településhez
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...nem alkalmas rá a hely
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...túl sok a település
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nem lehet több települést építeni
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nincs több hely a térképen
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nem lehet több települést építeni
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...nincs több hely a térképen
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}A település méretének növelése
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Növel
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}A település nem fog utakat építeni. Az útépítést a Haladó beállítások->Gazdaság->Városok menüben engedélyezheted.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}A település nem fog utakat építeni. Az útépítést a Haladó beállítások->Gazdaság->Városok menüben engedélyezheted.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Egy véletlen település
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Egy település építése véletlenszerű helyre
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Nem építhető ide {STRING}...
@@ -658,13 +658,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Sziklás
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Világítótorony építése
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Adótorony építése
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Sivatagot hoz létre.{}Nyomj CTRL-t az eltávolításához
-STR_CREATE_LAKE                                                 :{BLACK}Vizi terület definiálása.{}Csatornát készít, kivéve ha tengerszinten CTRL-t lenyomva hívod meg, ekkor elárasztja a területet
-STR_CREATE_RIVER                                                :{BLACK}Folyók elhelyezése
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Vizi terület definiálása.{}Csatornát készít, kivéve ha tengerszinten CTRL-t lenyomva hívod meg, ekkor elárasztja a területet
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Folyók elhelyezése
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Töröl
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}A település teljes eltüntetése
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Pálya mentése
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Pálya betöltése
-STR_MENU_LOAD_HEIGHTMAP                                         :Magasságtérkép betöltése
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Magasságtérkép betöltése
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Kilépés a szerkesztőből
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Kilépés
@@ -674,7 +674,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Pálya m
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Játék saját pályán
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Játék magasságtérképen
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Új játékot kezd egy magasságtérkép alapján
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Biztosan abba akarod hagyni a pálya szerkesztését ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Biztosan abba akarod hagyni a pálya szerkesztését ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...csak 1200-nál nagyobb lakosságszámú településeken építhető
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}A kezdődátum visszább állítása egy évvel
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}A kezdődátum előrébb állítása egy évvel
@@ -682,21 +682,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...a hí
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Kicsi
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Közepes
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Nagy
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Véletlenszerű
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Véletlenszerű
 STR_FOUND_TOWN_CITY                                             :{BLACK}Város
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}�tlagosnál gyorsabban növekedő városok{}Függ a beállításoktól, nagyobbak, mint alapításkor
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}A település méretének kiválasztása
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Új település mérete:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Település úthálózat építési módja:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Válassz úthálózati sémát ehhez a városhoz
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Eredeti
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Jobb utak
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2-es háló
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3-as háló
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Véletlenszerű
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Település úthálózat építési módja:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Válassz úthálózati sémát ehhez a városhoz
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Eredeti
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Jobb utak
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2-es háló
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3-as háló
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Véletlenszerű
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Utolsó üzenet vagy újsághír megmutatása
 STR_NEWS_MESSAGES_OFF                                           :Ki
 STR_NEWS_MESSAGES_SUMMARY                                       :Kivonat
@@ -796,10 +796,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}*  *  S
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}A képernyő elmentve '{STRING}' néven
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}A képmentés nem sikerült!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Földterület megvétele későbbi használatra
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Földterület megvétele későbbi használatra
 STR_STATUSBAR_AUTOSAVE                                          :{RED}Automatikus mentés
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  J�TÉK MENTÉSE  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}A mentés még tart,{}kérlek várd meg a végét!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}A mentés még tart,{}kérlek várd meg a végét!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}A 'szép az élet' zenei műsor kiválasztása
 
 ############ start of townname region
@@ -862,7 +862,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Válassz
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Teljes képernyő
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Jelöld be ezt, ha teljes képernyős módban szeretnél OpenTTD-zni
-STR_FULLSCREEN_FAILED                                           :{WHITE}Teljesképernyős módra váltás sikertelen
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Teljesképernyős módra váltás sikertelen
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}A képernyő felbontása
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Válaszd ki, milyen felbontást szeretnél a játékhoz
@@ -875,12 +875,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Kiválas
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} hiányzó/hibás fájl{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Kiegészítő információ az alap grafikus szettről
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automatikus mentés sikertelen
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automatikus mentés sikertelen
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION} állomás felé
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION} állomás felé, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Nincs menetrend
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Nincs menetrend, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}{STATION} állomás felé
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}{STATION} állomás felé, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Nincs menetrend
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Nincs menetrend, {VELOCITY}
 
 STR_PASSENGERS                                                  :utas
 STR_BAGS                                                        :csomag
@@ -891,9 +891,9 @@ STR_CRATES                                                      :láda
 STR_RES_OTHER                                                   :egyéb
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nem lehet megosztani a menetrendet...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nem lehet másolni a menetrendet...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Megosztott menetrend vége - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nem lehet megosztani a menetrendet...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nem lehet másolni a menetrendet...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Megosztott menetrend vége - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} nem talál utat a célpontjához.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} eltévedt.
@@ -1162,15 +1162,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}ÉNY-DK
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :kikapcsolva
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Válassz beállítási értéket
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Válassz beállítási értéket
 
-STR_TEMPERATE_LANDSCAPE                                         :mérsékelt táj
-STR_SUB_ARCTIC_LANDSCAPE                                        :sarkköri táj
-STR_SUB_TROPICAL_LANDSCAPE                                      :trópusi táj
-STR_TOYLAND_LANDSCAPE                                           :játék táj
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :mérsékelt táj
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :sarkköri táj
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :trópusi táj
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :játék táj
 
 STR_CHEATS                                                      :{WHITE}Csalások
-STR_CHEATS_TIP                                                  :{BLACK}A kijelölőnégyzetek jelzik a csalások eddigi használatát
+STR_CHEATS_TOOLTIP                                              :{BLACK}A kijelölőnégyzetek jelzik a csalások eddigi használatát
 STR_CHEATS_WARNING                                              :{BLACK}Figyelem! Te épp a versenytársaidat készülöd elárulni. Sose felejtsd el, hogy egy ilyen szégyenletes tett sose merül feledésbe.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Tőkeemelés {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Irányított cég: {ORANGE}{COMMA}
@@ -1182,179 +1182,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Klíma
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Dátum módosítás: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}A nyersanyagüzemek termelése változtatható: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Úton {WAYPOINT} felé
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Úton {WAYPOINT} felé, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Úton {WAYPOINT} felé
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Úton {WAYPOINT} felé, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Menj át a(z) {WAYPOINT}on
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Megállás nélkül menj a(z) {WAYPOINT}hoz
+STR_ORDER_GO_TO_WAYPOINT                                        :Menj át a(z) {WAYPOINT}on
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Megállás nélkül menj a(z) {WAYPOINT}hoz
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN}i ellenőrző pont
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN}i {COMMA}. ellenőrző pont
-STR_BUOYNAME_CITY                                               :{TOWN} bója
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} {COMMA}. bója
-STR_LANDINFO_WAYPOINT                                           :Ellenőrző pont
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN}i ellenőrző pont
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN}i {COMMA}. ellenőrző pont
+STR_FORMAT_BUOY_NAME                                            :{TOWN} bója
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} {COMMA}. bója
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Ellenőrző pont
 
-STR_WAYPOINT                                                    :{WHITE}Ellenőrző pont
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Válassz ellenőrző-pont tipust
+STR_WAYPOINT_CAPTION                                            :{WHITE}Ellenőrző pont
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Válassz ellenőrző-pont tipust
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ellenőrző pont nevének módosítása
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nem lehet megváltoztatni az ellenőrző pont nevét...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nem lehet megváltoztatni az ellenőrző pont nevét...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Ellenőrző pont építése vágányra
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Ide nem lehet vonat ellenőrző pontot építeni...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nem lehet eltávolítani az ellenőrző pontot...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Ide nem lehet vonat ellenőrző pontot építeni...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Nem lehet eltávolítani az ellenőrző pontot...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Vasúti pálya építése egyszerűsített módón
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...nincs település ezen a pályán
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}A térkép generálása meghiúsult...{}...nincs városépítésre alkalmas hely
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...nincs település ezen a pályán
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}A térkép generálása meghiúsult...{}...nincs városépítésre alkalmas hely
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Sok véletlen település
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Véletlenszerüen elhelyez a térképen sok települést.
-STR_MANY_RANDOM_INDUSTRIES                                      :Sok véletlen gazdasági épület
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Elhelyez a térképen véletlenszerüen sok gazdasági épületet
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nem tudok gazdasági épületet generálni...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Sok véletlen település
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Véletlenszerüen elhelyez a térképen sok települést.
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Sok véletlen gazdasági épület
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Elhelyez a térképen véletlenszerüen sok gazdasági épületet
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nem tudok gazdasági épületet generálni...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Nyisd meg a tájrendező ablakot a talaj növeléshez/csökkentéshez, faültetéshez, stb.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Tájrendezés
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Talajszintezés
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Talajszintezés
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Véletlenszerű fafélék
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Véletlenszerűen kiválasztott fákat helyez el
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Véletlenszerűen kiválasztott fákat helyez el
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Ide nem lehet csatornát építeni...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Ide nem lehet csatornát építeni...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Csatorna építése (vagy rosszabb esetben terület elárasztása!)
-STR_LANDINFO_CANAL                                              :Csatorna
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Csatorna
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Ide nem lehet zsilipet építeni...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Ide nem lehet zsilipet építeni...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Zsilip építése
-STR_LANDINFO_LOCK                                               :Zsilip
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Zsilip
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Ide nem lehet folyót elhelyezni...
-STR_LANDINFO_RIVER                                              :Folyó
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Ide nem lehet folyót elhelyezni...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Folyó
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... a bóját használják!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... a bóját használják!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordináták: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordináták: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nem lehet eltávolítani az állomás részét...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Itt nem lehet átalakítani a vasúti pályát...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nem lehet eltávolítani az állomás részét...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Itt nem lehet átalakítani a vasúti pályát...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Sínek átalakítása a kiválasztott típusra
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Húzd ide a mozdonyt a teljes vonat eladásához
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Húzd ide a mozdonyt a teljes vonat eladásához
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Fogd és dobd
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}�llomás építése fogd és dobd módon
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Válasz egy megjelenítendő állomásfajtát
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Válaszd ki a megépítendő állomásfajtát
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Válasz egy megjelenítendő állomásfajtát
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Válaszd ki a megépítendő állomásfajtát
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Játék gyorsítása
 STR_MESSAGE_HISTORY                                             :{WHITE}Előző üzenetek
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Az előző hírüzenetek listája
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Kikapcsol mind
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Bekapcsol mind
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Az előző hírüzenetek listája
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Kikapcsol mind
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Bekapcsol mind
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gazdasági épületek
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% elszállítva)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% elszállítva)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Gazdasági épületek listája - a névre kattintva a fő nézetet a választott objektumra irányíthatod
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Gazdasági épületek
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% elszállítva)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% elszállítva)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Gazdasági épületek listája - a névre kattintva a fő nézetet a választott objektumra irányíthatod
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...túl közel egy másik gazdasági épülethez
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...túl közel egy másik gazdasági épülethez
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Termelés megváltoztatása
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Hálózati játék
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Játékos neve:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}A többi játékos ilyen nével fog ismerni Téged.
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Add meg a neved
-STR_NETWORK_CONNECTION                                          :{BLACK}Kapcsolat:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Válassz az internetes vagy helyi hálózati játék közül
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Szerver indítása
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Saját szervert indít
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Név
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Játék neve
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Nyelv, szerver verzió, stb.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Kattints a listában a játékra hogy kiválaszd
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}A szerver amihez legutóbb csatlakoztál:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Kattints ide a legutóbb használt szerver kiválasztásához
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Szerver keresése
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Szerver keresése a hálózaton
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Szerver hozzáadása
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Hozzáadja a szervert a listához, így később gyorsabban tudsz hozzá csatlakozni
-STR_NETWORK_ENTER_IP                                            :{BLACK}�rd be a szerver IP címét
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Kliens
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Kliens online / kliens max{}Cég online / cég max
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Térkép méret
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}A játék térképének mérete{}Kattints ide a rendezéshez
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dátum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Az aktuális dátum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Évek
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}A játékban eltelt évek száma
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}J�TÉK INFÓ
-STR_NETWORK_CLIENTS                                             :{SILVER}Kliensek: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Nyelv: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tájtípus: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}A pálya nagysága: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Szerver verzió: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}A szerver címe: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Kezdési dátum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Jelenlegi dátum: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Jelszóval védve!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SZERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SZERVER TELE
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERZIÓ ELTÉRÉS
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ELTÉRÉS
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Csatlakozás
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Új játékot kezd
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Játék neve:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}A játék neve fog megjelenni a többi játékosnak a többjátékos menüben
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Add meg a hálózati játékhoz a neved
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Jelszó beállítása
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Védd le a játékodat jelszóval ha nem akarod hogy mások csatlakozzanak
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Válassz egy térképet:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Melyik terképen akarsz játszani?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Helyi hálózat
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :Hálózat / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (reklámoz)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} kliens
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Játékosok max. száma:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Válaszd ki hány játékos kapcsolódhat maximum. Nem szükséges pont ennyi embernek éppen kapcsolódva lennie.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} vállalat
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max cégszám:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}A cégek maximális száma
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} megfigyelő
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max megfigyelő:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}A megfigyelők maximális száma
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Beszélt nyelv:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}A többi játékos megtudhatja milyen nyelven beszélnek a szerveren.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Játék elindítása
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Új hálózati játék kezdése véletlen térképpel vagy saját pályával
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Játék betöltése
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Korábban elmentett többfelhasználós játék folytatása (győződj meg, hogy megfelelő játékosként kapcsolódtál)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Hálózati játék
+
+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ével fog ismerni Téged.
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Add meg a neved
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Kapcsolat:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Válassz az internetes vagy helyi hálózati játék közül
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Szerver indítása
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Saját szervert indít
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Név
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Játék neve
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Nyelv, szerver verzió, stb.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Kattints a listában a játékra hogy kiválaszd
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}A szerver amihez legutóbb csatlakoztál:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Kattints ide a legutóbb használt szerver kiválasztásához
+
+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_ENTER_IP                                :{BLACK}�rd be a szerver IP címét
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Kliens
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Kliens online / kliens max{}Cég online / cég max
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Térkép méret
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}A játék térképének mérete{}Kattints ide a rendezéshez
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dátum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Az aktuális dátum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Évek
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}A játékban eltelt évek száma
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}J�TÉK INFÓ
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Kliensek: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Nyelv: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tájtípus: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}A pálya nagysága: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Szerver verzió: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}A szerver címe: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Kezdési dátum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Jelenlegi dátum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Jelszóval védve!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SZERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SZERVER TELE
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERZIÓ ELTÉRÉS
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF ELTÉRÉS
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Csatlakozás
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Új játékot kezd
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Játék neve:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}A játék neve fog megjelenni a többi játékosnak a többjátékos menüben
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Add meg a hálózati játékhoz a neved
+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 mások csatlakozzanak
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Válassz egy térképet:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Melyik terképen akarsz játszani?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Helyi hálózat
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Hálózat / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (reklámoz)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} kliens
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Játékosok max. száma:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Válaszd ki hány játékos kapcsolódhat maximum. Nem szükséges pont ennyi embernek éppen kapcsolódva lennie.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} vállalat
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max cégszám:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}A cégek maximális száma
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} megfigyelő
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max megfigyelő:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}A megfigyelők maximális száma
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Beszélt nyelv:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}A többi játékos megtudhatja milyen nyelven beszélnek a szerveren.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Játék elindítása
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Új hálózati játék kezdése véletlen térképpel vagy saját pályával
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Játék betöltése
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Korábban elmentett többfelhasználós játék folytatása (győződj meg, hogy megfelelő játékosként kapcsolódtál)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Bármilyen
@@ -1395,33 +1395,33 @@ STR_NETWORK_LANG_GREEK                                          :Görög
 STR_NETWORK_LANG_LATVIAN                                        :Lett
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Hálózati-játék beállítások
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Hálózati-játék beállítások
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Készülődés a kapcsolódáshoz: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Egy lista az összes cégről aki játékban van. Alapíthatsz újat, beléphetsz egybe, vagy csak nézheted őket megfigyelőként
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Új vállalat
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Új vállalatot alapít
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Játék megvizsgálása
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Megtekinted a játékot mint megfigyelő
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Belépés a cégbe
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Segítesz valakinek egy cégben (többen irányítottok egy céget)
-STR_NETWORK_REFRESH                                             :{BLACK}Szerver frissítése
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Szerver infó frissítése
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Készülődés a kapcsolódáshoz: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Egy lista az összes cégről aki játékban van. Alapíthatsz újat, beléphetsz egybe, vagy csak nézheted őket megfigyelőként
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Új vállalat
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Új vállalatot alapít
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Játék megvizsgálása
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Megtekinted a játékot mint megfigyelő
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Belépés a cégbe
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Segítesz valakinek egy cégben (többen irányítottok egy céget)
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Szerver frissítése
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Szerver infó frissítése
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}CÉG INFÓ
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}CÉG INFÓ
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}A cég neve: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Beiktatás: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}A cég értéke: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Jelenlegi összeg: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Előző évi bevétel: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Teljesítmény: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}A cég neve: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Beiktatás: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}A cég értéke: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Jelenlegi összeg: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Előző évi bevétel: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Teljesítmény: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Járművek: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}�llomások: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Játékosok: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Járművek: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}�llomások: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Játékosok: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Kapcsolódás...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Kapcsolódás...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Kapcsolódás..
@@ -1437,49 +1437,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}CéginfÃ
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} kliensre várunk, hogy befejezze
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} lett eddig letöltve
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Megszakít
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Megszakít
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Add meg a küldeni kívánt pénz mennyiségét
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}A szerver jelszóval van védve. �rd be
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}A cég jelszóval van védve. �rd be
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Kliens lista
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Kliens lista
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Megfigyelés
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Új vállalat
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Nem található a hálózati csatoló, vagy a játékban nincs hálózati támogatás (ENABLE_NETWORK)
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Nem található semmilyen hálózati játék
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}A szerver nem reagált a kérésre
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}NewGRF eltérés(ek) miatt nem sikerült kapcsolódni
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Hálózat - Játék szinkronizáció sikertelen
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Hálózat - Játék kapcsolat elveszett
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Nem sikerült a szerver játékmentés betöltése
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Nem tudtam elindítani a szervert
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Nem tudtam kapcsolódni
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}A(z) {NUM}. játékos kapcsolata elveszett
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Protokoll-hiba keletkezett és megszakadt a kapcsolat
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}A gépeden és a szerveren lévő programnak nem egyezik meg a verziója
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Rossz jelszó
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}A szerver tele van
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Ki vagy tiltva erről a szerverről
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Ki lettél rúgva a szerverről
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Ez a szerver nem engedi a csalást
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Nem található a hálózati csatoló, vagy a játékban nincs hálózati támogatás (ENABLE_NETWORK)
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Nem található semmilyen hálózati játék
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}A szerver nem reagált a kérésre
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}NewGRF eltérés(ek) miatt nem sikerült kapcsolódni
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Hálózat - Játék szinkronizáció sikertelen
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Hálózat - Játék kapcsolat elveszett
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Nem sikerült a szerver játékmentés betöltése
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Nem tudtam elindítani a szervert
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Nem tudtam kapcsolódni
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}A(z) {NUM}. játékos kapcsolata elveszett
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Protokoll-hiba keletkezett és megszakadt a kapcsolat
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}A gépeden és a szerveren lévő programnak nem egyezik meg a verziója
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Rossz jelszó
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}A szerver tele van
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Ki vagy tiltva erről a szerverről
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Ki lettél rúgva a szerverről
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Ez a szerver nem engedi a csalást
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :általános hiba
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :szinkronizálási hiba
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :térkép betöltési hiba
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :elveszett a kapcsolat
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokoll hiba
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF eltérés(ek)
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nem engedélyezett
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ismeretlen csomag érkezett
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :rossz verzió
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :a név már használva van
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :rossz jelszó
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :hibás cég azonosító (wrong company-id in DoCommand)
-STR_NETWORK_ERR_CLIENT_KICKED                                   :a szerver kirúgott
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :csalni próbált
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :a szerver megtelt
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :általános hiba
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :szinkronizálási hiba
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :térkép betöltési hiba
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :elveszett a kapcsolat
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokoll hiba
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF eltérés(ek)
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nem engedélyezett
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :ismeretlen csomag érkezett
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :rossz verzió
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :a név már használva van
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :rossz jelszó
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :hibás cég azonosító (wrong company-id in DoCommand)
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :a szerver kirúgott
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :csalni próbált
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :a szerver megtelt
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1489,15 +1489,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Játék felfüg
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Játék elindítva (a kliens sikeresen csatlakozott)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Játék elindítva (a kliens csatlakozása nem sikerült)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :kilépés
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} csatlakozott a játékhoz
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} csatlakozott a(z) {2:NUM}. számú vállalathoz
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} csatlakozott a megfigyelőkhöz
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} új vállalatot alapított (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} kilépett a játékból ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} nevet változtatott. Új neve: {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} a következő összeget utalta cégednek: {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** {1:STRING} cégnek sikeresen átutaltál {2:CURRENCY}-t
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :kilépés
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} csatlakozott a játékhoz
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} csatlakozott a(z) {2:NUM}. számú vállalathoz
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} csatlakozott a megfigyelőkhöz
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} új vállalatot alapított (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} kilépett a játékból ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} nevet változtatott. Új neve: {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} a következő összeget utalta cégednek: {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** {1:STRING} cégnek sikeresen átutaltál {2:CURRENCY}-t
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Csapat] :
 STR_NETWORK_CHAT_COMPANY                                        :[Csapat] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Csapat] {STRING} számára: {WHITE}{STRING}
@@ -1507,8 +1507,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privát] {STRI
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Mindenkinek] :
 STR_NETWORK_CHAT_ALL                                            :[Mindenkinek] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Add meg a hálózati beszélgetéshez a neved
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} A szerver leállította a játékot
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} A szerver újraindul...{}Türelem...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} A szerver leállította a játékot
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} A szerver újraindul...{}Türelem...
 
 STR_NETWORK_SERVER                                              :Szerver
 STR_NETWORK_CLIENT                                              :Kliens
@@ -1522,19 +1522,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Üzenet a cégn
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privát üzenet
 
 
-STR_NETWORK_SEND                                                :{BLACK}Elküld
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Elküld
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nem tudom a térképet betölteni a PNG-ből...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fájl nem található.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nem tudtam konverálni a kép típusát. 8 vagy 24-bites PNG kép kell.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...valami nem igazán sikerült. Bocs. (talán sérült a fájl)
+STR_ERROR_PNGMAP                                                :{WHITE}Nem tudom a térképet betölteni a PNG-ből...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fájl nem található.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nem tudtam konverálni a kép típusát. 8 vagy 24-bites PNG kép kell.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...valami nem igazán sikerült. Bocs. (talán sérült a fájl)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Nem sikerült a térkép betöltése a BMP-ből...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nem sikerült a képtípust konvertálni.
+STR_ERROR_BMPMAP                                                :{WHITE}Nem sikerült a térkép betöltése a BMP-ből...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nem sikerült a képtípust konvertálni.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}{CURRENCY} KIAD�S
@@ -1548,13 +1548,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Becsült
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Nem emelheted fel itt a földet...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Nem süllyesztheted le itt a földet...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Itt nem tudsz terepmagasságot változtatni...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Kövek
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Durva föld
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Csupasz föld
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Fű
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Szántóföld
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Havas föld
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Sivatag
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kövek
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Durva föld
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Csupasz föld
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Fű
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Szántóföld
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Havas föld
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Sivatag
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Rossz irányba lejt a föld
@@ -1562,11 +1562,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Nem lehe
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Az ásás megsértené az alagutat
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Már tengerszinten van
 STR_ERROR_TOO_HIGH                                              :{WHITE}Túl magas
-STR_ALREADY_LEVELLED                                            :{WHITE}... már sík
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... már sík
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nincs megfelelő vasúti pálya
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...már van itt
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Előbb le kell rombolnod a vasúti pályát
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Az út egy irányú vagy blokkolt
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Az út egy irányú vagy blokkolt
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Normál vasút építése
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Villamosított vasút építése
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Egysínű vasút építése
@@ -1590,44 +1590,44 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Vasúti
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Vasúti híd építése
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Vasúti alagút építése
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Felszedés/lerakás közötti váltás vasúti pályánál és jelzőnél
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Híd kiválasztása - kattints arra a hídra, amit meg akarsz építeni
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Híd kiválasztása - kattints arra a hídra, amit meg akarsz építeni
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Válaszd ki a járműtelep helyzetét
-STR_RAILROAD_TRACK                                              :Vasúti pálya
-STR_RAILROAD_TRAIN_DEPOT                                        :Járműtelep
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Vasúti pálya
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Járműtelep
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...a terület más cégé
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Vasúti pálya normál jelzőkkel
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Vasúti pálya bejárati jelzőkkel
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Vasúti pálya kijárati jelzőkkel
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Vasúti pálya kombinált jelzőkkel
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Vasúti pálya fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Vasúti pálya egyirányú fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Vasúti pálya normál és bejárati jelzőkkel
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Vasúti pálya normál és kijárati jelzőkkel
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Vasúti pálya normál és kombinált jelzőkkel
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Vasúti pálya normál és fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Vasúti pálya normál és egyirányú fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Vasúti pálya be- és kijárati jelzőkkel
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Vasúti pálya bejárati- és kombinált jelzőkkel
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Vasúti pálya bejárati- és fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Vasúti pálya bejárati- és egyirányú fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Vasúti pálya kijárati- és bejárati jelzőkkel
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Vasúti pálya kijárati- és fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Vasúti pálya kijárati- és egyirányú fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Vasúti pálya kombinált és fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Vasúti pálya egy- és kétirányú fejlett jelzőkkel
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Vasúti pálya egy- és kétirányú fejlett jelzőkkel
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Előbb le kell rombolnod a vasútállomást
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Előbb le kell rombolnod az ellenőrző pontot
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Különálló állomás építése
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Különálló ellenőrző pont építése
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}�llomás egyesítése
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Ellenőrző pont egyesítése
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Vasúti pálya normál jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Vasúti pálya bejárati jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Vasúti pálya kijárati jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Vasúti pálya kombinált jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Vasúti pálya fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Vasúti pálya egyirányú fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Vasúti pálya normál és bejárati jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Vasúti pálya normál és kijárati jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Vasúti pálya normál és kombinált jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Vasúti pálya normál és fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Vasúti pálya normál és egyirányú fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Vasúti pálya be- és kijárati jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Vasúti pálya bejárati- és kombinált jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Vasúti pálya bejárati- és fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Vasúti pálya bejárati- és egyirányú fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Vasúti pálya kijárati- és bejárati jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Vasúti pálya kijárati- és fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Vasúti pálya kijárati- és egyirányú fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Vasúti pálya kombinált és fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Vasúti pálya egy- és kétirányú fejlett jelzőkkel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Vasúti pálya egy- és kétirányú fejlett jelzőkkel
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Előbb le kell rombolnod a vasútállomást
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Előbb le kell rombolnod az ellenőrző pontot
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Különálló állomás építése
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Különálló ellenőrző pont építése
+STR_JOIN_STATION_CAPTION                                        :{BLACK}�llomás egyesítése
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Ellenőrző pont egyesítése
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Előbb le kell rombolnod az utat
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Útkarbantartás folyamatban
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Útkarbantartás folyamatban
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Út építése
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Villamospálya építése
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Közúti híd építése
@@ -1663,14 +1663,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Villamos
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Egyirányú utak ki/be kapcsolása
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Építés/felszedés közötti váltás utaknál
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Építő/bontó üzemmód váltása a villamospályához
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Válaszd ki a garázs helyzetét
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Válaszd ki a remíz helyzetét
-STR_ROAD_DESCRIPTION_ROAD                                       :Út
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Út lámpákkal
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Fával szegélyezett út
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garázs
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Út/vasút kereszteződés
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Villamospálya
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Válaszd ki a garázs helyzetét
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Válaszd ki a remíz helyzetét
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Út
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Út lámpákkal
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Fával szegélyezett út
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garázs
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Út/vasút kereszteződés
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Villamospálya
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nem távolíthatod el ezt a buszmegállót...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nem távolíthatod el ezt a teherautó megállót...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nem lehet a villamos utasvárót eltávolítani...
@@ -1678,12 +1678,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nem lehe
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Városok
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Előbb le kell rombolnod az épületet
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Város)
@@ -1696,9 +1696,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}A fÅ‘ nÃ
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}A város nevének megváltoztatása
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Utasok az előző hónapban: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Levélcsomagok az előző hónapban: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}A város növekedéséhez szükséges áru:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} szükséges
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} szállítva a múlt hónapban
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}A város növekedéséhez szükséges áru:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} szükséges
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} szállítva a múlt hónapban
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Magas irodaház
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Irodaház
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Kis bérház
@@ -1735,7 +1735,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING} támogatást kapott!{}{}�gy {STRING} szállítása {STATION} és {STATION} között háromszoros hasznot hoz neki!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING} támogatást kapott!{}{}�gy {STRING} szállítása {STATION} és {STATION} között négyszeres hasznot hoz neki!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} önkormányzata nem engedélyez új repteret a városban
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} önkormányzata a zajszintnormák miatt megtagadta a repülőtér építését
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} önkormányzata a zajszintnormák miatt megtagadta a repülőtér építését
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Vidéki házak
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Házak
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Bérház
@@ -1771,7 +1771,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Közlekedési zűrzavar {TOWN} városában!{}{}{STRING} által indított útjavítás keseríti meg hat hónapig az autóvezetők életét!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (építés alatt)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (építés alatt)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Jégkunyhó
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indiánsátor
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teáskanna-ház
@@ -1784,17 +1784,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Felirat leraká
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Fák
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...már van itt
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Nem ültethetsz ide fát...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...túl sok a felirat
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Nem rakhatsz ide feliratot...
-STR_SIGN_DEFAULT                                                :Felirat
+STR_DEFAULT_SIGN_NAME                                           :Felirat
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Felirat szerkesztése
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nem változtathatod meg a feliratot...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}A felirat nem törölhető...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Válaszd ki, melyik fát ülteted
-STR_TREE_NAME_TREES                                             :Fák
-STR_TREE_NAME_RAINFOREST                                        :Esőerdő
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusz
+STR_LAI_TREE_NAME_TREES                                         :Fák
+STR_LAI_TREE_NAME_RAINFOREST                                    :Esőerdő
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusz
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Vasútállomás beállítása
@@ -1816,7 +1816,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Előbb l
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Túl közel van egy másik repülőtérhez
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Előbb le kell rombolnod a repülőteret
 
-STR_QUERY_RENAME_STATION_CAPTION                                :�llomás/rakodóhely átnevezése
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :�llomás/rakodóhely átnevezése
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nem nevezheted át az állomást...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Vélemény
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Elfogadás
@@ -1834,10 +1834,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :kimagasló
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Kilistázza az összes vonatot, aminek a menetrendjében szerepel ez az állomás
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Kilistázza az összes közúti járművet, aminek a menetrendjében szerepel ez az állomás
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Kilistázza az összes repülőt, aminek a menetrendjében szerepel ez az állomás
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Kilistázza az összes hajót, aminek a menetrendjében szerepel ez az állomás
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Kilistázza az összes vonatot, aminek a menetrendjében szerepel ez az állomás
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Kilistázza az összes közúti járművet, aminek a menetrendjében szerepel ez az állomás
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Kilistázza az összes repülőt, aminek a menetrendjében szerepel ez az állomás
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Kilistázza az összes hajót, aminek a menetrendjében szerepel ez az állomás
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} többé nem fogad el {STRING}
@@ -1873,47 +1873,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Az állo
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Az elfogadott áruk listájának mutatása
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}�llomásnevek - kattints egy névre az állomás megnézéséhez
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Repülőtér méretének/típusának kiválasztása
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Vasútállomás
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Reptéri hangár
-STR_STATION_DESCRIPTION_AIRPORT                                 :Repülőtér
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Teherautó-rakodóhely
-STR_STATION_DESCRIPTION_BUS_STATION                             :Buszmegálló
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Kikötő
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Vasútállomás
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Reptéri hangár
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Repülőtér
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Teherautó-rakodóhely
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Buszmegálló
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Kikötő
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Az állomással lefedett terület mutatása (vonzáskörzet)
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Az állomással lefedett terület elrejtése
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Lefedett terület mutatása:
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Kikötő
-STR_STATION_DESCRIPTION_BUOY                                    :Bója
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bója
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bója van az útban
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...az állomás túl kiterjedt
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...csak egyféle vágánytípusú állomások lehetnek
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Több elem kiválasztásához tartsd lenyomva a CTRL-t
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...csak egyféle vágánytípusú állomások lehetnek
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Több elem kiválasztásához tartsd lenyomva a CTRL-t
 
 STR_UNDEFINED                                                   :(nem definiált string)
-STR_STAT_CLASS_DFLT                                             :Alapértelmezett állomás
-STR_STAT_CLASS_WAYP                                             :Útipontok
+STR_STATION_CLASS_DFLT                                          :Alapértelmezett állomás
+STR_STATION_CLASS_WAYP                                          :Útipontok
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Dokk helyzete
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...csak vízen építhető
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nem építhetsz ide dokkot...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Válaszd ki a dokk helyzetét
-STR_WATER_DESCRIPTION_WATER                                     :Víz
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Tenger- vagy folyópart
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Dokk
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvadukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Víz
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Tenger- vagy folyópart
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Dokk
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...nem építhető vízen
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}A csatornát előbb le kell rombolni
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}A csatornát előbb le kell rombolni
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Játék mentése
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Játék betöltése
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Ment
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Töröl
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Megfigyelő, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Megfigyelő, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} szabad
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Nem olvasható a meghajtó
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}A mentés nem sikerült{}{STRING}
@@ -1929,12 +1929,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}MeghajtÃ
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}A mentés neve
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}A kijelölt mentés törlése
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}A játék elmentése a választott néven
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Véletlenszerű új játék
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Magasságtérkép betöltése
-STR_SAVE_OSKTITLE                                               :{BLACK}Add meg a játékmentés nevét
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Véletlenszerű új játék
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Magasságtérkép betöltése
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Add meg a játékmentés nevét
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}...{STRING} van az útban
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}...{STRING} van az útban
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Szénbánya
 STR_INDUSTRY_NAME_COAL_MINE.t                                   :szénbányát
@@ -2029,7 +2029,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}A fő nézetet a gazdasági épületre állítja
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Új {STRING.t} építenek {TOWN} közelében!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Új {STRING.t} ültettek {TOWN} közelében!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}�r: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}�r: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Nem építheted ide ezt a gazdasági épületet...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...erdő csak a hóhatár fölé ültethető
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} bejelentette, hogy hamarosan bezár!
@@ -2047,16 +2047,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Másik alagút van az útban
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Az alagút vége a pályán kívülre esik
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Az alagút vége a pályán kívülre esik
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nem lehet kiásni a földet az alagút túloldalán
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Előbb le kell rombolnod az alagutat
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Előbb le kell rombolnod a hidat
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Nem kezdődhet és végződhet ugyanott
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Hídfők nem egy szinten vannak
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}A híd túl alacsony a terepre
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Nem kezdődhet és végződhet ugyanott
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Hídfők nem egy szinten vannak
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}A híd túl alacsony a terepre
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}A kezdetének és a végének egy vonalban kell lennie
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Nem alkalmas a hely alagút bejáratának
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Függő, acél
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Gerendás, acél
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Rácsos, acél
@@ -2067,30 +2067,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cső, acél
 STR_BRIDGE_TUBULAR_SILICON                                      :Cső, Szilikon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Nem építhetsz ide hidat...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Nem áshatsz ide alagutat...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Vasúti alagút
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Közúti alagút
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Acél függő vasúti híd
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Gerendás acél vasúti híd
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Rácsos acél vasúti híd
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Vasbeton függő vasúti híd
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Fa vasúti híd
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Beton vasúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Acél függő közúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Gerendás acél közúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Rácsos acél közúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Vasbeton függő közúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Fa közúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Beton közúti híd
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Cső vasúti híd
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Cső közúti híd
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Vasúti alagút
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Közúti alagút
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Acél függő vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Gerendás acél vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Rácsos acél vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Vasbeton függő vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Fa vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Beton vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Acél függő közúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Gerendás acél közúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Rácsos acél közúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Vasbeton függő közúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Fa közúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Beton közúti híd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Cső vasúti híd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Cső közúti híd
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Tárgy van az útban
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Rádióadó torony
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Világítótorony
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Vállalat székháza
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Rádióadó torony
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Világítótorony
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Vállalat székháza
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...vállalat székháza van az útban
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Cég által lefoglalt föld
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Cég által lefoglalt föld
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Nem veheted meg ezt a földterületet...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...már a tiéd!
 
@@ -2138,7 +2138,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} {NUM}.
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Nehézségi szint
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Ment
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Ment
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Könnyű
@@ -2211,8 +2211,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Színsém
 STR_LIVERY_CAPTION                                              :{WHITE}Új színséma
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Vállalat neve
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Elnök neve
-STR_QUERY_COMPANY_NAME_CAPTION                                  :A vállalat neve
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Az elnök neve
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :A vállalat neve
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Az elnök neve
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Nem változtathatod meg a cég nevét...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Nem változtathatod meg az elnök nevét...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} pénzügyei {BLACK}{COMPANYNUM}
@@ -2236,11 +2236,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Összesen:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Jövedelem grafikon
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Működési nyereség grafikon
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Banki egyenleg
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Kölcsön
-STR_MAX_LOAN                                                    :{WHITE}Max. kölcsön: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max. kölcsön: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Kölcsönkér {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Visszafizet {SKIP}{SKIP}{CURRENCY}
@@ -2249,7 +2249,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nem köl
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...már visszatörlesztetted az összeset
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} kellene hozzá
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nem törleszthetsz a kölcsönből...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nem tudod a banktól kölcsönkapott pénzt továbbadni...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Nem tudod a banktól kölcsönkapott pénzt továbbadni...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Új arc választása az elnöknek
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}A cég járművei színének megváltoztatása
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Az elnök nevének megváltoztatása
@@ -2259,10 +2259,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}A kölcs
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Elnök)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Alapítás éve: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Járművek:
-STR_TRAINS                                                      :{WHITE}{COMMA} vonat
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} közúti jármű
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} repülőgép
-STR_SHIPS                                                       :{WHITE}{COMMA} hajó
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vonat
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} közúti jármű
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} repülőgép
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} hajó
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nincs
 STR_FACE_CAPTION                                                :{WHITE}Arcválasztás
 STR_FACE_MALE_BUTTON                                            :{BLACK}Férfi
@@ -2275,9 +2275,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}NÅ‘i arc
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Véletlenszerű új arc létrehozása
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Jelkulcs
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}A grafikonok jelmagyarázata
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Részletes teljesítményértékelés mutatása
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Részletes teljesítményértékelés mutatása
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Jelmagyarázat a grafikonokhoz
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}A vállalat adatainak mutatása/elrejtése a grafikonon
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}A vállalat adatainak mutatása/elrejtése a grafikonon
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Elszállított áruk mennyisége
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Cégek teljesítménye (legjobb teljesítmény=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Vállalatok értéke
@@ -2311,23 +2311,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Elnök
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Nagytőkés
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Székház építése
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}A cég székházának megépítése/ megtekintése
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}A cég székházának újraépítése máshol a cég értékének 1%-áért
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}A cég székházának újraépítése máshol a cég értékének 1%-áért
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nem építheted ide a székházadat...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Székház
-STR_RELOCATE_HQ                                                 :{BLACK}SZH áthelyezése
-STR_COMPANY_JOIN                                                :{BLACK}Csatlakozás
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Csatlakozz ezen vállalat vezetőjeként
-STR_COMPANY_PASSWORD                                            :{BLACK}Jelszó
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Védd le a vállalatodat jelszóval ha nem akarod hogy mások csatlakozzanak hozzá.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Vállalati jelszó beállítása
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}SZH áthelyezése
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Csatlakozás
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Csatlakozz ezen vállalat vezetőjeként
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Jelszó
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Védd le a vállalatodat jelszóval ha nem akarod hogy mások csatlakozzanak hozzá.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Vállalati jelszó beállítása
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne mentsd el a megadott jelszót
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Új jelszó megadása a céghez
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Cég jelszó
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Alapértelmezett cég jelszó
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Ezen jelszó mint alapjelszó használata az új cégeknél
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Alapértelmezett cég jelszó
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Ezen jelszó mint alapjelszó használata az új cégeknél
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Gazdasági visszaesés!{}{}A közgazdászok gazdasági válságtól tartanak!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Vége a visszaesésnek!{}{}A kereskedelem fellendül, ami önbizalmat ad az iparnak, és erősödik a gazdaság!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Kicsi/nagy ablakméret közötti váltás
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Kicsi/nagy ablakméret közötti váltás
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Cég értéke: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}25% megvétele a cégből
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}25% eladása a cégből
@@ -2337,7 +2337,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Nem vehe
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Nem adhatsz el 25%-ot ebből a cégből...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% {COMPANY} tulajdona)
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} céget felvásárolta {STRING}!
-STR_PROTECTED                                                   :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel...
+STR_ERROR_PROTECTED                                             :{WHITE}Ez a cég egyelőre még nem rendelkezik részvényekkel...
 
 STR_LIVERY_DEFAULT                                              :Alapértelmezett
 STR_LIVERY_STEAM                                                :GÅ‘zmozdony
@@ -2363,14 +2363,14 @@ STR_LIVERY_LARGE_PLANE                                          :Nagy repülÅ‘gÃ
 STR_LIVERY_PASSENGER_TRAM                                       :Utasszállító villamos
 STR_LIVERY_FREIGHT_TRAM                                         :Teherszállító villamos
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}�ltalános színsémák mutatása
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Vonat színsémák mutatása
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Mutasd a közúti járművek színsémáit
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Hajó színsémák mutatása
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Repülőgép színsémák mutatása
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Válassz egy elsődleges színt a kiválasztott sémához
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Válassz egy másodlagos színt a kiválasztott sémához
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Válassz megváltoztatandó színsémát, vagy színsémákat CTRL+kattintással. Kattints a dobozra a színséma használat váltásához.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}�ltalános színsémák mutatása
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Vonat színsémák mutatása
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Mutasd a közúti járművek színsémáit
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Hajó színsémák mutatása
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Repülőgép színsémák mutatása
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Válassz egy elsődleges színt a kiválasztott sémához
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Válassz egy másodlagos színt a kiválasztott sémához
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Válassz megváltoztatandó színsémát, vagy színsémákat CTRL+kattintással. Kattints a dobozra a színséma használat váltásához.
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (GÅ‘z)
@@ -2678,9 +2678,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(nem pakol le,
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}A kijelölt célpont megközelítésének és a megállási-áthajtási szokásainak beállítása
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}A kijelölt célponton a felpakolási szokások beállítása
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}A kijelölt célponton a lepakolási szokások beállítása
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Fejlett utasítás elhelyezése
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Fejlett utasítás elhelyezése
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Legközelebbi depóba
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Legközelebbi hangár
 STR_ORDER_NEAREST_DEPOT                                         :a legközelebbi
@@ -2690,9 +2690,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Ha javítás sz
 STR_ORDER_TRAIN_DEPOT                                           :járműtelepre
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :garázs
 STR_ORDER_SHIP_DEPOT                                            :dokk
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION}i reptér hangárjába
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION}i reptér hangárjába
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Mindig menj javítani
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Ha szükséges javítsd
@@ -2717,10 +2717,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :több, mint
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :nem kevesebb, mint
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :igaz
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :hamis
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Ugorj a(z) {COMMA}. utasításra
-STR_CONDITIONAL_NUM                                             :Ugorj a(z) {COMMA}. utasításra, ha {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Ugorj a(z) {COMMA}. utasításra, ha a '{STRING}' feltétel {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Ugorj a(z) {COMMA}. utasításra
+STR_ORDER_CONDITIONAL_NUM                                       :Ugorj a(z) {COMMA}. utasításra, ha {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Ugorj a(z) {COMMA}. utasításra, ha a '{STRING}' feltétel {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nincs utazás
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Következő célpontig a menetidő időzítetlen
@@ -2743,18 +2743,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Csak a j
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Kihagy
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Töröl
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Új cél
-STR_REFIT                                                       :{BLACK}�talakít
-STR_REFIT_TIP                                                   :{BLACK}Válaszd ki minek a szállítására álljunk át. Ctrl+kattintással eltávolítod az átalakítási utasítást.
-STR_REFIT_ORDER                                                 :(�talakít erre: {STRING})
-STR_REFIT_STOP_ORDER                                            :(átalakít erre: {STRING}, és megáll)
-STR_STOP_ORDER                                                  :(megáll)
-STR_TIMETABLE_VIEW                                              :{BLACK}Menetrend
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}�tkapcsolás menetrendi nézetre
-STR_ORDER_VIEW                                                  :{BLACK}Menetrend
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}�tkapcsolás a menetrend utasítástáblájára
+STR_ORDER_REFIT                                                 :{BLACK}�talakít
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Válaszd ki minek a szállítására álljunk át. Ctrl+kattintással eltávolítod az átalakítási utasítást.
+STR_ORDER_REFIT_ORDER                                           :(�talakít erre: {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(átalakít erre: {STRING}, és megáll)
+STR_ORDER_STOP_ORDER                                            :(megáll)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Menetrend
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}�tkapcsolás menetrendi nézetre
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Menetrend
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}�tkapcsolás a menetrend utasítástáblájára
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} menetrendje
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Menetrend vége - -
-STR_SERVICE                                                     :{BLACK}Javítás
+STR_ORDER_SERVICE                                               :{BLACK}Javítás
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK} Vásárlás éve: {LTBLUE}{NUM}{BLACK} Érték: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Érték: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2774,7 +2774,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}a jármÅ
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}egy jármű, amivel meg van osztva ez az utasítás, nem tud a megadott állomásra menni
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nem mozgathatod a járművet...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A mozdony első felének mindig elöl kell lennie
-STR_CARGO_N_A                                                   :Nincs{SKIP}
+STR_QUANTITY_N_A                                                :Nincs{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nem találok utat a helyi járműtelepre
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Javítási időköz: {LTBLUE}{COMMA} nap{BLACK}   Utolsó javítás: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Szervíz-intervallum: {LTBLUE}{COMMA}%{BLACK}   Utolsó szervíz: {LTBLUE}{DATE_LONG}
@@ -2794,10 +2794,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Menetren
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}A kijelölt menetrend-sor végrehajtási idejét változtatja meg
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}A kijelölt menetrendi sorhoz tartozó végrehajtási idő törlése
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Késés-számláló nullázása, azaz a jármű pontos lesz
-STR_SERVICE_HINT                                                :{BLACK}Célpont kihagyása, ha javítás szükséges
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}�r: {CURRENCY}    Súly: {WEIGHT_S}{}Sebesség: {VELOCITY}    Teljesítmény: {POWER}{}Működtetési költség: {CURRENCY}/év{}Kapacitás: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}�r: {CURRENCY} Végsebesség: {VELOCITY}{}Kapacitás: {CARGO}, {CARGO}{}Üzemeltetés: {CURRENCY}/év
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}�r: {CURRENCY} Végsebesség: {VELOCITY}{}Kapacitás: {CARGO}{}Üzemeltetés: {CURRENCY}/év
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Célpont kihagyása, ha javítás szükséges
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}�r: {CURRENCY}    Súly: {WEIGHT_S}{}Sebesség: {VELOCITY}    Teljesítmény: {POWER}{}Működtetési költség: {CURRENCY}/év{}Kapacitás: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}�r: {CURRENCY} Végsebesség: {VELOCITY}{}Kapacitás: {CARGO}, {CARGO}{}Üzemeltetés: {CURRENCY}/év
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}�r: {CURRENCY} Végsebesség: {VELOCITY}{}Kapacitás: {CARGO}{}Üzemeltetés: {CURRENCY}/év
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Kor: {LTBLUE}{STRING}{BLACK}   Üzemeltetés: {LTBLUE}{CURRENCY}/év
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Végsebesség: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Tömeg: {LTBLUE}{WEIGHT_S} {BLACK}Teljesítmény: {LTBLUE}{POWER}{BLACK} Végsebesség: {LTBLUE}{VELOCITY}
@@ -2817,28 +2817,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nem fordíthatod meg a vonatot...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}A járművet nem lehet megfordítani...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Több részből álló járművet nem lehet megfordítani
-STR_CLEAR_TIME                                                  :{BLACK}Idő törlése
-STR_RESET_LATENESS                                              :{BLACK}Késés nullázása
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}�tnevezi az ellenőrző pontot
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Bója átnevezése
-
-STR_TRAIN_STOPPING                                              :{RED}Lassít
-STR_TRAIN_STOPPING_VEL                                          :{RED}Lassít, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :inkompatibilis sintípusok
-STR_TRAIN_NO_POWER                                              :{RED}Nincs áram
-STR_TRAIN_START_NO_CATENARY                                     :Ennek a vágányszakasznak nincs felsővezetéke, a vonat nem tud indulni
-STR_TRAIN_STUCK                                                 :{ORANGE}Szabad útra vár
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Idő törlése
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Késés nullázása
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}�tnevezi az ellenőrző pontot
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Bója átnevezése
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Lassít
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Lassít, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :inkompatibilis sintípusok
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Nincs áram
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Ennek a vágányszakasznak nincs felsővezetéke, a vonat nem tud indulni
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Szabad útra vár
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Új {STRING} elérhető!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Új {STRING} elérhető!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}A megsemmisült jármű nem eladható...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nem lehetséges a megsemmisült jármű átalakítása...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}A megsemmisült jármű nem eladható...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nem lehetséges a megsemmisült jármű átalakítása...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}A jármű nem időzíthető
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}A járművek csak az állomáson várakozhatnak
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Ez a jármű nem áll meg ezen az állomáson
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}A jármű nem időzíthető
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}A járművek csak az állomáson várakozhatnak
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Ez a jármű nem áll meg ezen az állomáson
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Idő megváltoztatása
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Ez a jármű jelenleg pontosan közlekedik
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Ez a jármű jelenleg {STRING} késéssel közlekedik
@@ -2852,7 +2852,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Menetren
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...garázsban kellene állnia ehhez
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nem találom a helyi garázst
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Visszafordítja a járművet
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapacitás: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacitás: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} jármű{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2879,11 +2879,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Bója lerakása, ami az útvonal pontosítására használható
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Nem rakhatsz ide bóját...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Akvadukt építése
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ide nem lehet akvaduktot építeni...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Ide nem lehet akvaduktot építeni...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} átalakítása
 STR_REFIT_TITLE                                                 :{GOLD}�talakítás, hogy szállíthasson:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Új kapacitás: {GOLD}{CARGO}{}{BLACK}�talakítás költsége: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(átalakítható)
+STR_PURCHASE_INFO_REFITTABLE                                    :(átalakítható)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Reptér
@@ -2896,7 +2896,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Repülő
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Az emberek ünnepelnek . . .{}Megérkezett az első repülőgép {STATION} állomásra!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Lezuhant egy repülőgép!{}{COMMA} ember halt meg a zuhanás után {STATION} állomáson
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Repülő baleset!{}A repülőnek elfogyott az üzemanyaga, {COMMA} ember halt meg a zuhanásban!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} várakozási és menetidői
 
@@ -2909,13 +2909,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Egy szénbánya lesüllyedése földcsuszamlást okozott {TOWN} közelében!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}�radás!{}Legalább {COMMA} ember meghalt vagy eltünt a halálos áradás következtében!
 
-STR_BRIBE_FAILED                                                :{WHITE}A megvesztegetési kísérleted
-STR_BRIBE_FAILED_2                                              :{WHITE}lefülelte egy helyi nyomozó!
-STR_BUILD_DATE                                                  :{BLACK}Építve: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}A megvesztegetési kísérleted
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}lefülelte egy helyi nyomozó!
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Építve: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}�llomás osztálya: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}�llomás típusa: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}�llomás osztálya: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}�llomás típusa: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Teljesítményértékelések részletezése
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Részletek
@@ -2935,28 +2935,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Pénz:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Kölcsön:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Összesen:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Járművek száma. Beleértendőek a közúti járművek, a vonatok, hajók és repülők.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}�llomásrészek száma. Minden rész számít (pl. vasútállomás, buszmegálló, repülőtér), még akkor is, ha egy állomáshoz tartoznak is.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}A két évesnél idősebb járművek minimális profitja
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Az utóbbi 12 negyedév legalacsonyabb havi profitja
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Az utóbbi 12 negyedév legjövedelmezőbb havi profitja
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Utolsó négy negyedévben elszállított rakomány.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Az utolsó negyedévben elszállított áruk típusa.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Elérhető készpénz
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Magas kölcsönöd van?
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Megszerzett pontok az elérhető pontokból
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Járművek száma. Beleértendőek a közúti járművek, a vonatok, hajók és repülők.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}�llomásrészek száma. Minden rész számít (pl. vasútállomás, buszmegálló, repülőtér), még akkor is, ha egy állomáshoz tartoznak is.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}A két évesnél idősebb járművek minimális profitja
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Az utóbbi 12 negyedév legalacsonyabb havi profitja
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Az utóbbi 12 negyedév legjövedelmezőbb havi profitja
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Utolsó négy negyedévben elszállított rakomány.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Az utolsó negyedévben elszállított áruk típusa.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Elérhető készpénz
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Magas kölcsönöd van?
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Megszerzett pontok az elérhető pontokból
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF beállítások
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF beállítások megjelenítése
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF beállítások
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Alkalmazás
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Palettaváltás
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}A kiválasztott NewGRF palettájának váltása.{}Akkor használd, ha a NewGRF-ból származó grafikai elemek rózsaszínként jelennek meg
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Paraméterek beállítása
-STR_NEWGRF_FILENAME                                             :{BLACK}Fájlnév: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paletta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Alkalmazás
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palettaváltás
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}A kiválasztott NewGRF palettájának váltása.{}Akkor használd, ha a NewGRF-ból származó grafikai elemek rózsaszínként jelennek meg
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Paraméterek beállítása
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Fájlnév: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paletta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Te éppen a jelenleg futó játékot akarod megváltoztatni; ettől elszállhat az OpenTTD.{}Teljesen biztos vagy benne, hogy ezt akarod?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2979,34 +2979,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Érvénytelen I
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} hibás sprite-ot tartalmaz. Minden hibás sprite piros kérdőjellel (?) kerül jelölésre.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Túl sok Action 8 bejegyzést tartalmaz.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Kiválasztott lista betöltése
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Lista mentése
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}A kiválasztott elemek listába mentése
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}�rj be egy nevet a listának
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Lista törlése
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}A jelenleg kiválasztott lista törlése
-STR_NEWGRF_ADD                                                  :{BLACK}Hozzáad
-STR_NEWGRF_ADD_TIP                                              :{BLACK}A NewGRF-et hozzáadja a listához
-STR_NEWGRF_REMOVE                                               :{BLACK}Eltávolít
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Eltávolítja a kiválasztott NewGRF-et a listáról
-STR_NEWGRF_MOVEUP                                               :{BLACK}Fel
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}A kiválasztott NewGRF-et felfelé mozgatja a listán
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Le
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}A kiválasztott NewGRF-et lefelé mozgatja a listán
-STR_NEWGRF_FILE_TIP                                             :{BLACK}A feltelepített NewGRF-ek listája. Kattints a fileokra azok beállításához
-STR_NEWGRF_PARAMETER                                            :{BLACK}Paraméterek: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Add meg a NewGRF paramétereket
-STR_NEWGRF_NO_INFO                                              :{BLACK}Nem érhető el információ
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Kiválasztott lista betöltése
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Lista mentése
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}A kiválasztott elemek listába mentése
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}�rj be egy nevet a listának
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Lista törlése
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}A jelenleg kiválasztott lista törlése
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Hozzáad
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}A NewGRF-et hozzáadja a listához
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Eltávolít
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Eltávolítja a kiválasztott NewGRF-et a listáról
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Fel
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}A kiválasztott NewGRF-et felfelé mozgatja a listán
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Le
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}A kiválasztott NewGRF-et lefelé mozgatja a listán
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}A feltelepített NewGRF-ek listája. Kattints a fileokra azok beállításához
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paraméterek: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Add meg a NewGRF paramétereket
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Nem érhető el információ
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Elérhető NewGRF fileok
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Kiválasztáshoz hozzáad
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}A kiválasztott NewGRF fájlt hozzáadja a konfigurációdhoz
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Fájlok újraellenőrzése
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Az elérhető NewGRF fájlok listájának frissítése
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}A kiválasztott NewGRF fájlt hozzáadja a konfigurációdhoz
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Fájlok újraellenőrzése
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Az elérhető NewGRF fájlok listájának frissítése
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nem lehetséges a fájl hozzáadása: duplikált GRF azonosító
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Fájl nem található
-STR_NEWGRF_DISABLED                                             :{RED}Kikapcsolva
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Fájl nem található
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Kikapcsolva
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Pontosan megegyező fájlt nem találtam (kompatibilis GRF-fel helyettesítve)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilis GRF(ek) betöltve a hiányzó fájl(ok) helyett
@@ -3022,7 +3022,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}A(z) '{0
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}A(z) '{1:ENGINE}' rakomány/átalakítás információja a gyártás után különbözik a vételi listán találhatótól. Ez hibát okozhat az automatikus felújítás/lecserélés során az átalakításban.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' végtelen ciklust okozott a termelés folyamatnál.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}A játék olyan verzióban lett elmentve, ami nem támogatja a villamosokat . Az összes villamos törölve lett.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}A játék olyan verzióban lett elmentve, ami nem támogatja a villamosokat . Az összes villamos törölve lett.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Saját pénznem
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Értékarány: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3033,16 +3033,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Euróra
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Euróra váltás: {ORANGE}soha
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Előnézet: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}A saját pénznem paramétereinek megváltoztatása
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}�tváltási arány csökkentése egy Fonthoz (£) képest
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}�tváltási arány növelése egy Fonthoz (£) képest
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}�tváltási arány beállítása egy Fonthoz (£) képest
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Elválasztó beállítása a pénznemedhez
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Előtag beállítása a pénznemedhez
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Utótag beállítása a pénznemedhez
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Euróra váltás korábban
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Euróra váltás később
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Euróra váltás évének beállítása
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Font (£) a pénznemedben
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}�tváltási arány csökkentése egy Fonthoz (£) képest
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}�tváltási arány növelése egy Fonthoz (£) képest
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}�tváltási arány beállítása egy Fonthoz (£) képest
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Elválasztó beállítása a pénznemedhez
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Előtag beállítása a pénznemedhez
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Utótag beállítása a pénznemedhez
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Euróra váltás korábban
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Euróra váltás később
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Euróra váltás évének beállítása
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Font (£) a pénznemedben
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3061,8 +3061,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} hajói - {COMMA}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} repülőgépei - {COMMA}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} jármű megosztott menetrendje
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Megmutatja az összes járművet, amik megosztják ezt a menetrendet
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA} jármű megosztott menetrendje
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Megmutatja az összes járművet, amik megosztják ezt a menetrendet
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} a járműtelepen vár
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} a garázsban vár
@@ -3169,39 +3169,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Teheraut
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}A hajó átalakítása másfajta rakomány szállítására
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}A repülőgép átalakítása másfajta rakomány szállítására
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Úton {TOWN} járműtelepére
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Úton {TOWN} járműtelepére, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Úton {TOWN} garázsába
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Úton {TOWN} garázsába, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Úton {TOWN} dokkjába
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Úton {TOWN} dokkjába, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Úton {STATION} hangárjába
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Úton {STATION} hangárjába, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Javítás {TOWN} járműtelepén
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Javítás {TOWN} járműtelepén, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Javítás {TOWN} garázsában
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Javítás {TOWN} garázsában, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Javítás {TOWN} dokkjában
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Javítás {TOWN} dokkjában, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Javítás {STATION} hangárjában
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Javítás {STATION} hangárjában, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Vonat másolása
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Jármű másolása
-STR_CLONE_SHIP                                                  :{BLACK}Hajó másolása
-STR_CLONE_AIRCRAFT                                              :{BLACK}Repülőgép másolása
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ide kattintva a teljes vonat másolatát készítheted el. Control+kattintás esetén a menetrendet is megosztod
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ide kattintva ezen jármű másolatát készítheted el. Control+kattintás esetén a menetrendet is megosztja
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ide kattintva egy hajó másolatát készítheted el. Control+kattintás esetén a menetrendet is megoszthatod
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ezzel a repülőgép másolatát készítheted el. Control+kattintás esetén a menetrendet is megoszthatod.
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ide kattintva egy teljes vonat másolatát készítheted el. Kattints ide majd a másolandó vonatra. Ctrl+kattintás esetén a menetrendet is megoszthatod
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ide kattintva elkészítheted egy közúti jármű másolatát. Kattints ide, majd a másolandó járműre. Ctrl+kattintás esetén a menetrendet is megosztod
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ide kattintva egy vonat másolatát készítheted el. Kattints ide majd a másolandó vonatra. Ctrl+kattintás esetén a menetrendet is megoszthatod
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ide kattintva egy repülőgép másolatát készítheted el. Kattints ide majd a másolandó repülőgépre. Ctrl+kattintás esetén a menetrendet is megoszthatod.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Úton {TOWN} járműtelepére
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Úton {TOWN} járműtelepére, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Úton {TOWN} garázsába
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Úton {TOWN} garázsába, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Úton {TOWN} dokkjába
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Úton {TOWN} dokkjába, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Úton {STATION} hangárjába
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Úton {STATION} hangárjába, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Javítás {TOWN} járműtelepén
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Javítás {TOWN} járműtelepén, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Javítás {TOWN} garázsában
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Javítás {TOWN} garázsában, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Javítás {TOWN} dokkjában
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Javítás {TOWN} dokkjában, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Javítás {STATION} hangárjában
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Javítás {STATION} hangárjában, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Vonat másolása
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Jármű másolása
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Hajó másolása
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Repülőgép másolása
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Ide kattintva a teljes vonat másolatát készítheted el. Control+kattintás esetén a menetrendet is megosztod
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Ide kattintva ezen jármű másolatát készítheted el. Control+kattintás esetén a menetrendet is megosztja
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Ide kattintva egy hajó másolatát készítheted el. Control+kattintás esetén a menetrendet is megoszthatod
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Ezzel a repülőgép másolatát készítheted el. Control+kattintás esetén a menetrendet is megoszthatod.
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ide kattintva egy teljes vonat másolatát készítheted el. Kattints ide majd a másolandó vonatra. Ctrl+kattintás esetén a menetrendet is megoszthatod
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ide kattintva elkészítheted egy közúti jármű másolatát. Kattints ide, majd a másolandó járműre. Ctrl+kattintás esetén a menetrendet is megosztod
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ide kattintva egy vonat másolatát készítheted el. Kattints ide majd a másolandó vonatra. Ctrl+kattintás esetén a menetrendet is megoszthatod
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ide kattintva egy repülőgép másolatát készítheted el. Kattints ide majd a másolandó repülőgépre. Ctrl+kattintás esetén a menetrendet is megoszthatod.
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Új vasúti járművek
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Új villamosvasúti járművek
@@ -3271,28 +3271,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}A fÅ‘ nÃ
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Biztosan eladod a járműtelepen lévő összes járművet?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Rossz depó típus
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Rossz depó típus
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Összes vonat eladása a járműtelepen
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Összes garázsbeli jármű eladása
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Összes dokkbeli hajó eladása
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Összes hangárbéli repülő eladása
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Összes vonat eladása a járműtelepen
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Összes garázsbeli jármű eladása
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Összes dokkbeli hajó eladása
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Összes hangárbéli repülő eladása
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Az összes, ezen járműtelepet menetrendszerüen látogató vonat listájának összeállítása
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Az összes, ezen hangárt menetrendszerüen látogató jármű listájának összeállítása
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Az összes, ezen dokkot menetrendszerüen látogató hajó listájának összeállítása
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Az összes, itteni hangárt menetrendszerüen látogató repülőgép listájának összeállítása
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Az összes, ezen járműtelepet menetrendszerüen látogató vonat listájának összeállítása
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Az összes, ezen hangárt menetrendszerüen látogató jármű listájának összeállítása
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Az összes, ezen dokkot menetrendszerüen látogató hajó listájának összeállítása
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Az összes, itteni hangárt menetrendszerüen látogató repülőgép listájának összeállítása
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}A járműtelepen lévő összes vonat automatikus cseréje
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}A garázsban lévő összes jármű automatikus cseréje
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}A dokkban lévő összes hajó automatikus cseréje
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}A hangárban lévő összes repülő automatikus cseréje
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}A járműtelepen lévő összes vonat automatikus cseréje
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}A garázsban lévő összes jármű automatikus cseréje
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}A dokkban lévő összes hajó automatikus cseréje
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}A hangárban lévő összes repülő automatikus cseréje
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Lecserél {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Járműcsere elkezdése
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Járműcsere befejezése
-STR_NOT_REPLACING                                               :{BLACK}Nem cserélendő
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nincs kiválasztva jármű
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Nem cserélendő
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nincs kiválasztva jármű
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Válaszd ki mely mozdonyokat cseréljük
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}A bal oldalon kiválasztott egységek ilyen típusuakra lesznek lecserélve
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Nyomd meg ezt a gombot, ha be akarod fejezni a bal oldalon kiválasztott egység cseréjét
@@ -3304,26 +3304,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Az autom
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Lecserél: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Váltás a mozdony és a vasúti-kocsi cserélő ablak között
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}A jármű nem elérhető.
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}A jármű nem elérhető.
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}A hajó nem elérhető.
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}A repülő nem elérhető.
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}A jármű nem elérhető.
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}A jármű nem elérhető.
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}A hajó nem elérhető.
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}A repülő nem elérhető.
 
-STR_ENGINES                                                     :Mozdonyok
-STR_WAGONS                                                      :Vagonok
+STR_REPLACE_ENGINES                                             :Mozdonyok
+STR_REPLACE_WAGONS                                              :Vagonok
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Kattints ide az összes vonat megállításában a járműtelepen
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Kattints ide az összes közúti jármű megállításához a garázsban
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Kattints ide az összes dokkbeli hajó leállításához
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Kattints ide az összes hangárbeli repülő leállításához
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Kattints ide az összes vonat megállításában a járműtelepen
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Kattints ide az összes közúti jármű megállításához a garázsban
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Kattints ide az összes dokkbeli hajó leállításához
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Kattints ide az összes hangárbeli repülő leállításához
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Kattints ide az összes vonat elindításához a járműtelepről
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Kattints ide az összes közúti jármű elindításához a garázsból
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Kattints ide az összes dokkbeli hajó elindításához
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Kattints ide az összes hangárbeli repülő elindításához
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Kattints ide az összes vonat elindításához a járműtelepről
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Kattints ide az összes közúti jármű elindításához a garázsból
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Kattints ide az összes dokkbeli hajó elindításához
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Kattints ide az összes hangárbeli repülő elindításához
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Kattints ide a listán lévő összes jármű leállításához
-STR_MASS_START_LIST_TIP                                         :{BLACK}Kattints ide a listán lévő összes jármű elindításához
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Kattints ide a listán lévő összes jármű leállításához
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Kattints ide a listán lévő összes jármű elindításához
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Feliratok listája ({COMMA} db)
@@ -3332,14 +3332,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Hibás Ã
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Normál Vasutak
-STR_ELRAIL_VEHICLES                                             :Villamosított vasúti járművek
-STR_MONORAIL_VEHICLES                                           :Egysínű Vasutak
-STR_MAGLEV_VEHICLES                                             :Maglev Járművek
+STR_REPLACE_RAIL_VEHICLES                                       :Normál Vasutak
+STR_REPLACE_ELRAIL_VEHICLES                                     :Villamosított vasúti járművek
+STR_REPLACE_MONORAIL_VEHICLES                                   :Egysínű Vasutak
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev Járművek
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}�r: {GOLD}{CURRENCY}{BLACK} Súly: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Sebesség: {GOLD}{VELOCITY}{BLACK} Telj.: {GOLD}{POWER}
@@ -3366,70 +3366,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generál
-STR_RANDOM                                                      :{BLACK}Véletlenszerűen
-STR_RANDOM_HELP                                                 :{BLACK}Megváltoztatja a térképgenerálásnál használt véletlen alapszámot
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Térkép létrehozása
-STR_RANDOM_SEED                                                 :{BLACK}Véletlen alapszám:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Kattints ide a véletlen alapszám beírásához
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Irj be egy tetszőleges számot
-STR_LAND_GENERATOR                                              :{BLACK}Térkép generátor:
-STR_TREE_PLACER                                                 :{BLACK}Fa algoritmus:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Magasságtérkép elforgatása:
-STR_TERRAIN_TYPE                                                :{BLACK}Tereptípus:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Tengerszint:
-STR_SMOOTHNESS                                                  :{BLACK}Simaság:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Hóhatár:
-STR_DATE                                                        :{BLACK}Dátum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Várossűrűség:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Iparsűrűség:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}A hóhatár megnövelése eggyel
-STR_SNOW_LINE_DOWN                                              :{BLACK}A hóhatár csökkentése eggyel
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Hóhatár megváltoztatása
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Kezdő év megváltoztatása
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}�tméretezési figyelmeztetés
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}A forrás térkép túlságosan nagy mértékű átméretezése nem javasolt. Folytatod mégis?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Magasságtérkép neve:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Méret: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generál
+STR_MAPGEN_RANDOM                                               :{BLACK}Véletlenszerűen
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Megváltoztatja a térképgenerálásnál használt véletlen alapszámot
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Térkép létrehozása
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Véletlen alapszám:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Kattints ide a véletlen alapszám beírásához
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Irj be egy tetszőleges számot
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Térkép generátor:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Fa algoritmus:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Magasságtérkép elforgatása:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tereptípus:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Tengerszint:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Simaság:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Hóhatár:
+STR_MAPGEN_DATE                                                 :{BLACK}Dátum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Várossűrűség:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Iparsűrűség:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}A hóhatár megnövelése eggyel
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}A hóhatár csökkentése eggyel
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Hóhatár megváltoztatása
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Kezdő év megváltoztatása
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}�tméretezési figyelmeztetés
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}A forrás térkép túlságosan nagy mértékű átméretezése nem javasolt. Folytatod mégis?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Magasságtérkép neve:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Méret: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Térkép létrehozása...
 STR_GENERATION_ABORT                                            :{BLACK}Félbeszakít
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Megszakítja a térkép létrehozását
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Tényleg meg akarod szakítani a térkép generálását?
-STR_PROGRESS                                                    :{WHITE}{NUM}% kész
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Térkép létrehozása
-STR_TREE_GENERATION                                             :{BLACK}Fák generálása
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Világítótornyok létrehozása
-STR_CLEARING_TILES                                              :{BLACK}Durva és köves területek generálása
-STR_SETTINGUP_GAME                                              :{BLACK}Játék beállítása
-STR_PREPARING_TILELOOP                                          :{BLACK}Mezők véglegesítése
-STR_PREPARING_GAME                                              :{BLACK}Játék előkészítése
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ez a módosítás megváltoztatta a nehézségi szintet egyedire.
-STR_SE_FLAT_WORLD                                               :{WHITE}Lapos térkép
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Lapos térképet generál
-STR_SE_RANDOM_LAND                                              :{WHITE}Véletlen térkép
-STR_SE_NEW_WORLD                                                :{BLACK}Új küldetés létrehozása
-STR_SE_CAPTION                                                  :{WHITE}Küldetés típusa
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Csökkenti eggyel a sima terep magasságát
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Növeli eggyel a sima terep magasságát
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Sima terep magasságát változtatja
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Sima terep magassága:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% kész
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Térkép létrehozása
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Fák generálása
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Világítótornyok létrehozása
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Durva és köves területek generálása
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Játék beállítása
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Mezők véglegesítése
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Játék előkészítése
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Ez a módosítás megváltoztatta a nehézségi szintet egyedire.
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Lapos térkép
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Lapos térképet generál
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Véletlen térkép
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Új küldetés létrehozása
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Küldetés típusa
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Csökkenti eggyel a sima terep magasságát
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Növeli eggyel a sima terep magasságát
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Sima terep magasságát változtatja
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Sima terep magassága:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}A kistérkép közepét a jelenlegi helyre állítja
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Térkép szélei:
-STR_NORTHWEST                                                   :{BLACK}Északnyugat
-STR_NORTHEAST                                                   :{BLACK}Északkelet
-STR_SOUTHEAST                                                   :{BLACK}Délkelet
-STR_SOUTHWEST                                                   :{BLACK}Délnyugat
-STR_BORDER_FREEFORM                                             :{BLACK}Szárazföld
-STR_BORDER_WATER                                                :{BLACK}Víz
-STR_BORDER_RANDOM                                               :{BLACK}Véletlen
-STR_BORDER_RANDOMIZE                                            :{BLACK}Véletlen
-STR_BORDER_MANUAL                                               :{BLACK}Kézi
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Térkép szélei:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Északnyugat
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Északkelet
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Délkelet
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Délnyugat
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Szárazföld
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Víz
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Véletlen
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Véletlen
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Kézi
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Kicsi
@@ -3454,21 +3454,21 @@ STR_MEASURE_AREA                                                :{BLACK}Terület
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Távolság: {NUM}{}Magasságkülönbség: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Terület: {NUM} x {NUM}{}Magasságkülönbség: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Szállítási díj: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ez egy városi tulajdonú út
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...az út másik irányba vezet
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}�tlátszósági beállítások
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Keret nélküli állomásnevek bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Fák átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Épületek átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Gazdasági létesítmények átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Építhető elemek (állomások, járműtelepek, ellenőrző pontok) átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Hidak átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Tereptárgyak (adótornyok, világítótornyok, stb.) átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Felsővezetékek átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}�tlátszó rakodásjelző bekapcsolása. CTRL+kattintással zárolható.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Az objektum ne átlátszó legyen, hanem láthatatlan
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Szállítási díj: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ez egy városi tulajdonú út
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...az út másik irányba vezet
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}�tlátszósági beállítások
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Keret nélküli állomásnevek bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Fák átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Épületek átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Gazdasági létesítmények átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Építhető elemek (állomások, járműtelepek, ellenőrző pontok) átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Hidak átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Tereptárgyak (adótornyok, világítótornyok, stb.) átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Felsővezetékek átlátszóságának bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}�tlátszó rakodásjelző bekapcsolása. CTRL+kattintással zárolható.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Az objektum ne átlátszó legyen, hanem láthatatlan
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3478,7 +3478,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Összes vonat
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Összes közúti jármű
 STR_GROUP_ALL_SHIPS                                             :Összes hajó
@@ -3487,24 +3487,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Csoportosítatl
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Csoportosítatlan közúti járművek
 STR_GROUP_DEFAULT_SHIPS                                         :Csoportosítatlan hajók
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Csoportosítatlan repülők
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Megosztott jármű hozzáadása
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Összes jármű eltávolítása
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Csoport átnevezése
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Csoport létrehozás sikertelen...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Csoport törlése sikertelen...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Csoport átnevezése sikertelen...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Csoport járműveinek törlése sikertelen...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Jármű hozzáadása a csoporthoz sikertelen...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Megosztott jármű csoporthoz való hozzáadása sikertelen...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Csoport létrehozás sikertelen...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Csoport törlése sikertelen...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Csoport átnevezése sikertelen...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Csoport járműveinek törlése sikertelen...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Jármű hozzáadása a csoporthoz sikertelen...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Megosztott jármű csoporthoz való hozzáadása sikertelen...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Csoportok - Kattints a csoport nevére a járművek listázásához
-STR_GROUP_CREATE_TIP                                            :{BLACK}Csoport létrehozásához kattints ide
-STR_GROUP_DELETE_TIP                                            :{BLACK}Kijelölt csoportosítás törlése
-STR_GROUP_RENAME_TIP                                            :{BLACK}Kijelölt csoport átnevezése
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Csoport automata csere alóli mentességének beállításához katt.ide
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Csoportok - Kattints a csoport nevére a járművek listázásához
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Csoport létrehozásához kattints ide
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Kijelölt csoportosítás törlése
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Kijelölt csoport átnevezése
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Csoport automata csere alóli mentességének beállításához katt.ide
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3565,35 +3565,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}A névnek egyedinek kell lennie
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}A névnek egyedinek kell lennie
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Következő felirat
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Előző felirat
-STR_SIGN_OSKTITLE                                               :{BLACK}Felirat szövegének szerkesztése
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Következő felirat
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Előző felirat
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Felirat szövegének szerkesztése
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Alapít
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Kutatás
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Épít
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Válaszd ki a megfelelő ipartípust a listából
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Alapít
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Kutatás
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Épít
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Válaszd ki a megfelelő ipartípust a listából
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Fejlett
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Fejlett arcválasztó.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Fejlett arcválasztó.
 STR_FACE_SIMPLE                                                 :{BLACK}Egyszerű
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Egyszerű arcválasztó.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Egyszerű arcválasztó.
 STR_FACE_LOAD                                                   :{BLACK}Betölt
-STR_FACE_LOAD_TIP                                               :{BLACK}Kedvenc arcod betöltése
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Kedvenc arcod betöltése
 STR_FACE_LOAD_DONE                                              :{WHITE}A kedvenc arcod az OpenTTD konfig-fájlból be lett töltve.
 STR_FACE_FACECODE                                               :{BLACK}Játékos arc szám
-STR_FACE_FACECODE_TIP                                           :{BLACK}Játékos arc-számának megtekintését/módosítását teszi lehetővé
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Játékos arc-számának megtekintését/módosítását teszi lehetővé
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Játékos arcszámának megtekintése/módosítása
 STR_FACE_FACECODE_SET                                           :{WHITE}Az új arcszám-kód beállítása megtörtént.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Játékos arc-szám beállítás sikertelen - A megadott értéknek 0 és 4.294.967.295 közé eső számnak kell lennie!
 STR_FACE_SAVE                                                   :{BLACK}Mentés
-STR_FACE_SAVE_TIP                                               :{BLACK}Kedvenc arc elmentése
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Kedvenc arc elmentése
 STR_FACE_SAVE_DONE                                              :{WHITE}Ez az arc mint a kedvenc arcod fog az OpenTTD konfig-fájlba elmentődni.
 STR_FACE_EUROPEAN                                               :{BLACK}Európai
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Európai arc választása
@@ -3601,51 +3601,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikai
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Afrikai arc választása
 STR_FACE_YES                                                    :Igen
 STR_FACE_NO                                                     :Nem
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Engedélyezi a bajuszt és/vagy a fülbevalót
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Engedélyezi a bajuszt és/vagy a fülbevalót
 STR_FACE_HAIR                                                   :Haj:
-STR_FACE_HAIR_TIP                                               :{BLACK}Haj váltása
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Haj váltása
 STR_FACE_EYEBROWS                                               :Szemöldök:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Szemöldök módosítása
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Szemöldök módosítása
 STR_FACE_EYECOLOUR                                              :Szemszín:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Szemszín cseréje
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Szemszín cseréje
 STR_FACE_GLASSES                                                :Szemüveg:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Szemüveg engedélyezése
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Szemüveg váltása
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Szemüveg engedélyezése
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Szemüveg váltása
 STR_FACE_NOSE                                                   :Orr:
-STR_FACE_NOSE_TIP                                               :{BLACK}Orr váltása
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Orr váltása
 STR_FACE_LIPS                                                   :Ajkak:
 STR_FACE_MOUSTACHE                                              :Bajusz:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Ajkak vagy bajusz váltása
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Ajkak vagy bajusz váltása
 STR_FACE_CHIN                                                   :�ll:
-STR_FACE_CHIN_TIP                                               :{BLACK}�ll váltása
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}�ll váltása
 STR_FACE_JACKET                                                 :Kabát
-STR_FACE_JACKET_TIP                                             :{BLACK}Kabát cseréje
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Kabát cseréje
 STR_FACE_COLLAR                                                 :Gallér
-STR_FACE_COLLAR_TIP                                             :{BLACK}Gallér cseréje
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Gallér cseréje
 STR_FACE_TIE                                                    :Nyakkendő:
 STR_FACE_EARRING                                                :Fülbevaló:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Nyakkendő vagy fülbevaló cseréje
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Nyakkendő vagy fülbevaló cseréje
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Jelző választó
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Itt nem lehet konvertálni a jelzőket...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Normál jelző (alak){}A jelzők feladata a vonatok összeütközésének megakadályozása a többvonatos vasúti hálózatokon.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Bejárati jelző (alak){}Mindaddig zöld, amíg van legalább egy zöld kijárati jelző az utána következő szakaszon. Egyébként vöröset jelez.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Kijárati jelző (alak){}Ugyanúgy viselkedik mint a normál jelző, de megléte elengedhetetlenül szükséges a bejárati- és a kombinált jelzők működéséhez.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinált jelző (alak){}A kombinált jelző voltaképpen egy kijárati- és egy bejárati jelző egybeépítve. Segítségével bejárati jelzőkből lehet nagy "fákat" kialakítani.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Fejlett jelző (PBS alakjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. A fejlett jelzők mellett hátulról is el lehet haladni.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Egyirányú fejlett jelző (PBS alakjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. Az egyirányú jelzők mellett nem lehet hátulról elhaladni.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Normál jelző (fény){}A jelzők feladata a vonatok összeütközésének megakadályozása a többvonatos vasúti hálózatokon.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Bejárati jelző (fény){}Mindaddig zöld, amíg van legalább egy zöld kijárati jelző az utána következő szakaszon. Egyébként vöröset jelez.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Kijárati jelző (fény){}Ugyanúgy viselkedik mint a normál jelző, de megléte elengedhetetlenül szükséges a bejárati- és a kombinált jelzők működéséhez.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinált jelző (fény){}A kombinált jelző voltaképpen egy kijárati- és egy bejárati jelző egybeépítve. Segítségével bejárati jelzőkből lehet nagy "fákat" kialakítani.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Fejlett jelző (PBS fényjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. A fejlett jelzők mellett hátulról is el lehet haladni.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Egyirányú fejlett jelző (PBS fényjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. Az egyirányú jelzők mellett nem lehet hátulról elhaladni.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Jelző átalakítás{}Amikor ki van jelölve, egy meglévő jelzőre való kattintással átkonvertálja a kiválasztott jelzőtípusra és -variációra, CTRL+kattintás a variációt fogja változtatni.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Automata jelzőlerakás sűrűsége
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Automata jelzőlerakás-sűrűség csökkentése
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Automata jelzőlerakás-sűrűség növelése
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Jelző választó
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Itt nem lehet konvertálni a jelzőket...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Normál jelző (alak){}A jelzők feladata a vonatok összeütközésének megakadályozása a többvonatos vasúti hálózatokon.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Bejárati jelző (alak){}Mindaddig zöld, amíg van legalább egy zöld kijárati jelző az utána következő szakaszon. Egyébként vöröset jelez.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Kijárati jelző (alak){}Ugyanúgy viselkedik mint a normál jelző, de megléte elengedhetetlenül szükséges a bejárati- és a kombinált jelzők működéséhez.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinált jelző (alak){}A kombinált jelző voltaképpen egy kijárati- és egy bejárati jelző egybeépítve. Segítségével bejárati jelzőkből lehet nagy "fákat" kialakítani.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Fejlett jelző (PBS alakjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. A fejlett jelzők mellett hátulról is el lehet haladni.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Egyirányú fejlett jelző (PBS alakjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. Az egyirányú jelzők mellett nem lehet hátulról elhaladni.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Normál jelző (fény){}A jelzők feladata a vonatok összeütközésének megakadályozása a többvonatos vasúti hálózatokon.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Bejárati jelző (fény){}Mindaddig zöld, amíg van legalább egy zöld kijárati jelző az utána következő szakaszon. Egyébként vöröset jelez.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Kijárati jelző (fény){}Ugyanúgy viselkedik mint a normál jelző, de megléte elengedhetetlenül szükséges a bejárati- és a kombinált jelzők működéséhez.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinált jelző (fény){}A kombinált jelző voltaképpen egy kijárati- és egy bejárati jelző egybeépítve. Segítségével bejárati jelzőkből lehet nagy "fákat" kialakítani.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Fejlett jelző (PBS fényjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. A fejlett jelzők mellett hátulról is el lehet haladni.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Egyirányú fejlett jelző (PBS fényjelző){}Egy fejlett jelző lehetővé teszi, hogy amennyiben a vonatok le tudnak foglalni maguknak egy biztonságos vágányutat a következő jelzőig, több vonat is beléphessen ugyanabba a jelzőblokkba. Az egyirányú jelzők mellett nem lehet hátulról elhaladni.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Jelző átalakítás{}Amikor ki van jelölve, egy meglévő jelzőre való kattintással átkonvertálja a kiválasztott jelzőtípusra és -variációra, CTRL+kattintás a variációt fogja változtatni.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Automata jelzőlerakás sűrűsége
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Automata jelzőlerakás-sűrűség csökkentése
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Automata jelzőlerakás-sűrűség növelése
 ########
 
 ############ on screen keyboard
@@ -3657,37 +3657,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :§'"+!%/=()ÖÜ
 STR_INTRO_AI_SETTINGS                                           :{BLACK}MI beállítások
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}A gépi ellenfelek beállításainak megjelenítése
 STR_AI_DEBUG                                                    :{WHITE}MI nyomkövetés
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}MI neve
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}MI neve
 STR_AI_DEBUG_RELOAD                                             :{BLACK}MI újratöltése
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}MI kilövése, szkript újratöltése, MI újraindítása
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Az MI nyomkövetés ablak csak a szerver számára elérhető
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}MI kilövése, szkript újratöltése, MI újraindítása
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Az MI nyomkövetés ablak csak a szerver számára elérhető
 STR_AI_CONFIG_CAPTION                                           :{WHITE}MI beállítások
-STR_AI_CHANGE                                                   :{BLACK}MI kiválasztása
-STR_AI_CONFIGURE                                                :{BLACK}Beállítások
-STR_AI_CHANGE_TIP                                               :{BLACK}Másik MI betöltése
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Az MI paramétereinek beállítása
-STR_AI_LIST_TIP                                                 :{BLACK}Az összes MI, ami be lesz töltve a következő játékban
+STR_AI_CONFIG_CHANGE                                            :{BLACK}MI kiválasztása
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Beállítások
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Másik MI betöltése
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Az MI paramétereinek beállítása
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Az összes MI, ami be lesz töltve a következő játékban
 STR_AI_LIST_CAPTION                                             :{WHITE}Elérhető MI-k
-STR_AI_AILIST_TIP                                               :{BLACK}Kattints ide az MI kiválasztásához
-STR_AI_ACCEPT                                                   :{BLACK}Elfogad
-STR_AI_ACCEPT_TIP                                               :{BLACK}A kijelölt MI kiválasztása
-STR_AI_CANCEL                                                   :{BLACK}Mégsem
-STR_AI_CANCEL_TIP                                               :{BLACK}MI változtatások visszavonása
-STR_AI_CLOSE                                                    :{BLACK}Bezárás
-STR_AI_RESET                                                    :{BLACK}Visszaállítás
-STR_AI_HUMAN_PLAYER                                             :Játékos
-STR_AI_RANDOM_AI                                                :Véletlenszerűen választott MI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Kattints ide az MI kiválasztásához
+STR_AI_LIST_ACCEPT                                              :{BLACK}Elfogad
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}A kijelölt MI kiválasztása
+STR_AI_LIST_CANCEL                                              :{BLACK}Mégsem
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}MI változtatások visszavonása
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Bezárás
+STR_AI_SETTINGS_RESET                                           :{BLACK}Visszaállítás
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Játékos
+STR_AI_CONFIG_RANDOM_AI                                         :Véletlenszerűen választott MI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}MI paraméterek
-STR_AI_AUTHOR                                                   :{BLACK}Készítő: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Verzió: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Az egyik futó MI futása közben hiba történt. Kérjük jelezd ezt az MI készítőjének az MI nyomkövetés ablakról készített képpel.
-STR_AI_NO_AI_FOUND                                              :Nincs MI, amit be lehetne tölteni.{}A jelenlegi MI nem fog semmit csinálni.{}MI-k letöltéséhez használd a főmenüből elérhető tartalomletöltő rendszert.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Készítő: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Verzió: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Az egyik futó MI futása közben hiba történt. Kérjük jelezd ezt az MI készítőjének az MI nyomkövetés ablakról készített képpel.
+STR_ERROR_AI_NO_AI_FOUND                                        :Nincs MI, amit be lehetne tölteni.{}A jelenlegi MI nem fog semmit csinálni.{}MI-k letöltéséhez használd a főmenüből elérhető tartalomletöltő rendszert.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Zajszint a városban: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Zajtermelés: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Zajszint a városban: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Zajtermelés: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3701,21 +3701,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Térkép
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Magasságtérkép
 STR_CONTENT_TITLE                                               :{WHITE}Tartalom letöltés
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Típus
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}A tartalom típusa
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}A tartalom típusa
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Név
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}A tartalom neve
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Kattints a sorra a részletek megjelenítéséhez. Kattints a jelölőnégyzetbe letöltésre való kijelöléshez
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}A tartalom neve
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Kattints a sorra a részletek megjelenítéséhez. Kattints a jelölőnégyzetbe letöltésre való kijelöléshez
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Összes kijelölése
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Az összes elérhető tartalom kijelölése letöltéshez
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Az összes elérhető tartalom kijelölése letöltéshez
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Frissítések kijelölése
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Már meglévő tartalmakhoz az összes elérhető frissítés kijelölése letöltéshez
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Már meglévő tartalmakhoz az összes elérhető frissítés kijelölése letöltéshez
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Nincs kijelölés
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Megszünteti az összes kijelölést
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Megszünteti az összes kijelölést
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Kulcsszó megadása a szűréshez
-STR_CONTENT_FILTER_TIP                                          :{BLACK}�rd ide a kulcsszót ami alapján szűrni szeretnéd a listát
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}�rd ide a kulcsszót ami alapján szűrni szeretnéd a listát
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Címke/név szűrő:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Letöltés
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}A kijelölt tartalmak letöltésének megkezdése
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}A kijelölt tartalmak letöltésének megkezdése
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}A letöltés teljes mérete: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORM�CIÓ A KIV�LASZTOTT TARTALOMRÓL
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Nem jelölted ki letöltésre
@@ -3748,6 +3748,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nem sike
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Letölthető tartalmak
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Új és frissített tartalmak megtekintése és letöltése
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Keresd a hiányzó tartalmat online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Ellenőrizd, hogy letölthető-e a hiányzó tartalom
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Keresd a hiányzó tartalmat online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Ellenőrizd, hogy letölthető-e a hiányzó tartalom
 ########
diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt
index 9d7def9f4..e904bfe14 100644
--- a/src/lang/icelandic.txt
+++ b/src/lang/icelandic.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kort - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Stillingar
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Skilaboð
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Skilaboð frá {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varúð!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varúð!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Get ekki gert þetta....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Get ekki hreinsað þetta svæði....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Upphaflegur höfundarréttur {COPYRIGHT} 1995 Chris Sawyer, Öll réttindi áskilin
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD hópurinn
 
 STR_QUIT_CAPTION                                                :{WHITE}Hætta
-STR_YES                                                         :{BLACK}Já
-STR_NO                                                          :{BLACK}Nei
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ertu viss um að þú viljir hætta í OpenTTD og fara aftur í {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Já
+STR_QUIT_NO                                                     :{BLACK}Nei
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ertu viss um að þú viljir hætta í OpenTTD og fara aftur í {STRING}?
 
 STR_JUST_NOTHING                                                :Ekkert
 STR_COLOUR_DARK_BLUE                                            :Dökkblár
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Eyðimörk
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Snjór
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Skilaboð
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Sjálfgildi
-STR_QUERY_CANCEL                                                :{BLACK}Hætta við
-STR_QUERY_OK                                                    :{BLACK}� lagi
-STR_QUERY_RENAME                                                :{BLACK}Endurnefna
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Sjálfgildi
+STR_BUTTON_CANCEL                                               :{BLACK}Hætta við
+STR_BUTTON_OK                                                   :{BLACK}� lagi
+STR_BUTTON_RENAME                                               :{BLACK}Endurnefna
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Farmur
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Upplýsingar
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Burðargeta
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Heildarfarmur
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Farmur alls (burðargeta) þessarar lestar:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Farmur alls (burðargeta) þessarar lestar:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nýr leikur
 STR_INTRO_LOAD_GAME                                             :{BLACK}Opna leik
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Fjölspilun
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Landslagsgerð
 
-STR_MAPSIZE                                                     :{BLACK}Kortastærð:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kortastærð:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Stillingar
 
 STR_COMPANY_SOMEONE                                             :einhver{SKIP}{SKIP}
@@ -309,10 +309,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Hætta leik
 STR_FILE_MENU_EXIT                                              :Hætta
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Ertu viss um að þú viljir hætta í þessum leik ?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Hætta leik
-STR_SORT_ORDER_TIP                                              :{BLACK}Velja uppröðun (minnkandi/stækkandi)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Velja uppröðun
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Veldu hvers kyns farartæki þú vilt kaupa
-STR_SORT_BY                                                     :{BLACK}Flokka eftir
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Velja uppröðun (minnkandi/stækkandi)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Velja uppröðun
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Veldu hvers kyns farartæki þú vilt kaupa
+STR_BUTTON_SORT_BY                                              :{BLACK}Flokka eftir
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Fólksfjöldi
@@ -344,24 +344,24 @@ STR_SORT_BY_RUNNING_COST                                        :RekstrarkostnaÃ
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Afl/Rekstrarkostnaður
 STR_SORT_BY_CARGO_CAPACITY                                      :Burðargeta
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Enginn farmur bíður
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Velja allar gerðir
-STR_SELECT_ALL_TYPES                                            :{BLACK}Velja allar tegundir farms (einnig þær sem ekki bíða)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Skoða úrval
-STR_MANAGE_LIST                                                 :{BLACK}Stýra lista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Senda boð til allra farartækja á listanum
-STR_REPLACE_VEHICLES                                            :Skipta út vögnum
-STR_SEND_FOR_SERVICING                                          :Senda í skoðun
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Lestaúrval
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Bifreiðaúrval
-STR_AVAILABLE_SHIPS                                             :{BLACK}Skipaúrval
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Flugvélaúrval
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Senda í skýli
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Senda í skýli
-STR_SEND_SHIP_TO_DEPOT                                          :Senda í slipp
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Senda í skýli
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Enginn farmur bíður
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Velja allar gerðir
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Velja allar tegundir farms (einnig þær sem ekki bíða)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Skoða úrval
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Stýra lista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Senda boð til allra farartækja á listanum
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Skipta út vögnum
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Senda í skoðun
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Lestaúrval
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Bifreiðaúrval
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Skipaúrval
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Flugvélaúrval
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Senda í skýli
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Senda í skýli
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Senda í slipp
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Senda í skýli
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -391,12 +391,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Stilling
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Get ekki breytt viðgerðarmillibili...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Loka glugga
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Haus glugga - dragðu með músinni til að færa gluggann
-STR_STICKY_BUTTON                                               :{BLACK}Merkja þennan glugga sem ólokanlegan fyrir
-STR_RESIZE_BUTTON                                               :{BLACK}�ttu og dragðu til að breyta stærð gluggans
+STR_TOOLTIP_STICKY                                              :{BLACK}Merkja þennan glugga sem ólokanlegan fyrir
+STR_TOOLTIP_RESIZE                                              :{BLACK}�ttu og dragðu til að breyta stærð gluggans
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Smelltu hér til að opna möppu fyrir vistaða leiki
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Eyða byggingum o.s.frv. á lóðarreiti
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Lækka horn af landssvæði
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Lyfta horni af landssvæði
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Lækka horn af landssvæði
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Lyfta horni af landssvæði
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Skrunslá - færir lista upp/niður
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rennislá - rennir lista til vinstri/hægri
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Sýna útlínur lands á korti
@@ -409,21 +409,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Sýna/fe
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Hagnaður þetta ár: {CURRENCY} (síðasta ár: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} ár ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ár ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ár ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ár ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Lest
-STR_VEHICLE_ROAD_VEHICLE                                        :Bifreið
-STR_VEHICLE_SHIP                                                :Skip
-STR_VEHICLE_AIRCRAFT                                            :Flugvél
+STR_REPLACE_VEHICLE_TRAIN                                       :Lest
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Bifreið
+STR_REPLACE_VEHICLE_SHIP                                        :Skip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Flugvél
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} er tekinn að eldast
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} er tekinn að eldast mikið
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} er tekinn að eldast mikið og nauðsynlegt er að skipta honum út
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Landsvæðisupplýsingar
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Kostnaður við hreinsun: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Kostnaður við hreinsun: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}�góði af hreinsun: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}�góði af hreinsun: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Enginn
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigandi: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Eigandi vegs: {LTBLUE}{STRING}
@@ -432,7 +432,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Eigandi
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Bæjaryfirvöld: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Enginn
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nafn
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -544,7 +544,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Veldu la
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Smelltu á lag til að fjarlægja það úr listanum (á aðeins við um Sérvalið1 og Sérvalið2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Kveikja/slökkva á stokkun
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Sýna lagalista
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}�ttu á þjónustu til að færa sýnishorn á tiltekinn iðnað/bæ
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}�ttu á þjónustu til að færa sýnishorn á tiltekinn iðnað/bæ
 STR_INTRO_DIFFICULTY                                            :{BLACK}Erfiðleikastig ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Síðustu skilaboð/frétt
@@ -593,7 +593,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Minnka s
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Mynda til land af handahófi
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Eyða landi
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Eyða landi
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Fjarlægja allar eignir leikmanna af landinu
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Fjarlægja allar eignir leikmanna af landinu
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ertu viss um að þú viljir fjarlægja allar eignir leikmanna?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landslagsgerð
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Bæjargerð
@@ -607,11 +607,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...of nÃ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...of nálægt öðrum bæ
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...óhentugur staður
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...of margir bæir
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Get ekki stofnað nýja borg
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...það er ekkert laust svæði á kortinu
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Get ekki stofnað nýja borg
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...það er ekkert laust svæði á kortinu
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Stækka bæ
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Stækka
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Bærinn getur ekki lagt vegi. Því er hægt að breyta í Þróaðri stillingar->Efnahagur->Bæir.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Bærinn getur ekki lagt vegi. Því er hægt að breyta í Þróaðri stillingar->Efnahagur->Bæir.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Handahófskenndur bær
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Byggja bæ á handahófskenndum stað
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Get ekki byggt {STRING} hérna...
@@ -625,13 +625,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Setja kl
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Setja vita
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Setja sendi
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Afmarkaðu eyðimörk.{}Smelltu og haltu CTRL til að fjarlægja hana
-STR_CREATE_LAKE                                                 :{BLACK}Skilgreina vantssvæði.{}Grafa skipaskurð, nema CTRL sé haldið niðri við sjávarmál, þá flæðir yfir umhverfið í staðin.
-STR_CREATE_RIVER                                                :{BLACK}Búa til fljót.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Skilgreina vantssvæði.{}Grafa skipaskurð, nema CTRL sé haldið niðri við sjávarmál, þá flæðir yfir umhverfið í staðin.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Búa til fljót.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Eyða
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Eyða þessum bæ algjörlega
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Vista kort
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Opna kort
-STR_MENU_LOAD_HEIGHTMAP                                         :Hlaða hæðakorti
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Hlaða hæðakorti
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Hætta í kortagerð
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Hætta
@@ -641,7 +641,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Vista ko
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Spila kort
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spila á hæðakorti
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Hefja nýjan leik byggðan á hæðakorti
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Ertu viss um að þú viljir hætta í þessu korti ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Ertu viss um að þú viljir hætta í þessu korti ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...aðeins hægt að byggja í bæjum með fleiri en 1200 íbúum
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Færa byrjunardagsetninguna aftur um 1 ár
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Færa byrjunardagsetninguna fram um 1 ár
@@ -649,21 +649,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...báð
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Lítill
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Miðlungs
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Stór
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Handahófskennd
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Handahófskennd
 STR_FOUND_TOWN_CITY                                             :{BLACK}Borg
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Borgir vaxa hraðar en venjulegir bæir{}Möguleiki á aukinni upphafsstærð í stillingum
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Velja stærð bæjar
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Stærð bæjar:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Vegaskipulag bæja
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Veldu það skipulag sem þessi bær notar fyrir sína vegi
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Upphaflegt
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Betri vegir
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 reitir
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 reitir
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Handahófskennt
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Vegaskipulag bæja
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Veldu það skipulag sem þessi bær notar fyrir sína vegi
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Upphaflegt
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Betri vegir
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 reitir
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 reitir
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Handahófskennt
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Sýna seinustu skilaboð eða fréttatilkynningu
 STR_NEWS_MESSAGES_OFF                                           :Af
 STR_NEWS_MESSAGES_SUMMARY                                       :Úrtak
@@ -763,10 +763,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ST
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Skjámynd vistuð sem '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ekki tókst að taka skjámynd!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kaupa landssvæði til notkunar síðar
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kaupa landssvæði til notkunar síðar
 STR_STATUSBAR_AUTOSAVE                                          :{RED}SJ�LFVIRK VISTUN
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  VISTA LEIK  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Vistun er enn í gangi,{}vinsamlegast bíddu á meðan hún klárst!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Vistun er enn í gangi,{}vinsamlegast bíddu á meðan hún klárst!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Velja 'Ezy gata' listann
 
 ############ start of townname region
@@ -829,7 +829,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Tungumá
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fylla út í skjá
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Smelltu hér til að OpenTTD fylli út í skjáinn
-STR_FULLSCREEN_FAILED                                           :{WHITE}Skjáfyllihamur brást
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Skjáfyllihamur brást
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjáupplausn
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Stilla skjáupplausn
@@ -842,12 +842,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Nota gru
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} týnd{P "" ar} eða ónýt{P "" ar} skrá{P "" r}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Frekari upplýsingar um grunngrafíkpakkann
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Sjálfvirk vistun mistókst
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Sjálfvirk vistun mistókst
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}� leið til {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}� leið til {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Engar skipanir
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Engar skipanir, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}� leið til {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}� leið til {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Engar skipanir
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Engar skipanir, {VELOCITY}
 
 STR_PASSENGERS                                                  :farþegar
 STR_BAGS                                                        :pokar
@@ -858,9 +858,9 @@ STR_CRATES                                                      :kassar
 STR_RES_OTHER                                                   :annað
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Get ekki deilt áætlun...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Get ekki afritað áætlun...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Endi sameiginlegra skipana - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Get ekki deilt áætlun...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Get ekki afritað áætlun...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Endi sameiginlegra skipana - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ratar ekki á áfangastað
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} er týndur
@@ -1129,15 +1129,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Breidd
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :óvirkt
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Breyta gildi stillingar
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Breyta gildi stillingar
 
-STR_TEMPERATE_LANDSCAPE                                         :Temprað landslag
-STR_SUB_ARCTIC_LANDSCAPE                                        :Heimskautalandslag
-STR_SUB_TROPICAL_LANDSCAPE                                      :Miðjarðarlandslag
-STR_TOYLAND_LANDSCAPE                                           :Leikfangalandslag
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Temprað landslag
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Heimskautalandslag
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Miðjarðarlandslag
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Leikfangalandslag
 
 STR_CHEATS                                                      :{WHITE}Svindl
-STR_CHEATS_TIP                                                  :{BLACK}Valreitur segir til um ef þú hefur notað þetta svindl áður
+STR_CHEATS_TOOLTIP                                              :{BLACK}Valreitur segir til um ef þú hefur notað þetta svindl áður
 STR_CHEATS_WARNING                                              :{BLACK}Aðvörun! Þú ert í þann mund að svíkja keppinauta þína. Hafðu í huga að þess lags svívirðing mun ætíð höfð í minnum.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Auka pening um {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spila sem fyrirtæki: {ORANGE}{COMMA}
@@ -1149,177 +1149,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Skipta
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Breyta dagsetningu: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Leyfa breytingar á verðmæti framleiðslu: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}� leið til {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}� leið til {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}� leið til {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}� leið til {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Fara með {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ekki stöðva á {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Fara með {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ekki stöðva á {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Millistöð {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Millistöð {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Millistöð
+STR_FORMAT_WAYPOINT_NAME                                        :Millistöð {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Millistöð {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Millistöð
 
-STR_WAYPOINT                                                    :{WHITE}Leiðarvísir
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Velja tegund leiðarvísis
+STR_WAYPOINT_CAPTION                                            :{WHITE}Leiðarvísir
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Velja tegund leiðarvísis
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Breyta nafni millistöðvar
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Get ekki breytt nafni millistöðvar...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Get ekki breytt nafni millistöðvar...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Breyta teini í millistöð
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Get ekki byggt lestarmillistöð hér...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Get ekki fjarlægt lestarmillistöð héðan...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Get ekki byggt lestarmillistöð hér...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Get ekki fjarlægt lestarmillistöð héðan...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Byggja lestartein í Sjálfvirkum ham
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...það er enginn bær í þessu landi
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Sköpun korts hætt...{}...ekkert hentugt bæjarstæði
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...það er enginn bær í þessu landi
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Sköpun korts hætt...{}...ekkert hentugt bæjarstæði
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Búa til marga bæi
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Þekja landið með bæjum
-STR_MANY_RANDOM_INDUSTRIES                                      :Búa til marga iðnaði
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Þekja kortið mörgum handahófskenndum iðnöðum
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Get ekki búið til iðnað...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Búa til marga bæi
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Þekja landið með bæjum
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Búa til marga iðnaði
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Þekja kortið mörgum handahófskenndum iðnöðum
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Get ekki búið til iðnað...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Opna landslags verkfæraslána til að hækka/lækka land, gróðursetja tré o.s.frv.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Mótun lands
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Jafna land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Jafna land
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Tré af handahófskenndri gerð
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Gróðursetja tré af handahófskenndri gerð
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Gróðursetja tré af handahófskenndri gerð
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Ekki hægt að grafa skipaskurð hér...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Ekki hægt að grafa skipaskurð hér...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Grafa skipaskurði.
-STR_LANDINFO_CANAL                                              :Skipaskurður
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Skipaskurður
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Ekki hægt að gera skurðgátt hér
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Ekki hægt að gera skurðgátt hér
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Grafa skruðgátt
-STR_LANDINFO_LOCK                                               :Skurðgátt
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Skurðgátt
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Ekki hægt að setja ár hér...
-STR_LANDINFO_RIVER                                              :�
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Ekki hægt að setja ár hér...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :�
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... bauja í notkun!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bauja í notkun!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Hnit: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Hnit: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Get ekki fjarlægt hluta af stöð...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Get ekki breytt lestarteini...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Get ekki fjarlægt hluta af stöð...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Get ekki breytt lestarteini...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Breyta/uppfæra gerð lestarteins
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Dragðu eimreið hingað til að selja alla lestina
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Dragðu eimreið hingað til að selja alla lestina
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Draga & Sleppa
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Byggja lestarstöð með 'draga og sleppa' aðferðinni
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Veldu flokk stöðva sem á að sýna
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Veldu tegund stöðvar til að reisa
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Veldu flokk stöðva sem á að sýna
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Veldu tegund stöðvar til að reisa
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Spóla leikinn áfram
 STR_MESSAGE_HISTORY                                             :{WHITE}Saga skilaboða
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Listi yfir nýlegar fréttir
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Fela allt
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Sýna allt
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Listi yfir nýlegar fréttir
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Fela allt
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Sýna allt
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Iðnaðir
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% flutt)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% flutt)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Iðnaðar nafn - smella á nafn til að sjá iðnað á skjá
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Iðnaðir
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% flutt)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% flutt)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Iðnaðar nafn - smella á nafn til að sjá iðnað á skjá
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...of nálægt öðrum iðnaði
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...of nálægt öðrum iðnaði
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Breyta framleiðslu
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Fjölspilun
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nafn leikmanns:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Þetta er nafnið sem aðrir leikmenn munu þekkja þig undir
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Sláðu inn nafn þitt
-STR_NETWORK_CONNECTION                                          :{BLACK}Tenging:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Veldu milli internetleiks eða staðarnetleiks
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Hefja þjón
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Hefja eigin þjón
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nafn
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nafn leiksins
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Tungumál, útgáfa þjóns o.s.frv.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}�ttu á leik á listanum til að velja hann
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Þjónninn sem þú tengdist síðast:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Smelltu til að velja þjóninn sem þú tengdist í síðast
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Finna þjón
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Leita að þjónum á neti
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Bæta við þjóni
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Bætir þjóni við listann sem mun alltaf sýna leiki í spilun
-STR_NETWORK_ENTER_IP                                            :{BLACK}Sláðu inn IP tölu þjónsins
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Notendur
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Tengdir notendur / hámarksfjöldi notenda
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kortastærð
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Stærð korts í leiknum{}Smelltu til að flokka eftir stærð
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dagsetning
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Núverandi dagsetning
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}�r
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Fjöldi ára{}sem leikurinn er í gangi
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}UPPL�SINGAR UM LEIK
-STR_NETWORK_CLIENTS                                             :{SILVER}Notendur:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Tungumál:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Landslag:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Stærð:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Útgáfa þjóns:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Veffang þjóns:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Upphafsdagsetning:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Núverandi dagsetning:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Varið með lykilorði!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}ÞJÓNN AFTENGDUR
-STR_NETWORK_SERVER_FULL                                         :{SILVER}ÞJÓNN FULLUR
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ÚTG�FA STEMMIR EKKI
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MISRÆMI
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Tengjast leik
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Hefja nýjan fjölspilunarleik
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nafn leiks:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Nafn leiksins mun vera sýnilegt öðrum leikmönnum í fjölspilunarvalmyndinni
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Sláðu inn nafn netleiksins
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Veldu lykilorð
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Verndaðu leikinn þinn með lykilorði ef þú vilt ekki að óboðnir tengist honum
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Veldu kort:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Hvaða kort viltu spila?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Staðarnet
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :Staðarnet / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (auglýsa)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} biðlar{P i ar}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Hámarksfjöldi notenda:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Veldu hámarksfjölda notenda. Ekki þarf að fylla öll pláss
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Fyrirtæki
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Hámarksfjöldi fyrirtækja:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Takmarka fjölda fyrirtækja á vefþjóni
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} áhorf{P andi endur}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Hámarksfjöldi áhorfanda:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Takmarka fjölda áhorfanda á vefþjóninum
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Tungumál:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aðrir notendur munu vita hvaða tungumál er talað á þjóninum
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Hefja leik
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Hefja nýjan netleik í sérvöldu korti eða landslagi af handahófi
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Hlaða leik
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Hefja aftur vistaðan fjölspilunarleik (vertu viss um að tengjast sem réttur leikmaður)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Fjölspilun
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Nafn leikmanns:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Þetta er nafnið sem aðrir leikmenn munu þekkja þig undir
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Sláðu inn nafn þitt
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Tenging:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Veldu milli internetleiks eða staðarnetleiks
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Hefja þjón
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Hefja eigin þjón
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nafn
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nafn leiksins
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Tungumál, útgáfa þjóns o.s.frv.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}�ttu á leik á listanum til að velja hann
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Þjónninn sem þú tengdist síðast:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Smelltu til að velja þjóninn sem þú tengdist í síðast
+
+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 sem mun alltaf sýna leiki í spilun
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Sláðu inn IP tölu þjónsins
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Notendur
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Tengdir notendur / hámarksfjöldi notenda
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kortastærð
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Stærð korts í leiknum{}Smelltu til að flokka eftir stærð
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dagsetning
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Núverandi dagsetning
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}�r
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Fjöldi ára{}sem leikurinn er í gangi
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}UPPL�SINGAR UM LEIK
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Notendur:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Tungumál:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Landslag:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Stærð:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Útgáfa þjóns:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Veffang þjóns:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Upphafsdagsetning:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Núverandi dagsetning:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Varið með lykilorði!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}ÞJÓNN AFTENGDUR
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}ÞJÓNN FULLUR
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}ÚTG�FA STEMMIR EKKI
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF MISRÆMI
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Tengjast leik
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Hefja nýjan fjölspilunarleik
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nafn leiks:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nafn leiksins mun vera sýnilegt öðrum leikmönnum í fjölspilunarvalmyndinni
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Sláðu inn nafn netleiksins
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Veldu lykilorð
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Verndaðu leikinn þinn með lykilorði ef þú vilt ekki að óboðnir tengist honum
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Veldu kort:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Hvaða kort viltu spila?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Staðarnet
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Staðarnet / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (auglýsa)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} biðlar{P i ar}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Hámarksfjöldi notenda:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Veldu hámarksfjölda notenda. Ekki þarf að fylla öll pláss
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Fyrirtæki
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Hámarksfjöldi fyrirtækja:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Takmarka fjölda fyrirtækja á vefþjóni
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} áhorf{P andi endur}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Hámarksfjöldi áhorfanda:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Takmarka fjölda áhorfanda á vefþjóninum
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Tungumál:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Aðrir notendur munu vita hvaða tungumál er talað á þjóninum
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Hefja leik
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Hefja nýjan netleik í sérvöldu korti eða landslagi af handahófi
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Hlaða leik
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Hefja aftur vistaðan fjölspilunarleik (vertu viss um að tengjast sem réttur leikmaður)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Hvað sem er
@@ -1360,33 +1360,33 @@ STR_NETWORK_LANG_GREEK                                          :Gríska
 STR_NETWORK_LANG_LATVIAN                                        :Lettneska
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Anddyri fjölspilunarleiks
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Anddyri fjölspilunarleiks
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Undirbý tengingu við:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Listi yfir öll fyrirtæki í leiknum. Þú getur annað hvort gengið í lið með einu eða komið á fót nýju ef pláss er fyrir nýtt
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nýtt fyrirtæki
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Koma á fót nýju fyrirtæki
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Fylgjast með leik
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Fylgjast með leiknum sem áhorfandi
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Ganga í lið með fyrirtæki
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Hjálpa við stjórnun þessa fyrirtækis
-STR_NETWORK_REFRESH                                             :{BLACK}Endurnýja þjón
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Endurnýja upplýsingar um þjón
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Undirbý tengingu við:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Listi yfir öll fyrirtæki í leiknum. Þú getur annað hvort gengið í lið með einu eða komið á fót nýju ef pláss er fyrir nýtt
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nýtt fyrirtæki
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Koma á fót nýju fyrirtæki
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Fylgjast með leik
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Fylgjast með leiknum sem áhorfandi
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Ganga í lið með fyrirtæki
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hjálpa við stjórnun þessa fyrirtækis
+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_COMPANY_INFO                                        :{SILVER}UPPL�SINGAR UM FYRIRTÆKI
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}UPPL�SINGAR UM FYRIRTÆKI
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nafn fyrirtækis:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Upphaf:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Heildarverðmæti fyrirtækis:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Núverandi staða:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Innkoma síðasta árs:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Frammistaða:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nafn fyrirtækis:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Upphaf:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Heildarverðmæti fyrirtækis:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Núverandi staða:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Innkoma síðasta árs:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Frammistaða:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Farartæki:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stöðvar:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Leikmenn:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Farartæki:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stöðvar:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Leikmenn:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Tengist...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Tengist...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Tengist..
@@ -1402,49 +1402,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Næ í u
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} þjónar fyrir framan þig
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} niðurhöluð hingaðtil
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Aftengjast
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Aftengjast
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Sláðu inn peningaupphæð sem þú vilt láta af hendi rakna
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Þjónn er varinn. Sláðu inn lykilorð
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Fyrirtæki er varið. Sláðu inn lykilorð
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Listi yfir leikmenn
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Listi yfir leikmenn
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Fylgjast með
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nýtt fyrirtæki
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Enginn netbúnaður fannst eða vistþýtt án ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Fann enga netleiki
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Þjóninn svaraði ekki fyrirspurninni
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Gat ekki tengst vegna NewGRF misræmis
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Samstilling netleiks mistókst.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Tenging við netleik glataðist.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Gat ekki hlaðið vistuðum leik af þjóni.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Gat ekki ræst þjón
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Gat ekki tengst
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tenging #{NUM} fjaraði út.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Villa varð í samskiptum og tengingu var lokað
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Útgáfa biðils er ekki sama og útgáfa þjóns
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Rangt lykilorð
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Þjónninn er fullur
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Þú ert bannaður/bönnuð á þessum þjóni
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Þér var hent út úr leiknum
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Svindl er ekki leyft á þessum þjóni
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Enginn netbúnaður fannst eða vistþýtt án ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Fann enga netleiki
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Þjóninn svaraði ekki fyrirspurninni
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Gat ekki tengst vegna NewGRF misræmis
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Samstilling netleiks mistókst.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Tenging við netleik glataðist.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Gat ekki hlaðið vistuðum leik af þjóni.
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Gat ekki ræst þjón
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Gat ekki tengst
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Tenging #{NUM} fjaraði út.
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Villa varð í samskiptum og tengingu var lokað
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Útgáfa biðils er ekki sama og útgáfa þjóns
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Rangt lykilorð
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Þjónninn er fullur
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Þú ert bannaður/bönnuð á þessum þjóni
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Þér var hent út úr leiknum
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Svindl er ekki leyft á þessum þjóni
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :almenn villa
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :samstillingarvilla
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :gat ekki opnað kort
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :tenging rofnaði
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :samskiptavilla
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF misræmi
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Ekki leyfilegt
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :tók á móti undarlegum pakka
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :röng útgáfa
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nafn nú þegar í notkun
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :rangt leikjalykilorð
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :vitlaust fyrirtækis-id í DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :hent út af þjón
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :reyndi að svindla
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :vefþjónn fullur
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :almenn villa
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :samstillingarvilla
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :gat ekki opnað kort
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :tenging rofnaði
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :samskiptavilla
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF misræmi
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :Ekki leyfilegt
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :tók á móti undarlegum pakka
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :röng útgáfa
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nafn nú þegar í notkun
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :rangt leikjalykilorð
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :vitlaust fyrirtækis-id í DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :hent út af þjón
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :reyndi að svindla
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :vefþjónn fullur
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1454,15 +1454,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Leikur í bið
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Leikur gangsettur (notandi tengdur)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Leikur gangsettur (tenging við notanda slitnaði)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :yfirgefur
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} tengdist leiknum
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} hefur gengið í lið með fyrirtæki #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} horfir á
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} stofnaði nýtt fyrirtæki (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} yfirgefur leikinn ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} heitir nú {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} sendi þér {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Þú gafst {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :yfirgefur
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} tengdist leiknum
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} hefur gengið í lið með fyrirtæki #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} horfir á
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} stofnaði nýtt fyrirtæki (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} yfirgefur leikinn ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} heitir nú {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} sendi þér {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Þú gafst {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] Til {STRING}: {WHITE}{STRING}
@@ -1472,8 +1472,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] Til {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Sláðu inn texta fyrir netpsjall
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Þjónninn sleit tengingunni
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Verið er að endurræsa þjóninn...{}Vinsamlega bíðið...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Þjónninn sleit tengingunni
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Verið er að endurræsa þjóninn...{}Vinsamlega bíðið...
 
 STR_NETWORK_SERVER                                              :Þjónn
 STR_NETWORK_CLIENT                                              :Notandi
@@ -1487,19 +1487,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Tala við fyrir
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Einkaskilaboð
 
 
-STR_NETWORK_SEND                                                :{BLACK}Senda
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Senda
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Get ekki hlaðið landslagi úr PNG skrá...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...skrá ekki til staðar.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...gat ekki meðhöndlað myndsniðið. 8 eða 24 bita PNG myndir nauðsynlegar.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...eitthvað fór úrskeiðis (mögulega gölluð skrá).
+STR_ERROR_PNGMAP                                                :{WHITE}Get ekki hlaðið landslagi úr PNG skrá...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...skrá ekki til staðar.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...gat ekki meðhöndlað myndsniðið. 8 eða 24 bita PNG myndir nauðsynlegar.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...eitthvað fór úrskeiðis (mögulega gölluð skrá).
 
-STR_BMPMAP_ERROR                                                :{WHITE}Get ekki hlaðið landslagi úr BMP skrá...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... gat ekki breytt myndsniði.
+STR_ERROR_BMPMAP                                                :{WHITE}Get ekki hlaðið landslagi úr BMP skrá...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... gat ekki breytt myndsniði.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Kostnaður: {CURRENCY}
@@ -1513,13 +1513,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Ã�ætlaÃ
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Get ekki lyft landssvæði hér...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Get ekki lækkað landssvæði hér...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Ekki hægt að fletja land hér...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Klettar
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Hrjúft land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Bert land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gras
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Akur
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snjóþekið land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Eyðimörk
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Klettar
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Hrjúft land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bert land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Akur
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snjóþekið land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Eyðimörk
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Landssvæði hallar í ranga átt
@@ -1527,11 +1527,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Ómögul
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Framkvæmdin myndi skemma göng
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Nú þegar við sjávarmál
 STR_ERROR_TOO_HIGH                                              :{WHITE}Of hátt
-STR_ALREADY_LEVELLED                                            :{WHITE}... nú þegar flatt
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... nú þegar flatt
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Enginn hentugur lestarteinn
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...nú þegar byggt
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Verður að fjarlægja lestartein fyrst
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Vegurinn er einstefnuvegur eða stíflaður
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Vegurinn er einstefnuvegur eða stíflaður
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Járnbrautarlestarframkvæmdir
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Raflestaframkvæmdir
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Einteinungsframkvæmdir
@@ -1555,41 +1555,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Byggja l
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Byggja lestarbrú
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Byggja lestargöng
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Skipta á milli byggja/fjarlægja lestarteina og lestarljós
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brúarval - veldu brú til að byggja
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brúarval - veldu brú til að byggja
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Veldu legu lestarskýlis
-STR_RAILROAD_TRACK                                              :Lestarteinn
-STR_RAILROAD_TRAIN_DEPOT                                        :Lestarskýli
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Lestarteinn
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Lestarskýli
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...svæðið er í eigu annars fyrirtækis
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Lestarteinn með venjulegum ljósum
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Lestarteinn með forljósum
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Lestarteinn með útljósum
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Járnbrautarspor með fjölljósum
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Járnbrautarteinar með háþróuðum skiltum
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Járnbrautarteinar með háþróuðum einstefnuskiltum
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Járbrautarspor með venjulegum ljósum og forljósum
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Járnbrautarspor með venjulegum ljósum og útgangsljósum
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Járnbrautarspor með venjulegum ljósum og fjölljósum
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Járnbrautarteinar með venjulegum og háþróuðum skiltum
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Járnbrautarteinar með venjulegum skiltum og háþróuðum einstefnuskiltum
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Járnbrautarspor með for- og útgangsljósum
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Járnbrautarspor með for- og fjölljósum
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Járnbrautarteinar með for- og háþróuðum skiltum
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Járnbrautarteinar með forskiltum og háþróuðum einstefnuskiltum
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Járnbrautarspor með útgangs- og fjölljósum
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Járnbrautarteinar með útgöngu- og háþróuðum skiltum
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Járnbrautarteinar með útgönguskiltum og háþróuðum einstefnuskiltum
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Lestarteinar með samskeyta- og leiðar-merkjum
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Járnbrautarspor með fjöl- og einstefnuskiltum
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Járnbrautarspor með háþróuðum og einstefnuskiltum
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Verður að fjarlægja járnbrautarstöð fyrst
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Reisa aðra stöð
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Tengja stöðvar
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Lestarteinn með venjulegum ljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Lestarteinn með forljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Lestarteinn með útljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Járnbrautarspor með fjölljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Járnbrautarteinar með háþróuðum skiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Járnbrautarteinar með háþróuðum einstefnuskiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Járbrautarspor með venjulegum ljósum og forljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Járnbrautarspor með venjulegum ljósum og útgangsljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Járnbrautarspor með venjulegum ljósum og fjölljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Járnbrautarteinar með venjulegum og háþróuðum skiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Járnbrautarteinar með venjulegum skiltum og háþróuðum einstefnuskiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Járnbrautarspor með for- og útgangsljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Járnbrautarspor með for- og fjölljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Járnbrautarteinar með for- og háþróuðum skiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Járnbrautarteinar með forskiltum og háþróuðum einstefnuskiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Járnbrautarspor með útgangs- og fjölljósum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Járnbrautarteinar með útgöngu- og háþróuðum skiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Járnbrautarteinar með útgönguskiltum og háþróuðum einstefnuskiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Lestarteinar með samskeyta- og leiðar-merkjum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Járnbrautarspor með fjöl- og einstefnuskiltum
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Járnbrautarspor með háþróuðum og einstefnuskiltum
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Verður að fjarlægja járnbrautarstöð fyrst
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Reisa aðra stöð
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Tengja stöðvar
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Verður að fjarlægja veg fyrst
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vegaframkvæmdir standa yfir
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vegaframkvæmdir standa yfir
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Vegagerð
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Sporvagnaframkvæmdir
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Veldu vegabrú
@@ -1625,14 +1625,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Grafa sp
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Virkja/afvirkja einstefnugötur
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Skipta á milli byggja/fjarlægja fyrir vegagerð
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Skipta á milli þess að leggja leggja og fjarlægja sporvagnaspor
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Veldu legu bifreiðaskýlis
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Veldu stöðu sporvagnaskýlis
-STR_ROAD_DESCRIPTION_ROAD                                       :Vegur
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Vegur með umferðarljósum
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Trjáskreyttur vegur
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Bifreiðaskýli
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Vega/lestar gatnamót
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Sporvagn
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Veldu legu bifreiðaskýlis
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Veldu stöðu sporvagnaskýlis
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Vegur
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Vegur með umferðarljósum
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Trjáskreyttur vegur
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Bifreiðaskýli
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Vega/lestar gatnamót
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Sporvagn
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Get ekki fjarlægt strætóstoppistöð...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Get ekki flutt vörubílastöð...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Get ekki fjarlægt farþegasporvagnastöð...
@@ -1640,12 +1640,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Get ekki
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Bæir
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Verður að eyða byggingu fyrst
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Borg)
@@ -1658,9 +1658,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Færa sj
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Breyta nafni bæjar
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Farþegar síðasta mánaðar: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Póstur síðasta mánaðar: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Nauðsynlegur farmur fyrir stækkun bæjarins:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} nauðsynlegt
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} flutt í síðasta mánuði
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Nauðsynlegur farmur fyrir stækkun bæjarins:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} nauðsynlegt
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} flutt í síðasta mánuði
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Há skrifstofubygging
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Skrifstofubygging
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Lítil íbúðarbygging
@@ -1697,7 +1697,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Samstarfssamningur gerður við {STRING}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga þrefalt í heilt ár!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Samstarfssamningur gerður við {STRING}!{}{}{STRING}flutningur frá {STATION} til {STATION} mun borga fjórfalt í heilt ár!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Bæjaryfirvöld {TOWN} leyfa ekki byggingu annars flugvallar nærliggjandi bænum
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} Stjórn bæjarins hafnar leyfir fyrir flugvelli vegna hljóðmengunar
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} Stjórn bæjarins hafnar leyfir fyrir flugvelli vegna hljóðmengunar
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Einbýlishús
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Hús
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :�búðir
@@ -1733,7 +1733,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Glundroði í umferð {TOWN}!{}{}Uppbygging vega kostuð af {STRING} veldur 6 mánaða vesæld meðal ökumanna!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (í byggingu)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (í byggingu)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Snjóhús
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indíánatjald
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Teketilshús
@@ -1746,17 +1746,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Setja skilti
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Tré
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...hér er nú þegar tré
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Ekki hægt að gróðursetja tré hér...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...of mörg skilti
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Ekki hægt að setja tré hér...
-STR_SIGN_DEFAULT                                                :Skilti
+STR_DEFAULT_SIGN_NAME                                           :Skilti
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Breyta texta skiltis
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Get ekki breytt nafni skiltis...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Ekki hægt að eyða skilti...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Veldu trjátegund sem á að gróðursetja
-STR_TREE_NAME_TREES                                             :Tré
-STR_TREE_NAME_RAINFOREST                                        :Regnskógar
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktus
+STR_LAI_TREE_NAME_TREES                                         :Tré
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regnskógar
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktus
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Lestarstöðvastillingar
@@ -1776,7 +1776,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Þarf fy
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Of nálægt öðrum flugvelli
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Þarf fyrst að rífa flugvöll
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Endurnefna stöð/lestunarsvæði
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Endurnefna stöð/lestunarsvæði
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Get ekki endurnefnt stöð...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Einkunn
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Tekur við
@@ -1794,10 +1794,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Framúrskarandi
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Sýna allar lestir sem hafa þessa stöð á áætlun
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Sýna allar bifreiðir sem hafa þessa stöð á áætlun
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Sýna allar flugvélar sem hafa þessa stöð á áætlun
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Sýna öll skip sem hafa þessa stöð á áætlun
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Sýna allar lestir sem hafa þessa stöð á áætlun
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Sýna allar bifreiðir sem hafa þessa stöð á áætlun
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Sýna allar flugvélar sem hafa þessa stöð á áætlun
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Sýna öll skip sem hafa þessa stöð á áætlun
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} tekur ekki lengur við {STRING}
@@ -1830,47 +1830,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Breyta n
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Sýna lista yfir móttækilegan varning
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nöfn stöðva - ýttu á nafn til að færa miðju sjónarhorns á stöð
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Veldu stærð/tegund flugvallar
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Lestastöð
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Flugskýli
-STR_STATION_DESCRIPTION_AIRPORT                                 :Flugvöllur
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Vörubílastöð
-STR_STATION_DESCRIPTION_BUS_STATION                             :Strætisvagnastöð
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Bryggja
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Lestastöð
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Flugskýli
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Flugvöllur
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Vörubílastöð
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Strætisvagnastöð
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Bryggja
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Sýna svæði sem tilheyrir stöð
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Ekki sýna svæði sem tilheyrir stöð
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Svæði sem tilheyrir stöð
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Höfn
-STR_STATION_DESCRIPTION_BUOY                                    :Bauja
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bauja
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bauja fyrir
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stöð of dreyfð
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...óregluleg lögun lestarstöðva bönnuð
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Haltu CTRL inni til að velja fleiri en eitt
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...óregluleg lögun lestarstöðva bönnuð
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Haltu CTRL inni til að velja fleiri en eitt
 
 STR_UNDEFINED                                                   :(óskilgreindur strengur)
-STR_STAT_CLASS_DFLT                                             :Sjálfgefin stöð
-STR_STAT_CLASS_WAYP                                             :Millistöð
+STR_STATION_CLASS_DFLT                                          :Sjálfgefin stöð
+STR_STATION_CLASS_WAYP                                          :Millistöð
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Staða slipps
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...verður að byggjast á vatni
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Get ekki reist slipp hér...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Velja stöðu slipps
-STR_WATER_DESCRIPTION_WATER                                     :Vatn
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Strönd
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Slippur
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Vatnsleiðsla
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vatn
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Strönd
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Slippur
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Vatnsleiðsla
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Get ekki byggt á vatni
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Verður að fylla upp í skipaskurð fyrst
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Verður að fylla upp í skipaskurð fyrst
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Vista leik
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Opna leik
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Vista
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Eyða
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :�horfandi, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :�horfandi, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} laus
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Get ekki lesið af drifi
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Vistun leiks mistókst{}{STRING}
@@ -1886,12 +1886,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Listi yf
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nafn fyrir vistun leiks
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Eyða nafninu
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Vista leikinn undir þessu nafni
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Búa til nýjan leik
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Hlaða hæðakorti
-STR_SAVE_OSKTITLE                                               :{BLACK}Sláðu inn nafn fyrir vistun leiksins
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Búa til nýjan leik
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Hlaða hæðakorti
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Sláðu inn nafn fyrir vistun leiksins
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} er fyrir
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} er fyrir
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kolanáma
 STR_INDUSTRY_NAME_POWER_STATION                                 :Rafmagnsstöð
@@ -1949,7 +1949,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Miðja aðalsjónarhorn á iðnað
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Ný {STRING} í byggingu við {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Ný {STRING} er að rísa við {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kostnaður: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kostnaður: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Get ekki reist þennan iðnað hér...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...skógur getur aðeins verið gróðursettur yfir snjólínu
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} tilkynnir yfirvofandi lokun!
@@ -1967,16 +1967,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Önnur göng fyrir
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Göng myndu enda utan korts
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Göng myndu enda utan korts
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Get ekki breytt landi fyrir hinn enda gangnanna
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Verður að eyða göngum fyrst
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Verður að eyða brú fyrst
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Getur ekki byrjað og endað á sama stað
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Brúarendar ekki í sömu hæð
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Brú er of lág fyrir umhverfið
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Getur ekki byrjað og endað á sama stað
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Brúarendar ekki í sömu hæð
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Brú er of lág fyrir umhverfið
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Verður að byrja og enda í sömu línu
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Óhentug staðsetning fyrir enda gangnanna
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hengibrú, stál
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Burðarbitabrú, stál
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Svifbitabrú, stál
@@ -1987,30 +1987,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Rörabrú, stá
 STR_BRIDGE_TUBULAR_SILICON                                      :Rörabrú, kísill
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Get ekki reist brú hér...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Get ekki grafið göng hér...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Lestagöng
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Vegagöng
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Stálhengibrú, lestir
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Stálburðarbitabrú, lestir
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Stálsvifbitabrú, lestir
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Styrkt steypuhengirbú, lestir
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Viðarbrú, lestir
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Steypubrú, lestir
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Stálhengibrú, vegur
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Stálburðarbitabrú, vegur
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Stálsvifbitabrú, vegur
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Styrkt steypuhengibrú, vegur
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Viðarbrú, vegur
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Stepubrú, vegur
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Rörabrú, lestir
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Rörabrú, vegur
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Lestagöng
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Vegagöng
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Stálhengibrú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Stálburðarbitabrú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Stálsvifbitabrú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Styrkt steypuhengirbú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Viðarbrú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Steypubrú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Stálhengibrú, vegur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Stálburðarbitabrú, vegur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Stálsvifbitabrú, vegur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Styrkt steypuhengibrú, vegur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Viðarbrú, vegur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Stepubrú, vegur
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Rörabrú, lestir
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Rörabrú, vegur
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Hluturinn er fyrir
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Mastur
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Viti
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Höfuðstöðvar fyritækis
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Mastur
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Viti
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Höfuðstöðvar fyritækis
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...höfuðstöðvar fyrirtækis eru fyrir
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Land í eigu fyrirtækis
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Land í eigu fyrirtækis
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Þú getur ekki keypt þetta land...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...þú átt það nú þegar!
 
@@ -2056,7 +2056,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stöð
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Erfiðleikastig
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Vista
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Vista
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Auðvelt
@@ -2129,8 +2129,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Litaskema
 STR_LIVERY_CAPTION                                              :{WHITE}Nýtt Litaskema
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Nafn fyrirtækis
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Nafn forstöðumanns
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nafn Fyrirtækis
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nafn forstöðumanns
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nafn Fyrirtækis
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nafn forstöðumanns
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Ekki hægt að breyta nafni fyrirtækis...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Ekki hægt að breyta nafni forstöðumanns...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Fjármál {BLACK}{COMPANYNUM}
@@ -2154,11 +2154,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Summa:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Tekjulínurit
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Resktrartekju línurit
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bankainnistæða
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Lán
-STR_MAX_LOAN                                                    :{WHITE}Hámarkslán:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Hámarkslán:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Taka lán {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Borga lán {SKIP}{SKIP}{CURRENCY}
@@ -2167,7 +2167,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Ekki hæ
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...ekkert lán til að borga
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} vantar
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Getur ekki borgað lán...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Það er ekki hægt að gefa peninga sem teknir eru að láni frá bankanum...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Það er ekki hægt að gefa peninga sem teknir eru að láni frá bankanum...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Velja nýtt andlit á forstöðumanninn
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Breyta útliti á farartækjum fyrirtækisins
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Breyta nafni forstöðumanns
@@ -2177,10 +2177,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Borga ti
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Hafið: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Farartæki:
-STR_TRAINS                                                      :{WHITE}{COMMA} lest{P "" ir}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} bíl{P l ar}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} flugvél{P "" ar}
-STR_SHIPS                                                       :{WHITE}{COMMA} skip
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} lest{P "" ir}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} bíl{P l ar}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} flugvél{P "" ar}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} skip
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Engin
 STR_FACE_CAPTION                                                :{WHITE}Andlitsval
 STR_FACE_MALE_BUTTON                                            :{BLACK}Karlmaður
@@ -2193,9 +2193,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Velja kv
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Mynda andlit af handahófi
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Lykill
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Sýna lykilmynd
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Birta ítarlegt árangursmat
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Birta ítarlegt árangursmat
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Lykilmynd fyrir fyrirtækjagröf
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Smelltu hér til að taka út/setja inn graf þessa fyrirtækis
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Smelltu hér til að taka út/setja inn graf þessa fyrirtækis
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Fluttar einingar af farmi
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Einkunn fyrirtækis (hámarkseinkunn=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Fyrirtækisvirði
@@ -2229,23 +2229,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Forseti
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Auðkýfingur
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Byggja HS
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Byggja höfuðstöðvar fyrirtækisins / skoða höfuðstöðvar fyrirtækisins
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Endurreisa höfuðstöðvarnar annarsstaðar fyrir 1% af verðmæti fyrirtækis
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Endurreisa höfuðstöðvarnar annarsstaðar fyrir 1% af verðmæti fyrirtækis
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Ekki hægt að byggja höfuðstöðvar...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Skoða HS
-STR_RELOCATE_HQ                                                 :{BLACK}Flytja HS
-STR_COMPANY_JOIN                                                :{BLACK}Taka þátt
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Taka þátt sem þetta fyrirtæki
-STR_COMPANY_PASSWORD                                            :{BLACK}Lykilorð
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Til að vernda fyrirtæki þitt frá óboðnum notendum geturðu sett lykilorð á það
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Setja lykilorð á fyrirtæki
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Flytja HS
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Taka þátt
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Taka þátt sem þetta fyrirtæki
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Lykilorð
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Til að vernda fyrirtæki þitt frá óboðnum notendum geturðu sett lykilorð á það
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Setja lykilorð á fyrirtæki
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ekki vista innslegið lykilorð
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Læsa fyrirtækinu með nýja lykilorðinu
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Lykilorð fyrirtækis
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Sjálfgefið lykilorð fyrirtækis
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Nota lykilorð þessa fyrirtækis sem sjálfgefið fyrir ný fyrirtæki
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Sjálfgefið lykilorð fyrirtækis
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Nota lykilorð þessa fyrirtækis sem sjálfgefið fyrir ný fyrirtæki
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Heimssamdráttur!{}{}Hagfræðingar hræddir um efnahagshrun!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Samdráttur!{}{}Uppslag í viðskiptum gefur bjartari von um betri efnahag!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Stækka/smækka gluggastærð
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Stækka/smækka gluggastærð
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Heildarverðmæti fyrirtækis: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kaupa 25% hlut í fyrirtæki
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Selja 25% hlut í fyrirtæki
@@ -2255,7 +2255,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Get ekki
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Get ekki selt 25% hlut í þessu fyrirtæki...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% í eigu {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} hefur verið yfirtekið af {STRING}!
-STR_PROTECTED                                                   :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
+STR_ERROR_PROTECTED                                             :{WHITE}Þetta fyrirtæki er ekki nógu gamalt til að versla með hluti ...
 
 STR_LIVERY_DEFAULT                                              :Aðal litaskema
 STR_LIVERY_STEAM                                                :Gufuvagnar
@@ -2281,14 +2281,14 @@ STR_LIVERY_LARGE_PLANE                                          :Þotur
 STR_LIVERY_PASSENGER_TRAM                                       :Farþegasporvagn
 STR_LIVERY_FREIGHT_TRAM                                         :Farmsporvagn
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Grunnlitur fyrirtækis
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Litaskema lesta
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Litaskema bifreiða
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Litaskema skipa
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Litaskema flugvéla
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Veldu lit fyrir valda hluti á listanum
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Veldu seinni lit fyrir valda hluti á listanum
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Veldu hluti til að breyta lit á, CTRL-smelltu til að velja marga saman. Smelltu í reitinn til að virkja valinn lit.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Grunnlitur fyrirtækis
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Litaskema lesta
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Litaskema bifreiða
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Litaskema skipa
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Litaskema flugvéla
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Veldu lit fyrir valda hluti á listanum
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Veldu seinni lit fyrir valda hluti á listanum
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Veldu hluti til að breyta lit á, CTRL-smelltu til að velja marga saman. Smelltu í reitinn til að virkja valinn lit.
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Gufu)
@@ -2596,9 +2596,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ekki afhlaða
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Breyta stanshegðun valinna skipana
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Breyta fermishegðun valinna skipana
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Breyta hegðun affermingar valinna skipanna
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Bæta við ítarlegri skipun
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Bæta við ítarlegri skipun
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Fara í næsta skýli
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Fara í næsta flugskýli
 STR_ORDER_NEAREST_DEPOT                                         :næsta
@@ -2608,9 +2608,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Þjónusta hraÃ
 STR_ORDER_TRAIN_DEPOT                                           :lestaskýli
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :bifreiðaskýli
 STR_ORDER_SHIP_DEPOT                                            :skipaskýli
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} flugskýli
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} flugskýli
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Fara alltaf
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Þjónusta ef þarf
@@ -2635,10 +2635,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :er stærra en
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :er stærra en eða jafnt og
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er satt
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er ósatt
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Hoppa í skipun {COMMA}
-STR_CONDITIONAL_NUM                                             :Hoppa í skipun {COMMA} þegar {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Hoppa í skipun {COMMA} þegar {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Hoppa í skipun {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Hoppa í skipun {COMMA} þegar {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Hoppa í skipun {COMMA} þegar {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Engin ferðalög
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Ferðalag (ekki sett í áætlun)
@@ -2661,18 +2661,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Aðeins
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Sleppa
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Eyða
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Fara að
-STR_REFIT                                                       :{BLACK}Breyta
-STR_REFIT_TIP                                                   :{BLACK}Veldu farm til að breyta í. CTRL smelltu til að fjarlægja breytiskipun
-STR_REFIT_ORDER                                                 :(Breyta í {STRING})
-STR_REFIT_STOP_ORDER                                            :(Breyta í {STRING} og stöðva)
-STR_STOP_ORDER                                                  :(Stopp)
-STR_TIMETABLE_VIEW                                              :{BLACK}�ætlun
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Skipta yfir í áætlanasýn
-STR_ORDER_VIEW                                                  :{BLACK}Skipanir
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Skipta yfir í skipanasýn
+STR_ORDER_REFIT                                                 :{BLACK}Breyta
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Veldu farm til að breyta í. CTRL smelltu til að fjarlægja breytiskipun
+STR_ORDER_REFIT_ORDER                                           :(Breyta í {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Breyta í {STRING} og stöðva)
+STR_ORDER_STOP_ORDER                                            :(Stopp)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}�ætlun
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Skipta yfir í áætlanasýn
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Skipanir
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Skipta yfir í skipanasýn
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Skipanir)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Endi skipana - -
-STR_SERVICE                                                     :{BLACK}Skoðun
+STR_ORDER_SERVICE                                               :{BLACK}Skoðun
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Framleitt: {LTBLUE}{NUM}{BLACK} Virði: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Virði: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2692,7 +2692,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}farartæ
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}farartæki sem deilir þessum skipunum getur ekki farið á þessa stöð
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Get ekki fært farartæki...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Aftari dráttarvagn fylgir alltaf fremri hluta
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Get ekki fundið leit til staðbundins skýlis
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA}dagar{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Skoðanamillibil: {LTBLUE}{COMMA}%{BLACK}   Seinasta skoðun: {LTBLUE}{DATE_LONG}
@@ -2712,10 +2712,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}�ætlun
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Breyta tímanum sem valin skipun ætti að taka
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Hreinsa tímann fyrir valda skipun
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Endurstilla seinkunarteljara, svo farartækið verði á réttum tíma
-STR_SERVICE_HINT                                                :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Verð: {CURRENCY} Þyngd: {WEIGHT_S}{}Hraði: {VELOCITY}  Afl: {POWER}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {CARGO}, {CARGO}{}Rekstrarkostnaður: {CURRENCY} á ári
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {CARGO}{}Rekstrarkostnaður: {CURRENCY} á ári
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Verð: {CURRENCY} Þyngd: {WEIGHT_S}{}Hraði: {VELOCITY}  Afl: {POWER}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {CARGO}, {CARGO}{}Rekstrarkostnaður: {CURRENCY} á ári
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Verð: {CURRENCY} Hámarkshraði: {VELOCITY}{}Burðargeta: {CARGO}{}Rekstrarkostnaður: {CURRENCY} á ári
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Aldur: {LTBLUE}{STRING}{BLACK}   Rekstrarkostnaður: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Hámarkshraði: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Þyngd: {LTBLUE}{WEIGHT_S} {BLACK}Afl: {LTBLUE}{POWER}{BLACK} Hámarkshraði: {LTBLUE}{VELOCITY}
@@ -2735,27 +2735,27 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Get ekki snúið lest við...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Get ekki snúið lestinni við...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Get ekki snúið vögnum sem tilheyra vagnapari
-STR_CLEAR_TIME                                                  :{BLACK}Hreinsa tíma
-STR_RESET_LATENESS                                              :{BLACK}Endurstilla seinkunnarteljara
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Breyta nafni á vegleiðara
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Hreinsa tíma
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Endurstilla seinkunnarteljara
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Breyta nafni á vegleiðara
 
-STR_TRAIN_STOPPING                                              :{RED}Stöðva
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stöðva, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Ósamstæðir lestarteinar
-STR_TRAIN_NO_POWER                                              :{RED}Ekkert afl
-STR_TRAIN_START_NO_CATENARY                                     :� þetta lestarspor vantar rafmagnsvíra, lestin kemst ekki af stað
-STR_TRAIN_STUCK                                                 :{ORANGE}Bíð eftir lausri leið
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stöðva
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stöðva, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Ósamstæðir lestarteinar
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ekkert afl
+STR_ERROR_TRAIN_START_NO_CATENARY                               :� þetta lestarspor vantar rafmagnsvíra, lestin kemst ekki af stað
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Bíð eftir lausri leið
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Ný {STRING} er nú fáanleg!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Ný {STRING} er nú fáanleg!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Get ekki selt ónýtt farartæki...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Get ekki breytt ónýtu farartæki...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Get ekki selt ónýtt farartæki...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Get ekki breytt ónýtu farartæki...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Get ekki stillt áætlun farartækis...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Farartæki getur aðeins beðið við stöð.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Þetta farartæki mun ekki stoppa við þessa stöð.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Get ekki stillt áætlun farartækis...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Farartæki getur aðeins beðið við stöð.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Þetta farartæki mun ekki stoppa við þessa stöð.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Breyta tíma
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Þetta farartæki er nú þegar á réttum tíma
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Þetta farartæki er {STRING} of seint
@@ -2769,7 +2769,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Bæta á
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...verður að stöðvast í bifreiðaskýli
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Finnur ekkert nálægt skýli
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Þvinga bifreið til að snúa við
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Rými: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Rými: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} farartæki{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2796,11 +2796,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Setja niður bauju sem hægt er að nota sem leiðarvísi fyrir skip
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Get ekki sett bauju hér...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Byggja vatnsleyðslu
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ekki hægt að byggja vatnsleyðslu hér...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Ekki hægt að byggja vatnsleyðslu hér...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Breyta)
 STR_REFIT_TITLE                                                 :{GOLD}Veldu farm sem á að flytja:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ný burðargeta: {GOLD}{CARGO}{}{BLACK}Breytingarkostnaður: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(breytanlegt)
+STR_PURCHASE_INFO_REFITTABLE                                    :(breytanlegt)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flugvellir
@@ -2813,7 +2813,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Byggja f
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Bæjarbúar fagna . . .{}Fyrsta flugvél kemur við á {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Flugslys!{}{COMMA} deyja í sprengingu á {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Flugslys!{}Flugvél varð eldsneytislaus, {COMMA} deyja í sprengingu!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (�ætlun)
 
@@ -2826,13 +2826,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Hrun í kolanámu veldur eyðileggingu nálægt {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Flóð!{}Að minnsta kosti {COMMA} er saknað og eru taldir af eftir gífurleg flóð!
 
-STR_BRIBE_FAILED                                                :{WHITE}Tilraun þín til múturs var
-STR_BRIBE_FAILED_2                                              :{WHITE}uppgvötuð af héraðsrannsóknarmanni
-STR_BUILD_DATE                                                  :{BLACK}Byggt: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Tilraun þín til múturs var
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}uppgvötuð af héraðsrannsóknarmanni
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Byggt: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Tegund stöðvar: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tegund stöðvar: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Tegund stöðvar: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tegund stöðvar: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Nákvæm frammistöðumæling
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Upplýsingar
@@ -2852,28 +2852,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}ReiðufÃ
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Lán:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Alls:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Fjöldi farartækja; inniheldur fjölda bifreiða, lesta, skipa og flugvéla
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Fjöldi stöðvarhluta. Hver hluti stöðvar (t.d. lestarstöð, strætóstöð, flugvöllur) er talinn, jafnvel þótt þeir séu tengdir sem ein stöð.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Hagnaður tekjulægsta farartækisins (sem er eldra en 2 ára)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Afkoma mánaðarins með minnsta hagnaðinn síðustu 12 ársfjórðunga
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Afkoma mánaðarins með mesta hagnaðinn síðustu 12 ársfjórðunga
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Einingar farms sem fluttar hafa verið síðasta árið
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Fjöldi farmgerða sem fluttar voru í síðasta ársfjórðungi
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Peningar sem þetta fyrirtæki á í bankanum
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Peningar sem þetta fyrirtæki hefur tekið að láni
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Heildarpunktar af mögulegum punktum
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Fjöldi farartækja; inniheldur fjölda bifreiða, lesta, skipa og flugvéla
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Fjöldi stöðvarhluta. Hver hluti stöðvar (t.d. lestarstöð, strætóstöð, flugvöllur) er talinn, jafnvel þótt þeir séu tengdir sem ein stöð.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Hagnaður tekjulægsta farartækisins (sem er eldra en 2 ára)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Afkoma mánaðarins með minnsta hagnaðinn síðustu 12 ársfjórðunga
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Afkoma mánaðarins með mesta hagnaðinn síðustu 12 ársfjórðunga
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Einingar farms sem fluttar hafa verið síðasta árið
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Fjöldi farmgerða sem fluttar voru í síðasta ársfjórðungi
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Peningar sem þetta fyrirtæki á í bankanum
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Peningar sem þetta fyrirtæki hefur tekið að láni
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Heildarpunktar af mögulegum punktum
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Stillingar
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Sýna NewGRF stillingar
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF stillingar
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Virkja breytingar
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Skipta milli litaskema
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Skipta um litaskema fyrir valin sett.{}Ef mikið af bleikum lit birtist á röngum stöðum mun þetta laga vandann.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Stilla breytur
-STR_NEWGRF_FILENAME                                             :{BLACK}Skráarnafn: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Litaskema: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF einkenni: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 summa: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Virkja breytingar
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Skipta milli litaskema
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Skipta um litaskema fyrir valin sett.{}Ef mikið af bleikum lit birtist á röngum stöðum mun þetta laga vandann.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Stilla breytur
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Skráarnafn: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Litaskema: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF einkenni: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5 summa: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Þú ert í þann mund að eiga við leik í gangi, við það gæti OpenTTD hrunið.{}Ertu viss um að þú viljir halda áfram?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2896,34 +2896,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Reyndi að nota
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inniheldur gallaða mynd. Allar gallaðar myndir munu birtast sem rauð spurningamerki (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inniheldur margar „Action 8“ færslur
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Hlaða valdar stillingu
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Vista stillingu
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Vista núverandi lista sem stillingu
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Skrifaðu nafn á stillingu
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Eyða stillingu
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Eyða valinni stillingu
-STR_NEWGRF_ADD                                                  :{BLACK}Bæta við
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Bæta NewGRF skrá við listann
-STR_NEWGRF_REMOVE                                               :{BLACK}Fjarlægja
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjarlægja valda NewGRF skrá af listanum
-STR_NEWGRF_MOVEUP                                               :{BLACK}Færa ofar
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Færa valda NewGRF skrá ofar á listann
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Færa neðar
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Færa valda NewGRF skrá neðar á listann
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Listi yfir NewGRF skrár sem eru til staðar. Smelltu á skrá til að eiga við eiginleika hennar.
-STR_NEWGRF_PARAMETER                                            :{BLACK}Eiginleikar: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Sláðu inn NewGRF breytur
-STR_NEWGRF_NO_INFO                                              :{BLACK}Engar upplýsingar tiltækar
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Hlaða valdar stillingu
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Vista stillingu
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Vista núverandi lista sem stillingu
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Skrifaðu nafn á stillingu
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Eyða stillingu
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Eyða valinni stillingu
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Bæta við
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Bæta NewGRF skrá við listann
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Fjarlægja
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Fjarlægja valda NewGRF skrá af listanum
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Færa ofar
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Færa valda NewGRF skrá ofar á listann
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Færa neðar
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Færa valda NewGRF skrá neðar á listann
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Listi yfir NewGRF skrár sem eru til staðar. Smelltu á skrá til að eiga við eiginleika hennar.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Eiginleikar: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Sláðu inn NewGRF breytur
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Engar upplýsingar tiltækar
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tiltækar NewGRF skrár
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Bæta á lista
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Bæta valinni NewGRF skrá í stillingarnar
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Uppfæra lista
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Uppfæra listann yfir tiltækar NewGRF skrár
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Bæta valinni NewGRF skrá í stillingarnar
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Uppfæra lista
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Uppfæra listann yfir tiltækar NewGRF skrár
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Get ekki bætt skrá við: tvö eins GRF einkenni
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Viðeigandi skrá finnst ekki
-STR_NEWGRF_DISABLED                                             :{RED}Óvirkt
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Viðeigandi skrá finnst ekki
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Óvirkt
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Viðeigandi skrá finnst ekki (samsvarandi GRF hlaðið)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Samsvarandi GRF hlaðið í staðin týndrar skrár
@@ -2939,7 +2939,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}Rangar u
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Farm/breytingaupplýsingar fyrir '{1:ENGINE}' stangast á við innkaupalista eftir kaup. Þetta kann að valda því að sjálfvirk uppfærsla/útskipting mistakist.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' olli endalausri lykkju í framleiðsluferlinu.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Leikurinn var vistaður í útgáfu án sporvagna. Allir sporvagnar hafa verið fjarlægðir.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Leikurinn var vistaður í útgáfu án sporvagna. Allir sporvagnar hafa verið fjarlægðir.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Sérvalinn gjaldeyrir
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Gengi: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2950,16 +2950,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Skipta
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Skipta í Evrur: {ORANGE}aldrei
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Dæmi: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Breyta sérvöldum gjaldeyri
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Hækka gengi miðað við pund (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Lækka gengi miðað við pund (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Setja gengi gjaldmiðils miðað við pund (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Veldu aðgreiningarmerki fyrir gjaldmiðilinn
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Veldu forskeyti fyrir gjaldmiðilinn
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Veldu viðskeyti fyrir gjaldmiðilinn
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Skipta fyr yfir í evru
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Skipta síðar yfir í evru
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Veldu ártal fyrir evruskipti
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10.000 pund (£) í þessum gjaldmiðli
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Hækka gengi miðað við pund (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Lækka gengi miðað við pund (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Setja gengi gjaldmiðils miðað við pund (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Veldu aðgreiningarmerki fyrir gjaldmiðilinn
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Veldu forskeyti fyrir gjaldmiðilinn
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Veldu viðskeyti fyrir gjaldmiðilinn
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Skipta fyr yfir í evru
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Skipta síðar yfir í evru
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Veldu ártal fyrir evruskipti
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10.000 pund (£) í þessum gjaldmiðli
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2978,8 +2978,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Skip
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Flugvél
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Samnýttar skipanir {COMMA} {P farartækis farartækja}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Sýna öll farartæki sem deila þessari áætlun
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Samnýttar skipanir {COMMA} {P farartækis farartækja}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Sýna öll farartæki sem deila þessari áætlun
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} bíður í þjónustumiðstöð
@@ -3086,39 +3086,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Breyta b
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Breyta vöruflutningaskipum svo þau flytji annan farm
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Breyta flugvél svo hún flytji annan farm
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}� leið í {TOWN} lestaskýli
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}� leið í {TOWN} lestaskýli, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}� leið í {TOWN} bifreiðaskýli
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}� leið í {TOWN} bifreiðaskýli, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}� leið í {TOWN} slipp
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}� leið í {TOWN} slipp, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}� leið í {STATION} flugskýli
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}� leið í {STATION} flugskýli, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Viðhald í {TOWN} lestaskýli
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Viðhald í {TOWN} lestaskýli, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Viðhald í {TOWN} slippi
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Viðhald í {TOWN} slippi, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Viðhald í {STATION} flugskýli
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Viðhald í {STATION} flugskýli, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Afrita lest
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Afrita bifreið
-STR_CLONE_SHIP                                                  :{BLACK}Afrita skip
-STR_CLONE_AIRCRAFT                                              :{BLACK}Afrita flugvél
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Þetta býr til aðra eins lest að tengivögnunum meðtöldum. Control smelltu til að deila áætlun
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Þetta býr til aðra eins bifreið. Control smelltu til að deila áætlun
-STR_CLONE_SHIP_INFO                                             :{BLACK}Þetta býr til annað eins skip. Control smelltu til að deila áætlun
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Þetta býr til aðra eins flugvél. Control smelltu til að deila áætlun
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Þetta býr til aðra lest að tengivögnunum meðtöldum sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á lestina. Control smelltu til að deila áætlun
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Þetta býr til aðra bifreið sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á bifreiðina. Control smelltu til að deila áætlun
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Þetta býr til annað skip sem er eins og það sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á skipið. Control smelltu til að deila áætlun
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Þetta býr til aðra flugvél sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á flugvélina. Control smelltu til að deila áætlun
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}� leið í {TOWN} lestaskýli
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}� leið í {TOWN} lestaskýli, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}� leið í {TOWN} bifreiðaskýli
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}� leið í {TOWN} bifreiðaskýli, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}� leið í {TOWN} slipp
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}� leið í {TOWN} slipp, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}� leið í {STATION} flugskýli
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}� leið í {STATION} flugskýli, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Viðhald í {TOWN} lestaskýli
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Viðhald í {TOWN} lestaskýli, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Viðhald í {TOWN} bifreiðaskýli, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Viðhald í {TOWN} slippi
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Viðhald í {TOWN} slippi, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Viðhald í {STATION} flugskýli
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Viðhald í {STATION} flugskýli, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Afrita lest
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Afrita bifreið
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Afrita skip
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Afrita flugvél
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Þetta býr til aðra eins lest að tengivögnunum meðtöldum. Control smelltu til að deila áætlun
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Þetta býr til aðra eins bifreið. Control smelltu til að deila áætlun
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Þetta býr til annað eins skip. Control smelltu til að deila áætlun
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Þetta býr til aðra eins flugvél. Control smelltu til að deila áætlun
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Þetta býr til aðra lest að tengivögnunum meðtöldum sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á lestina. Control smelltu til að deila áætlun
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Þetta býr til aðra bifreið sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á bifreiðina. Control smelltu til að deila áætlun
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Þetta býr til annað skip sem er eins og það sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á skipið. Control smelltu til að deila áætlun
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Þetta býr til aðra flugvél sem er eins og sú sem þú velur, hvort heldur sem er innan eða utan skýlisins. Smelltu á takkann og svo á flugvélina. Control smelltu til að deila áætlun
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Lestaúrval
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nýjir rafdrifnir lestarvagnar
@@ -3188,28 +3188,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Miðja a
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Þú ert í þann mund að selja öll farartækin. Viltu halda áfram?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Röng tegund skýlis
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Röng tegund skýlis
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Selja allar lestir í skýli
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Selja allar bifreiðar í skýli
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Selja öll skip í slippi
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Selja allar flugvélar í skýli
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Selja allar lestir í skýli
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Selja allar bifreiðar í skýli
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Selja öll skip í slippi
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Selja allar flugvélar í skýli
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Fá lista yfir allar lestir sem hafa þetta skýli á áætlun
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Fá lista yfir allar bifreiðir sem hafa þetta skýli á áætlun
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Fá lista yfir öll skip sem hafa þennan slipp á áætlun
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Fá lista yfir allar flugvélar sem hafa flugskýli á þessum velli á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Fá lista yfir allar lestir sem hafa þetta skýli á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Fá lista yfir allar bifreiðir sem hafa þetta skýli á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Fá lista yfir öll skip sem hafa þennan slipp á áætlun
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Fá lista yfir allar flugvélar sem hafa flugskýli á þessum velli á áætlun
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Skipta öllum lestum í skýlinu sjálfvirkt út
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Skipta öllum bifreiðum í skýlinu sjálfvirkt út
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Skipta öllum skipum í slippnum sjálfvirkt út
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Skipta öllum flugvélum í skýlinu sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Skipta öllum lestum í skýlinu sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Skipta öllum bifreiðum í skýlinu sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Skipta öllum skipum í slippnum sjálfvirkt út
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Skipta öllum flugvélum í skýlinu sjálfvirkt út
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Endurnýja {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Hefja skipti
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stöðva skipti
-STR_NOT_REPLACING                                               :{BLACK}Skipti ekki
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Enginn vagn valinn
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Skipti ekki
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Enginn vagn valinn
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Veldu vagntegund til að skipta út
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Velja vagntegund sem þú myndir vilja nota í staðin fyrir vagntegundina sem valinn er vinstra megin
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Smelltu til að stöðva skipti á vagntegundinni sem valin er vinstra megin
@@ -3221,26 +3221,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Heldur l
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Skipti út: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skipta á milli útskiptiglugga dráttar- og flutningavagna
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Lestarvagn er ekki fáanlegur
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Bifreið er ekki fáanleg
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skip er ekki fáanlegt
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Flugvél er ekki fáanleg
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Lestarvagn er ekki fáanlegur
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Bifreið er ekki fáanleg
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Skip er ekki fáanlegt
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Flugvél er ekki fáanleg
 
-STR_ENGINES                                                     :Dráttarvagnar
-STR_WAGONS                                                      :Vagnar
+STR_REPLACE_ENGINES                                             :Dráttarvagnar
+STR_REPLACE_WAGONS                                              :Vagnar
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Smelltu til að stöðva allar lestir í skýlinu
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Smelltu til að stöðva allar bifreiðar í skýlinu
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Smelltu til að stöðva öll skip í slippnum
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Smelltu til að stöðva allar flugvélar í flugskýlinu
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Smelltu til að stöðva allar lestir í skýlinu
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Smelltu til að stöðva allar bifreiðar í skýlinu
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Smelltu til að stöðva öll skip í slippnum
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Smelltu til að stöðva allar flugvélar í flugskýlinu
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Smelltu til að ræsa allar lestir í skýlinu
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Smelltu til að ræsa allar bifreiðar í skýlinu
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Smelltu til að ræsa öll skip í slippnum
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Smelltu til að ræsa allar flugvélar í flugskýlinu
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Smelltu til að ræsa allar lestir í skýlinu
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Smelltu til að ræsa allar bifreiðar í skýlinu
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Smelltu til að ræsa öll skip í slippnum
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Smelltu til að ræsa allar flugvélar í flugskýlinu
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Smelltu til að stöðva öll farartæki á listanum
-STR_MASS_START_LIST_TIP                                         :{BLACK}Smelltu til að ræsa öll farartæki á listanum
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Smelltu til að stöðva öll farartæki á listanum
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Smelltu til að ræsa öll farartæki á listanum
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Merkjalisti - {COMMA} merki
@@ -3249,14 +3249,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Járnbrautavagnar
-STR_ELRAIL_VEHICLES                                             :Rafdrifnir lestarvagnar
-STR_MONORAIL_VEHICLES                                           :Einteinungsvagnar
-STR_MAGLEV_VEHICLES                                             :Segulsvifvagnar
+STR_REPLACE_RAIL_VEHICLES                                       :Járnbrautavagnar
+STR_REPLACE_ELRAIL_VEHICLES                                     :Rafdrifnir lestarvagnar
+STR_REPLACE_MONORAIL_VEHICLES                                   :Einteinungsvagnar
+STR_REPLACE_MAGLEV_VEHICLES                                     :Segulsvifvagnar
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Verð: {GOLD}{CURRENCY}{BLACK} Þyngd: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hámarkshraði: {GOLD}{VELOCITY}{BLACK}   Afl: {GOLD}{POWER}
@@ -3283,70 +3283,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Mynda land
-STR_RANDOM                                                      :{BLACK}Nýtt raðnúmer
-STR_RANDOM_HELP                                                 :{BLACK}Fá tilviljanakennt raðnúmer fyrir myndun lands
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Sköpun heims
-STR_RANDOM_SEED                                                 :{BLACK}Raðnúmer lands:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Smelltu til að skrifa inn raðnúmer
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Sláðu inn slembistofn
-STR_LAND_GENERATOR                                              :{BLACK}Landmyndun:
-STR_TREE_PLACER                                                 :{BLACK}Planta trjám:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Snúningur hæðarkorts:
-STR_TERRAIN_TYPE                                                :{BLACK}Gerð lands:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Magn sjávar:
-STR_SMOOTHNESS                                                  :{BLACK}Sléttleiki lands:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Hæð snjólínu:
-STR_DATE                                                        :{BLACK}Dags.:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Fjöldi bæja:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Fjöldi iðnaða:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Hækka snjólínu upp um eitt þrep
-STR_SNOW_LINE_DOWN                                              :{BLACK}Lækka snjólínu niður um eitt þrep
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Breyta hæð snjólínu
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Breyta upphafsári
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Stærð hæðarlínukorts
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ekki er mælt með því að breyta stærð grunnkorts of mikið. Viltu halda áfram?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nafn hæðarlínukorts:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Stærð: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Mynda land
+STR_MAPGEN_RANDOM                                               :{BLACK}Nýtt raðnúmer
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Fá tilviljanakennt raðnúmer fyrir myndun lands
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Sköpun heims
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Raðnúmer lands:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Smelltu til að skrifa inn raðnúmer
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Sláðu inn slembistofn
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landmyndun:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Planta trjám:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Snúningur hæðarkorts:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Gerð lands:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Magn sjávar:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Sléttleiki lands:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Hæð snjólínu:
+STR_MAPGEN_DATE                                                 :{BLACK}Dags.:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Fjöldi bæja:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Fjöldi iðnaða:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Hækka snjólínu upp um eitt þrep
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Lækka snjólínu niður um eitt þrep
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Breyta hæð snjólínu
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Breyta upphafsári
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Stærð hæðarlínukorts
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ekki er mælt með því að breyta stærð grunnkorts of mikið. Viltu halda áfram?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nafn hæðarlínukorts:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Stærð: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Skapa heim...
 STR_GENERATION_ABORT                                            :{BLACK}Hætta
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Hætta við sköpun heims
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ertu viss um að þú viljir hætta við sköpunina?
-STR_PROGRESS                                                    :{WHITE}{NUM}% tilbúið
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Sköpun heims
-STR_TREE_GENERATION                                             :{BLACK}Gróðursetning trjáa
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Staðsetning fastra hluta
-STR_CLEARING_TILES                                              :{BLACK}Hrjúft og grýtt landslag
-STR_SETTINGUP_GAME                                              :{BLACK}Set upp leik
-STR_PREPARING_TILELOOP                                          :{BLACK}Keyri reitalykkju
-STR_PREPARING_GAME                                              :{BLACK}Undirbý leik
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Þessi stilling breytti erfiðleikastigi í sérsniðið
-STR_SE_FLAT_WORLD                                               :{WHITE}Slétt land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Mynda slétt land
-STR_SE_RANDOM_LAND                                              :{WHITE}Handahófskennt land
-STR_SE_NEW_WORLD                                                :{BLACK}Búa til nýtt kort
-STR_SE_CAPTION                                                  :{WHITE}Tegund korts
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Lækka slétt land niður um eitt þrep
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Hækka slétt land upp um eitt þrep
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Breyta hæð á sléttu landi
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Hæð slétts lands yfir sjávarmáli
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% tilbúið
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Sköpun heims
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Gróðursetning trjáa
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Staðsetning fastra hluta
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Hrjúft og grýtt landslag
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Set upp leik
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Keyri reitalykkju
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Undirbý leik
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Þessi stilling breytti erfiðleikastigi í sérsniðið
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Slétt land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Mynda slétt land
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Handahófskennt land
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Búa til nýtt kort
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tegund korts
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Lækka slétt land niður um eitt þrep
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Hækka slétt land upp um eitt þrep
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Breyta hæð á sléttu landi
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Hæð slétts lands yfir sjávarmáli
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Miðja heimskort á núverandi staðsetningu
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Hliðar korts:
-STR_NORTHWEST                                                   :{BLACK}Norðvestur
-STR_NORTHEAST                                                   :{BLACK}Norðaustur
-STR_SOUTHEAST                                                   :{BLACK}Suðaustur
-STR_SOUTHWEST                                                   :{BLACK}Suðvestur
-STR_BORDER_FREEFORM                                             :{BLACK}Frjálsar
-STR_BORDER_WATER                                                :{BLACK}Vatn
-STR_BORDER_RANDOM                                               :{BLACK}Slembin
-STR_BORDER_RANDOMIZE                                            :{BLACK}Slembnar
-STR_BORDER_MANUAL                                               :{BLACK}Forvaldar
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Hliðar korts:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Norðvestur
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Norðaustur
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Suðaustur
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Suðvestur
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Frjálsar
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vatn
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Slembin
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Slembnar
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Forvaldar
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Lítill flugvöllur
@@ -3371,21 +3371,21 @@ STR_MEASURE_AREA                                                :{BLACK}Svæði:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Hæðarmunur {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Svæði: {NUM} x {NUM}{}Hæðarmunur: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Millifæra gjaldeyri: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...vegurinn er í eigu bæjar
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vegurinn snýr í ranga átt
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Stilling gegnsæjis
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Virkja/afvirkja gegnsæji stöðvaskiltia. CTRL+smella til að læsa.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Virkja/afvirkja gegnsæji trjáa. CTRL+smella til að læsa.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Virkja/afvirkja gegnsæji húsa. CTRL+smella til að læsa.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Virkja/afvirkja gegnsæji iðnaða. CTRL+smella til að læsa.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við stöðvar, skýli og veghlið. CTRL+smella til að læsa.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Virkja/afvirkja gegnsæji brúa. CTRL+smella til að læsa.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við vita og möstur. CTRL+smella til að læsa.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Virkja/afvirkja gegnsæji raflína. CTRL+smella til að læsa.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Virkja/afvirkja gegnsæji hleðslumæla. CTRL+smella til að læsa.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gera hluti ósýnilega en ekki gagnsæja
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Millifæra gjaldeyri: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...vegurinn er í eigu bæjar
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...vegurinn snýr í ranga átt
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Stilling gegnsæjis
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Virkja/afvirkja gegnsæji stöðvaskiltia. CTRL+smella til að læsa.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Virkja/afvirkja gegnsæji trjáa. CTRL+smella til að læsa.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Virkja/afvirkja gegnsæji húsa. CTRL+smella til að læsa.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Virkja/afvirkja gegnsæji iðnaða. CTRL+smella til að læsa.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við stöðvar, skýli og veghlið. CTRL+smella til að læsa.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Virkja/afvirkja gegnsæji brúa. CTRL+smella til að læsa.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við vita og möstur. CTRL+smella til að læsa.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Virkja/afvirkja gegnsæji raflína. CTRL+smella til að læsa.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Virkja/afvirkja gegnsæji hleðslumæla. CTRL+smella til að læsa.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Gera hluti ósýnilega en ekki gagnsæja
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3395,7 +3395,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Allar lestir
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Allar bifreiðir
 STR_GROUP_ALL_SHIPS                                             :Öll skip
@@ -3404,24 +3404,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Hóplausar lest
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Hóplausar bifreiðir
 STR_GROUP_DEFAULT_SHIPS                                         :Hóplaus skip
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Hóplausar flugvélar
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Bæta við deildu farartæki
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Fjarlægja öll farartæki
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Endurnefna hóp
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Get ekki búið til hóp...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Get ekki eytt þessum hópi...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Get ekki endurnefnt hóp...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Get ekki fjarlægt öll farartæki úr þessum hóp...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Get ekki bætt farartækinu við þennan hóp...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Get ekki bætt við deildu farartæki við hóp...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Get ekki búið til hóp...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Get ekki eytt þessum hópi...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Get ekki endurnefnt hóp...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Get ekki fjarlægt öll farartæki úr þessum hóp...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Get ekki bætt farartækinu við þennan hóp...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Get ekki bætt við deildu farartæki við hóp...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Hópar - Smelltu á hóp til að skrifa öll farartæki í þessum hóp
-STR_GROUP_CREATE_TIP                                            :{BLACK}Smelltu til að búa til hóp
-STR_GROUP_DELETE_TIP                                            :{BLACK}Eyða völdum hóp
-STR_GROUP_RENAME_TIP                                            :{BLACK}Endurnefna valinn hóp
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Smelltu til að halda þessum hóp frá sjálfvirkri uppfærslu
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Hópar - Smelltu á hóp til að skrifa öll farartæki í þessum hóp
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Smelltu til að búa til hóp
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Eyða völdum hóp
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Endurnefna valinn hóp
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Smelltu til að halda þessum hóp frá sjálfvirkri uppfærslu
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3482,35 +3482,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nafnið verður að vera sérstætt
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nafnið verður að vera sérstætt
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Fara að næsta skilti
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Fara að fyrra skilti
-STR_SIGN_OSKTITLE                                               :{BLACK}Sláðu inn nafn fyrir skiltið
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Fara að næsta skilti
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Fara að fyrra skilti
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Sláðu inn nafn fyrir skiltið
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fjármagna
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Horfur
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Reisa
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Veldu viðeigandi iðnað úr listanum
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fjármagna
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Horfur
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Reisa
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Veldu viðeigandi iðnað úr listanum
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}�tarlegt
-STR_FACE_ADVANCED_TIP                                           :{BLACK}�tarleg breyting andlits
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}�tarleg breyting andlits
 STR_FACE_SIMPLE                                                 :{BLACK}Einfalt
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Einföld breyting andlits
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Einföld breyting andlits
 STR_FACE_LOAD                                                   :{BLACK}Hlaða
-STR_FACE_LOAD_TIP                                               :{BLACK}Hlaða uppáhalds andliti
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Hlaða uppáhalds andliti
 STR_FACE_LOAD_DONE                                              :{WHITE}Uppáhalds andlitinu þínu hefur verið hlaðið úr stilliskrá OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Andlit nr.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Skoða og/eða stilla andlitsnúmer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Skoða og/eða stilla andlitsnúmer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Skoða og/eða stilla andlitsnúmer
 STR_FACE_FACECODE_SET                                           :{WHITE}Nýtt andlitsnúmer hefur verið stillt.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Gat ekki stillt andlitsnúmer - verður að vera tala á bilinu 0 og upp í 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Vista
-STR_FACE_SAVE_TIP                                               :{BLACK}Vista uppáhalds andlit
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Vista uppáhalds andlit
 STR_FACE_SAVE_DONE                                              :{WHITE}Þetta andlit verður vistað sem þitt uppáhalds í stilliskrá OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Evrópskt
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Velur evrópskt útlit
@@ -3518,51 +3518,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrískt
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Velur afrískt útlit
 STR_FACE_YES                                                    :Já
 STR_FACE_NO                                                     :Nei
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Virkja yfirvaraskegg eða eyrnalokk
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Virkja yfirvaraskegg eða eyrnalokk
 STR_FACE_HAIR                                                   :Hár:
-STR_FACE_HAIR_TIP                                               :{BLACK}Breyta hári
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Breyta hári
 STR_FACE_EYEBROWS                                               :Augabrúnir:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Breyta augabrúnum
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Breyta augabrúnum
 STR_FACE_EYECOLOUR                                              :Augnlitur:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Breyta augnlit
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Breyta augnlit
 STR_FACE_GLASSES                                                :Gleraugu:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Velja/afvelja gleraugu
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Breyta gleraugum
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Velja/afvelja gleraugu
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Breyta gleraugum
 STR_FACE_NOSE                                                   :Nef:
-STR_FACE_NOSE_TIP                                               :{BLACK}Breyta nefi
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Breyta nefi
 STR_FACE_LIPS                                                   :Varir:
 STR_FACE_MOUSTACHE                                              :Yfirvaraskegg:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Breyta vörum eða yfirvaraskeggi
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Breyta vörum eða yfirvaraskeggi
 STR_FACE_CHIN                                                   :Vangar:
-STR_FACE_CHIN_TIP                                               :{BLACK}Breyta vöngum
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Breyta vöngum
 STR_FACE_JACKET                                                 :Jakki:
-STR_FACE_JACKET_TIP                                             :{BLACK}Breyta jakka
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Breyta jakka
 STR_FACE_COLLAR                                                 :Kragi:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Breyta kraga
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Breyta kraga
 STR_FACE_TIE                                                    :Bindi:
 STR_FACE_EARRING                                                :Eyrnalokkur:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Breyta bindi eða eyrnalokk
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Breyta bindi eða eyrnalokk
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Lestaljós
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Get ekki breytt ljósum hér...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Hefðbundin merki{}Merki eru nauðsynleg til að koma í veg fyrir að lestir lendi í árekstri.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Komumerki{}Hleypir í gegn uns ekkert frámerki er eftir opið.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Frámerki{}Virkar eins og hefðbundið merki en er nauðsynlegt til að fá rétta virkni fyrir komu- og fjölmerki.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Fjölmerki{}Fjölmerkin virka bæði sem komu- og frámerki sem gerir þér kleyft að hanna stór "tré" af formerkjum.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Leiðarmerki (skilti){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta farið framhjá venjulegum skiltum aftanfrá.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Einstefnuleiðarmerki (skilti){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta ekki farið framhjá einstefnuskiltum aftanfrá.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Hefðbundin ljós{}Ljós eru nauðsynleg til að koma í veg fyrir að lestir lendi í árekstri.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Komuljós{}Hleypir í gegn uns ekkert fráljós er lengur grænt.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Fráljós{}Virkar eins og hefðbundið ljós en er naðusynlegt til að fá rétta virkni fyrir komu- og fjölljós.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Fjölljós{}Fjölljósið virkar bæði sem komu- og fráljós sem gerir þér kleyft að hanna stór "tré" af forljósum.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Leiðarmerki (ljós){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta farið framhjá venjulegum skiltum aftanfrá.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Einstefnuleiðarmerki (ljós){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta ekki farið framhjá einstefnuskiltum aftanfrá.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Breyting ljósa{}Þegar valið þá breytist merki sem til er fyrir í valda gerð og tegund. CTRL-smellur mun rúlla í gegnum núverandi tegund.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Þéttleiki dreginna ljósa
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Minnka þéttleika dreginna ljósa
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Auka þéttleika dreginna ljósa
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Lestaljós
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Get ekki breytt ljósum hér...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Hefðbundin merki{}Merki eru nauðsynleg til að koma í veg fyrir að lestir lendi í árekstri.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Komumerki{}Hleypir í gegn uns ekkert frámerki er eftir opið.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Frámerki{}Virkar eins og hefðbundið merki en er nauðsynlegt til að fá rétta virkni fyrir komu- og fjölmerki.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Fjölmerki{}Fjölmerkin virka bæði sem komu- og frámerki sem gerir þér kleyft að hanna stór "tré" af formerkjum.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Leiðarmerki (skilti){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta farið framhjá venjulegum skiltum aftanfrá.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Einstefnuleiðarmerki (skilti){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta ekki farið framhjá einstefnuskiltum aftanfrá.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Hefðbundin ljós{}Ljós eru nauðsynleg til að koma í veg fyrir að lestir lendi í árekstri.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Komuljós{}Hleypir í gegn uns ekkert fráljós er lengur grænt.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Fráljós{}Virkar eins og hefðbundið ljós en er naðusynlegt til að fá rétta virkni fyrir komu- og fjölljós.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Fjölljós{}Fjölljósið virkar bæði sem komu- og fráljós sem gerir þér kleyft að hanna stór "tré" af forljósum.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Leiðarmerki (ljós){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta farið framhjá venjulegum skiltum aftanfrá.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Einstefnuleiðarmerki (ljós){}Leiðarmerki gera fleiri en einni lest í einu kleift að keyra inn á svæði án umferðarmerkja ef þær finna örugga leið út af því aftur. Lestir geta ekki farið framhjá einstefnuskiltum aftanfrá.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Breyting ljósa{}Þegar valið þá breytist merki sem til er fyrir í valda gerð og tegund. CTRL-smellur mun rúlla í gegnum núverandi tegund.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Þéttleiki dreginna ljósa
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Minnka þéttleika dreginna ljósa
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Auka þéttleika dreginna ljósa
 ########
 
 ############ on screen keyboard
@@ -3574,36 +3574,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Stillingar gervigreindar
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Sýna stillingar gervigreindar
 STR_AI_DEBUG                                                    :{WHITE}Aflúsun gervigreindar
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nafn gervigreindar
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nafn gervigreindar
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Endurhlaða gervigreind
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Stöðva gervigreindina, endurhlaða skriftunni og ræsa gervigreindina á ný
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Aflúsunargluggi gervigreindar er aðeins aðgengilegur á þjóni
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Stöðva gervigreindina, endurhlaða skriftunni og ræsa gervigreindina á ný
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Aflúsunargluggi gervigreindar er aðeins aðgengilegur á þjóni
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Stilling gervigreindar
-STR_AI_CHANGE                                                   :{BLACK}Velja gervigreind
-STR_AI_CONFIGURE                                                :{BLACK}Stilla
-STR_AI_CHANGE_TIP                                               :{BLACK}Velja aðra gervigreind
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Stilltu eiginleika gervigreindarinnar
-STR_AI_LIST_TIP                                                 :{BLACK}Gervigreindir sem notaðar verða í næsta leik
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Velja gervigreind
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Stilla
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Velja aðra gervigreind
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Stilltu eiginleika gervigreindarinnar
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Gervigreindir sem notaðar verða í næsta leik
 STR_AI_LIST_CAPTION                                             :{WHITE}Tiltækar gervigreindir
-STR_AI_AILIST_TIP                                               :{BLACK}Smelltu til að merkja gervigreind
-STR_AI_ACCEPT                                                   :{BLACK}� lagi
-STR_AI_ACCEPT_TIP                                               :{BLACK}Velja merkta gervigreind
-STR_AI_CANCEL                                                   :{BLACK}Hætta við
-STR_AI_CANCEL_TIP                                               :{BLACK}Hætta við breytingar
-STR_AI_CLOSE                                                    :{BLACK}Loka
-STR_AI_RESET                                                    :{BLACK}Frumstilla
-STR_AI_HUMAN_PLAYER                                             :Mennskur leikmaður
-STR_AI_RANDOM_AI                                                :Gervigreind af handahófi
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Smelltu til að merkja gervigreind
+STR_AI_LIST_ACCEPT                                              :{BLACK}� lagi
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Velja merkta gervigreind
+STR_AI_LIST_CANCEL                                              :{BLACK}Hætta við
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Hætta við breytingar
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Loka
+STR_AI_SETTINGS_RESET                                           :{BLACK}Frumstilla
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Mennskur leikmaður
+STR_AI_CONFIG_RANDOM_AI                                         :Gervigreind af handahófi
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Stillingar gervigreindar
-STR_AI_AUTHOR                                                   :{BLACK}Höfundur: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Útgáfa: {NUM}
-STR_AI_URL                                                      :{BLACK}Vefslóð: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Ein af gervigreindunum hrundi. Vinsamlega gerðu höfundi gervigreindarinnar viðvart og sendu inn mynd af aflúsunarglugga gervigreindarinnar.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Höfundur: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Útgáfa: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}Vefslóð: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ein af gervigreindunum hrundi. Vinsamlega gerðu höfundi gervigreindarinnar viðvart og sendu inn mynd af aflúsunarglugga gervigreindarinnar.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Hávaðamörk í bænum: {ORANGE}{COMMA}{BLACK}  mest: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Hávaði við flugvöll: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Hávaðamörk í bænum: {ORANGE}{COMMA}{BLACK}  mest: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Hávaði við flugvöll: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3617,21 +3617,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Kort
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Hæðakort
 STR_CONTENT_TITLE                                               :{WHITE}Niðurhel efni
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Týpa
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tegund pakka
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tegund pakka
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Heiti
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Heiti efnis
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Smelltu á pakka fyrir frekari upplýsingar{}Smelltu í reitinn til að velja pakka til niðurhals
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Heiti efnis
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Smelltu á pakka fyrir frekari upplýsingar{}Smelltu í reitinn til að velja pakka til niðurhals
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Velja allt
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Velja allt til niðurhals
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Velja allt til niðurhals
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Velja uppfærslur
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Velja til niðurhals allar uppfærslur fyrir pakka sem nú þegar hefur verið náð í
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Velja til niðurhals allar uppfærslur fyrir pakka sem nú þegar hefur verið náð í
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Af-velja allt
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Afvelja allt frá niðurhali
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Afvelja allt frá niðurhali
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Sláðu inn leitarstreng
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Sláðu inn leitarstreng til að sía listann
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Sláðu inn leitarstreng til að sía listann
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Leitarstrengur:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Niðurhala
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Hefja niðurhal á völdum pökkum
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Hefja niðurhal á völdum pökkum
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Stærð niðurhals: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}UPPL�SINGAR
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Pakkinn er ekki valinn til niðurhals
@@ -3664,6 +3664,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Gat ekki
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Ná í viðbætur af netinu
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skoða viðbætur sem hægt er að ná í af netinu
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Leita á netinu að efni sem vantar
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Skoða hvort hægt sé að ná í það sem vantar af netinu
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Leita á netinu að efni sem vantar
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Skoða hvort hægt sé að ná í það sem vantar af netinu
 ########
diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt
index b738efbc6..118050b84 100644
--- a/src/lang/indonesian.txt
+++ b/src/lang/indonesian.txt
@@ -118,7 +118,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} kopi t
 STR_QUANTITY_BATTERIES                                          :{COMMA} baterai
 STR_QUANTITY_PLASTIC                                            :{VOLUME} plastik
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} minuman berdesis
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -208,26 +208,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Pilih modus pengurutan (menurun/menaik)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Pilih kriteria pengurutan
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Pilih kriteria
-STR_SORT_BY                                                     :{BLACK}Urutkan
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Pilih modus pengurutan (menurun/menaik)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Pilih kriteria pengurutan
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Pilih kriteria
+STR_BUTTON_SORT_BY                                              :{BLACK}Urutkan
 STR_BUTTON_LOCATION                                             :{BLACK}Lokasi
-STR_QUERY_RENAME                                                :{BLACK}Ubah nama
+STR_BUTTON_RENAME                                               :{BLACK}Ubah nama
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Tutup window
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Judul Jendela - klik dan tahan disini untuk memindahkan jendela
-STR_STICKY_BUTTON                                               :{BLACK}Catat jendela ini agar tidak tertutup saat di beri perintah "Tutup Semua Jendela"
-STR_RESIZE_BUTTON                                               :{BLACK}Klik dan Geser untuk mengubah ukuran jendela ini.
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Tandai besar/kecil ukuran jendela
+STR_TOOLTIP_STICKY                                              :{BLACK}Catat jendela ini agar tidak tertutup saat di beri perintah "Tutup Semua Jendela"
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik dan Geser untuk mengubah ukuran jendela ini.
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Tandai besar/kecil ukuran jendela
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Batang Geser - Geser daftar ke atas/bawah
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Batang Geser - Geser daftar ke kiri/kanan
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Runtuhkan bangunan, dll dalam area kotak
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Standar
-STR_QUERY_CANCEL                                                :{BLACK}Batal
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Standar
+STR_BUTTON_CANCEL                                               :{BLACK}Batal
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -316,7 +316,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Memasang
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Simpan Skenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Buka Skenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Buka heightmap
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Buka heightmap
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Keluar editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Keluar
@@ -504,11 +504,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Pilih jenis kargo yang akan ditampilkan
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Perlihatkan detil rating kekuatan
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Perlihatkan detil rating kekuatan
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Grafik item perusahaan
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klik disini untuk menandai daftar perusahaan pada grafik
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik disini untuk menandai daftar perusahaan pada grafik
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Tabel Liga Perusahaan
@@ -543,16 +543,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Kekayaan
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Hutang:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Jumlah kendaraan; termasuk bus/truk, kereta api, kapal dan pesawat
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Jumlah dari bagian-bagian stasiun. Setiap bagian dari stasiun (misal: stasiun kereta api, halte Bus, bandara) dihitung, meskipun mereka dihubungkan menjadi satu kesatuan stasiun
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Keuntungan dari kendaraan dan pendapatan terendah (semua kendaraan yang usianya tidak melebihi 2 tahun)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Banyaknya uang tunai yang dihasilkan dalam satu bulan dengan keuntungan terendah pada 1/4 tahun terakhir
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Banyaknya uang tunai yang dihasilkan dalam satu bulan dengan keuntungan tertinggi pada 1/4 tahun terakhir
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Jumlah kargo yang terkirim selama kuartal terakhir
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Jumlah jenis kargo yang terkirim selama kuartal terakhir
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Banyaknya uang yang dimiliki perusahaan ini yang tersimpan di bank
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Banyaknya uang perusahaan ini yang digunakan untuk membayar pinjaman
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total Nilai Keluar dari nilai-nilai yang mungin
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Jumlah kendaraan; termasuk bus/truk, kereta api, kapal dan pesawat
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Jumlah dari bagian-bagian stasiun. Setiap bagian dari stasiun (misal: stasiun kereta api, halte Bus, bandara) dihitung, meskipun mereka dihubungkan menjadi satu kesatuan stasiun
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Keuntungan dari kendaraan dan pendapatan terendah (semua kendaraan yang usianya tidak melebihi 2 tahun)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Banyaknya uang tunai yang dihasilkan dalam satu bulan dengan keuntungan terendah pada 1/4 tahun terakhir
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Banyaknya uang tunai yang dihasilkan dalam satu bulan dengan keuntungan tertinggi pada 1/4 tahun terakhir
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Jumlah kargo yang terkirim selama kuartal terakhir
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Jumlah jenis kargo yang terkirim selama kuartal terakhir
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Banyaknya uang yang dimiliki perusahaan ini yang tersimpan di bank
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Banyaknya uang perusahaan ini yang digunakan untuk membayar pinjaman
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total Nilai Keluar dari nilai-nilai yang mungin
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Kotak musik Jazz
@@ -670,8 +670,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Hidup/ma
 STR_SMALLMAP_CENTER                                             :{BLACK}Tengahkan peta kecil pada posisi ini
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Matikan semua
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Aktifkan semua
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Matikan semua
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Aktifkan semua
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Tampilkan pesan atau laporan berita terakhir
@@ -682,8 +682,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  MENY
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Pesan Lampau
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Daftar pesan berita-berita yang ada
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Daftar pesan berita-berita yang ada
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Pesan
@@ -917,32 +917,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pilih gr
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} berkas hilang atau rusak
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informasi tambahan tentang set grafik dasar
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Modus layar penuh gagal
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Modus layar penuh gagal
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Atur Mata Uang
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Nilai tukar: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Menurunkan nilai mata uang satu Pound (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Meningkatkan nilai mata uang satu Pound (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Atur penukaran nilai mata uang per satu Pound (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Menurunkan nilai mata uang satu Pound (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Meningkatkan nilai mata uang satu Pound (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Atur penukaran nilai mata uang per satu Pound (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Pemisah: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Atur pemisah nilai mata uang Anda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Atur pemisah nilai mata uang Anda
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Awalan: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Masukkan awalan untuk mata uang
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Masukkan awalan untuk mata uang
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Akhiran: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Masukkan akhiran untuk mata uang
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Masukkan akhiran untuk mata uang
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Menggunakan Euro tahun: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Menggunakan Euro: {ORANGE}tidak pernah
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Masukkan tahun perpindahan ke Euro
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Berpindah ke Euro lebih awal
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Berpindah ke Eurolebih akhir
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Masukkan tahun perpindahan ke Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Berpindah ke Euro lebih awal
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Berpindah ke Eurolebih akhir
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Contoh: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pound (£) pada mata uang Anda
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pound (£) pada mata uang Anda
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Ubah sendiri parameter mata uang
 
 # Difficulty level window
@@ -956,7 +956,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Bebas
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Tampilkan tabel skor tertinggi
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Simpan
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Simpan
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Jumlah pesaing maksimal: {ORANGE}{COMMA}
@@ -1022,7 +1022,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Selalu boleh
 STR_CITY_APPROVAL_TOLERANT                                      :Toleran
 STR_CITY_APPROVAL_HOSTILE                                       :Bermusuhan
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Tindakan ini menyebabkan tingkat kesulitan menjadi bebas
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Tindakan ini menyebabkan tingkat kesulitan menjadi bebas
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Pengaturan lanjutan
@@ -1271,7 +1271,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Tdk
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Ukuran X peta: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Ukuran Y peta: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ganti nilai tetapan
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Ganti nilai tetapan
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1313,9 +1313,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Keluar O
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Keluar
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Anda yakin ingin keluar dari OpenTTD dan kembali ke {STRING}?
-STR_YES                                                         :{BLACK}Ya
-STR_NO                                                          :{BLACK}Tidak
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Anda yakin ingin keluar dari OpenTTD dan kembali ke {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ya
+STR_QUIT_NO                                                     :{BLACK}Tidak
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1331,11 +1331,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Batalkan Permainan
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Apakah anda yakin untuk membatalkan permainan saat ini?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Apa anda yakin mau keluar dari skenario ini ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Apa anda yakin mau keluar dari skenario ini ?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Kode Curang
-STR_CHEATS_TIP                                                  :{BLACK}Daftar cek ini mengindikasikan bahwa anda telah menggunakan kode curang ini sebelumnya
+STR_CHEATS_TOOLTIP                                              :{BLACK}Daftar cek ini mengindikasikan bahwa anda telah menggunakan kode curang ini sebelumnya
 STR_CHEATS_WARNING                                              :{BLACK}Peringatan! Anda akan mencurangi pemain lainnya. Kecurangan ini akan tetap tercatat selama game berjalan.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Tambah uang sebanyak {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Bermain sebagai pemain: {ORANGE}{COMMA}
@@ -1344,24 +1344,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Terowon
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Membangun saat mode "BERHENTI": {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Pesawat tak akan (sering) celaka di bandara kecil: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Ganti alam: {ORANGE} {STRING}
-STR_TEMPERATE_LANDSCAPE                                         :Lansekap 'sederhana'
-STR_SUB_ARCTIC_LANDSCAPE                                        :Lansekap 'Sub Antartika'
-STR_SUB_TROPICAL_LANDSCAPE                                      :Lansekap 'Sub Tropis'
-STR_TOYLAND_LANDSCAPE                                           :Lansekap 'Taman Bermain'
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Lansekap 'sederhana'
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Lansekap 'Sub Antartika'
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Lansekap 'Sub Tropis'
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Lansekap 'Taman Bermain'
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Ganti tanggal: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktifkan modifikasi nilai produksi: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Warna tema baru
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Tampilkan skema warna umum
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Tampilkan skema warna kereta api
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Tampilkan skema warna bus/truk
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Tampilkan skema warna kapal
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Tampilkan skema warna pesawat
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Pilih warna utama untuk skema terpilih
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Pilih warna kedua untuk skema terpilih
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Pilih skema warna untuk diganti, atau banyak skema dengan CTRL+klik. Klik pada kotak untuk berganti dari skema warna yang digunakan
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Tampilkan skema warna umum
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Tampilkan skema warna kereta api
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Tampilkan skema warna bus/truk
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Tampilkan skema warna kapal
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Tampilkan skema warna pesawat
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Pilih warna utama untuk skema terpilih
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Pilih warna kedua untuk skema terpilih
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Pilih skema warna untuk diganti, atau banyak skema dengan CTRL+klik. Klik pada kotak untuk berganti dari skema warna yang digunakan
 
 STR_LIVERY_DEFAULT                                              :Warna Standar
 STR_LIVERY_STEAM                                                :Mesin Uap
@@ -1399,19 +1399,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Pilih wa
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Ganti Wajah
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Buat wajah baru secara acak
 STR_FACE_ADVANCED                                               :{BLACK}Lebih Lanjut
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Pengaturan Wajah lebih lanjut.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Pengaturan Wajah lebih lanjut.
 STR_FACE_SIMPLE                                                 :{BLACK}Sederhana
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Memilih wajah secara sederhana.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Memilih wajah secara sederhana.
 STR_FACE_LOAD                                                   :{BLACK}Ambil simpanan
-STR_FACE_LOAD_TIP                                               :{BLACK}Baca simpanan wajah terpilih
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Baca simpanan wajah terpilih
 STR_FACE_LOAD_DONE                                              :{WHITE}Wajah kesukaanmu telah dimuat kembali dari berkas config OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Wajah pemain no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Lihat/ubah nomer wajah pemain
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Lihat/ubah nomer wajah pemain
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Lihat/ubah nomer wajah pemain
 STR_FACE_FACECODE_SET                                           :{WHITE}Kode jumlah wajah baru telah diatur.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Tidak dapat mengubah nomer wajah pemain - haruslah angka antara  0 dan 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Simpan
-STR_FACE_SAVE_TIP                                               :{BLACK}Simpan wajah kesukaanmu
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Simpan wajah kesukaanmu
 STR_FACE_SAVE_DONE                                              :{WHITE}Wajah ini akan disimpan sebagai kesukaanmu ke dalam berkas config OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Eropa
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Pilih wajah Eropa
@@ -1419,120 +1419,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrika
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Pilih wajah afrika
 STR_FACE_YES                                                    :Ya
 STR_FACE_NO                                                     :Tanpa
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Punya kumis atau anting-anting
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Punya kumis atau anting-anting
 STR_FACE_HAIR                                                   :Rambut:
-STR_FACE_HAIR_TIP                                               :{BLACK}Ganti model rambut
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Ganti model rambut
 STR_FACE_EYEBROWS                                               :Alis:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Ubah Alis
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Ubah Alis
 STR_FACE_EYECOLOUR                                              :Warna Mata:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Ubah Warna Mata
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Ubah Warna Mata
 STR_FACE_GLASSES                                                :Kacamata:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Pakai Kacamata
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Ganti Kacamata
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Pakai Kacamata
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Ganti Kacamata
 STR_FACE_NOSE                                                   :Hidung:
-STR_FACE_NOSE_TIP                                               :{BLACK}Ubah Hidung
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Ubah Hidung
 STR_FACE_LIPS                                                   :Bibir:
 STR_FACE_MOUSTACHE                                              :Kumis:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Ubah Bibir atau Kumis
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Ubah Bibir atau Kumis
 STR_FACE_CHIN                                                   :Dagu:
-STR_FACE_CHIN_TIP                                               :{BLACK}Ubah Dagu
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Ubah Dagu
 STR_FACE_JACKET                                                 :Jaket:
-STR_FACE_JACKET_TIP                                             :{BLACK}Ubah Jaket
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Ubah Jaket
 STR_FACE_COLLAR                                                 :Kerah Baju:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Ubah Kerah Baju
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Ubah Kerah Baju
 STR_FACE_TIE                                                    :Dasi:
 STR_FACE_EARRING                                                :Anting-anting:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Ubah dasi atau anting-anting
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Ubah dasi atau anting-anting
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Bermain bersama
-STR_NETWORK_CONNECTION                                          :{BLACK}Koneksi:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Pilih jalur internet atau jalur jaringan lokal (LAN).
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nama pemain:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ini adalah nama yang akan terlihat oleh pemain lain
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nama
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nama dari permainan
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klien
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klien online / klien maks.{}Perusahaan yang online / perusahaan maks.
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Ukuran peta
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Ukuran Peta dari permainan{}Klik untuk diurutkan berdasarkan area
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Tanggal
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Tanggal sekarang
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Tahun
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Jumlah tahun{}permainan telah berjalan
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Bahasa, versi server, dll.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klik untuk memilih sesi permainan dari daftar
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server yang diikuti dulu:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klik untuk memilih server yang digunakan sebelumnya
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO PERMAINAN
-STR_NETWORK_CLIENTS                                             :{SILVER}Klien: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Bahasa: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Ukuran "Tileset": {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Ukuran Peta: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versi Server: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Alamat Server: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Tgl mulai: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Tgl sekarang: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Terproteksi dengan kata kunci!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER PENUH
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSI TIDAK SESUAI
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF TIDAK SESUAI
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Bergabung
-STR_NETWORK_REFRESH                                             :{BLACK}Cek server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Periksa lagi  status server
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Cari server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Cari jaringan server
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Tambah server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Daftarkan server baru yang akan dipantau aktivitasnya
-STR_NETWORK_START_SERVER                                        :{BLACK}Mulai server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Mulai melayani
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Masukkan nama anda
-STR_NETWORK_ENTER_IP                                            :{BLACK}Masukkan alamat IP server
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Bermain bersama
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Koneksi:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Pilih jalur internet atau jalur jaringan lokal (LAN).
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+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
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nama
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nama dari permainan
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klien
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klien online / klien maks.{}Perusahaan yang online / perusahaan maks.
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Ukuran peta
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Ukuran Peta dari permainan{}Klik untuk diurutkan berdasarkan area
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Tanggal
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Tanggal sekarang
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Tahun
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Jumlah tahun{}permainan telah berjalan
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Bahasa, versi server, dll.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klik untuk memilih sesi permainan dari daftar
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Server yang diikuti dulu:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klik untuk memilih server yang digunakan sebelumnya
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO PERMAINAN
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klien: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Bahasa: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Ukuran "Tileset": {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Ukuran Peta: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versi Server: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Alamat Server: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Tgl mulai: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Tgl sekarang: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Terproteksi dengan kata kunci!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER PENUH
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSI TIDAK SESUAI
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF TIDAK SESUAI
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Bergabung
+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
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Mulai melayani
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Masukkan nama anda
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Masukkan alamat IP server
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Mulai permainan bersama baru
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nama Permainan:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Nama permainan akan ditampilkan kepada pemain lainnya didalam Menu seleksi dari "multiplayer game"
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Atur kata sandi
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Lindungi permainan ini dengan kata kunci jika anda tidak ingin membiarkannya terbuka untuk umum
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Pilih peta:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Peta mana yang akan dimainkan?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Bangkitkan permainan baru secara acak
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (mengiklankan)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klien
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maksimum klien:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Pilih jumlah klien maksimal. Tidak semua slot harus diisi
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Perusahaan
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maksimum perusahaan:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Batasi jumlah perusahaan pada server
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} Penonton
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maksimum penonton:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Batasi jumlah penonton pada server
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Bahasa pembicaraan:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Agar pemain lain mengetahui bahasa apa yang digunakan pada sever
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Mulai permainan
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Mulai satu permainan dalam jaringan dari salah satu peta acak atau skenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Buka Permainan
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Lanjutkan permainan bersama dari simpanan terdahulu (pastikan untuk terhubung sebagai pemain yang benar)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Masukkan nama dari permainan di jaringan
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Mulai permainan bersama baru
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nama Permainan:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nama permainan akan ditampilkan kepada pemain lainnya didalam Menu seleksi dari "multiplayer game"
+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_SELECT_MAP                             :{BLACK}Pilih peta:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Peta mana yang akan dimainkan?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Bangkitkan permainan baru secara acak
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (mengiklankan)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klien
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maksimum klien:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Pilih jumlah klien maksimal. Tidak semua slot harus diisi
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Perusahaan
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maksimum perusahaan:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Batasi jumlah perusahaan pada server
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} Penonton
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maksimum penonton:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Batasi jumlah penonton pada server
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Bahasa pembicaraan:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Agar pemain lain mengetahui bahasa apa yang digunakan pada sever
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Mulai permainan
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Mulai satu permainan dalam jaringan dari salah satu peta acak atau skenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Buka Permainan
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Lanjutkan permainan bersama dari simpanan terdahulu (pastikan untuk terhubung sebagai pemain yang benar)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Masukkan nama dari permainan di jaringan
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1575,32 +1575,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Latvia
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Lobi Bermain bersama
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Persiapan bergabung: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Daftar perusahaan yang ada dalam sesi permainan ini. Anda bisa bergabung dengan salah satu perusahaan, atau membuat perusahaan baru bila masih ada ruang tersisa.
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO PERUSAHAAN
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nama Perusahaan: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Dilantik: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Nilai perusahaan: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Neraca saat ini: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Pendapatan tahun terakhir: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performa: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Kendaraan: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasiun: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Para pemain: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Perusahaan baru
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Ciptakan satu perusahaan baru
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Nonton permainan
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Menonton permainan sebagai penonton
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Bergabung dengan perusahaan
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Membantu untuk mengatur perusahaan ini
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Lobi Bermain bersama
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Persiapan bergabung: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Daftar perusahaan yang ada dalam sesi permainan ini. Anda bisa bergabung dengan salah satu perusahaan, atau membuat perusahaan baru bila masih ada ruang tersisa.
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO PERUSAHAAN
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nama Perusahaan: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Dilantik: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Nilai perusahaan: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Neraca saat ini: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Pendapatan tahun terakhir: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performa: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Kendaraan: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stasiun: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Para pemain: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Perusahaan baru
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Ciptakan satu perusahaan baru
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Nonton permainan
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Menonton permainan sebagai penonton
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Bergabung dengan perusahaan
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Membantu untuk mengatur perusahaan ini
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Menghubungkan...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Menghubungkan...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Mencoba menghubungkan..
@@ -1616,13 +1616,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Mengambi
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klien di depanmu
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} terunduh
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Putuskan
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Putuskan
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server terkunci, masukkan kata kunci
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Perusahaan terkunci, masukkan kata kunci
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Daftar klien
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Daftar klien
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Menonton
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Buat Perusahaan
 
@@ -1644,18 +1644,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Masukkan
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Jangan simpan kata sandi yang telah dimasukkan
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Berikan perusahaan kata sandi baru
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Kata Sandi Perusahaan
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standar Kata Sandi Perusahaan
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Pergunakan kata sandi perusahaan ini sebagai standar perusahaan baru
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standar Kata Sandi Perusahaan
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Pergunakan kata sandi perusahaan ini sebagai standar perusahaan baru
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Gabung
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Gabung dan bermain sebagai perush. ini
-STR_COMPANY_PASSWORD                                            :{BLACK}Kata Sandi
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Kata Sandi-Melindungi perusahaanmu dari pemakai yang tidak bewenang untuk bergabung.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Atur Kata Sandi Perusahaan
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Gabung
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Gabung dan bermain sebagai perush. ini
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Kata Sandi
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Kata Sandi-Melindungi perusahaanmu dari pemakai yang tidak bewenang untuk bergabung.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Atur Kata Sandi Perusahaan
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Kirim
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Kirim
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Tim] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privat] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Semua] :
@@ -1668,40 +1668,40 @@ STR_NETWORK_CHAT_ALL                                            :[Semua] {STRING
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Masukkan teks untuk perbincangan jaringan
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Tak menemukan perangkat jaringan atau kompilasi tanpa "ENABLE_NETWORK"
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Tidak menemukan permainan di jaringan
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Server tidak merespon
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Tak dapat tersambung karena NewGRF tidak cocok
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Sinkronisasi permainan jaringan gagal
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Koneksi ke permainan jaringan terputus
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Tak dapat membuka game tersimpan
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Tak dapat memulai server
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Tak dapat tersambung
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Waktu Koneksi #{NUM} telah habis
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Kesalahan protokol, koneksi ditutup
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revisi pada klien tidak sama dengan revisi pada server
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Kata kunci salah
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Server penuh
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Anda ditolak memasuki server ini
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Anda diusir dari permainan
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Tidak boleh curang di server ini
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Tak menemukan perangkat jaringan atau kompilasi tanpa "ENABLE_NETWORK"
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Tidak menemukan permainan di jaringan
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Server tidak merespon
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Tak dapat tersambung karena NewGRF tidak cocok
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Sinkronisasi permainan jaringan gagal
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Koneksi ke permainan jaringan terputus
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Tak dapat membuka game tersimpan
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Tak dapat memulai server
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Tak dapat tersambung
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Waktu Koneksi #{NUM} telah habis
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Kesalahan protokol, koneksi ditutup
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Revisi pada klien tidak sama dengan revisi pada server
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Kata kunci salah
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server penuh
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Anda ditolak memasuki server ini
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Anda diusir dari permainan
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Tidak boleh curang di server ini
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :Kesalahan umum
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :Kesalahan de-sinkronisasi
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :Tak dapat memuat peta
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :koneksi terputus
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :Kesalahan protokol
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF tidak cocok
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :tidak sah
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :menerima paket aneh
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisi salah
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nama sudah digunakan
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :kata kunci salah
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :kesalahan pada company-id dalam DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :diusir oleh server
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :tadi mencoba curang
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server penuh
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :Kesalahan umum
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :Kesalahan de-sinkronisasi
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :Tak dapat memuat peta
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :koneksi terputus
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :Kesalahan protokol
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF tidak cocok
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :tidak sah
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :menerima paket aneh
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :revisi salah
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nama sudah digunakan
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :kata kunci salah
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :kesalahan pada company-id dalam DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :diusir oleh server
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :tadi mencoba curang
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server penuh
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1713,36 +1713,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Permainan Terta
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Permainan Dilanjutkan (pemain telah terhubung)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Permainan Dilanjutkan (gagal menghubungi pemain lainnya)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :pergi
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} telah bergabung
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} bergabung dalam perusahaan #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} bergabung menjadi penonton
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} mulai mendirikan perusahaan (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} meninggalkan permainan ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} telah mengganti namanya menjadi {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} telah memberi perusahaanmu {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Anda telah memberi {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Server menutup sesi
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Server memulai ulang...{}Tunggulah...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :pergi
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} telah bergabung
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} bergabung dalam perusahaan #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} bergabung menjadi penonton
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} mulai mendirikan perusahaan (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} meninggalkan permainan ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} telah mengganti namanya menjadi {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} telah memberi perusahaanmu {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Anda telah memberi {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Server menutup sesi
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Server memulai ulang...{}Tunggulah...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Mengunduh konten
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipe
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Jenis konten
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Jenis konten
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nama
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nama konten
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klik pada baris untuk menampilkan detail{}Klik pada kotak cek untuk mengunduhnya
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nama konten
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klik pada baris untuk menampilkan detail{}Klik pada kotak cek untuk mengunduhnya
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Pilih semua
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Tandai semua konten untuk diunduh
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Tandai semua konten untuk diunduh
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Pilih pembaruan
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Pilih semua konten yang tersedia pembaruannya untuk diunduh
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Pilih semua konten yang tersedia pembaruannya untuk diunduh
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Hps semua pilihan
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Tandai semua untuk tidak diunduh
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Tandai semua untuk tidak diunduh
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Masukkan kata penyaring
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Masukkan kata kunci untuk menyaring daftar
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Masukkan kata kunci untuk menyaring daftar
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tanda/nama filter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Unduh
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Mulai unduh konten terpilih
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Mulai unduh konten terpilih
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total ukuran terunduh: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO KONTEN
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Anda tidak memilih ini untuk diunduh
@@ -1786,17 +1786,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... berk
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Tak dapat mengembangkan file terunduh
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Pengaturan Transparasi
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Hidup/matikan transparansi sinyal stasiun. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Hidup/matikan transparansi pepohonan. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Hidup/matikan transparansi perumahan. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Hidup/matikan transparansi industri. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Hidup/matikan transparansi bangunan seperti stasiun, depo dan waypoint. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Hidup/matikan transparansi jembatan. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Hidup/matikan transparansi struktur bangunan semacam mercusuar dan antena. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Hidup/matikan transparansi katenari CTRL+klik untuk mengunci.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Hidup/matikan indikator proses pemuatan kargo. CTRL+klik untuk mengunci.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Atur obyek menjadi sama sekali tidak nampak daripada transparan.
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Pengaturan Transparasi
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Hidup/matikan transparansi sinyal stasiun. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Hidup/matikan transparansi pepohonan. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Hidup/matikan transparansi perumahan. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Hidup/matikan transparansi industri. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Hidup/matikan transparansi bangunan seperti stasiun, depo dan waypoint. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Hidup/matikan transparansi jembatan. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Hidup/matikan transparansi struktur bangunan semacam mercusuar dan antena. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Hidup/matikan transparansi katenari CTRL+klik untuk mengunci.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Hidup/matikan indikator proses pemuatan kargo. CTRL+klik untuk mengunci.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Atur obyek menjadi sama sekali tidak nampak daripada transparan.
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Jangkauan layanan
@@ -1808,11 +1808,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Menerima
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Suplai: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Gabung stasiun
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Pisahkan stasiun
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Gabung stasiun
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Pisahkan stasiun
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Gabungkan waypoint
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Pisahkan waypoint
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Gabungkan waypoint
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Pisahkan waypoint
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Pembangun Rel Kereta
@@ -1836,8 +1836,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Arah Dep
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Pilih arah depo kereta
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Waypoint
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Pilih jenis waypoint
+STR_WAYPOINT_CAPTION                                            :{WHITE}Waypoint
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Pilih jenis waypoint
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Pilih stasiun kereta
@@ -1850,36 +1850,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Pilih pa
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Membangun stasiun dengan Drag & Drop
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Pilih kelas stasiun yang akan ditampilkan
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Pilih jenis stasiun yang akan dibangun
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Pilih kelas stasiun yang akan ditampilkan
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Pilih jenis stasiun yang akan dibangun
 
-STR_STAT_CLASS_DFLT                                             :Stasiun asli/"default"
-STR_STAT_CLASS_WAYP                                             :Waypoint
+STR_STATION_CLASS_DFLT                                          :Stasiun asli/"default"
+STR_STATION_CLASS_WAYP                                          :Waypoint
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Pemilihan Sinyal
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Sinyal Blok (semaphore){}Ini adalah jenis sinyal yang umum, hanya memperbolehkan satu kereta berada pada satu blok yang sama dalam waktu yang sama.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sinyal Masuk (semaphore){}Akan berwarna hijau jika, dan hanya jika ada satu atau lebih Sinyal Keluar yang berwarna hijau pada bagian jalur  berikutnya. Jika tidak, akan berwarna merah
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Sinyal Keluar (semaphore){}Cara kerjanya sama dengan Sinyal Blok, akan tetapi penggunaanya lebih ditujukan untuk menghasilkan warna yang benar pada Sinyal Masuk dan Sinyal Kombo
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Sinyal Kombo (semaphore){}Sinyal Kombo berfungsi ganda, sebagai Sinyal Masuk sekaligus Sinyal keluar. Sehingga kita bisa membuat rangkaian sinyal-sinyal
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Sinyal Jalur (semaphore){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur standard  bisa di lewati dari arah belakang.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Sinyal Jalur Searah (semaphore){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur searah tidak  bisa di lewati dari arah belakangnya.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Sinyal Blok (elektris){}Ini adalah jenis sinyal yang umum, hanya memperbolehkan satu kereta berada pada satu blok yang sama dalam waktu yang sama.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sinyal Masuk (elektris){}Akan berwarna hijau jika, dan hanya jika ada satu atau lebih Sinyal Keluar yang berwarna hijau pada bagian jalur  berikutnya. Jika tidak, akan berwarna merah
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Sinyal Keluar (elektris){}Cara kerjanya sama dengan Sinyal Blok, akan tetapi penggunaannya lebih ditujukan untuk menghasilkan warna yang benar pada Sinyal Masuk dan Sinyal Kombo
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Sinyal Kombo (elektris){}Sinyal Kombo berfungsi ganda, sebagai Sinyal Masuk sekaligus Sinyal keluar. Sehingga kita bisa membuat rangkaian sinyal-sinyal
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Sinyal Jalur (elektris){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur standard  bisa di lewati dari arah belakang.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Sinyal Jalur Searah (elektris){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur searah tidak  bisa di lewati dari arah belakangnya.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Konversi Sinyal{}Jika terpilih, klik pada sinyal yang telah ada akan mengakibatkan sinyal berubah jenisnya, CTRL-click untuk mengubah secara berturut-turut.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Kerapatan Sinyal
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Kurangi kerapatan sinyal
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Tambah kerapatan sinyal
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Pemilihan Sinyal
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Sinyal Blok (semaphore){}Ini adalah jenis sinyal yang umum, hanya memperbolehkan satu kereta berada pada satu blok yang sama dalam waktu yang sama.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sinyal Masuk (semaphore){}Akan berwarna hijau jika, dan hanya jika ada satu atau lebih Sinyal Keluar yang berwarna hijau pada bagian jalur  berikutnya. Jika tidak, akan berwarna merah
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Sinyal Keluar (semaphore){}Cara kerjanya sama dengan Sinyal Blok, akan tetapi penggunaanya lebih ditujukan untuk menghasilkan warna yang benar pada Sinyal Masuk dan Sinyal Kombo
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Sinyal Kombo (semaphore){}Sinyal Kombo berfungsi ganda, sebagai Sinyal Masuk sekaligus Sinyal keluar. Sehingga kita bisa membuat rangkaian sinyal-sinyal
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Sinyal Jalur (semaphore){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur standard  bisa di lewati dari arah belakang.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Sinyal Jalur Searah (semaphore){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur searah tidak  bisa di lewati dari arah belakangnya.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Sinyal Blok (elektris){}Ini adalah jenis sinyal yang umum, hanya memperbolehkan satu kereta berada pada satu blok yang sama dalam waktu yang sama.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sinyal Masuk (elektris){}Akan berwarna hijau jika, dan hanya jika ada satu atau lebih Sinyal Keluar yang berwarna hijau pada bagian jalur  berikutnya. Jika tidak, akan berwarna merah
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Sinyal Keluar (elektris){}Cara kerjanya sama dengan Sinyal Blok, akan tetapi penggunaannya lebih ditujukan untuk menghasilkan warna yang benar pada Sinyal Masuk dan Sinyal Kombo
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Sinyal Kombo (elektris){}Sinyal Kombo berfungsi ganda, sebagai Sinyal Masuk sekaligus Sinyal keluar. Sehingga kita bisa membuat rangkaian sinyal-sinyal
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Sinyal Jalur (elektris){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur standard  bisa di lewati dari arah belakang.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Sinyal Jalur Searah (elektris){}Sinyal jalur dapat digunakan untuk memperbolehkan kereta memasuki sinyal blok pada saat yang sama, jika kereta bisa berbalik jalur ke area pemberhentian yang aman . Sinyal jalur searah tidak  bisa di lewati dari arah belakangnya.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konversi Sinyal{}Jika terpilih, klik pada sinyal yang telah ada akan mengakibatkan sinyal berubah jenisnya, CTRL-click untuk mengubah secara berturut-turut.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Kerapatan Sinyal
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Kurangi kerapatan sinyal
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Tambah kerapatan sinyal
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Pilih Jembatan Rel
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Pilih Jembatan
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Pilihan jembatan - Klik pada jembatan yang ingin anda bangun
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Pilihan jembatan - Klik pada jembatan yang ingin anda bangun
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensi, Baja
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Balok, Baja
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Beton, Baja
@@ -1913,9 +1913,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Membangu
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Arah Depo kendaraan
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Pilih arah bengkel kendaraan
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Pilih arah bengkel kendaraan
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientasi Depo Trem
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Pilih arah depo trem
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Pilih arah depo trem
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientasi stasiun Bus
@@ -1936,8 +1936,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Membangu
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Membangun pelabuhan
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Tempatkan pelampung yang dapat digunakan sebagai petunjuk arah
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Membangun jembatan air
-STR_CREATE_LAKE                                                 :{BLACK}Membuat area perairan .{}Membuat kanal, kecuali jika CTRL ditekan pada level yang sejajar dengan laut, maka air akan memenuhi permukaan
-STR_CREATE_RIVER                                                :{BLACK}Membuat Sungai
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Membuat area perairan .{}Membuat kanal, kecuali jika CTRL ditekan pada level yang sejajar dengan laut, maka air akan memenuhi permukaan
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Membuat Sungai
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientasi Galangan
@@ -1969,20 +1969,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Ukuran b
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Ukuran super
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Helikopad
 
-STR_STATION_NOISE                                               :{BLACK}Tingkat Kebisingan: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Tingkat Kebisingan: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Proses Lansekap
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Rendahkan sudut area
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Naikkan sudut dataran tanah
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Permukaan tanah
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Beli tanah untuk digunakan pada masa depan
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Rendahkan sudut area
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Naikkan sudut dataran tanah
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Permukaan tanah
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Beli tanah untuk digunakan pada masa depan
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Pepohonan
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Pilih jenis pohon untuk ditanam
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Tanam pohon secara acak
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Tempatkan tipe Tumbuhan secara acak
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Tempatkan tipe Tumbuhan secara acak
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Pohon Acak
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Menanam pohon secara acak pada lansekap
 
@@ -1995,9 +1995,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Meletakk
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Tambah ukuran area untuk menurunkan/menaikkan
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Kurangi ukuran area untuk menurunkan/menaikkan
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Buat wilayah secara acak
-STR_SE_NEW_WORLD                                                :{BLACK}Ciptakan Skenario baru
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Ciptakan Skenario baru
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Kembalikan lansekap seperti semula
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Buang semua kekayaan/kepimilikan para pemain dari peta
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Buang semua kekayaan/kepimilikan para pemain dari peta
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Kembalikan lansekap seperti semula
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Apakah anda yakin untuk menghapus semua kekayaan para pemain ?
@@ -2008,41 +2008,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Kota bar
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Membangun kota baru
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Kota secara acak
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Membangun kota di lokasi secara acak
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Buat kota secara acak
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Dukung Peta dengan penempatan kota secara otomatis
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Buat kota secara acak
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Dukung Peta dengan penempatan kota secara otomatis
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Ukuran kota:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Kecil
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Sedang
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Besar
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Acak
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Acak
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Pilih ukuran kota
 STR_FOUND_TOWN_CITY                                             :{BLACK}Kota
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Kota tumbuh lebih cepat daripada biasanya{}Tergantung pengaturan, kota dapat lebih besar ketika di danai.
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Tampilan jalan kota:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Pilihlah tampilan jalan yang digunakan utk kota ini
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Asli
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Jalan yang lebih baik
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}grid 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}grid 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Acak
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Tampilan jalan kota:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Pilihlah tampilan jalan yang digunakan utk kota ini
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Asli
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Jalan yang lebih baik
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}grid 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}grid 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Acak
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Danai industri baru
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Pilih jenis industri yang di inginkan dari daftar
-STR_MANY_RANDOM_INDUSTRIES                                      :Bangun industri secara acak
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Dukung Peta dengan penempatan industri secara otomatis
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Biaya: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospek
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bangun
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Danai
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Pilih jenis industri yang di inginkan dari daftar
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Bangun industri secara acak
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Dukung Peta dengan penempatan industri secara otomatis
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Biaya: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospek
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bangun
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Danai
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informasi area daratan
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Biaya penghancuran: {LTBLUE}tidak ada
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Biaya penghancuran: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Nilai jual kembali: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Nilai jual kembali: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :-kosong-
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Pemilik: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Pemilik Jalan: {LTBLUE}{STRING}
@@ -2050,104 +2050,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Pemilik
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Pemilik Rel Kereta: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Pemkot setempat: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Kosong
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinat: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Dibuat: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Kelas Stasiun: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipe Stasiun: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinat: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Dibuat: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Kelas Stasiun: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipe Stasiun: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Muatan diterima: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Bebatuan
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Tanah Kasar
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Lahan kritis
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Rerumputan
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Ladang
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Daerah tertutup salju
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Gurun Pasir
-
-STR_RAILROAD_TRACK                                              :Jalur rel
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Rel dengan sinyal blok
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Rel dengan sinyal muka
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Rel dengan sinyal keluar
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Rel dengan sinyal campuran
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Rel dengan sinyal jalan
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Rel dengan sinyal jalan satu arah
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Rel dengan blok dan sinyal muka
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Rel denyan blok dan sinyal muka
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Rel dengan blok dan sinyal campur
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Rel dengan blok dan sinyal jalan
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Rel dengan blok dan sinyal jalan satu arah
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Rel dengan sinyal muka dan keluar
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Rel dengan sinyal muka dan campuran
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Rel dengan sinyal muka dan jalan
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Rel dengan sinyal muka dan sinjal jalan satu arah
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Rel dengan sinyal keluar dan campuran
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Rel dengan sinyal keluar dan jalan
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Rel dengan sinyal keluar dan jalan satu arah
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Jalur rel kereta api dengan sinyal ganda dan sinyal menengah
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Rel dengan sinyal campuran dan jalan satu arah
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Rel dengan sinyal jalan dan sinyal jalan satu arah
-STR_RAILROAD_TRAIN_DEPOT                                        :Depo kereta api
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Jalan
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Jalan raya dengan lampu
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Jalan berbatas pohon
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depo Kendaraan Darat
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Persimpangan jalan/rel
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Jalur Trem
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Bebatuan
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Tanah Kasar
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Lahan kritis
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Rerumputan
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Ladang
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Daerah tertutup salju
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Gurun Pasir
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jalur rel
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Rel dengan sinyal blok
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Rel dengan sinyal muka
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Rel dengan sinyal keluar
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Rel dengan sinyal campuran
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Rel dengan sinyal jalan
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Rel dengan sinyal jalan satu arah
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Rel dengan blok dan sinyal muka
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Rel denyan blok dan sinyal muka
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Rel dengan blok dan sinyal campur
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Rel dengan blok dan sinyal jalan
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Rel dengan blok dan sinyal jalan satu arah
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Rel dengan sinyal muka dan keluar
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Rel dengan sinyal muka dan campuran
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Rel dengan sinyal muka dan jalan
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Rel dengan sinyal muka dan sinjal jalan satu arah
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Rel dengan sinyal keluar dan campuran
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Rel dengan sinyal keluar dan jalan
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Rel dengan sinyal keluar dan jalan satu arah
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Jalur rel kereta api dengan sinyal ganda dan sinyal menengah
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Rel dengan sinyal campuran dan jalan satu arah
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Rel dengan sinyal jalan dan sinyal jalan satu arah
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depo kereta api
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Jalan
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Jalan raya dengan lampu
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Jalan berbatas pohon
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depo Kendaraan Darat
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Persimpangan jalan/rel
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Jalur Trem
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (dalam perbaikan)
-
-STR_TREE_NAME_TREES                                             :Pepohonan
-STR_TREE_NAME_RAINFOREST                                        :Hutan Hujan
-STR_TREE_NAME_CACTUS_PLANTS                                     :Tanaman Kaktus
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Stasiun Kereta Api
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar Pesawat
-STR_STATION_DESCRIPTION_AIRPORT                                 :Bandara
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Area bongkar muat truk
-STR_STATION_DESCRIPTION_BUS_STATION                             :Terminal Bus
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Pelabuhan
-STR_STATION_DESCRIPTION_BUOY                                    :Pelampung
-STR_LANDINFO_WAYPOINT                                           :Waypoint
-
-STR_WATER_DESCRIPTION_WATER                                     :Air
-STR_LANDINFO_CANAL                                              :Kanal
-STR_LANDINFO_LOCK                                               :Kunci
-STR_LANDINFO_RIVER                                              :Sungai
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Pantai atau tepi sungai
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Galangan Kapal
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (dalam perbaikan)
+
+STR_LAI_TREE_NAME_TREES                                         :Pepohonan
+STR_LAI_TREE_NAME_RAINFOREST                                    :Hutan Hujan
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Tanaman Kaktus
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Stasiun Kereta Api
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar Pesawat
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Bandara
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Area bongkar muat truk
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Terminal Bus
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Pelabuhan
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Pelampung
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Waypoint
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Air
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Kunci
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Sungai
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Pantai atau tepi sungai
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Galangan Kapal
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Terowongan Kereta api
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Terowongan jalan
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Terowongan Kereta api
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Terowongan jalan
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Jembatan rel suspensi dan baja
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Jembatan rel balok dan baja
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Jembatan rel beton dan baja
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Jembatan rel suspensi beton bertulang
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Jembatan rel kayu
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Jembatan rel beton
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Jembatan rel berbentuk tabung
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Jembatan rel suspensi dan baja
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Jembatan rel balok dan baja
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Jembatan rel beton dan baja
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Jembatan rel suspensi beton bertulang
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Jembatan rel kayu
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Jembatan rel beton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Jembatan rel berbentuk tabung
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Jembatan jalan suspensi baja
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Jembatan jalan balok dan baja
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Jembatan jalan beton dan baja
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Jembatan jalan suspensi beton bertulang
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Jembatan jalan kayu
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Jembatan jalan beton
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Jembatan berbentuk tabung
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Jembatan jalan suspensi baja
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Jembatan jalan balok dan baja
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Jembatan jalan beton dan baja
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Jembatan jalan suspensi beton bertulang
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Jembatan jalan kayu
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Jembatan jalan beton
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Jembatan berbentuk tabung
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Saluran air dari beton
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Saluran air dari beton
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Pemancar
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Mercusuar
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Kantor Utama Perusahaan
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Tanah milik Perusahaan
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Pemancar
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Mercusuar
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Kantor Utama Perusahaan
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Tanah milik Perusahaan
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Tentang OpenTTD
@@ -2160,7 +2160,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Simpan P
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Buka Permainan
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Simpan Skenario
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Buka Skenario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Buka peta  Heightmap
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Buka peta  Heightmap
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik disini untuk langsung mengarah ke folder asal simpan/buka saat ini.
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} bebas
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Daftar drive, direktori dan berkas permainan tersimpan
@@ -2170,119 +2170,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Hapus na
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Simpan
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Simpan permainan saat ini, gunakan nama yang terpilih
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Masukkan nama dari permainan tersimpan
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Masukkan nama dari permainan tersimpan
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Pembuatan peta
-STR_MAPSIZE                                                     :{BLACK}Ukuran Peta:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Jumlah Kota:
-STR_DATE                                                        :{BLACK}Tgl:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Jumlah industri:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Tinggi garis salju:
-STR_SNOW_LINE_UP                                                :{BLACK}Naikkan ketinggian garis salju satu angka
-STR_SNOW_LINE_DOWN                                              :{BLACK}Turunkan ketinggian garis salju satu angka
-STR_RANDOM_SEED                                                 :{BLACK}Angka masukkan:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klik untuk mengisi umpan angka acak
-STR_RANDOM                                                      :{BLACK}Acak angka
-STR_RANDOM_HELP                                                 :{BLACK}Ganti angka umpan pengacakan untuk menghasilkan pulau
-STR_LAND_GENERATOR                                              :{BLACK}Algoritma pulau:
-STR_TREE_PLACER                                                 :{BLACK}Algoritma pohon:
-STR_TERRAIN_TYPE                                                :{BLACK}Jenis dataran:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Area perairan:
-STR_SMOOTHNESS                                                  :{BLACK}Kehalusan:
-STR_GENERATE                                                    :{WHITE}Buat Peta
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Pembuatan peta
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Ukuran Peta:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Jumlah Kota:
+STR_MAPGEN_DATE                                                 :{BLACK}Tgl:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Jumlah industri:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Tinggi garis salju:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Naikkan ketinggian garis salju satu angka
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Turunkan ketinggian garis salju satu angka
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Angka masukkan:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klik untuk mengisi umpan angka acak
+STR_MAPGEN_RANDOM                                               :{BLACK}Acak angka
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Ganti angka umpan pengacakan untuk menghasilkan pulau
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Algoritma pulau:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritma pohon:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Jenis dataran:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Area perairan:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Kehalusan:
+STR_MAPGEN_GENERATE                                             :{WHITE}Buat Peta
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Jenis Tepi Peta:
-STR_NORTHWEST                                                   :{BLACK}Barat Laut
-STR_NORTHEAST                                                   :{BLACK}Timur Laut
-STR_SOUTHEAST                                                   :{BLACK}Tenggara
-STR_SOUTHWEST                                                   :{BLACK}Barat Daya
-STR_BORDER_FREEFORM                                             :{BLACK}Bebas
-STR_BORDER_WATER                                                :{BLACK}Perairan
-STR_BORDER_RANDOM                                               :{BLACK}Acak
-STR_BORDER_RANDOMIZE                                            :{BLACK}Acak
-STR_BORDER_MANUAL                                               :{BLACK}Manual
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotasi Heightmap:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nama Peta Heightmap:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Luas: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Masukkan angka umpan pengacakan
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ubah ketinggian garis salju
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Ganti Tahun Permulaan
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Jenis Tepi Peta:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Barat Laut
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Timur Laut
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Tenggara
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Barat Daya
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Bebas
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Perairan
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Acak
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Acak
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotasi Heightmap:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nama Peta Heightmap:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Luas: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Masukkan angka umpan pengacakan
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ubah ketinggian garis salju
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Ganti Tahun Permulaan
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Jenis Skenario
-STR_SE_FLAT_WORLD                                               :{WHITE}Pulau datar
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Membuat pulau yang sangat datar
-STR_SE_RANDOM_LAND                                              :{WHITE}Pulau bergelombang
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Tinggi daratan:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Turunkan ketinggian dataran satu level. (0 = laut)
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Naikkan ketinggian dataran satu level. (0 = laut)
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Jenis Skenario
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Pulau datar
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Membuat pulau yang sangat datar
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Pulau bergelombang
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Tinggi daratan:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Turunkan ketinggian dataran satu level. (0 = laut)
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Naikkan ketinggian dataran satu level. (0 = laut)
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ubah ketinggian dataran
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Ubah ketinggian dataran
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Membuat Peta ...
 STR_GENERATION_ABORT                                            :{BLACK}Batalkan
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Membatalkan Pembuatan Peta
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Apakah anda ingin membatalkan pembuatan?
-STR_PROGRESS                                                    :{WHITE}{NUM}% selesai
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Membuat dunia
-STR_TREE_GENERATION                                             :{BLACK}Membuat pepohonan
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Membuat objek tak bergerak
-STR_CLEARING_TILES                                              :{BLACK}Membersihan area
-STR_SETTINGUP_GAME                                              :{BLACK}Mengatur permainan
-STR_PREPARING_TILELOOP                                          :{BLACK}Menyiapkan area loop
-STR_PREPARING_GAME                                              :{BLACK}Menyiapkan permainan
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% selesai
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Membuat dunia
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Membuat pepohonan
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Membuat objek tak bergerak
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Membersihan area
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Mengatur permainan
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Menyiapkan area loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Menyiapkan permainan
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Pengaturan NewGRF
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Baca kembali setingan terdahulu yang terpilih
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Simpan
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Simpan daftar ini dalam daftar aturan
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Masukkan nama
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Hapus
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Hapus daftar aturan yang terpilih
-STR_NEWGRF_ADD                                                  :{BLACK}Tambahkan
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Tambahkan berkas NewGRF ke dalam daftar
-STR_NEWGRF_REMOVE                                               :{BLACK}Buang
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Buang berkas NewGRF yang terpilih dari daftar
-STR_NEWGRF_MOVEUP                                               :{BLACK}Keatas
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Pindahkan berkas NewGRF yang terpilih kebagian atas daftar
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Kebawah
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Pindahkan berkas NewGRF yang terpilih kebagian bawah daftar
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Daftar berkas NewGRF yang diinstal. Klik satu berkas untuk melakukan perubahan pada parameter-parameternya
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Atur parameter
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Tandai palet
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Tandai palet NewGRF terpilih.{}Lakukan ini ketika grafis NewGRF ini terlihat berwarna merah muda di dalam permainan
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Terapkan Perubahan
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Temukan konten yg blm ada
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Memeriksa apakah ada konten yg bisa ditemukan secara online
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Nama File: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palet/warna: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameter: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Tidak ada informasi yang tersedia
-STR_NEWGRF_NOT_FOUND                                            :{RED}Berkas yang cocok tidak diketemukan
-STR_NEWGRF_DISABLED                                             :{RED}Non-aktifkan
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Masukkan Parameter NewGRF
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Baca kembali setingan terdahulu yang terpilih
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Simpan
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Simpan daftar ini dalam daftar aturan
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Masukkan nama
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Hapus
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Hapus daftar aturan yang terpilih
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Tambahkan
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Tambahkan berkas NewGRF ke dalam daftar
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Buang
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Buang berkas NewGRF yang terpilih dari daftar
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Keatas
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Pindahkan berkas NewGRF yang terpilih kebagian atas daftar
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Kebawah
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pindahkan berkas NewGRF yang terpilih kebagian bawah daftar
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Daftar berkas NewGRF yang diinstal. Klik satu berkas untuk melakukan perubahan pada parameter-parameternya
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Atur parameter
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Tandai palet
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Tandai palet NewGRF terpilih.{}Lakukan ini ketika grafis NewGRF ini terlihat berwarna merah muda di dalam permainan
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Terapkan Perubahan
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Temukan konten yg blm ada
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Memeriksa apakah ada konten yg bisa ditemukan secara online
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nama File: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palet/warna: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameter: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Tidak ada informasi yang tersedia
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Berkas yang cocok tidak diketemukan
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Non-aktifkan
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Masukkan Parameter NewGRF
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}File NewGRF yang tersedia
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Tambahkan pada pilihan
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Tambahkan berkas NewGRF terpilih kedalam konfigurasi anda
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Telusuri ulang berkas
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Memperbarui daftar berkas NewGRF yang tersedia.
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Tambahkan berkas NewGRF terpilih kedalam konfigurasi anda
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Telusuri ulang berkas
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Memperbarui daftar berkas NewGRF yang tersedia.
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2306,7 +2306,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contains multiple Action 8 entries.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Peringatan!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Peringatan!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Apakah anda yakin utk menerapkan perubahan pada permainan yang sedang berjalan?{}Ini dapat membuat OpenTTD berhenti mendadak
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Tidak dapat menambahkan: GRF ID  sudah ada
@@ -2331,10 +2331,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Daftar t
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Ubah tulisan di tanda pengenal
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Pergi sampai rambu berikutnya
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Pergi ke rambu sebelumnya
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Pergi sampai rambu berikutnya
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Pergi ke rambu sebelumnya
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Masukkan nama rambu
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Masukkan nama rambu
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Kota
@@ -2348,10 +2348,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Populasi: {ORANGE}{COMMA}{BLACK}  Rumah: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Penumpang bulan lalu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Dokumen bulan lalu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Kargo untuk pertumbuhan kota:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{BLACK} Butuh {ORANGE}{STRING}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{BLACK} Bulan lalu terima {ORANGE}{CARGO}
-STR_NOISE_IN_TOWN                                               :{BLACK}Batas kebisingan di kota : {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Kargo untuk pertumbuhan kota:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{BLACK} Butuh {ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{BLACK} Bulan lalu terima {ORANGE}{CARGO}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Batas kebisingan di kota : {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Arahkan pandangan pada lokasi kota
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Pemkot
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Tampilkan Informasi pemerintah setempat
@@ -2398,18 +2398,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Belum ada
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Jasa transportasi bersubsidi:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} dari {STATION} ke {STATION}{YELLOW} ({COMPANY}{YELLOW}, hingga {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik pada servis untuk memindahkan industri/kota ke tengah
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik pada servis untuk memindahkan industri/kota ke tengah
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nama Stasiun - klik pada nama di bagian tengan pada stasiun
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tekan CTRL untuk memilih lebih dari satu item
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Tekan CTRL untuk memilih lebih dari satu item
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Stasiun
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Tidak ada -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pilih semua fasilitas
-STR_SELECT_ALL_TYPES                                            :{BLACK}Pilih semua jenis kargo (termasuk kargo tanpa jeda)
-STR_NO_WAITING_CARGO                                            :{BLACK}Tidak ada barang yang sedang menunggu
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Pilih semua fasilitas
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Pilih semua jenis kargo (termasuk kargo tanpa jeda)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Tidak ada barang yang sedang menunggu
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2440,18 +2440,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Diatas Sempurna
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Arahkan pandangan pada lokasi stasiun
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Ganti nama stasiun
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Tampilkan semua kereta yang memiliki jadwal menuju stasiun ini.
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Tampilkan semua bus/truk yang memiliki jadwal menuju terminal ini.
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Tampilkan semua Pesawat yang memiliki jadwal menuju bandara ini.
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Tampilkan semua kapal yang memiliki jadwal menuju pelabuhan ini.
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Tampilkan semua kereta yang memiliki jadwal menuju stasiun ini.
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Tampilkan semua bus/truk yang memiliki jadwal menuju terminal ini.
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Tampilkan semua Pesawat yang memiliki jadwal menuju bandara ini.
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Tampilkan semua kapal yang memiliki jadwal menuju pelabuhan ini.
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Ubah nama stasiun/area bongkar muat
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Ubah nama stasiun/area bongkar muat
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Arahkan pandangan pada lokasi waypoint
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Ubah nama waypoint
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Ubah nama waypoint
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Arahkan pandangan pada lokasi pelampung
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Ubah nama pelampung
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Ubah nama pelampung
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ubah nama waypoint
 
@@ -2477,7 +2477,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Saldo Bank
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Pinjaman
-STR_MAX_LOAN                                                    :{WHITE}Pinjaman Maks: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Pinjaman Maks: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pinjam {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Tambah jumlah pinjaman. Tekan Ctrl+Click untuk meminjam sebanyak mungkin.
@@ -2491,10 +2491,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Dilantik : {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Warna tema:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Kendaraan:
-STR_TRAINS                                                      :{WHITE}{COMMA} kereta api
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} bus/truk
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} pesawat
-STR_SHIPS                                                       :{WHITE}{COMMA} kapal
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} kereta api
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} bus/truk
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} pesawat
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} kapal
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Tidak punya
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Nilai Perusahaan: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% saham dimiliki oleh {COMPANY})
@@ -2502,8 +2502,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Kantor Pusat
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Lokasi Kantor
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Membangun kantor pusat perusahaan / melihat kantor pusat
-STR_RELOCATE_HQ                                                 :{BLACK}Relokasi Kantor
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Membangun kembali kantor pusat perusahaan di tempat lain dengan 1% ongkos dari nilai perusahaan
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Relokasi Kantor
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Membangun kembali kantor pusat perusahaan di tempat lain dengan 1% ongkos dari nilai perusahaan
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Ganti Wajah
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Pilih wajah baru pimpinan
@@ -2519,17 +2519,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Jual 25%
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Beli 25% saham perusahaan ini
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Jual 25% saham perusahaan ini
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nama Perusahaan
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nama Pimpinan
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nama Perusahaan
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nama Pimpinan
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Kami mencari perusahaan transporasi untuk mengambil alih perusahaan kami.{}{}Anda ingin membeli {COMPANY} senilai {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industri
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% terkirim)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% terkirim)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nama industri - klik di nama untuk mengetengahkan industri
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industri
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% terkirim)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% terkirim)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nama industri - klik di nama untuk mengetengahkan industri
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2565,26 +2565,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}Pesawat
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Laba tahun ini: {CURRENCY} (tahun lalu: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Kereta api tersedia
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Kendaraan tersedia
-STR_AVAILABLE_SHIPS                                             :{BLACK}Kapal tersedia
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Pesawat tersedia
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Lihat daftar desain mesin yang tersedia untuk kendaraan tipe ini
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Kereta api tersedia
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Kendaraan tersedia
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Kapal tersedia
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Pesawat tersedia
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Lihat daftar desain mesin yang tersedia untuk kendaraan tipe ini
 
-STR_MANAGE_LIST                                                 :{BLACK}Atur Daftar
-STR_MANAGE_LIST_TIP                                             :{BLACK}Kirim perintah untuk semua kendaraan dalam daftar ini.
-STR_REPLACE_VEHICLES                                            :Ganti kendaraan
-STR_SEND_FOR_SERVICING                                          :Kirim untuk di servis
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Atur Daftar
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Kirim perintah untuk semua kendaraan dalam daftar ini.
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Ganti kendaraan
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Kirim untuk di servis
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Kirim ke depo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Kirim ke depo
-STR_SEND_SHIP_TO_DEPOT                                          :Kirim ke Galangan
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Kirim ke Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Kirim ke depo
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Kirim ke depo
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Kirim ke Galangan
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Kirim ke Hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klik untuk menghentikan semua kendaraan dalam daftar
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klik untuk menjalankan semua kendaraan dalam daftar
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klik untuk menghentikan semua kendaraan dalam daftar
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klik untuk menjalankan semua kendaraan dalam daftar
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Perintah bersama {COMMA} kendaraan
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Perintah bersama {COMMA} kendaraan
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Semua Kereta
@@ -2597,11 +2597,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Bus/truk tanpa
 STR_GROUP_DEFAULT_SHIPS                                         :Kapal tanpa kelompok
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Pesawat tanpa kelompok
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Kelompok - Klik salah satu untuk melihat daftar kendaraan pada kelompok tersebut
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klik untuk membuat kelompok
-STR_GROUP_DELETE_TIP                                            :{BLACK}Hapus kelompok terpilih
-STR_GROUP_RENAME_TIP                                            :{BLACK}Ubah Nama kelompok terpilih
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klik untuk memproteksi kelompok ini dari perintah penggantian otomatis
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Kelompok - Klik salah satu untuk melihat daftar kendaraan pada kelompok tersebut
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klik untuk membuat kelompok
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Hapus kelompok terpilih
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Ubah Nama kelompok terpilih
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klik untuk memproteksi kelompok ini dari perintah penggantian otomatis
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Tambah kendaraan dgn perintah bersama
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Jual semua
@@ -2624,7 +2624,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Kecepata
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Kecepatan: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Biaya Operasional: {GOLD}{CURRENCY}/thn
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Kapasitas: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(kargo dapat diubah)
+STR_PURCHASE_INFO_REFITTABLE                                    :(kargo dapat diubah)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Desain: {GOLD}{NUM}{BLACK} Usia: {GOLD}{COMMA} tahun
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Kehandalan Maks.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Biaya: {GOLD}{CURRENCY}
@@ -2688,17 +2688,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Drag ken
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Drag kapal kesini untuk menjualnya
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Drag pesawat kesini untuk menjualnya
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Drag/Klik, tahan dan geser mouse pada Mesin kereta api disini untuk menjual keseluruhan kereta api
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Drag/Klik, tahan dan geser mouse pada Mesin kereta api disini untuk menjual keseluruhan kereta api
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Jual kereta di depo
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Jual bus/truk di bengkel
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Jual kapal di galangan
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Jual pesawat di hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Jual kereta di depo
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Jual bus/truk di bengkel
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Jual kapal di galangan
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Jual pesawat di hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Penggantian secara otomatis semua kereta di dalam depo
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Penggantian secara otomatis semua bus/truk di dalam bengkel
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Penggantian secara otomatis semua kapal di dalam galangan
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Penggantian secara otomatis semua Pesawat di dalam hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Penggantian secara otomatis semua kereta di dalam depo
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Penggantian secara otomatis semua bus/truk di dalam bengkel
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Penggantian secara otomatis semua kapal di dalam galangan
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Penggantian secara otomatis semua Pesawat di dalam hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Buat Kendaraan
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Kendaraan Baru
@@ -2710,35 +2710,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Membuat
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Membuat kapal baru
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Membuat pesawat baru
 
-STR_CLONE_TRAIN                                                 :{BLACK}Gandakan
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Gandakan
-STR_CLONE_SHIP                                                  :{BLACK}Gandakan
-STR_CLONE_AIRCRAFT                                              :{BLACK}Gandakan
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Gandakan
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Gandakan
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Gandakan
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Gandakan
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Untuk membuat kereta yang sama persis. Klik tombol ini lalu klik kereta yang ingin digandakan baik didalam maupun diluar depo. the Ctrl-klik akan membuat perintah berbagi
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Untuk membuat kendaraan yang sama persis. Klik tombol ini lalu klik kendaraan yang ingin digandakan, baik didalam maupun diluar depo.Ctrl-klik akan membuat perintah berbagi
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Untuk menggandakan satu unit Kapal . Klik tombol ini dan kemudian pada satu kapal di dalam atau diluar galangan. Kontrol-klik untuk berbagi perintah
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Untuk menggandakan satu unit Pesawat. Klik tombol ini dan kemudian pada satu Pesawat Udara didalam atau diluar hangar. Kontrol-klik untuk berbagi perintah
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Untuk membuat kereta yang sama persis. Klik tombol ini lalu klik kereta yang ingin digandakan baik didalam maupun diluar depo. the Ctrl-klik akan membuat perintah berbagi
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Untuk membuat kendaraan yang sama persis. Klik tombol ini lalu klik kendaraan yang ingin digandakan, baik didalam maupun diluar depo.Ctrl-klik akan membuat perintah berbagi
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Untuk menggandakan satu unit Kapal . Klik tombol ini dan kemudian pada satu kapal di dalam atau diluar galangan. Kontrol-klik untuk berbagi perintah
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Untuk menggandakan satu unit Pesawat. Klik tombol ini dan kemudian pada satu Pesawat Udara didalam atau diluar hangar. Kontrol-klik untuk berbagi perintah
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Arahkan pandangan utama pada lokasi depo kereta
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Arahkan pandangan pada lokasi garasi bus/truk
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Arahkan pandangan pada lokasi Galangan Kapal
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Arahkan pandangan ke lokasi hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Mendaftar semua kereta dengan depo ini beserta perintahnya.
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Mendaftar semua bus/truk dari bengkel ini beserta perintahnya.
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Mendaftar semua kapal dari galangan ini beserta perintah.
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Mendaftar semua Pesawat dari hangar ini beserta perintah.
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Mendaftar semua kereta dengan depo ini beserta perintahnya.
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Mendaftar semua bus/truk dari bengkel ini beserta perintahnya.
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Mendaftar semua kapal dari galangan ini beserta perintah.
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Mendaftar semua Pesawat dari hangar ini beserta perintah.
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klik untuk menghentikan semua kereta di dalam depo
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klik untuk menghentikan semua bus/truk di dalam bengkel
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klik untuk menghentikan semua kapal di dalam galangan
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klik untuk menghentikan semua Pesawat di dalam hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klik untuk menghentikan semua kereta di dalam depo
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klik untuk menghentikan semua bus/truk di dalam bengkel
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klik untuk menghentikan semua kapal di dalam galangan
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klik untuk menghentikan semua Pesawat di dalam hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klik untuk menjalankan semua kereta di dalam depo
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klik untuk menjalankan semua bus/truk di dalam bengkel
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klik untuk menjalankan semua kapal di dalam galangan
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klik untuk menjalankan semua Pesawat di dalam hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klik untuk menjalankan semua kereta di dalam depo
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klik untuk menjalankan semua bus/truk di dalam bengkel
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klik untuk menjalankan semua kapal di dalam galangan
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klik untuk menjalankan semua Pesawat di dalam hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Anda akan menjual semua kendaraan didalam depo. Anda yakin?
 
@@ -2752,38 +2752,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :kapal
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :lokomotif monorel
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :lokomotif maglev
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Biaya: {CURRENCY} Berat: {WEIGHT_S}{}Kecepatan: {VELOCITY}  Daya: {POWER}{}Biaya ops.: {CURRENCY}/thn{}Kapasitas: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Biaya: {CURRENCY} Kec. Max: {VELOCITY}{}Kapasitas: {CARGO}, {CARGO}{}Bea Berjalan: {CURRENCY}/thn
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Biaya: {CURRENCY} Kec. Max: {VELOCITY}{}Kapasitas: {CARGO}{}Bea Berjalan: {CURRENCY}/thn
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Biaya: {CURRENCY} Berat: {WEIGHT_S}{}Kecepatan: {VELOCITY}  Daya: {POWER}{}Biaya ops.: {CURRENCY}/thn{}Kapasitas: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Biaya: {CURRENCY} Kec. Max: {VELOCITY}{}Kapasitas: {CARGO}, {CARGO}{}Bea Berjalan: {CURRENCY}/thn
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Biaya: {CURRENCY} Kec. Max: {VELOCITY}{}Kapasitas: {CARGO}{}Bea Berjalan: {CURRENCY}/thn
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Ganti {STRING}
-STR_VEHICLE_TRAIN                                               :Kereta Api
-STR_VEHICLE_ROAD_VEHICLE                                        :Bus/truk
-STR_VEHICLE_SHIP                                                :Kapal
-STR_VEHICLE_AIRCRAFT                                            :Pesawat
+STR_REPLACE_VEHICLE_TRAIN                                       :Kereta Api
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Bus/truk
+STR_REPLACE_VEHICLE_SHIP                                        :Kapal
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Pesawat
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Pilih jenis kendaraan yang akan diganti
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Pilih jenis mesin yang ingin digunakan sebagai pengganti mesin terpilih di sisi kiri
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Mulai Mengganti
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Tekan untuk memulai penggantian jenis kendaraan terpilih  di sisi kiri dengan di sisi kanan
-STR_NOT_REPLACING                                               :{BLACK}Tidak Mengganti
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Tidak Ada Kendaraan yang dipilih
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Tidak Mengganti
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Tidak Ada Kendaraan yang dipilih
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Berhenti Mengganti
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Tekan untuk menghentikan penggantian jenis kendaraan terpilih di sisi kiri
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Mengganti: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Pindah tampilan penggantian lokomitif atau gerbong
-STR_ENGINES                                                     :Lokomotif
-STR_WAGONS                                                      :Gerbong
+STR_REPLACE_ENGINES                                             :Lokomotif
+STR_REPLACE_WAGONS                                              :Gerbong
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Pilih jenis kereta yang anda inginkan untuk diganti
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Menampilkan kendaraan terpilih di sisi kiri yang akan diganti, jika ada
-STR_RAIL_VEHICLES                                               :Kereta Api
-STR_ELRAIL_VEHICLES                                             :Kereta Listrik
-STR_MONORAIL_VEHICLES                                           :Kereta Monorel
-STR_MAGLEV_VEHICLES                                             :Kereta Maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Kereta Api
+STR_REPLACE_ELRAIL_VEHICLES                                     :Kereta Listrik
+STR_REPLACE_MONORAIL_VEHICLES                                   :Kereta Monorel
+STR_REPLACE_MAGLEV_VEHICLES                                     :Kereta Maglev
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Membuang gerbong: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Membuat panjang kereta tetap sama saat penggantian secara otomatis dengan cara membuang gerbong(dihitung dari bagian depan), jika penggantian lokomotif membuat kereta lebih panjang.
@@ -2801,10 +2801,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Kirim ke
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Kirim kapal ke Galangan. CTRL+klik hanya akan memerintahkan servis
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Kirim pesawat ke hangar. CTRL+klik hanya akan memerintahkan servis
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Untuk membuat kereta api yang sama persis termasuk gerbongnya. Ctrl-klik akan membuat perintah berbagi
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Untuk membuat kendaraan yang sama persis. Ctrl-klik akan membuat perintah berbagi
-STR_CLONE_SHIP_INFO                                             :{BLACK}Untuk menggandakan satu unit kapal. Kontrol-klik akan berbagi perintah
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Untuk menggandakan satu unit Pesawat. Kontrol-klik untuk berbagi perintah
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Untuk membuat kereta api yang sama persis termasuk gerbongnya. Ctrl-klik akan membuat perintah berbagi
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Untuk membuat kendaraan yang sama persis. Ctrl-klik akan membuat perintah berbagi
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Untuk menggandakan satu unit kapal. Kontrol-klik akan berbagi perintah
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Untuk menggandakan satu unit Pesawat. Kontrol-klik untuk berbagi perintah
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Paksa kereta terus berjalan tanpa menunggu sinyal hijau
 
@@ -2837,36 +2837,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Berangk
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kecelakaan!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Rusak
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Berhenti
-STR_TRAIN_STOPPING                                              :{RED}Berhenti
-STR_TRAIN_STOPPING_VEL                                          :{RED}Akan berhenti, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Tidak ada daya
-STR_TRAIN_STUCK                                                 :{ORANGE}Menunggu sampai jalur bebas
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Menuju ke {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Belum ada perintah
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Belum ada perintah, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Menuju ke {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Menuju ke {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Menuju ke Depo Kereta api di {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Menuju ke Depo Kereta api di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Menuju ke bengkel {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Menuju ke Bengkel {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Menuju ke Galangan Kapal {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Menuju ke Galangan Kapal {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Menuju ke hangar di {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Menuju ke hangar di {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servis di Depo Kereta api {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servis di Depo Kereta api {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servis di Bengkel {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servis di Bengkel {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servis di Galangan Kapal {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servis di Galangan Kapal {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Perbaikkan di Hangar {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Perbaikkan di Hangar {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Berhenti
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Akan berhenti, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Tidak ada daya
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Menunggu sampai jalur bebas
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Menuju ke {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Belum ada perintah
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Belum ada perintah, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Menuju ke {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Menuju ke {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Menuju ke Depo Kereta api di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Menuju ke Depo Kereta api di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Menuju ke bengkel {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Menuju ke Bengkel {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Menuju ke Galangan Kapal {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Menuju ke Galangan Kapal {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Menuju ke hangar di {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Menuju ke hangar di {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servis di Depo Kereta api {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servis di Depo Kereta api {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Servis di Bengkel {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servis di Bengkel {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servis di Galangan Kapal {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servis di Galangan Kapal {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Perbaikkan di Hangar {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Perbaikkan di Hangar {STATION}, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detail)
@@ -2879,8 +2879,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nama pes
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Umur: {LTBLUE}{STRING}{BLACK}   Biaya operasional: {LTBLUE}{CURRENCY}/thn
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} tahun ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} tahun ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} tahun ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} tahun ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Kec. Max: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Berat: {LTBLUE}{WEIGHT_S} {BLACK}Tenaga: {LTBLUE}{POWER}{BLACK} Kec. Max: {LTBLUE}{VELOCITY}
@@ -2894,7 +2894,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Daya Mua
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Daya Muat: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Daya Muat: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Nilai Transfer: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Nilai Transfer: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Jangka waktu servis: {LTBLUE}{COMMA} hari{BLACK}   Servis terakhir: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Jangka waktu servis: {LTBLUE}{COMMA} %{BLACK}   Servis terakhir: {LTBLUE}{DATE_LONG}
@@ -2910,9 +2910,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nama pes
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK} Buatan: {LTBLUE}{NUM}{BLACK} Nilai: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK} Nilai: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total kapasitas kargo untuk kereta:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Total kapasitas kargo untuk kereta:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Kosong
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} dari {STATION}
@@ -2927,7 +2927,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Tampilka
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Total kargo
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Tampilkan kapasitas total Kereta Api, pisahkan dengan jenis kargo
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapasitas: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapasitas: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Renovasi)
@@ -2951,15 +2951,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Ubah kar
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Perintah)
-STR_TIMETABLE_VIEW                                              :{BLACK}Jadwal
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Tampilkan daftar jadwal keberangkatan
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Jadwal
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Tampilkan daftar jadwal keberangkatan
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Daftar perintah - klik pada perintah untuk menandainya. CTRL + klik ke stasiun
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Akhir Perintah - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Akhir Perintah Bersama - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Akhir Perintah Bersama - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2983,14 +2983,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transfer
 STR_ORDER_DROP_NO_UNLOADING                                     :Tidak membongkar
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ubah model pembongkaran pada tujuan terpilih
 
-STR_REFIT                                                       :{BLACK}Pasang
-STR_REFIT_TIP                                                   :{BLACK}Mengubah jenis kargo ketika sampai di perintah terpilih. Kontrol klik untuk membatalkan pengubahan kargo
+STR_ORDER_REFIT                                                 :{BLACK}Pasang
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Mengubah jenis kargo ketika sampai di perintah terpilih. Kontrol klik untuk membatalkan pengubahan kargo
 
-STR_SERVICE                                                     :{BLACK}Perbaikan
+STR_ORDER_SERVICE                                               :{BLACK}Perbaikan
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Selalu masuk
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servis jika diperlukan
 STR_ORDER_DROP_HALT_DEPOT                                       :Berhenti
-STR_SERVICE_HINT                                                :{BLACK}Lewati servis kecuali jika dibutuhkan servis
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Lewati servis kecuali jika dibutuhkan servis
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Kondisi yang diperiksa
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :% muatan
@@ -3011,7 +3011,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :benar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :bukan
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Nilai untuk dibandingkan dengan kondisi
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Masukkan nilai untuk perbandingan
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Lewati
@@ -3025,13 +3025,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Depo terdekat
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Hangar terdekat
 STR_ORDER_CONDITIONAL                                           :Melompat ke perintah lain
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Masukkan perintah baru sebelum perintah yang terpilih, atau tambahkan pada akhir daftar
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Masukkan perintah berikutnya
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Masukkan perintah berikutnya
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Tampilkan semua kendaraan yang mempunyai perintah bersama.
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Tampilkan semua kendaraan yang mempunyai perintah bersama.
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Pergi lewat {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Pergi non stop lewat {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Pergi lewat {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Pergi non stop lewat {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Perbaikkan di
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Perbaikkan non-stop di
@@ -3041,15 +3041,15 @@ STR_ORDER_NEAREST_HANGAR                                        :Hangar terdekat
 STR_ORDER_TRAIN_DEPOT                                           :Depo Kereta
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Bengkel Bus/truk
 STR_ORDER_SHIP_DEPOT                                            :Galangan Kapal
-STR_GO_TO_DEPOT                                                 :{0:STRING} {2:STRING} {1:TOWN}
-STR_GO_TO_NEAREST_DEPOT                                         :{0:STRING} {2:STRING} {1:STRING}
-STR_GO_TO_HANGAR                                                :{STRING} Hangar {STATION}
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{0:STRING} {2:STRING} {1:TOWN}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{0:STRING} {2:STRING} {1:STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} Hangar {STATION}
 
-STR_REFIT_ORDER                                                 :(Pasang ulang menjadi {STRING})
-STR_REFIT_STOP_ORDER                                            :(Pasang {STRING} dan berhenti)
-STR_STOP_ORDER                                                  :(Berhenti)
+STR_ORDER_REFIT_ORDER                                           :(Pasang ulang menjadi {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Pasang {STRING} dan berhenti)
+STR_ORDER_STOP_ORDER                                            :(Berhenti)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Penuhi Semua)
 STR_ORDER_FULL_LOAD_ANY                                         :(Penuhi salah satu)
@@ -3070,16 +3070,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[agak belakang]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[tengah]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[Tepi terjauh]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Lompat ke perintah {COMMA}
-STR_CONDITIONAL_NUM                                             :Lompat ke perintah {COMMA} jika {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Lompat ke perintah {COMMA} jika {2:STRING} {1:STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Lompat ke perintah {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Lompat ke perintah {COMMA} jika {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Lompat ke perintah {COMMA} jika {2:STRING} {1:STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Perintah keliru)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Sesuai dengan jadwal)
-STR_ORDER_VIEW                                                  :{BLACK}Perintah
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Tampilkan daftar Perintah
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Perintah
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Tampilkan daftar Perintah
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Daftar Jadwal Keberangkatan - Klik salah satu tujuan untuk memilihnya.
 
@@ -3101,10 +3101,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Kendaraa
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ubah Durasi
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ubah jumlah waktu yang seharusnya dibutuhkan, pada tujuan yang terpilih
 
-STR_CLEAR_TIME                                                  :{BLACK}Hapus waktu
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Hapus waktu
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Hapus jumlah waktu pada tujuan yang terpilih
 
-STR_RESET_LATENESS                                              :{BLACK}Reset
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Kembalikan penghitung waktu keterlambatan seperti semula, sehingga kendaraan akan selalu tepat waktu
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Otomatis
@@ -3112,42 +3112,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Isi jadw
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}AI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nama AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nama AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Muat ulang AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Matikan fitur AI, muat ulang script, dan restart AI
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Matikan fitur AI, muat ulang script, dan restart AI
 
-STR_AI_NO_AI_FOUND                                              :Tidak ada AI yang cocok untuk digunakan.{}Ini adalah dummy AI yang tidak akan melakukan apapun.{}Anda dapat download beberapa AI melalui sistem 'Konten Online'.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Salah satu AI gagal. Laporkan ini kepada AI Author dengan potongan layar dari Jendela Debug AI.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI Jendela "Debug" hanya tersedia untuk server
+STR_ERROR_AI_NO_AI_FOUND                                        :Tidak ada AI yang cocok untuk digunakan.{}Ini adalah dummy AI yang tidak akan melakukan apapun.{}Anda dapat download beberapa AI melalui sistem 'Konten Online'.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Salah satu AI gagal. Laporkan ini kepada AI Author dengan potongan layar dari Jendela Debug AI.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI Jendela "Debug" hanya tersedia untuk server
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfigurasi AI
-STR_AI_LIST_TIP                                                 :{BLACK}Semua AI yang akan dimuat pada permainan selanjutnya
-STR_AI_HUMAN_PLAYER                                             :Pemain Manusia
-STR_AI_RANDOM_AI                                                :AI Acak
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Semua AI yang akan dimuat pada permainan selanjutnya
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Pemain Manusia
+STR_AI_CONFIG_RANDOM_AI                                         :AI Acak
 
-STR_AI_CHANGE                                                   :{BLACK}Pilih AI
-STR_AI_CHANGE_TIP                                               :{BLACK}Muat AI lainnya
-STR_AI_CONFIGURE                                                :{BLACK}Konfigurasikan
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Mengkonfigurasi parameter AI
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Pilih AI
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Muat AI lainnya
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurasikan
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Mengkonfigurasi parameter AI
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}AI tersedia
-STR_AI_AILIST_TIP                                               :{BLACK}Klik untuk memilih AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klik untuk memilih AI
 
-STR_AI_AUTHOR                                                   :{BLACK}Pembuat: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versi: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Pembuat: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versi: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Terapkan
-STR_AI_ACCEPT_TIP                                               :{BLACK}Pilih AI yg  disorot
-STR_AI_CANCEL                                                   :{BLACK}Batal
-STR_AI_CANCEL_TIP                                               :{BLACK}Jangan mengubah AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Terapkan
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Pilih AI yg  disorot
+STR_AI_LIST_CANCEL                                              :{BLACK}Batal
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Jangan mengubah AI
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parameter AI
-STR_AI_CLOSE                                                    :{BLACK}Tutup
-STR_AI_RESET                                                    :{BLACK}Reset
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tutup
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3168,8 +3168,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Perkiraa
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Perkiraan Pemasukan: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Penyimpanan sedang berlangsung,{}mohon tunggu hingga selesai
-STR_AUTOSAVE_FAILED                                             :{WHITE}Simpan otomatis gagal
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Penyimpanan sedang berlangsung,{}mohon tunggu hingga selesai
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Simpan otomatis gagal
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Tidak dapat membaca drive
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Penyimpanan Game gagal{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Tidak mampu untuk menghapus file/berkas
@@ -3180,22 +3180,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Berkas simpanan
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Berkas tidak terbaca
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Berkas tidak dapat ditulisi
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Pemeriksaan integritas data gagal
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Game telah disimpan pada versi terdahulu tanpa dukungan alat transportasi trem. Semua Trem telah dihilangkan.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Game telah disimpan pada versi terdahulu tanpa dukungan alat transportasi trem. Semua Trem telah dihilangkan.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Pebuatan peta dibatalkan...{}...tak ada lokasi kota yang cocok
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...disana tidak ada kota dalam skenario ini
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Pebuatan peta dibatalkan...{}...tak ada lokasi kota yang cocok
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...disana tidak ada kota dalam skenario ini
 
-STR_PNGMAP_ERROR                                                :{WHITE}Tidak dapat memuat lansekap dari PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...berkas tidak ada
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...tak dapat mengkonversi. PNG 8 atau 24-bit diperlukan.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...sepertinya ada yang salah. Maaf. (mungkin berkasnya rusak)
+STR_ERROR_PNGMAP                                                :{WHITE}Tidak dapat memuat lansekap dari PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...berkas tidak ada
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...tak dapat mengkonversi. PNG 8 atau 24-bit diperlukan.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...sepertinya ada yang salah. Maaf. (mungkin berkasnya rusak)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Tidak dapat memuat lansekap dari BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...tak dapat mengkonversi jenis gambar.
+STR_ERROR_BMPMAP                                                :{WHITE}Tidak dapat memuat lansekap dari BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...tak dapat mengkonversi jenis gambar.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Peringatan Skala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ukuran peta terlalu besar dan tidak direkomendasikan. Lanjutkan?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Peringatan Skala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ukuran peta terlalu besar dan tidak direkomendasikan. Lanjutkan?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Pengambilan gambar telah berhasil disimpan sebagai '{STRING}'
@@ -3218,15 +3218,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...lokas
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...sudah dibangun
 STR_ERROR_OWNED_BY                                              :{WHITE}...dimiliki oleh {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...area ini dimiliki oleh perusahaan lain
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nama haruslah unik
-STR_OBJECT_IN_THE_WAY                                           :terhalang {WHITE}{STRING}
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nama haruslah unik
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :terhalang {WHITE}{STRING}
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}Pemkot {TOWN} tidak mengijinkan anda melakukan ini
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Pemkot {TOWN} menolak pemberian izin pembangunan bandara lain di kota ini
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} Pihak Pemkot menolak izin pembangunan bandara karena masalah kebisingan
-STR_BRIBE_FAILED                                                :{WHITE}Usaha anda untuk menyuap telah
-STR_BRIBE_FAILED_2                                              :{WHITE}ditemukan oleh seorang investigator wilayah
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} Pihak Pemkot menolak izin pembangunan bandara karena masalah kebisingan
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Usaha anda untuk menyuap telah
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}ditemukan oleh seorang investigator wilayah
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Tidak dapat menaikkan tanah disini
@@ -3235,7 +3235,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Nggak bi
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Penggalian akan merusak terowongan
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Telah sama dengan ketinggian laut
 STR_ERROR_TOO_HIGH                                              :{WHITE}Terlalu tinggi
-STR_ALREADY_LEVELLED                                            :{WHITE}... sudah rata
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... sudah rata
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Tidak dapat mengubah nama perusahaan
@@ -3246,29 +3246,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Tidak da
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...tidak ada hutang yang harus dibayar
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...dibutuhkan {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Tidak dapat membayar hutang...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Tidak dapat memberikan uang yang berasal dari pinjaman bank...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Tidak dapat memberikan uang yang berasal dari pinjaman bank...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Tidak dapat membeli perusahaan...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Tidak dapat membangun kantor pusat perusahaan...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Tidak dapat membeli 25% saham perusahaan ini...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Tidak dapat menjual 25% saham perusahaan ini...
-STR_PROTECTED                                                   :{WHITE}Perusahaan ini terlalu muda untuk diperjualbelikan saham kepemilikannya...
+STR_ERROR_PROTECTED                                             :{WHITE}Perusahaan ini terlalu muda untuk diperjualbelikan saham kepemilikannya...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Tidak dapat membuat satu kota pun
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Tidak dapat membuat satu kota pun
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Tidak dapat mengubah nama kota...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Tidak dapat membangun kota disini
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...terlalu dekat dengan batas tepi peta
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...terlalu dekat dengan kota lain
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...terlalu banyak kota
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...tidak ada lagi ruang tersisa dalam peta
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Kota tidak akan membangun jalan. Anda dapat mengaktifkan pembangunan pada menu  Pengaturan Lanjutan->Ekonomi->Kota.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Jalan sedang dikerjakan
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...tidak ada lagi ruang tersisa dalam peta
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Kota tidak akan membangun jalan. Anda dapat mengaktifkan pembangunan pada menu  Pengaturan Lanjutan->Ekonomi->Kota.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Jalan sedang dikerjakan
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Tidak dapat membangkitkan/membuat industri...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Tidak dapat membangkitkan/membuat industri...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Tidak dapat membangun {STRING} disini...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Tidak dapat membangun industri ini disini...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...terlalu dekat dengan industri lain
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...terlalu dekat dengan industri lain
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}...harus membangun kota terlebih dahulu
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}...hanya diizinkan satu di setiap kota
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...hanya dapat dibangun pada kota dengan populasi paling sedikit 1200
@@ -3289,7 +3289,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Tidak da
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}berdempetan dengan lebih dari satu stasiun yang telah ada
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...Stasiun terlalu membentang/melebar
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...Stasiun tidak seragam tidak aktif
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...Stasiun tidak seragam tidak aktif
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Terlalu banyak stasiun/area bongkar muat
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Terlalu banyak bag. stasiun
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Terlalu banyak pemberhentian Bus
@@ -3299,12 +3299,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Terlalu
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Terlalu dekat dengan dok/galangan kapal lainnya
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Terlalu dekat dengan bandara lainnya
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Tidak dapat mengganti nama stasiun...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...jalan ini milik kota
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...menghadap pada arah yang salah
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...jalan ini milik kota
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...menghadap pada arah yang salah
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Tidak dapat menghapus bagian dari stasiun...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Harus menghapus stasiun dulu
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Tidak dapat menghapus bagian dari stasiun...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Harus menghapus stasiun dulu
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Tidak dapat membongkar stasiun Bus...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Tidak dapat membongkar stasiun truk...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Tidak dapat membongkar stasiun trem...
@@ -3322,14 +3322,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Harus me
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Berdempetan dengan lebih dari satu waypoint yang ada
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Terlalu dekat dengan waypoint yang lain
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Tidak dapat membuat waypoint kereta disini...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Tidak dapat membuat waypoint kereta disini...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Tidak dapat menempatkan pelampung disini...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Tidak dapat mengganti nama waypoint...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Tidak dapat mengganti nama waypoint...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Tidak dapat menghapus waypoint kereta disini...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Harus membongkar rel waypoint terlebih dahulu
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Tidak dapat menghapus waypoint kereta disini...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Harus membongkar rel waypoint terlebih dahulu
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...pelampung ada di jalan
-STR_BUOY_IS_IN_USE                                              :{WHITE}...Pelampung sedang digunakan!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...Pelampung sedang digunakan!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Tidak dapat membangun depo kereta disini...
@@ -3346,14 +3346,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Kereta a
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Kereta api terlalu panjang
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Tidak dapat memutar balik arah kendaraan...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Tidak dapat membalik arah kendaraan yang terdiri dari beberapa unit
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Jenis rel tidak sesuai
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Jenis rel tidak sesuai
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Tidak dapat memindahkan kendaraan...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Bagian belakang mesin akan selalu mengikuti bagian depannya
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Tidak menemukan rute menuju depo terdekat
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Tidak dapat menemukan garasi terdekat
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Jenis depo salah
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Jenis depo salah
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} jadi terlalu panjang setelah diganti
@@ -3364,14 +3364,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(batas min. uan
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Kombinasi rel yang tidak mungkin
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tidak tersedia rel yang sesuai
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Harus membongkar rel  terlebih dahulu
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Jalan satu arah atau ada yang menghalangi
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Jalan satu arah atau ada yang menghalangi
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Tidak dapat membangun sinyal disini
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Tidak dapat membangun jalur rel disini
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Tidak dapat menghapus jalur rel dari sini
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Tidak dapat menghapus sinyal dari sini
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Tidak dapat mengubah sinyal ini...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Tidak dapat mengubah sinyal ini...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Tidak dapat mengubah tipe rel disini...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Tidak dapat mengubah tipe rel disini...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Harus membongkar jalan terlebih dahulu
@@ -3382,13 +3382,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Tidak da
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Tidak dapat membongkar jalan trem disini...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Tidak dapat membangun kanal disini...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Tidak dapat membangun lock disini...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Tidak dapat menempatkan sungai disini...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Tidak dapat membangun kanal disini...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Tidak dapat membangun lock disini...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Tidak dapat menempatkan sungai disini...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...harus dibangun di atas air
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Tidak dapat membangun di atas air
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Harus menghancurkan kanal terlebih dahulu
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tidak dapat membangun jembatan air disini...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Harus menghancurkan kanal terlebih dahulu
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Tidak dapat membangun jembatan air disini...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...pohon sudah ada disini
@@ -3397,9 +3397,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Tidak da
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Tidak dapat membangun jembatan disini...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Harus menghancurkan jembatan terlebih dahulu
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Tidak dapat awal dan akhir pada spot/titik lokasi yang sama
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Ujung jembatan tidak pada level yang sama
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Jembatan lebih rendah dari daratan
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Tidak dapat awal dan akhir pada spot/titik lokasi yang sama
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Ujung jembatan tidak pada level yang sama
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Jembatan lebih rendah dari daratan
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Awal dan akhir harus segaris
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... kedua ujung jembatan harus berada di daratan
 
@@ -3408,7 +3408,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tidak da
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Lokasi tidak sesuai untuk jalur masuk terowongan
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Harus menghancurkan terowongan terlebih dahul
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Bersinggungan dengan terowongan lain
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Terowongan boleh berakhir di luar peta
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Terowongan boleh berakhir di luar peta
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Tidak dapat menyesuaikan kemiringan tanah di ujung terowongan
 
 # Unmovable related errors
@@ -3418,12 +3418,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Tidak da
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...anda sudah memilikinya!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Tidak data membuat kelompok...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Tidak dapat menghapus kelompok ini...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Tidak dapat mengganti nama kelompok...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Tidak dapat memindahkan semua kendaraan dari kelompok ini...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Tidak dapat menambah Kendaraan dalam kelompok ini...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Tidak dapat menambah Kendaraan yang dapat dipakai bersama ke dalam grup...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Tidak data membuat kelompok...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Tidak dapat menghapus kelompok ini...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Tidak dapat mengganti nama kelompok...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Tidak dapat memindahkan semua kendaraan dari kelompok ini...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Tidak dapat menambah Kendaraan dalam kelompok ini...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Tidak dapat menambah Kendaraan yang dapat dipakai bersama ke dalam grup...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Kereta sedang berjalan
@@ -3466,21 +3466,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Tidak da
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Tidak dapat menjual kapal...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Tidak dapat menjual pesawat...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kereta tidak tersedia
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Bus/truk tidak tersedia
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Kapal tidak tersedia
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Pesawat tidak tersedia
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Kereta tidak tersedia
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Bus/truk tidak tersedia
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Kapal tidak tersedia
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Pesawat tidak tersedia
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Terlalu banyak kendaraan dalam permainan
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Tidak dapat mengubah waktu servis
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Tidak dapat menjual kendaraan yang telah dihancurkan...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Tidak dapat menyusun ulang kendaraan yang telah dihancurkan...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Tidak dapat menjual kendaraan yang telah dihancurkan...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Tidak dapat menyusun ulang kendaraan yang telah dihancurkan...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Tidak dapat memaksa kereta melanggar sinyal pada saat bahaya...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Tidak dapat memutar balik arah kereta...
-STR_TRAIN_START_NO_CATENARY                                     :Jalur ini mengalami kekurangan "catenary" sehingga kereta api tidak dapat dijalankan
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Jalur ini mengalami kekurangan "catenary" sehingga kereta api tidak dapat dijalankan
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Tidak dapat memutar kendaraan...
 
@@ -3499,14 +3499,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}Kendaraa
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}kendaraan tdk dpt menuju stasiun tsb
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}kendaraan berperintah sama tdk dpt menuju stasiun tsb
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Tidak dapat berbagi perintah...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Tidak dapat meniru perintah...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Tidak dapat berbagi perintah...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Tidak dapat meniru perintah...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...terlalu jauh dari tujuan sebelumnya
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Tidak dapat membuat jadwal keberangkatan kendaraan...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Kendaran hanya dapat menunggu di stasiun
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Kendaraan ini tidak  berhenti pada stasiun ini.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Tidak dapat membuat jadwal keberangkatan kendaraan...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Kendaran hanya dapat menunggu di stasiun
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Kendaraan ini tidak  berhenti pada stasiun ini.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...terlalu banyak tanda
@@ -3896,35 +3896,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :Pelampung {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Pelampung {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Pelampung {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Pelampung {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Perusahaan {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Kelompok {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{1:STRING} {0:TOWN}
-STR_WAYPOINTNAME_CITY                                           :Waypoint {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Waypoint {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Waypoint {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :stasiun tidak dikenal
-STR_SIGN_DEFAULT                                                :Tanda
+STR_DEFAULT_SIGN_NAME                                           :Tanda
 STR_COMPANY_SOMEONE                                             :seseorang{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Penonton, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Penonton, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3942,7 +3942,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3956,25 +3956,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{BLACK}{TINYFONT}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/italian.txt b/src/lang/italian.txt
index 3bb2133c9..01f8499c7 100644
--- a/src/lang/italian.txt
+++ b/src/lang/italian.txt
@@ -160,7 +160,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mappa -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opzioni di gioco
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Messaggio
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Messaggio dalla {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Attenzione!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Attenzione!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Non è possibile farlo....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Impossibile ripulire l'area....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Copyright originale {COPYRIGHT} 1995 Chris Sawyer, Tutti i diritti riservati
@@ -168,9 +168,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Il team OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Esci
-STR_YES                                                         :{BLACK}Sì
-STR_NO                                                          :{BLACK}No
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Si è sicuri di voler uscire da OpenTTD e tornare a {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Sì
+STR_QUIT_NO                                                     :{BLACK}No
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Si è sicuri di voler uscire da OpenTTD e tornare a {STRING}?
 
 STR_JUST_NOTHING                                                :Nulla
 STR_COLOUR_DARK_BLUE                                            :Blu scuro
@@ -231,11 +231,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Deserto
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Neve
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Messaggio
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Predefinito
-STR_QUERY_CANCEL                                                :{BLACK}Annulla
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Rinomina
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Predefinito
+STR_BUTTON_CANCEL                                               :{BLACK}Annulla
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Rinomina
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -252,16 +252,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Carico
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informazioni
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Capienza
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Carico totale
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Capacità di carico totale di questo treno:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Capacità di carico totale di questo treno:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nuova partita
 STR_INTRO_LOAD_GAME                                             :{BLACK}Carica partita
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Multigiocatore
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor di scenari
 
-STR_MAPSIZE                                                     :{BLACK}Area mappa:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Area mappa:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opzioni di gioco
 
 STR_COMPANY_SOMEONE                                             :qualcuno{SKIP}{SKIP}
@@ -310,10 +310,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Abbandona parti
 STR_FILE_MENU_EXIT                                              :Esci
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Si è sicuri di voler abbandonare la partita in corso?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abbandona partita
-STR_SORT_ORDER_TIP                                              :{BLACK}Seleziona l'ordinamento (discendente/ascendente)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleziona il criterio di ordinamento
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Seleziona il criterio di filtraggio
-STR_SORT_BY                                                     :{BLACK}Ordina per
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Seleziona l'ordinamento (discendente/ascendente)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Seleziona il criterio di ordinamento
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Seleziona il criterio di filtraggio
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordina per
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Popolazione
@@ -345,24 +345,24 @@ STR_SORT_BY_RUNNING_COST                                        :Costo d'eserciz
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Potenza / Costo d'esercizio
 STR_SORT_BY_CARGO_CAPACITY                                      :Capacità di carico
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Non c'è nessun tipo di merce in attesa
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleziona tuti i fabbricati
-STR_SELECT_ALL_TYPES                                            :{BLACK}Seleziona tutti i tipi di merce (comprese le merci non in attesa)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Mostra un elenco di veicoli disponibili in questa categoria di mezzi di trasporto
-STR_MANAGE_LIST                                                 :{BLACK}Gestione veicoli
-STR_MANAGE_LIST_TIP                                             :{BLACK}Invia istruzioni a tutti i veicoli di questo elenco
-STR_REPLACE_VEHICLES                                            :Rimpiazza veicoli
-STR_SEND_FOR_SERVICING                                          :Manutenzione
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Treni disponibili
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Automezzi disponibili
-STR_AVAILABLE_SHIPS                                             :{BLACK}Navi disponibili
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeromobili disponibili
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Manda al deposito
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Manda al deposito
-STR_SEND_SHIP_TO_DEPOT                                          :Manda al deposito
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Manda all'hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Non c'è nessun tipo di merce in attesa
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleziona tuti i fabbricati
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Seleziona tutti i tipi di merce (comprese le merci non in attesa)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Mostra un elenco di veicoli disponibili in questa categoria di mezzi di trasporto
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Gestione veicoli
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Invia istruzioni a tutti i veicoli di questo elenco
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Rimpiazza veicoli
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Manutenzione
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Treni disponibili
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Automezzi disponibili
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Navi disponibili
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aeromobili disponibili
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Manda al deposito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Manda al deposito
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Manda al deposito
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Manda all'hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -392,12 +392,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opzioni
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Impossibile cambiare l'intervallo di manutenzione...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Chiude la finestra
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titolo della finestra - trascinarlo per muovere la finestra
-STR_STICKY_BUTTON                                               :{BLACK}Marca questa finestra in modo che non venga chiusa quando si preme il tasto 'Chiudi tutte le finestre'
-STR_RESIZE_BUTTON                                               :{BLACK}Fare clic e trascinare per ridimensionare questa finestra
+STR_TOOLTIP_STICKY                                              :{BLACK}Marca questa finestra in modo che non venga chiusa quando si preme il tasto 'Chiudi tutte le finestre'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Fare clic e trascinare per ridimensionare questa finestra
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Fare clic qui per spostarsi nella cartella di salvataggio predefinita
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolisce edifici etc. su un area di terra
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Abbassa un angolo del terreno
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Alza un angolo del terreno
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Abbassa un angolo del terreno
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Alza un angolo del terreno
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra di scorrimento - scorre l'elenco su/giù
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra di scorrimento - scorre l'elenco a sinistra/destra
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Mostra la conformazione del terreno sulla mappa
@@ -410,21 +410,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Attiva/d
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Profitto quest'anno: {CURRENCY} (anno scorso: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} ann{P o i} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ann{P o i} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ann{P o i} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ann{P o i} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Treno
-STR_VEHICLE_ROAD_VEHICLE                                        :Automezzo
-STR_VEHICLE_SHIP                                                :Nave
-STR_VEHICLE_AIRCRAFT                                            :Aeromobile
+STR_REPLACE_VEHICLE_TRAIN                                       :Treno
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Automezzo
+STR_REPLACE_VEHICLE_SHIP                                        :Nave
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeromobile
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} sta invecchiando
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} sta invecchiando molto
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} sta invecchiando molto e richiede urgentemente sostituzione
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informazioni sull'area di terreno
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Costo di demolizione: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Costo di demolizione: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Ricavo da demolizione: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Ricavo da demolizione: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Proprietario: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Proprietario strada: {LTBLUE}{STRING}
@@ -433,7 +433,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Propriet
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autorità locale: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nessuno
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -545,7 +545,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Fare cli
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Fare clic su un brano per rimuoverlo dal programma corrente (solo Personale1 o Personale2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Attiva/disattiva la riproduzione in ordine casuale
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Mostra la finestra di selezione dei brani musicali
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Fare clic su un servizio per centrare la visuale sull'industria o città
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Fare clic su un servizio per centrare la visuale sull'industria o città
 STR_INTRO_DIFFICULTY                                            :{BLACK}Difficoltà ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Ultimo messaggio/notizia
@@ -594,7 +594,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Riduce l
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Genera terreno casuale
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Azzerra paesaggio
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Azzerra Paesaggio
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Rimuove tutte le strutture di proprietà dei giocatori dalla mappa
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Rimuove tutte le strutture di proprietà dei giocatori dalla mappa
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Si è sicuri di voler rimuovere tutte le proprietà dei giocatori?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generazione paesaggio
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generazione città
@@ -608,11 +608,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...tropp
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...troppo vicino ad un'altra città
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...sito inadatto
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...troppe città
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Impossibile costruire città
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...non c'è altro spazio sulla mappa
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Impossibile costruire città
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...non c'è altro spazio sulla mappa
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumenta la dimensione della città
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Espandi
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Alla città non è permesso costruire strade. È possibile abilitare la costruzione di strade in Impostazioni avanzate -> Economia -> Città.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Alla città non è permesso costruire strade. È possibile abilitare la costruzione di strade in Impostazioni avanzate -> Economia -> Città.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Città casuale
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Costruisce una città in un luogo casuale
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Impossibile costruire {STRING} qui...
@@ -626,13 +626,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Piazza t
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Piazza faro
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Piazza trasmettitore
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definisce un'area desertica.{}Fare clic tenendo premuto CTRL per rimuoverla
-STR_CREATE_LAKE                                                 :{BLACK}Definisce una zona d'acqua.{}Costruisce un canale, a meno che non si tenga premuto CTRL mentre si fa clic al livello del mare, provocando l'allagamento dei dintorni
-STR_CREATE_RIVER                                                :{BLACK}Crea un fiume
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definisce una zona d'acqua.{}Costruisce un canale, a meno che non si tenga premuto CTRL mentre si fa clic al livello del mare, provocando l'allagamento dei dintorni
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Crea un fiume
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Elimina
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Elimina completamente questa città
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Salva scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Carica scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Carica heightmap
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carica heightmap
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Esci dall'editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Esci
@@ -642,7 +642,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Salva sc
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Gioca scenario
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Gioca con heightmap
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Inizia una nuova partita, utilizzando una heightmap per definire il terreno
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Si è sicuri di voler abbandonare questo scenario?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Si è sicuri di voler abbandonare questo scenario?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...può essere costruita solo in città con una popolazione di almeno 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Sposta la data d'inizio indietro di 1 anno
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Sposta la data d'inizio avanti di 1 anno
@@ -650,21 +650,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...gli e
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Piccola
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Media
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grande
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Casuale
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Casuale
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropoli
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Le metropoli crescono più rapidamente delle normali città.{}A seconda delle impostazioni, sono più grandi quando vengono fondate.
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleziona la dimensione della città
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Dimensione città:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Disposizione strade:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Seleziona la disposizione delle strade per questa città
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originale
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Migliorata
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Griglia 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Griglia 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Casuale
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposizione strade:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Seleziona la disposizione delle strade per questa città
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originale
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Migliorata
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Griglia 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Griglia 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Casuale
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Mostra l'ultimo messaggio o notizia
 STR_NEWS_MESSAGES_OFF                                           :No
 STR_NEWS_MESSAGES_SUMMARY                                       :Sommario
@@ -764,10 +764,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  IN
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot salvato con successo come '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screenshot non riuscito!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Compra terreno per usi futuri
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Compra terreno per usi futuri
 STR_STATUSBAR_AUTOSAVE                                          :{RED}SALVATAGGIO AUTOMATICO
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SALVATAGGIO PARTITA  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Salvataggio in corso,{}prego attenderne la fine!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Salvataggio in corso,{}prego attenderne la fine!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Seleziona il programma 'Musica ezy street'
 
 ############ start of townname region
@@ -830,7 +830,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Selezion
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Schermo intero
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Attiva questa casella per giocate a OpenTTD in modalità schermo intero
-STR_FULLSCREEN_FAILED                                           :{WHITE}Attivazione modalità schermo intero fallita
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Attivazione modalità schermo intero fallita
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Risoluzione schermo
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Seleziona la risoluzione dello schermo da utilizzare
@@ -843,12 +843,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selezion
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} file mancant{P e i}/corrott{P o i}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informazioni aggiuntive sullo stile grafico di base
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Salvataggio automatico fallito
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Salvataggio automatico fallito
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Diretto a {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Diretto a {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Nessun ordine
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Nessun ordine, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Diretto a {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Diretto a {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Nessun ordine
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Nessun ordine, {VELOCITY}
 
 STR_PASSENGERS                                                  :passeggeri
 STR_BAGS                                                        :borse
@@ -859,9 +859,9 @@ STR_CRATES                                                      :casse
 STR_RES_OTHER                                                   :Altra
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Impossibile condividere la lista degli ordini...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Impossibile copiare la lista degli ordini...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fine degli ordini condivisi - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Impossibile condividere la lista degli ordini...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Impossibile copiare la lista degli ordini...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fine degli ordini condivisi - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} non trova un percorso per proseguire
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} si è perso
@@ -1130,15 +1130,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Dimensi
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :disabilitato
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Cambia impostazione
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Cambia impostazione
 
-STR_TEMPERATE_LANDSCAPE                                         :Paesaggio 'temperato'
-STR_SUB_ARCTIC_LANDSCAPE                                        :Paesaggio 'sub-artico'
-STR_SUB_TROPICAL_LANDSCAPE                                      :Paesaggio 'sub-tropicale'
-STR_TOYLAND_LANDSCAPE                                           :Paesaggio 'città dei giocattoli'
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Paesaggio 'temperato'
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Paesaggio 'sub-artico'
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Paesaggio 'sub-tropicale'
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Paesaggio 'città dei giocattoli'
 
 STR_CHEATS                                                      :{WHITE}Trucchi
-STR_CHEATS_TIP                                                  :{BLACK}Le caselle indicano se un trucco è già stato usato una volta
+STR_CHEATS_TOOLTIP                                              :{BLACK}Le caselle indicano se un trucco è già stato usato una volta
 STR_CHEATS_WARNING                                              :{BLACK}Attenzione! Stai per tradire i tuoi avversari. Ricordati che un così grande disonore sarà ricordato per l'eternità.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumenta denaro di {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Compagnia controllata: {ORANGE}{COMMA}
@@ -1150,179 +1150,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Cambia
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Cambia data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Permetti la modifica dei valori di produzione: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Diretto a {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Diretto a {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Diretto a {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Diretto a {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Passa per {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Passa no-stop per {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Passa per {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Passa no-stop per {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Waypoint di {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Waypoint di {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :Boa di {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boa #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Waypoint
+STR_FORMAT_WAYPOINT_NAME                                        :Waypoint di {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Waypoint di {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Boa di {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boa #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Waypoint
 
-STR_WAYPOINT                                                    :{WHITE}Waypoint
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Seleziona il tipo di waypoint
+STR_WAYPOINT_CAPTION                                            :{WHITE}Waypoint
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Seleziona il tipo di waypoint
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Rinomina il waypoint
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Impossibile rinominare il waypoint...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Impossibile rinominare il waypoint...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Trasforma la rotaia in un waypoint
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Impossibile costruire qui un waypoint ferroviario...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Impossibile rimuovere il waypoint ferroviario da qui...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Impossibile costruire qui un waypoint ferroviario...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Impossibile rimuovere il waypoint ferroviario da qui...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Costruisce binari usando la modalità automatica
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...non ci sono città in questo scenario
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generazione mondo interrotta...{}...nessuna posizione adatta per le città
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...non ci sono città in questo scenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generazione mondo interrotta...{}...nessuna posizione adatta per le città
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Alcune città casuali
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Copre la mappa con città posizionate casualmente
-STR_MANY_RANDOM_INDUSTRIES                                      :Alcune industrie casuali
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Copre la mappa con industrie posizionate casualmente
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Impossibile generare industrie...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Alcune città casuali
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Copre la mappa con città posizionate casualmente
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Alcune industrie casuali
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Copre la mappa con industrie posizionate casualmente
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Impossibile generare industrie...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Apre la barra di modellazione del terreno per alzare/abbassare il terreno, piantare alberi, etc.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Modellazione terreno
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Livella terreno
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Livella terreno
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Alberi casuali
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Pianta alberi di specie a caso
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Pianta alberi di specie a caso
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Impossibile costruire qui il canale...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Impossibile costruire qui il canale...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Costruisce canali
-STR_LANDINFO_CANAL                                              :Canale
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canale
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Impossibile costruire qui le chiuse...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Impossibile costruire qui le chiuse...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Costruisce chiuse per i canali
-STR_LANDINFO_LOCK                                               :Chiuse
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Chiuse
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Impossibile creare un fiume qui...
-STR_LANDINFO_RIVER                                              :Fiume
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Impossibile creare un fiume qui...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Fiume
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...la boa è in uso!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...la boa è in uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Impossibile rimuovere parte della stazione...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Impossibile convertire il tipo di rotaie qui...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Impossibile rimuovere parte della stazione...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Impossibile convertire il tipo di rotaie qui...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Converte/aggiorna il tipo di rotaie
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Trascinare qui la locomotiva di un treno per vendere l'intero treno
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Trascinare qui la locomotiva di un treno per vendere l'intero treno
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Costruisce una stazione con il drag & drop
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Seleziona il tipo di stazioni da mostrare
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Seleziona il tipo di stazione da costruire
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Seleziona il tipo di stazioni da mostrare
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Seleziona il tipo di stazione da costruire
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Aumenta la velocità di gioco
 STR_MESSAGE_HISTORY                                             :{WHITE}Cronologia messaggi
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Elenco delle notizie recenti
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Disabilita tutti
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Abilita tutti
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Elenco delle notizie recenti
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Disabilita tutti
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Abilita tutti
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrie
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% trasportato)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% trasportato)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomi delle industrie - fare clic su un nome per centrare la visuale sull'industria
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrie
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% trasportato)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% trasportato)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomi delle industrie - fare clic su un nome per centrare la visuale sull'industria
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...troppo vicina ad un'altra industria
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...troppo vicina ad un'altra industria
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Cambia produzione
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multigiocatore
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nome giocatore:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Questo è il nome con cui si verrà identificati dagli altri giocatori
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Inserire il nome del giocatore
-STR_NETWORK_CONNECTION                                          :{BLACK}Connessione:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Sceglie fra una partita in Internet o in rete locale (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Avvia server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Avvia il proprio server
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nome
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nome della partita
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Lingua, versione del server, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Fare clic su una partita in elenco per selezionarla
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Ultimo server utilizzato:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Fare clic per selezionare il server su cui si è giocato l'ultima volta
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Trova server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Cerca un server sulla rete
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Aggiungi server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Aggiunge all'elenco un server che verrà sempre controllato in cerca di partite attive
-STR_NETWORK_ENTER_IP                                            :{BLACK}Digitare l'indirizzo del server
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Client
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Client online / client max{}Compagnie online / compagnie max
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Dim. mappa
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Dimensione della mappa in uso - fare clic per ordinare per area
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data corrente
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anni
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Numero di anni{}da cui la partita è in corso
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAZIONI PARTITA
-STR_NETWORK_CLIENTS                                             :{SILVER}Client: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Lingua: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Paesaggio: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Dimensione mappa: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versione server: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Indirizzo del server: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data di inizio: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data corrente: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protetto da password!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER PIENO
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIONE DIFFERENTE
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF DIFFERENTI
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Entra nella partita
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Avvia nuova partita multigiocatore
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nome partita:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Il nome della partita sarà mostrato dagli altri giocatori nel menu di selezione delle partite multigiocatore
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Inserire il nome della partita
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Imposta password
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protegge la partita con una password in modo che non sia accessibile pubblicamente
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Seleziona mappa:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Selezionare la mappa con la quale si desidera giocare
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (pubblicizza)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max client:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Imposta il numero massimo di client. Non tutti i posti dovranno essere occupati
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compagni{P a e}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max compagnie:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limita il server a un certo numero di compagnie
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spettator{P e i}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max spettatori:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limita il server a un certo numero di spettatori
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Lingua parlata:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Fa spaere agli altri giocatori quale lingua è parlata sul server
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Avvia partita
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Inizia una nuova partita in rete con una mappa casuale o uno scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Carica partita
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Riprende una partita multigiocatore salvata in precedenza (assicurarsi di connettersi come il giocatore corretto)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multigiocatore
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Inserire il nome del giocatore
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Connessione:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Sceglie fra una partita in Internet o in rete locale (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Avvia server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Avvia il proprio server
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nome
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nome della partita
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Lingua, versione del server, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Fare clic su una partita in elenco per selezionarla
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Ultimo server utilizzato:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Fare clic per selezionare il server su cui si è giocato l'ultima volta
+
+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 all'elenco un server che verrà sempre controllato in cerca di partite attive
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Digitare l'indirizzo del server
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Client
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Client online / client max{}Compagnie online / compagnie max
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Dim. mappa
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Dimensione della mappa in uso - fare clic per ordinare per area
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Data corrente
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Anni
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Numero di anni{}da cui la partita è in corso
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFORMAZIONI PARTITA
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Client: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Lingua: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Paesaggio: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Dimensione mappa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versione server: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Indirizzo del server: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data di inizio: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data corrente: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protetto da password!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER PIENO
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIONE DIFFERENTE
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF DIFFERENTI
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Entra nella partita
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Avvia nuova partita multigiocatore
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nome partita:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Il nome della partita sarà mostrato dagli altri giocatori nel menu di selezione delle partite multigiocatore
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Inserire il nome della partita
+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_SELECT_MAP                             :{BLACK}Seleziona mappa:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Selezionare la mappa con la quale si desidera giocare
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (pubblicizza)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max client:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Imposta il numero massimo di client. Non tutti i posti dovranno essere occupati
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compagni{P a e}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max compagnie:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limita il server a un certo numero di compagnie
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spettator{P e i}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max spettatori:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limita il server a un certo numero di spettatori
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Lingua parlata:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Fa spaere agli altri giocatori quale lingua è parlata sul server
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Avvia partita
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Inizia una nuova partita in rete con una mappa casuale o uno scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Carica partita
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Riprende una partita multigiocatore salvata in precedenza (assicurarsi di connettersi come il giocatore corretto)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Qualsiasi
@@ -1363,33 +1363,33 @@ STR_NETWORK_LANG_GREEK                                          :Greco
 STR_NETWORK_LANG_LATVIAN                                        :Lèttone
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Stanza principale partita multigiocatore
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Stanza principale partita multigiocatore
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparazione all'ingresso in: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Elenco di tutte le compagnie attualmente nella partita. È possibile unirsi ad una di esse o fondarne una nuova se è disponibile un posto
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nuova compagnia
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Crea una nuova compagnia
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Assisti alla partita
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Osserva la partita come spettatore
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Usa compagnia
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Aiuta a controllare questa compagnia
-STR_NETWORK_REFRESH                                             :{BLACK}Aggiorna
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Aggiorna le informazioni sul server
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparazione all'ingresso in: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Elenco di tutte le compagnie attualmente nella partita. È possibile unirsi ad una di esse o fondarne una nuova se è disponibile un posto
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nuova compagnia
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Crea una nuova compagnia
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Assisti alla partita
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Osserva la partita come spettatore
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Usa compagnia
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Aiuta a controllare questa compagnia
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Aggiorna
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Aggiorna le informazioni sul server
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAZIONI COMPAGNIA
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFORMAZIONI COMPAGNIA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome compagnia: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaugurazione: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valore compagnia: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Saldo corrente: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Incassi anno scorso: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestazioni: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nome compagnia: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inaugurazione: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valore compagnia: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Saldo corrente: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Incassi anno scorso: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Prestazioni: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veicoli: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stazioni: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Giocatori: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Veicoli: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stazioni: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Giocatori: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Connessione...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Connessione...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connessione..
@@ -1405,49 +1405,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Recupero
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} client in attesa
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} scaricati
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Disconnetti
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconnetti
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Inserire la quantità di denaro da donare
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server protetto. Inserire la password
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Compagnia protetta. Inserire la password
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Elenco dei client
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Elenco dei client
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Diventa spettatore
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nuova compagnia
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Nessun dispositivo di rete trovato o compilato senza ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Impossibile trovare partite in rete
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Il server non ha risposto alla richiesta
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Impossibile connettersi a causa di file NewGRF differenti
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Sincronizzazione alla partita in rete fallita
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Connessione alla partita in rete persa.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Impossibile caricare la partita salvata
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Impossibile avviare il server
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Impossibile connettersi
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Tempo scaduto per la connessione #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Un errore di protocollo ha chiuso la connessione
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}La revisione di questo client non corrisponde a quella del server
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Password errata
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Il server è pieno
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sei stato bandito da questo server
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Sei stato espulso dalla partita
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}I trucchi non sono ammessi su questo server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Nessun dispositivo di rete trovato o compilato senza ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Impossibile trovare partite in rete
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Il server non ha risposto alla richiesta
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Impossibile connettersi a causa di file NewGRF differenti
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Sincronizzazione alla partita in rete fallita
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Connessione alla partita in rete persa.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Impossibile caricare la partita salvata
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Impossibile avviare il server
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Impossibile connettersi
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Tempo scaduto per la connessione #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Un errore di protocollo ha chiuso la connessione
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}La revisione di questo client non corrisponde a quella del server
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Password errata
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Il server è pieno
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sei stato bandito da questo server
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Sei stato espulso dalla partita
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}I trucchi non sono ammessi su questo server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :errore generale
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :errore di sincronizzazione
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :impossibile caricare la mappa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :connessione perduta
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :errore di protocollo
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :file NewGRF non corrispondenti
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :non autorizzato
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ricevuto un pacchetto inatteso
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisione differente
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nome già in uso
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :password errata
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :company-id errato in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :espulso dal server
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :ha provato a usare un trucco
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server pieno
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :errore generale
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :errore di sincronizzazione
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :impossibile caricare la mappa
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :connessione perduta
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :errore di protocollo
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :file NewGRF non corrispondenti
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :non autorizzato
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :ricevuto un pacchetto inatteso
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :revisione differente
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nome già in uso
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :password errata
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :company-id errato in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :espulso dal server
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :ha provato a usare un trucco
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server pieno
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1457,15 +1457,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Partita in paus
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Partita ripresa (client connesso)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Partita ripresa (connessione client fallita)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :abbandono della partita
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} è entrato nella partita
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} ha iniziato a controllare la compagnia #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} è diventato spettatore
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ha avviato una nuova compagnia (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} ha abbandonato la partita ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} ha cambiato nome in {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} ha donato alla tua compagnia {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Hai donato {2:CURRENCY} a {1:STRING}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :abbandono della partita
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} è entrato nella partita
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ha iniziato a controllare la compagnia #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} è diventato spettatore
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ha avviato una nuova compagnia (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ha abbandonato la partita ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ha cambiato nome in {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} ha donato alla tua compagnia {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Hai donato {2:CURRENCY} a {1:STRING}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Squadra] :
 STR_NETWORK_CHAT_COMPANY                                        :[Squadra] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Squadra] A {STRING}: {WHITE}{STRING}
@@ -1475,8 +1475,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privato] A {ST
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Tutti] :
 STR_NETWORK_CHAT_ALL                                            :[Tutti] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Inserire il messaggio
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Il server ha chiuso la sessione
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Il server si sta riavviando...{}Attendere prego...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Il server ha chiuso la sessione
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Il server si sta riavviando...{}Attendere prego...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Client
@@ -1490,19 +1490,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Parla alla comp
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Messaggio privato
 
 
-STR_NETWORK_SEND                                                :{BLACK}Invia
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Invia
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Impossibile caricare il terreno dal file PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...file non trovato.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...impossibile convertire il tipo di immagine. È richiesta un'immagine PNG a 8 o 24 bit.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...qualcosa non ha funzionato (probabilimente il file è corrotto)
+STR_ERROR_PNGMAP                                                :{WHITE}Impossibile caricare il terreno dal file PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...file non trovato.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...impossibile convertire il tipo di immagine. È richiesta un'immagine PNG a 8 o 24 bit.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...qualcosa non ha funzionato (probabilimente il file è corrotto)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Impossibile caricare il terreno dal file BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...impossibile convertire il tipo di immagine
+STR_ERROR_BMPMAP                                                :{WHITE}Impossibile caricare il terreno dal file BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...impossibile convertire il tipo di immagine
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Costo: {CURRENCY}
@@ -1516,13 +1516,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Incasso
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Impossibile alzare il terreno qui...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Impossibile abbassare il terreno qui...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Impossibile livellare il terreno qui...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Roccie
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Terreno accidentato
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Terreno spoglio
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Erba
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Campi
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Terreno innevato
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Deserto
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Roccie
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Terreno accidentato
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terreno spoglio
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Erba
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campi
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Terreno innevato
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deserto
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Terreno inclinato nella direzione sbagliata
@@ -1530,11 +1530,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Combinaz
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Gli scavi danneggerebbero il tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}...già al livello del mare
 STR_ERROR_TOO_HIGH                                              :{WHITE}...troppo alto
-STR_ALREADY_LEVELLED                                            :{WHITE}...già pianeggiante
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}...già pianeggiante
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tipo di binari non adatti
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...già costruito
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Bisogna demolire i binari prima
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}La strada è bloccata o a senso unico
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}La strada è bloccata o a senso unico
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Costruzione ferrovie
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Costruzione ferrovie elettrificate
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Costruzione monorotaia
@@ -1558,44 +1558,44 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Costruis
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Costruisce un ponte ferroviario
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Costruisce un tunnel ferroviario
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Seleziona fra costruzione/rimozione di binari e segnali
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Selezione ponte - fare clic sul ponte desiderato per costruirlo
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selezione ponte - fare clic sul ponte desiderato per costruirlo
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Seleziona l'orientamento del deposito ferroviario
-STR_RAILROAD_TRACK                                              :Ferrovia
-STR_RAILROAD_TRAIN_DEPOT                                        :Deposito ferroviario
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Ferrovia
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Deposito ferroviario
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...l'area appartiene a un'altra compagnia
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Ferrovia con segnali di blocco
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Ferrovia con pre-segnali
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Ferrovia con segnali di uscita
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Ferrovia con segnali combinati
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Ferrovia con segnali a percorso
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Ferrovia con segnali a percorso s.u.
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Ferrovia con segnali di blocco e pre-segnali
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Ferrovia con segnali di blocco e di uscita
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Ferrovia con segnali di blocco e combinati
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Ferrovia con segnali di blocco e a percorso
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Ferrovia con segnali di blocco e a percorso s.u.
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Ferrovia con pre-segnali e segnali di uscita
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Ferrovia con pre-segnali e segnali combinati
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Ferrovia con pre-segnali e segnali a percorso
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Ferrovia con pre-segnali e segnali a percorso s.u.
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Ferrovia con segnali di uscita e combinati
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Ferrovia con segnali di uscita e a percorso
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Ferrovia con segnali di uscita e a percorso s.u.
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Ferrovia con segnali combinati e a percorso
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Ferrovia con segnali combinati e a percorso s.u.
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Ferrovia con segnali a percorso e a percorso s.u.
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Bisogna rimuovere la stazione prima
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Bisogna rimuovere il waypoint ferroviario prima
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Costruisci stazione separata
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Costruisci waypoint separato
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Unisci stazione
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Unisci waypoint
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Ferrovia con segnali di blocco
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Ferrovia con pre-segnali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Ferrovia con segnali di uscita
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Ferrovia con segnali combinati
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Ferrovia con segnali a percorso
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Ferrovia con segnali a percorso s.u.
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Ferrovia con segnali di blocco e pre-segnali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Ferrovia con segnali di blocco e di uscita
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Ferrovia con segnali di blocco e combinati
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Ferrovia con segnali di blocco e a percorso
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Ferrovia con segnali di blocco e a percorso s.u.
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Ferrovia con pre-segnali e segnali di uscita
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Ferrovia con pre-segnali e segnali combinati
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Ferrovia con pre-segnali e segnali a percorso
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Ferrovia con pre-segnali e segnali a percorso s.u.
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Ferrovia con segnali di uscita e combinati
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Ferrovia con segnali di uscita e a percorso
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Ferrovia con segnali di uscita e a percorso s.u.
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Ferrovia con segnali combinati e a percorso
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Ferrovia con segnali combinati e a percorso s.u.
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Ferrovia con segnali a percorso e a percorso s.u.
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Bisogna rimuovere la stazione prima
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Bisogna rimuovere il waypoint ferroviario prima
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Costruisci stazione separata
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Costruisci waypoint separato
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Unisci stazione
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Unisci waypoint
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Bisogna rimuovere la strada prima
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Lavori stradali in corso
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Lavori stradali in corso
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Costruzione strade
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Costruzione tranvie
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Seleziona ponte stradale
@@ -1631,14 +1631,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Costruis
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Attiva/disattiva strade a senso unico
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Seleziona fra costruzione/rimozione di strade
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Seleziona fra costruzione/rimozione di tranvie
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Seleziona l'orientamento del deposito automezzi
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Seleziona l'orientamento del deposito tranviario
-STR_ROAD_DESCRIPTION_ROAD                                       :Strada
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Strada con lampioni
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Strada alberata
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Deposito automezzi
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Passaggio a livello
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tranvia
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Seleziona l'orientamento del deposito automezzi
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Seleziona l'orientamento del deposito tranviario
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Strada
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Strada con lampioni
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Strada alberata
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Deposito automezzi
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Passaggio a livello
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tranvia
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Impossibile rimuovere la stazione degli autobus...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Impossibile rimuovere l'area di carico per camion...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Impossibile rimuovere la stazione tram passeggeri...
@@ -1646,12 +1646,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Impossib
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Città
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}L'edificio deve essere demolito prima
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Metropoli)
@@ -1664,9 +1664,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centra l
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Cambia il nome della città
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passeggeri il mese scorso: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Posta il mese scorso: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Carichi richiesti per la crescita della città:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}Richiesto: {ORANGE}{STRING}{BLACK}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}Consegnato il mese scorso: {ORANGE}{CARGO}{BLACK}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Carichi richiesti per la crescita della città:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}Richiesto: {ORANGE}{STRING}{BLACK}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}Consegnato il mese scorso: {ORANGE}{CARGO}{BLACK}
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Grattacielo di uffici
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Palazzo di uffici
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Piccolo condominio
@@ -1703,7 +1703,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Sussidio aggiudicato alla {STRING}!{}{}Il trasporto di {STRING} da {STATION} a {STATION} verrà pagato il triplo per il prossimo anno!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Sussidio aggiudicato alla {STRING}!{}{}Il trasporto di {STRING} da {STATION} a {STATION} verrà pagato il quadruplo per il prossimo anno!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}L'autorita locale di {TOWN} rifiuta la costruzione di un altro aeroporto nella città
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}L'autorita locale di {TOWN} rifiuta il permesso per motivi di inquinamento acustico
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}L'autorita locale di {TOWN} rifiuta il permesso per motivi di inquinamento acustico
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Cottage
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Case
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Appartamenti
@@ -1739,7 +1739,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Traffico nel caos a {TOWN}!{}{}La ricostruzione delle strade finanziata dalla {STRING} porterà 6 mesi di disagio agli automobilisti!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (in costruzione)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (in costruzione)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igloo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tepee
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Casa-teiera
@@ -1752,17 +1752,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Posiziona carte
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Alberi
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...albero già qui
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Impossibile piantare l'albero qui...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...troppi cartelli
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Impossibile piazzare il cartello qui...
-STR_SIGN_DEFAULT                                                :Cartello
+STR_DEFAULT_SIGN_NAME                                           :Cartello
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Modifica testo del cartello
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Impossibile modificare il testo del cartello...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Impossibile eliminare il cartello...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Seleziona il tipo di albero da piantare
-STR_TREE_NAME_TREES                                             :Alberi
-STR_TREE_NAME_RAINFOREST                                        :Foresta pluviale
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactus
+STR_LAI_TREE_NAME_TREES                                         :Alberi
+STR_LAI_TREE_NAME_RAINFOREST                                    :Foresta pluviale
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactus
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Selezione stazione
@@ -1784,7 +1784,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Bisogna
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Troppo vicino ad un altro aeroporto
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Bisogna demolire l'aeroporto prima
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Rinomina stazione/area di carico
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Rinomina stazione/area di carico
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Impossibile rinominare la stazione...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Valutazione
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accetta
@@ -1802,10 +1802,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Eccezionale
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostra tutti i treni che hanno questa stazione pianificata
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostra tutti gli automezzi che hanno questa stazione pianificata
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostra tutti gli aeromobili che hanno questa stazione pianificata
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostra tutte le navi che hanno questa stazione pianificata
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostra tutti i treni che hanno questa stazione pianificata
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostra tutti gli automezzi che hanno questa stazione pianificata
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostra tutti gli aeromobili che hanno questa stazione pianificata
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostra tutte le navi che hanno questa stazione pianificata
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} non accetta più {STRING}
@@ -1841,47 +1841,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Cambia i
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Mostra la lista delle merci accettate
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nomi delle stazioni - fare clic su un nome per centrare la visuale sulla stazione
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Seleziona dimensione/tipo di aeroporto
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Stazione ferroviaria
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeroporto
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Area di carico per camion
-STR_STATION_DESCRIPTION_BUS_STATION                             :Stazione degli autobus
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Molo
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Stazione ferroviaria
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeroporto
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Area di carico per camion
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Stazione degli autobus
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Molo
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Evidenzia l'area di copertura del sito proposto
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Non evidenziare  l'area di copertura del sito proposto
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Evidenzia area coperta
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Molo
-STR_STATION_DESCRIPTION_BUOY                                    :Boa
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boa
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boa di mezzo
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stazione troppo estesa
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...stazioni non uniformi disabilitate
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Tenere premuto CTRL per selezionare più di un elemento
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...stazioni non uniformi disabilitate
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Tenere premuto CTRL per selezionare più di un elemento
 
 STR_UNDEFINED                                                   :(stringa non definita)
-STR_STAT_CLASS_DFLT                                             :Stazione predefinita
-STR_STAT_CLASS_WAYP                                             :Waypoint
+STR_STATION_CLASS_DFLT                                          :Stazione predefinita
+STR_STATION_CLASS_WAYP                                          :Waypoint
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientamento deposito navale
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...deve essere costruito sull'acqua
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Impossibile costruire il deposito navale qui...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Seleziona l'orientamento del deposito navale
-STR_WATER_DESCRIPTION_WATER                                     :Acqua
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Costa
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Deposito navale
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Acquedotto
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Acqua
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Costa
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Deposito navale
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Acquedotto
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...impossibile costruire sull'acqua
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Bisogna demolire il canale prima
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Bisogna demolire il canale prima
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Salva partita
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Carica partita
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Salva
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Elimina
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spettatore, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Spettatore, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} liber{P o i}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Impossibile leggere dall'unità
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Salvataggio fallito{}{STRING}
@@ -1897,12 +1897,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Elenco d
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nome del salvataggio selezionato
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Elimina il salvataggio selezionato
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Salva la partita corrente, usando il nome scelto
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Crea partita casuale
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Carica heightmap
-STR_SAVE_OSKTITLE                                               :{BLACK}Inserire un nome per il salvataggio
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Crea partita casuale
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carica heightmap
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Inserire un nome per il salvataggio
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} di mezzo
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} di mezzo
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Miniera di carbone
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}Centrale elettrica
@@ -1960,7 +1960,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centra la visuale principale sulla posizione dell'industria
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Nuov{G o a} {STRING} in costruzione vicino a {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nuov{G o a} {STRING} piantat{G o a} vicino a {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Costo: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Costo: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Impossibile costruire l'industria qui...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...una foresta può essere piantata solo in una zona innevata
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} annuncia imminente chiusura!!
@@ -1978,16 +1978,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Altro tunnel di mezzo
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Il tunnel terminerebbe fuori dalla mappa
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Il tunnel terminerebbe fuori dalla mappa
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Impossibile scavare il terreno all'altra estremità del tunnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Bisogna demolire il tunnel prima
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Bisogna demolire il ponte prima
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Impossibile partire e finire nello stesso punto
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Le estremità del ponte non sono allo stesso livello
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Il ponte è troppo basso per il terreno
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Impossibile partire e finire nello stesso punto
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Le estremità del ponte non sono allo stesso livello
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Il ponte è troppo basso per il terreno
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Inizio e fine devono essere allineati
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Sito inadatto per l'entrata del tunnel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Sospeso, Acciaio
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :A travatura, Acciaio
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :A mensola, Acciaio
@@ -1998,30 +1998,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Tubolare, Accia
 STR_BRIDGE_TUBULAR_SILICON                                      :Tubolare, Silicio
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Impossibile costruire il ponte qui...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Impossibile costruire il tunnel qui...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Tunnel ferroviario
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunnel stradale
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ponte ferroviario sospeso in acciaio
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ponte ferroviario a travatura in acciaio
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ponte ferroviario a mensola in acciaio
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Ponte ferroviario sospeso in cemento armato
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Ponte ferroviario in legno
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Ponte ferroviario in cemento
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ponte stradale sopeso in acciaio
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ponte stradale a travutara in acciaio
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ponte stradale a mensola in acciaio
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Ponte stradale sospeso in cemento armato
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Ponte stradale in legno
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Ponte stradale in cemento
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Ponte ferroviario tubolare
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Ponte stradale tubolare
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Tunnel ferroviario
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunnel stradale
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ponte ferroviario sospeso in acciaio
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ponte ferroviario a travatura in acciaio
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ponte ferroviario a mensola in acciaio
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Ponte ferroviario sospeso in cemento armato
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ponte ferroviario in legno
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Ponte ferroviario in cemento
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ponte stradale sopeso in acciaio
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ponte stradale a travutara in acciaio
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ponte stradale a mensola in acciaio
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Ponte stradale sospeso in cemento armato
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ponte stradale in legno
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Ponte stradale in cemento
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Ponte ferroviario tubolare
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Ponte stradale tubolare
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Oggetto di mezzo
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Trasmettitore
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Faro
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sede della compagnia
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Trasmettitore
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Faro
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sede della compagnia
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...sede della compagnia di mezzo
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Terreno posseduto dalla compagnia
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Terreno posseduto dalla compagnia
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Impossibile acquistare quest'area di terreno...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...lo possiedi già!
 
@@ -2069,7 +2069,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING}, Stazi
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Livello di difficoltà
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Salva
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Salva
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Facile
@@ -2142,8 +2142,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Schema co
 STR_LIVERY_CAPTION                                              :{WHITE}Nuovo schema colori
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Nome compagnia
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Nome presidente
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nome della compagnia
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nome del presidente
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nome della compagnia
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome del presidente
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Impossibile cambiare il nome della compagnia...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Impossibile cambiare il nome del presidente...
 STR_FINANCES_CAPTION                                            :{WHITE}Finanze della {COMPANY} {BLACK}{COMPANYNUM}
@@ -2167,11 +2167,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totale:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Grafico incassi
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Grafico profitto operativo
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Saldo bancario
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Prestito
-STR_MAX_LOAN                                                    :{WHITE}Prestito massimo: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Prestito massimo: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Chiedi in prestito {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Ripaga {SKIP}{SKIP}{CURRENCY}
@@ -2180,7 +2180,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Impossib
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...debito già estinto
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} richiesti
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Impossibile ripagare il prestito...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Impossibile donare denaro prestato dalla banca...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Impossibile donare denaro prestato dalla banca...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Seleziona una nuova faccia per il presidente
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Cambia la livrea dei veicoli della compagnia
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Cambia il nome del presidente
@@ -2190,10 +2190,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Ripaga p
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurata nel: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Veicoli:
-STR_TRAINS                                                      :{WHITE}{COMMA} tren{P o i}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} automezz{P o i}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeromobil{P e i}
-STR_SHIPS                                                       :{WHITE}{COMMA} nav{P e i}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren{P o i}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automezz{P o i}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aeromobil{P e i}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} nav{P e i}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nessuno
 STR_FACE_CAPTION                                                :{WHITE}Seleziona faccia
 STR_FACE_MALE_BUTTON                                            :{BLACK}Maschio
@@ -2206,9 +2206,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Selezion
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Genera una nuova faccia a caso
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Legenda
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Mostra la legenda del grafico
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Mostra valutazione dettagliata prestazioni
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Mostra valutazione dettagliata prestazioni
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legenda grafico compagnie
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Fare clic per attivare/disattivare la visualizzazione di una compagnia sul grafico
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Fare clic per attivare/disattivare la visualizzazione di una compagnia sul grafico
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Unità di merce consegnate
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Valutazione prestazioni compagnie (massima valutazione=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Valore delle compagnie
@@ -2242,23 +2242,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Presidente
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnate
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Costr. sede
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Costruisce la sede della compagnia / visualizza la sede della compagnia
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Ricostruisce la sede della compagnia in un altro luogo pagando l'1% del valore della compagnia
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ricostruisce la sede della compagnia in un altro luogo pagando l'1% del valore della compagnia
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Impossibile costruire la sede della compagnia...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Vedi sede
-STR_RELOCATE_HQ                                                 :{BLACK}Sposta sede
-STR_COMPANY_JOIN                                                :{BLACK}Controlla
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Gioca controllando questa compagnia
-STR_COMPANY_PASSWORD                                            :{BLACK}Password
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Protegge la compagnia con una password per impedire ad utenti non autorizzati di accedervi
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Imposta password compagnia
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Sposta sede
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Controlla
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Gioca controllando questa compagnia
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Password
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Protegge la compagnia con una password per impedire ad utenti non autorizzati di accedervi
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Imposta password compagnia
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Non salvare la password inserita
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Assegna la nuova password alla compagnia
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Password della compagnia
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Password predefinita compagnia
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Usa questa password come predefinita per le nuove compagnie
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Password predefinita compagnia
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usa questa password come predefinita per le nuove compagnie
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Recessione mondiale!{}{}Il crollo dell'economia porta gli analisti finanziari a temere il peggio!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Recessione finita!{}{}La ripresa del commercio da fiducia alle industrie e rafforza l'economia!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Seleziona dimensione grande/piccola della finestra
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Seleziona dimensione grande/piccola della finestra
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valore compagnia: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Compra il 25% delle azioni
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vendi il 25% delle azioni
@@ -2268,7 +2268,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Impossib
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Impossibile vendere il 25% delle azioni...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% posseduto dalla {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}La {STRING} è stata rilevata dalla {STRING}!
-STR_PROTECTED                                                   :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
+STR_ERROR_PROTECTED                                             :{WHITE}Questa compagnia non è abbastanza vecchia per scambiare azioni...
 
 STR_LIVERY_DEFAULT                                              :Livrea standard
 STR_LIVERY_STEAM                                                :Locomotiva a vapore
@@ -2294,14 +2294,14 @@ STR_LIVERY_LARGE_PLANE                                          :Aeroplano grand
 STR_LIVERY_PASSENGER_TRAM                                       :Tram passeggeri
 STR_LIVERY_FREIGHT_TRAM                                         :Tram merci
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Mostra gli schemi di colorazione generali
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Mostra gli schemi di colorazione dei treni
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Mostra gli schemi di colorazione degli automezzi
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Mostra gli schemi di colorazione delle navi
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Mostra gli schemi di colorazione degli aeromobili
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Sceglie il colore primario per lo schema selezionato
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Sceglie il colore secondario per lo schema selezionato
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Selezionare uno schema colori da cambiare, o schemi multipli con CTRL+clic. Fare clic sulla casella per attivare/disattivare uno schema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Mostra gli schemi di colorazione generali
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Mostra gli schemi di colorazione dei treni
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Mostra gli schemi di colorazione degli automezzi
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Mostra gli schemi di colorazione delle navi
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Mostra gli schemi di colorazione degli aeromobili
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Sceglie il colore primario per lo schema selezionato
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Sceglie il colore secondario per lo schema selezionato
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selezionare uno schema colori da cambiare, o schemi multipli con CTRL+clic. Fare clic sulla casella per attivare/disattivare uno schema
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Vapore)
@@ -2609,9 +2609,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Non scaricare
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Cambia la modalità di fermata alle stazioni intermedie relativa all'ordine selezionato
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Cambia la modalità di caricamento alla stazione indicata nell'ordine selezionato
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Cambia la modalità di scaricamento alla stazione indicata nell'ordine selezionato
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Inserisce un ordine avanzato
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Inserisce un ordine avanzato
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Deposito più vicino
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Hangar più vicino
 STR_ORDER_NEAREST_DEPOT                                         :più vicino
@@ -2621,9 +2621,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Manutenzione no
 STR_ORDER_TRAIN_DEPOT                                           :Deposito ferroviario
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Deposito automezzi
 STR_ORDER_SHIP_DEPOT                                            :Deposito navale
-STR_GO_TO_DEPOT                                                 :{0:STRING}l {2:STRING} di {1:TOWN}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING}l {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING}ll'Hangar di {STATION}
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{0:STRING}l {2:STRING} di {1:TOWN}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING}l {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING}ll'Hangar di {STATION}
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Sempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Solo se necessario
@@ -2648,10 +2648,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :è maggiore di
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :è maggiore o uguale a
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :è vero
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :è falso
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Salta all'ordine {COMMA}
-STR_CONDITIONAL_NUM                                             :Salta all'ordine {COMMA} se {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Salta all'ordine {COMMA} se {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Salta all'ordine {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Salta all'ordine {COMMA} se {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Salta all'ordine {COMMA} se {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nessun viaggio
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viaggia senza orario
@@ -2674,18 +2674,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Un treno
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Salta
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Elimina
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Vai a
-STR_REFIT                                                       :{BLACK}Riadatta
-STR_REFIT_TIP                                                   :{BLACK}Selezionare il tipo di carico per il quale riadattare in questo ordine. Premere CTRL+clic per rimuovere l'istruzione di riadattamento
-STR_REFIT_ORDER                                                 :(Riadatta per {STRING})
-STR_REFIT_STOP_ORDER                                            :(Riadatta per {STRING} e ferma)
-STR_STOP_ORDER                                                  :(Ferma)
-STR_TIMETABLE_VIEW                                              :{BLACK}Orario
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Passa alla visualizzazione della tabella oraria
-STR_ORDER_VIEW                                                  :{BLACK}Ordini
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Passa alla visualizzazione degli ordini
+STR_ORDER_REFIT                                                 :{BLACK}Riadatta
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selezionare il tipo di carico per il quale riadattare in questo ordine. Premere CTRL+clic per rimuovere l'istruzione di riadattamento
+STR_ORDER_REFIT_ORDER                                           :(Riadatta per {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Riadatta per {STRING} e ferma)
+STR_ORDER_STOP_ORDER                                            :(Ferma)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Orario
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Passa alla visualizzazione della tabella oraria
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordini
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Passa alla visualizzazione degli ordini
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordini)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fine degli ordini - -
-STR_SERVICE                                                     :{BLACK}Manutieni
+STR_ORDER_SERVICE                                               :{BLACK}Manutieni
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Costruito nel: {LTBLUE}{NUM}{BLACK} Valore: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valore: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2705,7 +2705,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}il veico
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un veicolo che condivide l'ordine non può utilizzare questa stazione
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Impossibile spostare il veicolo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}La locomotiva di coda segue sempre quella di testa
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Impossibile determinare il tragitto verso il deposito più vicino
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Manutenzione ogni: {LTBLUE}{COMMA} giorni{BLACK}   Ultima volta: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervallo manutenzione: {LTBLUE}{COMMA}%{BLACK}   Ultima il: {LTBLUE}{DATE_LONG}
@@ -2725,10 +2725,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tabella
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia la quantità di tempo che dovrebbe essere impiegata per l'ordine selezionato
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Elimina l'impostazione della quantità di tempo per l'ordine selezionato
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Azzera il contatore del ritardo, in modo che il veicolo sia considerato in orario
-STR_SERVICE_HINT                                                :{BLACK}Ingnora quest'ordine a meno che non sia necessaria una manutenzione
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità: {VELOCITY}  Potenza: {POWER}{}Costo d'esercizio: {CURRENCY}/anno{}Capacità: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Costo: {CURRENCY} Velocità max.: {VELOCITY}{}Capacità: {CARGO}, {CARGO}{}Costo d'esercizio: {CURRENCY}/anno
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Costo: {CURRENCY} Velocità max.: {VELOCITY}{}Capacità: {CARGO}{}Costo d'esercizio: {CURRENCY}/anno
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Ingnora quest'ordine a meno che non sia necessaria una manutenzione
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Costo: {CURRENCY} Peso: {WEIGHT_S}{}Velocità: {VELOCITY}  Potenza: {POWER}{}Costo d'esercizio: {CURRENCY}/anno{}Capacità: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Costo: {CURRENCY} Velocità max.: {VELOCITY}{}Capacità: {CARGO}, {CARGO}{}Costo d'esercizio: {CURRENCY}/anno
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Costo: {CURRENCY} Velocità max.: {VELOCITY}{}Capacità: {CARGO}{}Costo d'esercizio: {CURRENCY}/anno
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Età: {LTBLUE}{STRING}{BLACK}   Costo d'esercizio: {LTBLUE}{CURRENCY}/anno
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Velocità max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potenza: {LTBLUE}{POWER}{BLACK} Velocità max.: {LTBLUE}{VELOCITY}
@@ -2748,28 +2748,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Impossibile invertire la direzione del treno...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossibile invertire la direzione del veicolo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Impossibile invertire i veicoli composti da più unità
-STR_CLEAR_TIME                                                  :{BLACK}Elimina tempo
-STR_RESET_LATENESS                                              :{BLACK}Azzera ritardo
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Cambia il nome del waypoint
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Cambia il nome della boa
-
-STR_TRAIN_STOPPING                                              :{RED}In frenata
-STR_TRAIN_STOPPING_VEL                                          :{RED}In frenata, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipi di rotaia non compatibili
-STR_TRAIN_NO_POWER                                              :{RED}Alimentazione mancante
-STR_TRAIN_START_NO_CATENARY                                     :In questo binario manca la catenaria, quindi il treno non può essere avviato
-STR_TRAIN_STUCK                                                 :{ORANGE}In attesa di un percorso libero
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Elimina tempo
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Azzera ritardo
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Cambia il nome del waypoint
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Cambia il nome della boa
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}In frenata
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}In frenata, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Tipi di rotaia non compatibili
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Alimentazione mancante
+STR_ERROR_TRAIN_START_NO_CATENARY                               :In questo binario manca la catenaria, quindi il treno non può essere avviato
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}In attesa di un percorso libero
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nuov{G o a} {STRING} disponibile!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nuov{G o a} {STRING} disponibile! -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Impossibile vendere un veicolo distrutto...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Impossibile riadattare un veicolo distrutto...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Impossibile vendere un veicolo distrutto...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Impossibile riadattare un veicolo distrutto...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Impossibile dare un orario al veicolo...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}I veicoli possono attendere solo alle stazioni.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Il veicolo non ferma a questa stazione.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Impossibile dare un orario al veicolo...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}I veicoli possono attendere solo alle stazioni.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Il veicolo non ferma a questa stazione.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambia tempo
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Il veicolo viaggia in orario
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Il veicolo viaggia con un ritardo di {STRING}
@@ -2783,7 +2783,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Riempie
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...deve essere fermo nel deposito automezzi
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Impossibile trovare il deposito più vicino
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Fa fare un'inversione al veicolo
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacità: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacità: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} component{P e i}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2810,11 +2810,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Posiziona una boa che può essere usata come waypoint
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Impossibile posizionare una boa qui...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Costruisce un acquedotto
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Impossibile costruire un acquedotto qui...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Impossibile costruire un acquedotto qui...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Riadatta)
 STR_REFIT_TITLE                                                 :{GOLD}Selezionare il tipo di carico da trasportare:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nuova capacità: {GOLD}{CARGO}{}{BLACK}Costo riadattamento: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(riadattabile)
+STR_PURCHASE_INFO_REFITTABLE                                    :(riadattabile)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Aeroporti
@@ -2827,7 +2827,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Costruis
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}I cittadini festeggiano . . .{}Il primo aereo atterra a {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Aeroplano precipitato!{}In {COMMA} muoiono nel fuoco a {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Incidente aereo!{}L'aereo ha esaurito il carburante. In {COMMA} muoiono fra le fiamme!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tabella oraria)
 
@@ -2840,13 +2840,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Cedimento in una miniera di carbone lascia una scia di distruzione vicino a {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Alluvione!{}Almeno {COMMA} dispersi, presunti morti, in una imponente alluvione!
 
-STR_BRIBE_FAILED                                                :{WHITE}Il tuo tentativo di corruzione è stato
-STR_BRIBE_FAILED_2                                              :{WHITE}scoperto dalla Guardia di Finanzia.
-STR_BUILD_DATE                                                  :{BLACK}Costruito il: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Il tuo tentativo di corruzione è stato
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}scoperto dalla Guardia di Finanzia.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Costruito il: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Categoria stazione: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipo stazione: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Categoria stazione: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipo stazione: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Valutazione dettagliata prestazioni
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Dettagli
@@ -2866,28 +2866,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Denaro:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Prestito:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totale:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Numero di veicoli; include automezzi, treni, navi e aeromobili
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Numero di blocchi stazione. Sono contate tutte le parti di una stazione (es. stazione ferroviaria, stazione autobus, aeroporto), anche se connesse insieme a formare un'unica stazione
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Profitto del veicolo con l'incasso minore (fra tutti i veicoli più vecchi di 2 anni)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Ammontare di denaro guadagnato nel mese con il minimo profitto degli ultimi 12 trimestri
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Ammontare di denaro guadagnato nel mese con il massimo profitto degli ultimi 12 trimestri
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unità di merce consegnate negli ultimi quattro trimestri
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tipi di merci consegnati nell'ultimo trimestre
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Ammontare di denaro di questa compagnia in banca
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}L'ammontare di denaro che questa compagnia ha preso in prestito
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Punteggio totale rispetto al massimo realizzabile
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Numero di veicoli; include automezzi, treni, navi e aeromobili
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Numero di blocchi stazione. Sono contate tutte le parti di una stazione (es. stazione ferroviaria, stazione autobus, aeroporto), anche se connesse insieme a formare un'unica stazione
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Profitto del veicolo con l'incasso minore (fra tutti i veicoli più vecchi di 2 anni)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Ammontare di denaro guadagnato nel mese con il minimo profitto degli ultimi 12 trimestri
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Ammontare di denaro guadagnato nel mese con il massimo profitto degli ultimi 12 trimestri
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unità di merce consegnate negli ultimi quattro trimestri
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipi di merci consegnati nell'ultimo trimestre
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Ammontare di denaro di questa compagnia in banca
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}L'ammontare di denaro che questa compagnia ha preso in prestito
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Punteggio totale rispetto al massimo realizzabile
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Impostazioni NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Mostra le impostazioni NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Impostazioni NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Applica modifiche
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Alterna tavolozze
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Alterna la tavolozza colori utilizzata dal NewGRF selezionato.{}Utilizzare questa impostazione se la grafica di questo NewGRF durante il gioco appare rosa.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Imposta parametri
-STR_NEWGRF_FILENAME                                             :{BLACK}Nome file: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Tavolozza: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}Somma MD5: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Applica modifiche
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna tavolozze
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna la tavolozza colori utilizzata dal NewGRF selezionato.{}Utilizzare questa impostazione se la grafica di questo NewGRF durante il gioco appare rosa.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Imposta parametri
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nome file: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Tavolozza: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}Somma MD5: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Si stanno per apportare cambiamenti a una partita in corso: questo potrebbe causare un crash di OpenTTD.{}Si è assolutamente sicuri?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2910,34 +2910,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativo di ut
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contiene degli sprite corrotti. Tutti gli sprite corrotti saranno mostrati come punti interrogativi (?) rossi.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contiene occorrenze multiple dell'azione 8.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Carica il profilo selezionato
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Salva profilo
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Salva la lista corrente in un profilo
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Inserire il nome del profilo
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Elimina profilo
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Elimina il profilo attualmente selezionato
-STR_NEWGRF_ADD                                                  :{BLACK}Aggiungi
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Aggiunge un file NewGRF all'elenco
-STR_NEWGRF_REMOVE                                               :{BLACK}Rimuovi
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Rimuove il file NewGRF selezionato dall'elenco
-STR_NEWGRF_MOVEUP                                               :{BLACK}Sposta su
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Sposta su il file NewGRF selezionato nell'elenco
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Sposta giù
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Sposta giù il file NewGRF selezionato nell'elenco
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Elenco dei file NewGRF installati. Fare clic su un file per cambiarne i parametri
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametri: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Inserire i parametri NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}Informazioni non disponibili
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Carica il profilo selezionato
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Salva profilo
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Salva la lista corrente in un profilo
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Inserire il nome del profilo
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Elimina profilo
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Elimina il profilo attualmente selezionato
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Aggiungi
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Aggiunge un file NewGRF all'elenco
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Rimuovi
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Rimuove il file NewGRF selezionato dall'elenco
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Sposta su
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Sposta su il file NewGRF selezionato nell'elenco
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Sposta giù
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Sposta giù il file NewGRF selezionato nell'elenco
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Elenco dei file NewGRF installati. Fare clic su un file per cambiarne i parametri
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametri: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Inserire i parametri NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Informazioni non disponibili
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}File NewGRF disponibili
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Aggiungi alla selezione
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Aggiunge il file NewGRF selezionato alla configurazione
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Aggiorna file
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Aggiorna la lista dei file NewGRF disponibili
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Aggiunge il file NewGRF selezionato alla configurazione
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Aggiorna file
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Aggiorna la lista dei file NewGRF disponibili
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Impossibile aggiungere il file: GRF ID duplicato
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}File corrispondente non trovato
-STR_NEWGRF_DISABLED                                             :{RED}Disabilitato
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}File corrispondente non trovato
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Disabilitato
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}File corrispondente non trovato (caricato file GRF compatibile)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}File GRF compatibili caricati al posto dei file mancanti
@@ -2953,7 +2953,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}Informaz
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}I dati su carico e riadattamento di '{1:ENGINE}' sono diversi da quelli indicati prima della costruzione. Il rinnovo/rimpiazzo automatico potrebbe fallire.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' ha causato un ciclo infinito nel callback di produzione.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}La partita è stata salvata in una versione senza il supporto per i tram. Tutte le tranvie sono state rimosse.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}La partita è stata salvata in una versione senza il supporto per i tram. Tutte le tranvie sono state rimosse.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Valuta personalizzata
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Cambio: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2964,16 +2964,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Passa a
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Passa all'Euro: {ORANGE}Mai
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Anteprima: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Cambia i parametri della valuta personalizzata
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Riduce l'ammontare della valuta per una Sterlina (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Aumenta l'ammontare della valuta per una Sterlina (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Imposta il tasso di cambio della valuta per una Sterlina (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Imposta il separatore delle migliaia utilizzato dalla valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Imposta il prefisso per la valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Imposta il suffisso per la valuta
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Anticipa l'anno di passaggio all'Euro
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Posticipa l'anno di passaggio all'Euro
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Imposta l'anno in cui passare all'Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}L'equivalente di 10.000 Sterline (£) nella valuta
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Riduce l'ammontare della valuta per una Sterlina (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Aumenta l'ammontare della valuta per una Sterlina (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Imposta il tasso di cambio della valuta per una Sterlina (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Imposta il separatore delle migliaia utilizzato dalla valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Imposta il prefisso per la valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Imposta il suffisso per la valuta
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Anticipa l'anno di passaggio all'Euro
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Posticipa l'anno di passaggio all'Euro
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Imposta l'anno in cui passare all'Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}L'equivalente di 10.000 Sterline (£) nella valuta
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2992,8 +2992,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} nav{P 2 e i}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} aeromobil{P 2 e i}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordini condivisi da {COMMA} veicol{P o i}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra tutti i veicoli che condividono questa lista ordini
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordini condivisi da {COMMA} veicol{P o i}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra tutti i veicoli che condividono questa lista ordini
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ha raggiunto il deposito
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ha raggiunto il deposito
@@ -3100,39 +3100,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Riadatta
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Riadatta il mercantile per permettere il trasporto di un tipo di carico differente
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Riadatta l'aeromobile per trasportare un tipo di carico differente
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Diretto al Deposito di {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Diretto al Deposito di {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Diretto al Deposito di {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Diretto all'Hangar di {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Manutenzione al Deposito di {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Manutenzione al Deposito di {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Manutenzione al Deposito di {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Manutenzione all'Hangar di {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Manutenzione all'Hangar di {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Clona treno
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clona automezzo
-STR_CLONE_SHIP                                                  :{BLACK}Clona nave
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clona aeromobile
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Costruisce una copia del treno, inclusi tutti i vagoni. Tenere premuto CTRL per condividere gli ordini.
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Costruisce una copia dell'automezzo. Tenere premuto CTRL per condividere gli ordini
-STR_CLONE_SHIP_INFO                                             :{BLACK}Costruisce una copia della nave. Tenere premuto CTRL per condividere gli ordini
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Costruisce una copia dell'aeromobile. Tenere premuto CTRL per condividere gli ordini
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Costruisce una copia di un treno, inclusi tutti i vagoni. Fare clic su questo pulsante e quindi su un treno dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Costruisce una copia di un automezzo. Fare clic su questo pulsante e quindi su un automezzo dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Costruisce una copia di una nave. Fare clic su questo pulsante e quindi su una nave dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Costruisce una copia di un aeromobile. Fare clic su questo pusalnte e quindi su un aeromobile dentro o fuori dall'hangar. Tenere premuto CTRL per convidivere gli ordini.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Diretto al Deposito di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Diretto al Deposito di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Diretto al Deposito di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Diretto al Deposito di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Diretto all'Hangar di {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Diretto all'Hangar di {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Manutenzione al Deposito di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Manutenzione al Deposito di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Manutenzione al Deposito di {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Manutenzione al Deposito di {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Manutenzione all'Hangar di {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Manutenzione all'Hangar di {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clona treno
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clona automezzo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clona nave
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clona aeromobile
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Costruisce una copia del treno, inclusi tutti i vagoni. Tenere premuto CTRL per condividere gli ordini.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Costruisce una copia dell'automezzo. Tenere premuto CTRL per condividere gli ordini
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Costruisce una copia della nave. Tenere premuto CTRL per condividere gli ordini
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Costruisce una copia dell'aeromobile. Tenere premuto CTRL per condividere gli ordini
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Costruisce una copia di un treno, inclusi tutti i vagoni. Fare clic su questo pulsante e quindi su un treno dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Costruisce una copia di un automezzo. Fare clic su questo pulsante e quindi su un automezzo dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Costruisce una copia di una nave. Fare clic su questo pulsante e quindi su una nave dentro o fuori dal deposito. Tenere premuto CTRL per condividere gli ordini
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Costruisce una copia di un aeromobile. Fare clic su questo pusalnte e quindi su un aeromobile dentro o fuori dall'hangar. Tenere premuto CTRL per convidivere gli ordini.
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nuovi veicoli ferroviari
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nuovi veicoli ferroviari elettrici
@@ -3202,28 +3202,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centra l
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Stai per vendere tutti i veicoli nel deposito. Sei sicuro?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo di deposito errato
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipo di deposito errato
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vende tutti i treni nel deposito
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vende tutti gli automezzi nel deposito
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vende tute le navi nel deposito
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vende tutti gli aeromobili nell'hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vende tutti i treni nel deposito
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vende tutti gli automezzi nel deposito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vende tute le navi nel deposito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vende tutti gli aeromobili nell'hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Elenca tutti i treni che hanno questo deposito nei loro ordini
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Elenca tutti gli automezzi che hanno questo deposito nei loro ordini
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Elenca tutte le navi che hanno questo deposito nei loro ordini
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Elenca tutti gli aeromobili che hanno un hangar di questo aeroporto nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Elenca tutti i treni che hanno questo deposito nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Elenca tutti gli automezzi che hanno questo deposito nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Elenca tutte le navi che hanno questo deposito nei loro ordini
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Elenca tutti gli aeromobili che hanno un hangar di questo aeroporto nei loro ordini
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Rimpiazza automaticamente tutti i treni nel deposito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Rimpiazza automaticamente gli automezzi nel deposito
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Rimpiazza automaticamente tutte le navi nel deposito
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Rimpiazza automaticamente tutti gli aeromobili nell'hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Rimpiazza automaticamente tutti i treni nel deposito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Rimpiazza automaticamente gli automezzi nel deposito
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Rimpiazza automaticamente tutte le navi nel deposito
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Rimpiazza automaticamente tutti gli aeromobili nell'hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Rimpiazza {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Inizia rimpiazzamento
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Interrompi rimpiazzamento
-STR_NOT_REPLACING                                               :{BLACK}Nessun rimpiazzo
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nessun veicolo selezionato
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Nessun rimpiazzo
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nessun veicolo selezionato
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Selezionare il tipo di locomotiva da rimpiazzare
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Selezionare il nuovo modello di locomotiva che si desidera usare al posto di quello selezionato a sinistra
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Premere per interrompere il rimpiazzamento del modello di locomotiva selezionato a sinistra
@@ -3235,26 +3235,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Fa sì c
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Rimpiazza: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Scambia tra loro le finestre di rimpiazzamento delle locomotive e dei vagoni
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Il veicolo non è disponibile
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}L'automezzo non è disponibile
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}La nave non è disponibile
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}L'aeromobile non è disponibile
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Il veicolo non è disponibile
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}L'automezzo non è disponibile
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}La nave non è disponibile
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}L'aeromobile non è disponibile
 
-STR_ENGINES                                                     :Locomotive
-STR_WAGONS                                                      :Vagoni
+STR_REPLACE_ENGINES                                             :Locomotive
+STR_REPLACE_WAGONS                                              :Vagoni
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Fare clic per fermare tutti i treni nel deposito
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Fare clic per fermare tutti gli automezzi nel deposito
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Fare clic per fermare tutte le navi nel deposito
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Fare clic per fermare tutti gli aeromobili nell'hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Fare clic per fermare tutti i treni nel deposito
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Fare clic per fermare tutti gli automezzi nel deposito
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Fare clic per fermare tutte le navi nel deposito
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Fare clic per fermare tutti gli aeromobili nell'hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Fare clic per avviare tutti i treni nel deposito
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Fare clic per avviare tutti gli automezzi nel deposito
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Fare clic per avviare tutte le navi nel deposito
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Fare clic per avviare tutti gli aeromobili nell'hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Fare clic per avviare tutti i treni nel deposito
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Fare clic per avviare tutti gli automezzi nel deposito
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Fare clic per avviare tutte le navi nel deposito
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Fare clic per avviare tutti gli aeromobili nell'hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Fare clic per fermare tutti i veicoli nell'elenco
-STR_MASS_START_LIST_TIP                                         :{BLACK}Fare clic per avviare tutti i veicoli nell'elenco
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Fare clic per fermare tutti i veicoli nell'elenco
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Fare clic per avviare tutti i veicoli nell'elenco
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Elenco cartelli - {COMMA} cartell{P o i}
@@ -3263,14 +3263,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Il falli
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Veicoli ferroviari
-STR_ELRAIL_VEHICLES                                             :Veicoli ferroviari elettrici
-STR_MONORAIL_VEHICLES                                           :Veicoli monorotaia
-STR_MAGLEV_VEHICLES                                             :Veicoli maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Veicoli ferroviari
+STR_REPLACE_ELRAIL_VEHICLES                                     :Veicoli ferroviari elettrici
+STR_REPLACE_MONORAIL_VEHICLES                                   :Veicoli monorotaia
+STR_REPLACE_MAGLEV_VEHICLES                                     :Veicoli maglev
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Costo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocità: {GOLD}{VELOCITY}{BLACK} Potenza: {GOLD}{POWER}
@@ -3297,70 +3297,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Genera
-STR_RANDOM                                                      :{BLACK}Scegli a caso
-STR_RANDOM_HELP                                                 :{BLACK}Cambia il seme casuale usato per la generazione del terreno
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generazione mondo
-STR_RANDOM_SEED                                                 :{BLACK}Seme casuale:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Fare clic per introdurre un seme casuale
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Inserire un seme casuale
-STR_LAND_GENERATOR                                              :{BLACK}Generatore:
-STR_TREE_PLACER                                                 :{BLACK}Algoritmo alberi:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotazione heightmap:
-STR_TERRAIN_TYPE                                                :{BLACK}Tipo di terreno:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Livello del mare:
-STR_SMOOTHNESS                                                  :{BLACK}Levigatezza:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altezza nevi:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Numero città:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Numero industrie:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Sposta in su di uno l'altezza delle nevi perenni
-STR_SNOW_LINE_DOWN                                              :{BLACK}Sposta in giù di uno l'altezza delle nevi perenni
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Cambia l'altezza delle nevi perenni
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Cambia l'anno di inizio
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Avviso scala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ridimensionare di molto l'heightmap sorgente non è consigliabile. Continuare con la generazione?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nome heightmap:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Dim.: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Genera
+STR_MAPGEN_RANDOM                                               :{BLACK}Scegli a caso
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Cambia il seme casuale usato per la generazione del terreno
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generazione mondo
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Seme casuale:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Fare clic per introdurre un seme casuale
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Inserire un seme casuale
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generatore:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritmo alberi:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotazione heightmap:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipo di terreno:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Livello del mare:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Levigatezza:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Altezza nevi:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Numero città:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Numero industrie:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Sposta in su di uno l'altezza delle nevi perenni
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Sposta in giù di uno l'altezza delle nevi perenni
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Cambia l'altezza delle nevi perenni
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Cambia l'anno di inizio
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Avviso scala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ridimensionare di molto l'heightmap sorgente non è consigliabile. Continuare con la generazione?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome heightmap:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Dim.: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generazione del mondo...
 STR_GENERATION_ABORT                                            :{BLACK}Interrompi
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Interromi generazione mondo
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Si è sicuri di voler interrompere la generazione?
-STR_PROGRESS                                                    :{WHITE}{NUM}% completato
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generazione mondo
-STR_TREE_GENERATION                                             :{BLACK}Generazione alberi
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Generazione oggetti inamovibili
-STR_CLEARING_TILES                                              :{BLACK}Generazione aree brulle e rocciose
-STR_SETTINGUP_GAME                                              :{BLACK}Impostazione partita
-STR_PREPARING_TILELOOP                                          :{BLACK}Generazione riquadri del terreno
-STR_PREPARING_GAME                                              :{BLACK}Preparazione della partita
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Questa azione ha cambiato il livello di difficolta in 'Personalizzata'
-STR_SE_FLAT_WORLD                                               :{WHITE}Pianeggiante
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Genera un terreno pianeggiante
-STR_SE_RANDOM_LAND                                              :{WHITE}Casuale
-STR_SE_NEW_WORLD                                                :{BLACK}Crea nuovo scenario
-STR_SE_CAPTION                                                  :{WHITE}Tipo di scenario
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Sposta in giù di uno l'altezza del terreno pianeggiante
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Sposta in su di uno l'altezza del terreno pianeggiante
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Cambia l'altezza del terreno pianeggiante
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Altezza terreno pianeggiante:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% completato
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generazione mondo
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generazione alberi
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Generazione oggetti inamovibili
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generazione aree brulle e rocciose
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Impostazione partita
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Generazione riquadri del terreno
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparazione della partita
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Questa azione ha cambiato il livello di difficolta in 'Personalizzata'
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Pianeggiante
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Genera un terreno pianeggiante
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Casuale
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Crea nuovo scenario
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipo di scenario
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Sposta in giù di uno l'altezza del terreno pianeggiante
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Sposta in su di uno l'altezza del terreno pianeggiante
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Cambia l'altezza del terreno pianeggiante
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Altezza terreno pianeggiante:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centra la minimappa sulla posizione corrente
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Bordi della mappa:
-STR_NORTHWEST                                                   :{BLACK}Nord-ovest
-STR_NORTHEAST                                                   :{BLACK}Nord-est
-STR_SOUTHEAST                                                   :{BLACK}Sud-est
-STR_SOUTHWEST                                                   :{BLACK}Sud-ovest
-STR_BORDER_FREEFORM                                             :{BLACK}Variabile
-STR_BORDER_WATER                                                :{BLACK}Acqua
-STR_BORDER_RANDOM                                               :{BLACK}Casuale
-STR_BORDER_RANDOMIZE                                            :{BLACK}Casuale
-STR_BORDER_MANUAL                                               :{BLACK}Manuale
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Bordi della mappa:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nord-ovest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nord-est
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sud-est
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sud-ovest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Variabile
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Acqua
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Casuale
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Casuale
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuale
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Piccolo
@@ -3385,21 +3385,21 @@ STR_MEASURE_AREA                                                :{BLACK}Area: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lunghezza: {NUM}{}Differenza in altezza: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Area: {NUM} x {NUM}{}Differenza in altezza: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Crediti di trasferimento: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...questa è una strada di proprietà della città
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...strada rivolta nella direzione sbagliata
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opzioni trasparenza
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Attiva/disattiva la trasparenza dei nomi delle stazioni. CTRL+clic per bloccare.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Attiva/disattiva la trasparenza degli alberi. CTRL+clic per bloccare.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Attiva/disattiva la trasparenza degli edifici. CTRL+clic per bloccare.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Attiva/disattiva la trasparenza delle industrie. CTRL+clic per bloccare.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Attiva/disattiva la trasparenza delle strutture edificabili come stazioni, depositi e waypoint. CTRL+clic per bloccare.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Attiva/disattiva la trasparenza dei ponti. CTRL+clic per bloccare.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Attiva/disattiva la trasparenza di strutture come fari e antenne. CTRL+clic per bloccare.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Attiva/disattiva la trasparenza delle catenarie. CTRL+clic per bloccare.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Attiva/disattiva la trasparenza degli indicatori di caricamento. CTRL+clic per bloccare.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Rendi gli oggetti invisibili invece che trasparenti
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Crediti di trasferimento: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...questa è una strada di proprietà della città
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...strada rivolta nella direzione sbagliata
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opzioni trasparenza
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Attiva/disattiva la trasparenza dei nomi delle stazioni. CTRL+clic per bloccare.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Attiva/disattiva la trasparenza degli alberi. CTRL+clic per bloccare.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Attiva/disattiva la trasparenza degli edifici. CTRL+clic per bloccare.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Attiva/disattiva la trasparenza delle industrie. CTRL+clic per bloccare.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Attiva/disattiva la trasparenza delle strutture edificabili come stazioni, depositi e waypoint. CTRL+clic per bloccare.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Attiva/disattiva la trasparenza dei ponti. CTRL+clic per bloccare.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Attiva/disattiva la trasparenza di strutture come fari e antenne. CTRL+clic per bloccare.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Attiva/disattiva la trasparenza delle catenarie. CTRL+clic per bloccare.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Attiva/disattiva la trasparenza degli indicatori di caricamento. CTRL+clic per bloccare.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Rendi gli oggetti invisibili invece che trasparenti
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3409,7 +3409,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Tutti i treni
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Tutti gli automezzi
 STR_GROUP_ALL_SHIPS                                             :Tutte le navi
@@ -3418,24 +3418,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Treni senza gru
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Automezzi senza gruppo
 STR_GROUP_DEFAULT_SHIPS                                         :Navi senza gruppo
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeromobili senza gruppo
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Aggiungi veicoli condivisi
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Rimuovi tutti i veicoli
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Rinomina un gruppo
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Impossibile creare il gruppo...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Impossibile eliminare il gruppo...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Impossibile rinominare il gruppo...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Impossibile rimuovere tutti i veicoli del gruppo...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Impossibile aggiungere il veicolo al gruppo...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Impossibile aggiungere veicoli condivisi al gruppo...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Impossibile creare il gruppo...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Impossibile eliminare il gruppo...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Impossibile rinominare il gruppo...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Impossibile rimuovere tutti i veicoli del gruppo...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Impossibile aggiungere il veicolo al gruppo...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Impossibile aggiungere veicoli condivisi al gruppo...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Gruppi - fare clic su un gruppo per elencare tutti i suoi veicoli
-STR_GROUP_CREATE_TIP                                            :{BLACK}Fare clic per creare un gruppo
-STR_GROUP_DELETE_TIP                                            :{BLACK}Elimina il gruppo selezionato
-STR_GROUP_RENAME_TIP                                            :{BLACK}Rinomina il gruppo selezionato
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Fare clic per proteggere questo gruppo dal rimpiazzo automatico
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruppi - fare clic su un gruppo per elencare tutti i suoi veicoli
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Fare clic per creare un gruppo
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Elimina il gruppo selezionato
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Rinomina il gruppo selezionato
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Fare clic per proteggere questo gruppo dal rimpiazzo automatico
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3496,35 +3496,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Il nome deve essere univoco
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Il nome deve essere univoco
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Va al cartello successivo
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Va al cartello precedente
-STR_SIGN_OSKTITLE                                               :{BLACK}Inserire il testo del cartello
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Va al cartello successivo
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Va al cartello precedente
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Inserire il testo del cartello
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finanzia
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Esegui prospezione
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Costruisci
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Selezionare l'industria appropriata dalla lista
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finanzia
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Esegui prospezione
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Costruisci
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Selezionare l'industria appropriata dalla lista
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avanzata
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Selezione avanzata della faccia
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selezione avanzata della faccia
 STR_FACE_SIMPLE                                                 :{BLACK}Semplice
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Selezione semplice della faccia
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selezione semplice della faccia
 STR_FACE_LOAD                                                   :{BLACK}Carica
-STR_FACE_LOAD_TIP                                               :{BLACK}Carica la faccia preferita
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Carica la faccia preferita
 STR_FACE_LOAD_DONE                                              :{WHITE}La faccia preferita è stata caricata dal file di configurazione di OpenTTD
 STR_FACE_FACECODE                                               :{BLACK}Numero faccia
-STR_FACE_FACECODE_TIP                                           :{BLACK}Visualizza e/o imposta il numero della faccia del giocatore
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Visualizza e/o imposta il numero della faccia del giocatore
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Visualizza e/o imposta il numero della faccia
 STR_FACE_FACECODE_SET                                           :{WHITE}Nuovo codice numerico faccia impostato
 STR_FACE_FACECODE_ERR                                           :{WHITE}Impossibile impostare il numero della faccia - deve essere un numero fra 0 e 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Salva
-STR_FACE_SAVE_TIP                                               :{BLACK}Salva come faccia preferita
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Salva come faccia preferita
 STR_FACE_SAVE_DONE                                              :{WHITE}La faccia corrente è stata salvata come preferita nel file di configurazione di OpenTTD
 STR_FACE_EUROPEAN                                               :{BLACK}Europea
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Seleziona le facce europee
@@ -3532,51 +3532,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Africana
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Seleziona le facce africane
 STR_FACE_YES                                                    :Sì
 STR_FACE_NO                                                     :No
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Abilita i baffi o l'orecchino
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Abilita i baffi o l'orecchino
 STR_FACE_HAIR                                                   :Capelli:
-STR_FACE_HAIR_TIP                                               :{BLACK}Cambia i capelli
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Cambia i capelli
 STR_FACE_EYEBROWS                                               :Sopracciglia:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Cambia le sopracciglia
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Cambia le sopracciglia
 STR_FACE_EYECOLOUR                                              :Colore occhi:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Cambia il colore degli occhi
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Cambia il colore degli occhi
 STR_FACE_GLASSES                                                :Occhiali:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Abilita gli occhiali
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Cambia gli occhiali
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Abilita gli occhiali
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Cambia gli occhiali
 STR_FACE_NOSE                                                   :Naso:
-STR_FACE_NOSE_TIP                                               :{BLACK}Cambia il naso
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Cambia il naso
 STR_FACE_LIPS                                                   :Labbra:
 STR_FACE_MOUSTACHE                                              :Baffi:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Cambia le labbra o i baffi
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Cambia le labbra o i baffi
 STR_FACE_CHIN                                                   :Mento:
-STR_FACE_CHIN_TIP                                               :{BLACK}Cambia il mento
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Cambia il mento
 STR_FACE_JACKET                                                 :Giacca:
-STR_FACE_JACKET_TIP                                             :{BLACK}Cambia la giacca
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Cambia la giacca
 STR_FACE_COLLAR                                                 :Colletto:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Cambia il colletto
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Cambia il colletto
 STR_FACE_TIE                                                    :Cravatta:
 STR_FACE_EARRING                                                :Orecchino:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Cambia la cravatta o l'orecchino
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambia la cravatta o l'orecchino
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Selezione segnale
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Impossibile convertire i segnali qui...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Segnale di blocco (semaforico){}I segnali sono necessari per impedire ai convogli di scontrarsi su reti ferroviarie dove viaggia più di un treno.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Pre-segnale (semaforico){}Via libera se è presente almeno un segnale di uscita su via libera al termine della sezione di blocco successiva. Altrimenti presenta via impedita.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Segnale di uscita (semaforico){}Si comporta come un segnale di blocco, ma è necessario per far funzionare correttamente i pre-segnali e i segnali combinati all'ingresso della sezione.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Segnale combinato (semaforico){}Un segnale combinato funziona contemporaneamente da segnale d'uscita e da pre-segnale. In questo modo è possibile costruire "alberi" di pre-segnali.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Segnale a percorso (semaforico){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Segnale a percorso s. u. (semaforico){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Segnale di blocco (luminoso){}I segnali sono necessari per impedire ai convogli di scontrarsi su reti ferroviarie dove viaggia più di un treno.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Pre-segnale (luminoso){}Via libera se è presente almeno un segnale di uscita su via libera al termine della sezione di blocco successiva. Altrimenti presenta via impedita.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Segnale di uscita (luminoso){}Si comporta come un segnale di blocco, ma è necessario per far funzionare correttamente i pre-segnali e i segnali combinati all'ingresso della sezione.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Segnale combinato (luminoso){}Un segnale combinato funziona contemporaneamente da segnale d'uscita e da pre-segnale. In questo modo è possibile costruire "alberi" di pre-segnali.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Segnale a percorso (luminoso){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Segnale a percorso s. u. (luminoso){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Conversione segnali - Se attivato, facendo clic su un segnale esistente lo si converte nel tipo selezionato, mentre con CTRL+clic se ne modifica la variante.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Distanza fra i segnali costruiti automaticamente trascinando il cursore
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Riduce la distanza fra i segnali costruiti
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Aumenta la distanza fra i segnali costruiti
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Selezione segnale
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Impossibile convertire i segnali qui...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Segnale di blocco (semaforico){}I segnali sono necessari per impedire ai convogli di scontrarsi su reti ferroviarie dove viaggia più di un treno.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Pre-segnale (semaforico){}Via libera se è presente almeno un segnale di uscita su via libera al termine della sezione di blocco successiva. Altrimenti presenta via impedita.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Segnale di uscita (semaforico){}Si comporta come un segnale di blocco, ma è necessario per far funzionare correttamente i pre-segnali e i segnali combinati all'ingresso della sezione.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Segnale combinato (semaforico){}Un segnale combinato funziona contemporaneamente da segnale d'uscita e da pre-segnale. In questo modo è possibile costruire "alberi" di pre-segnali.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Segnale a percorso (semaforico){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Segnale a percorso s. u. (semaforico){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Segnale di blocco (luminoso){}I segnali sono necessari per impedire ai convogli di scontrarsi su reti ferroviarie dove viaggia più di un treno.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Pre-segnale (luminoso){}Via libera se è presente almeno un segnale di uscita su via libera al termine della sezione di blocco successiva. Altrimenti presenta via impedita.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Segnale di uscita (luminoso){}Si comporta come un segnale di blocco, ma è necessario per far funzionare correttamente i pre-segnali e i segnali combinati all'ingresso della sezione.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Segnale combinato (luminoso){}Un segnale combinato funziona contemporaneamente da segnale d'uscita e da pre-segnale. In questo modo è possibile costruire "alberi" di pre-segnali.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Segnale a percorso (luminoso){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Può essere superato al contrario.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Segnale a percorso s. u. (luminoso){}Un segnale a percorso consente a più di un treno alla volta di entrare in una sezione di blocco, ammesso che ognuno possa riservarsi un percorso attraverso la sezione. Non può essere superato al contrario.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Conversione segnali - Se attivato, facendo clic su un segnale esistente lo si converte nel tipo selezionato, mentre con CTRL+clic se ne modifica la variante.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Distanza fra i segnali costruiti automaticamente trascinando il cursore
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Riduce la distanza fra i segnali costruiti
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Aumenta la distanza fra i segnali costruiti
 ########
 
 ############ on screen keyboard
@@ -3588,37 +3588,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :|!"£$%&/()=?^
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Impostazioni IA
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Mostra le impostazioni dell'intelligenza artificiale
 STR_AI_DEBUG                                                    :{WHITE}Debug IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nome della IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome della IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Ricarica IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Termina la IA, ricarica lo script, e riavvia la IA
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}La finestra di debug IA è disponibile soltanto per il server
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Termina la IA, ricarica lo script, e riavvia la IA
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}La finestra di debug IA è disponibile soltanto per il server
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configurazione IA
-STR_AI_CHANGE                                                   :{BLACK}Scegli IA
-STR_AI_CONFIGURE                                                :{BLACK}Configura
-STR_AI_CHANGE_TIP                                               :{BLACK}Sceglie un'altra IA da caricare
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configura i parametri della IA
-STR_AI_LIST_TIP                                                 :{BLACK}Lista delle IA che saranno caricate nella prossima partita
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Scegli IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configura
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Sceglie un'altra IA da caricare
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura i parametri della IA
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Lista delle IA che saranno caricate nella prossima partita
 STR_AI_LIST_CAPTION                                             :{WHITE}IA disponibili
-STR_AI_AILIST_TIP                                               :{BLACK}Fare clic per selezionare una IA
-STR_AI_ACCEPT                                                   :{BLACK}Accetta
-STR_AI_ACCEPT_TIP                                               :{BLACK}Sceglie l'IA selezionata
-STR_AI_CANCEL                                                   :{BLACK}Annulla
-STR_AI_CANCEL_TIP                                               :{BLACK}Non modifica l'IA utilizzata
-STR_AI_CLOSE                                                    :{BLACK}Chiudi
-STR_AI_RESET                                                    :{BLACK}Reimposta
-STR_AI_HUMAN_PLAYER                                             :Giocatore umano
-STR_AI_RANDOM_AI                                                :IA casuale
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Fare clic per selezionare una IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Accetta
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Sceglie l'IA selezionata
+STR_AI_LIST_CANCEL                                              :{BLACK}Annulla
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Non modifica l'IA utilizzata
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Chiudi
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reimposta
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Giocatore umano
+STR_AI_CONFIG_RANDOM_AI                                         :IA casuale
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parametri IA
-STR_AI_AUTHOR                                                   :{BLACK}Autore: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versione: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Una delle IA in funzione è andata in crash. Si prega di inviare una segnalazione all'autore della IA con uno screenshot della finestra Debug IA.
-STR_AI_NO_AI_FOUND                                              :Impossibile trovare una IA adatta da caricare.{}La IA caricata è solo un abbozzo e resterà semplicemente passiva.{}È possibile scaricare numerose IA tramite il sistema 'Contenuti online'.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autore: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versione: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Una delle IA in funzione è andata in crash. Si prega di inviare una segnalazione all'autore della IA con uno screenshot della finestra Debug IA.
+STR_ERROR_AI_NO_AI_FOUND                                        :Impossibile trovare una IA adatta da caricare.{}La IA caricata è solo un abbozzo e resterà semplicemente passiva.{}È possibile scaricare numerose IA tramite il sistema 'Contenuti online'.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Limite di rumore in città: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Rumore generato: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limite di rumore in città: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Rumore generato: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3632,21 +3632,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :{G=m}Scenario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :{G=f}Heightmap
 STR_CONTENT_TITLE                                               :{WHITE}Download contenuti
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipo
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipo del contenuto
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipo del contenuto
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nome
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nome del contenuto
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Fare clic su un elemento per i dettagli.{}Selezionarlo per includerlo nel download.
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nome del contenuto
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Fare clic su un elemento per i dettagli.{}Selezionarlo per includerlo nel download.
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Seleziona tutti
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Include nel download tutti i contenuti
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Include nel download tutti i contenuti
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Sel. aggiornamenti
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Include nel download tutte le versioni aggiornate di contenuti esistenti
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Include nel download tutte le versioni aggiornate di contenuti esistenti
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Deseleziona tutti
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Esclude dal download tutti gli elementi
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Esclude dal download tutti gli elementi
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Inserire il filtro
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Inserire una parola da utilizzare per filtrare la lista
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Inserire una parola da utilizzare per filtrare la lista
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtra per nome/tag:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Scarica
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Avvia il download dei contenuti selezionati
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Avvia il download dei contenuti selezionati
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Dimensione totale download: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMAZIONI CONTENUTO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Non incluso nel download
@@ -3679,6 +3679,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Impossib
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contenuti online
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Controlla l'esistenza di contenuti nuovi o aggiornati da scaricare
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Trova contenuti mancanti online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Controlla se i contenuti mancanti possono essere recuperati online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Trova contenuti mancanti online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Controlla se i contenuti mancanti possono essere recuperati online
 ########
diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt
index 254cb8136..b3ef4c84a 100644
--- a/src/lang/japanese.txt
+++ b/src/lang/japanese.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}地図 -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}ゲーム�設定
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}メッセージ
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}{STRING}�ら�メッセージ
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}注��
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注��
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}�れ�����ん...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}��土地を破壊����ん
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}オリジナル版権{COPYRIGHT} 1995 Chris Sawyer��許複製
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}終了
-STR_YES                                                         :{BLACK}��
-STR_NO                                                          :{BLACK}���
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}��ゲームを終了���{}{STRING}�戻��もよ������？
+STR_QUIT_YES                                                    :{BLACK}��
+STR_QUIT_NO                                                     :{BLACK}���
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}��ゲームを終了���{}{STRING}�戻��もよ������？
 
 STR_JUST_NOTHING                                                :��
 STR_COLOUR_DARK_BLUE                                            :紺�色
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}ç ‚æ¼ 
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}雪
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}メッセージ
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}デフォルト
-STR_QUERY_CANCEL                                                :{BLACK}キャンセル
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}�称を変更
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}デフォルト
+STR_BUTTON_CANCEL                                               :{BLACK}キャンセル
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}�称を変更
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}貨物
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}情報
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}容�
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}�計貨物
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}��列車�貨物最大容�：
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}��列車�貨物最大容�：
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}新��ゲーム
 STR_INTRO_LOAD_GAME                                             :{BLACK}ロード
 STR_INTRO_MULTIPLAYER                                           :{BLACK}多人数プレイ
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}シナリオエディタ
 
-STR_MAPSIZE                                                     :{BLACK}地図�サイズ：
-STR_BY                                                          :{BLACK}x
+STR_MAPGEN_MAPSIZE                                              :{BLACK}地図�サイズ：
+STR_MAPGEN_BY                                                   :{BLACK}x
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}ゲーム�基本設定
 
 STR_COMPANY_SOMEONE                                             :誰��{SKIP}{SKIP}
@@ -308,9 +308,9 @@ STR_FILE_MENU_QUIT_GAME                                         :ゲームを断
 STR_FILE_MENU_EXIT                                              :終了
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}��ゲームを終了��もよ������？
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}ゲームを断念
-STR_SORT_ORDER_TIP                                              :{BLACK}並�替��順�を�択（昇順��順）
-STR_SORT_CRITERIA_TIP                                           :{BLACK}並�替��基準を�択
-STR_SORT_BY                                                     :{BLACK}並�替�
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}並�替��順�を�択（昇順��順）
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}並�替��基準を�択
+STR_BUTTON_SORT_BY                                              :{BLACK}並�替�
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}人�
@@ -340,24 +340,24 @@ STR_SORT_BY_RUNNING_COST                                        :�転費
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :出力��転費
 STR_SORT_BY_CARGO_CAPACITY                                      :貨物容�
 
-STR_NO_WAITING_CARGO                                            :{BLACK}到�待��貨物��り��ん
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}����駅を�択
-STR_SELECT_ALL_TYPES                                            :{BLACK}����貨物種類を�択（到�待��貨物も�む）
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}��車両種類�デザイン�リストを表示���
-STR_MANAGE_LIST                                                 :{BLACK}リストを管�
-STR_MANAGE_LIST_TIP                                             :{BLACK}リスト内�����車両���指令を�信
-STR_REPLACE_VEHICLES                                            :車両を交�
-STR_SEND_FOR_SERVICING                                          :修��回�
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}購入�能�列車
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}購入�能��路車両
-STR_AVAILABLE_SHIPS                                             :{BLACK}購入�能�船舶
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}購入�能�飛行機
-
-STR_SEND_TRAIN_TO_DEPOT                                         :電車庫�回�
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :車庫�回�
-STR_SEND_SHIP_TO_DEPOT                                          :造船所�回�
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :格�庫�回�
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}到�待��貨物��り��ん
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}����駅を�択
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}����貨物種類を�択（到�待��貨物も�む）
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}��車両種類�デザイン�リストを表示���
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}リストを管�
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}リスト内�����車両���指令を�信
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :車両を交�
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :修��回�
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}購入�能�列車
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}購入�能��路車両
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}購入�能�船舶
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}購入�能�飛行機
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :電車庫�回�
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :車庫�回�
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :造船所�回�
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :格�庫�回�
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -387,12 +387,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}設定
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}整備間隔を変更����ん
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}ウィンドウを閉���
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}ウィンドウ�タイトル - ウィンドウを動�����クリック��ドラッグ���
-STR_STICKY_BUTTON                                               :{BLACK}「����ウィンドウを閉�る�をクリック��も��ウィンドウを閉�られ��よ�����
-STR_RESIZE_BUTTON                                               :{BLACK}リサイズ�る���クリック��ドラッグ���
+STR_TOOLTIP_STICKY                                              :{BLACK}「����ウィンドウを閉�る�をクリック��も��ウィンドウを閉�られ��よ�����
+STR_TOOLTIP_RESIZE                                              :{BLACK}リサイズ�る���クリック��ドラッグ���
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}デフォルト��存先フォルダ�ジャンプ�る�����クリック���
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}土地上�建物��を破壊���
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}土地�角を下���
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}土地�角を上���
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}土地�角を下���
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}土地�角を上���
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}スクロール�ー
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}スクロール�ー - リストをスクロール���
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}地図�土地�状態を表示���
@@ -405,14 +405,14 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}地図ã�
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}今年��益：{CURRENCY} (去年：{CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA}年（{COMMA}年）
-STR_AGE_RED                                                     :{RED}{COMMA}年（{COMMA}年）
+STR_VEHICLE_INFO_AGE                                            :{COMMA}年（{COMMA}年）
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA}年（{COMMA}年）
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :列車
-STR_VEHICLE_ROAD_VEHICLE                                        :�路車両
-STR_VEHICLE_SHIP                                                :船舶
-STR_VEHICLE_AIRCRAFT                                            :飛行機
+STR_REPLACE_VEHICLE_TRAIN                                       :列車
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :�路車両
+STR_REPLACE_VEHICLE_SHIP                                        :船舶
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :飛行機
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} ���������
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} ���も��������
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} ���も����������や��り替���れ��り��ん。
@@ -427,7 +427,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}ç·šè·¯ã�
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}町議会：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :��
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}�称
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1æ—¥
@@ -539,7 +539,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}é�¸æŠžã�
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}洗濯中�プレイリスト�ら�り除����曲をクリック���（カスタム１�２��）
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}プレイリスト�シャッフルを入�切����
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}曲�択�ウィンドウを表示���
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}町�産業を見る���サービスをクリック��下��
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}町�産業を見る���サービスをクリック��下��
 STR_INTRO_DIFFICULTY                                            :{BLACK} 難易度 ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :最後�メッセージ
@@ -588,7 +588,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}上ã�’ã‚
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}ランダム�地形を作����
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}地形をリセット���
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}地形�リセット
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}地図上�����プレヤー�所有���る�動産を破壊���
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}地図上�����プレヤー�所有���る�動産を破壊���
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}地図上�����プレヤー�所有���る�動産を破壊��もよ������？
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}地形�作�
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}市町��建設
@@ -602,11 +602,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...地å›
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...他�町�近����
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...地域���当��
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...市町�数�制�を超�����
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}市町�を建設����ん
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...地図�空�スペース��り��ん
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}市町�を建設����ん
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...地図�空�スペース��り��ん
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}町�サイズを����
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}拡大
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}��町��路を建設���ん。「詳細�設定->経済->市町���よ���路�建設を入��る�������。
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}��町��路を建設���ん。「詳細�設定->経済->市町���よ���路�建設を入��る�������。
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}ランダム�町
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}ランダム�����町を建設���
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}���{STRING}�建設����ん
@@ -620,13 +620,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}土地ã�
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}��を建設���
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}�信機を建設���
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}砂漠を作����。{}Control+クリック�る�消去���
-STR_CREATE_LAKE                                                 :{BLACK}。水を作����。{}通常�使用時��河を建設���。Controlをクリック�る��海水���る地域�浸水����。
-STR_CREATE_RIVER                                                :{BLACK}�を造る
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}。水を作����。{}通常�使用時��河を建設���。Controlをクリック�る��海水���る地域�浸水����。
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}�を造る
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}破壊
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}��町を完全�破壊���
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :シナリオを�存
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :シナリオを開�
-STR_MENU_LOAD_HEIGHTMAP                                         :�イトマップを開�
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :�イトマップを開�
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :エディタを終了
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :終了
@@ -636,7 +636,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}シナãƒ
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}シナリオをプレイ
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}�イトマップをプレイ
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}地形を�イトマップ�基���新�ゲームを開始���
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}��シナリオを終了��もよ������？
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}��シナリオを終了��もよ������？
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...人��1200人以上�市町���建設����
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}開始日を1年間減ら���
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}開始日を1年間増や���
@@ -644,21 +644,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...æ©‹ã�
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}�
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}町
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}市
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}ランダム
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}ランダム
 STR_FOUND_TOWN_CITY                                             :{BLACK}市町�
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}市�町�比���より早�拡大���。{}設定�よ���基礎����大��もより大����。
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}町�サイズを�択���
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}町�サイズ：
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}市町���路�置
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}��市町���路�置を�択������。
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}オリジナル
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}改善���路
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2�格�
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 格�
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}ランダム
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}市町���路�置
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}��市町���路�置を�択������。
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}オリジナル
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}改善���路
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2�格�
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 格�
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}ランダム
 
-STR_NEWS_MESSAGE                                                :{STRING} - {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING} - {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}最後�メッセージ�報�を表示���
 STR_NEWS_MESSAGES_OFF                                           :切
 STR_NEWS_MESSAGES_SUMMARY                                       :概�
@@ -758,10 +758,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}＊＊ã
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}スクリーンショットを'{STRING}'�正常��存����
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}スクリーンショット��存�失敗�����
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}将�用�土地を購入
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}将�用�土地を購入
 STR_STATUSBAR_AUTOSAVE                                          :{RED}自動�存
 STR_STATUSBAR_SAVING_GAME                                       :{RED}＊＊ゲームを�存中＊＊
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}ゲームを�存�����{}完了���ら��ら��待������
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}ゲームを�存�����{}完了���ら��ら��待������
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}'Ezy Street ��音楽'�プレイリストを�択���
 
 ############ start of townname region
@@ -824,7 +824,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}ゲーãƒ
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}フルスクリーン
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD をフルスクリーン�プレイ�る���ック���
-STR_FULLSCREEN_FAILED                                           :{WHITE}フルスクリーンモード�設定����ん
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}フルスクリーンモード�設定����ん
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}画��解�度
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}画��解�度を�択���
@@ -836,12 +836,12 @@ STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}ベーã‚
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}使用�るGRF��択
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}ベースGRFセット�����追加情報
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}自動�存�失敗����
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}自動�存�失敗����
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION}�行�
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION}�行��{VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}指令��
-STR_NO_ORDERS_VEL                                               :{LTBLUE}指令���{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}{STATION}�行�
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}{STATION}�行��{VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}指令��
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}指令���{VELOCITY}
 
 STR_PASSENGERS                                                  :人�乗客
 STR_BAGS                                                        :袋
@@ -852,9 +852,9 @@ STR_CRATES                                                      :ç®±
 STR_RES_OTHER                                                   :��他
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}指令リストを共有����ん...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}指令リストをコピー����ん...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共有指令�終了- -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}指令リストを共有����ん...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}指令リストをコピー����ん...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - 共有指令�終了- -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} �目的地��経路を見��られ��ん。
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} �迷�����。
@@ -1106,15 +1106,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}地図ã
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :切
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}設定を変更���
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}設定を変更���
 
-STR_TEMPERATE_LANDSCAPE                                         :温帯国
-STR_SUB_ARCTIC_LANDSCAPE                                        :亜寒帯国
-STR_SUB_TROPICAL_LANDSCAPE                                      :亜熱帯国
-STR_TOYLAND_LANDSCAPE                                           :玩具国
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :温帯国
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :亜寒帯国
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :亜熱帯国
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :玩具国
 
 STR_CHEATS                                                      :{WHITE}�ート
-STR_CHEATS_TIP                                                  :{BLACK}以�����ートを使用������る��を示���
+STR_CHEATS_TOOLTIP                                              :{BLACK}以�����ートを使用������る��を示���
 STR_CHEATS_WARNING                                              :{BLACK}注�! �ート�る��競争者��切り���見られ����永�����れる�能性��り���
 STR_CHEAT_MONEY                                                 :{LTBLUE}残��{CURRENCY}を追加
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}会社: {ORANGE}{COMMA}�プレイ�る
@@ -1126,176 +1126,176 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}気候ã
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}日付を変更: {ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}生産��変更を入��る：{ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}{WAYPOINT}�行�
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}{WAYPOINT}�行��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}{WAYPOINT}�行�
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}{WAYPOINT}�行��{VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :{WAYPOINT}を経�行�
-STR_GO_NON_STOP_TO_WAYPOINT                                     :{WAYPOINT}を経�直行�行�
+STR_ORDER_GO_TO_WAYPOINT                                        :{WAYPOINT}を経�行�
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :{WAYPOINT}を経�直行�行�
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN}�通�点
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN}�通�点 #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :通�点
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN}�通�点
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN}�通�点 #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :通�点
 
-STR_WAYPOINT                                                    :{WHITE}通�点
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}通�点�種類を�択���
+STR_WAYPOINT_CAPTION                                            :{WHITE}通�点
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}通�点�種類を�択���
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}通�点�を変更
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}通�点�を変更����ん...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}通�点�を変更����ん...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}線路を通�点�交����
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}���線路通�点を建設����ん...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}���線路通�点を破壊����ん...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}���線路通�点を建設����ん...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}���線路通�点を破壊����ん...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}自動線路建設モードを用��線路を建設
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...��シナリオ�市町���り��ん
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...��シナリオ�市町���り��ん
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}多��ランダム�市町�
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}地図����ん�市町�を建設���
-STR_MANY_RANDOM_INDUSTRIES                                      :多��ランダム�産業
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}地図����ん�産業を建設���
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}産業を建設����ん...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}多��ランダム�市町�
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}地図����ん�市町�を建設���
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :多��ランダム�産業
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}地図����ん�産業を建設���
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}産業を建設����ん...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}整地��り��林��り�る���地形�ツール�ーを開���
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}地形
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}土地を�ら�
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}土地を�ら�
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}ランドム�木
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}ランドム�木を�林���
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}ランドム�木を�林���
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}����河を建設����ん...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}����河を建設����ん...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}�河を建設���
-STR_LANDINFO_CANAL                                              :�河
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :�河
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}���水門を建設����ん...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}���水門を建設����ん...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}水門を建設
-STR_LANDINFO_LOCK                                               :æ°´é–€
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :æ°´é–€
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}����を設置����ん
-STR_LANDINFO_RIVER                                              :å·�
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}����を設置����ん
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :å·�
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...ブイ�使用中���
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...ブイ�使用中���
 
-STR_LANDINFO_COORDS                                             :{BLACK}座標：{LTBLUE}{NUM}x{NUM}x{NUM}（{STRING}）
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}座標：{LTBLUE}{NUM}x{NUM}x{NUM}（{STRING}）
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}駅�部分を破壊����ん...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}���線路�種類を交�����ん...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}駅�部分を破壊����ん...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}���線路�種類を交�����ん...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}線路種類を交��更新
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}列車�全般を売��る�����ドラッグ���
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}列車�全般を売��る�����ドラッグ���
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}自動サイズ
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}ドラッグアンドドロップ�駅を建設���
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}駅�種類を�択���
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}駅�種類を�択���
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}駅�種類を�択���
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}駅�種類を�択���
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}ゲームを早�り
 STR_MESSAGE_HISTORY                                             :{WHITE}メッセージ履歴
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}最近表示��ニュースや��他�メッセージ�リストを表示���
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}���を切
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}���を入
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}最近表示��ニュースや��他�メッセージ�リストを表示���
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}���を切
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}���を入
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}産業
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK}（{CARGO}{STRING}）{YELLOW}（{COMMA}％���済�）
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK}（{CARGO}{STRING}�{CARGO}{STRING}）{YELLOW}（{COMMA}％�{COMMA}％���済�）
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}産業���- ��をクリック�産業を画��中央�表示
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}産業
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK}（{CARGO}{STRING}）{YELLOW}（{COMMA}％���済�）
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK}（{CARGO}{STRING}�{CARGO}{STRING}）{YELLOW}（{COMMA}％�{COMMA}％���済�）
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}産業���- ��をクリック�産業を画��中央�表示
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...他�産業�近����。
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...他�産業�近����。
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}生産�を変更
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}多人数ゲーム
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}プレヤー�：
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}他人�プレヤー�見�る��������
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}プレヤー�を入力
-STR_NETWORK_CONNECTION                                          :{BLACK}接続：
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}ローカル�ットワークも���インター�ット上�ゲームを�択���
-
-STR_NETWORK_START_SERVER                                        :{BLACK}サー�を開始
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}自分�サー�を開始���
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}��
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}ゲーム�
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}言語�サー��ージョン��
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}�択�る��リスト内�ゲームをクリック���
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}�回�加��サー�：
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}クリック���回�加��サー�を�択���
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}サー�を検索
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}�ットワーク上�サー�を検索���
-STR_NETWORK_ADD_SERVER                                          :{BLACK}サー�を追加
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}検索時�ゲーム�実行���る����を常�確��るサー�を追加���
-STR_NETWORK_ENTER_IP                                            :{BLACK}ホストアドレスを入力���
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}クライアント
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}オンライン�クライアント人数�最高クライアント人数{}オンライン�会社数�最高会社数
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}地図�サイズ
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}ゲーム�地図�サイズ{}クリック��地域�よ��並�替���
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}日付
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}ゲーム��在�日付を示���
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}実行年間
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}ゲーム�起動�ら{}�年間
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}ゲーム情報
-STR_NETWORK_CLIENTS                                             :{SILVER}クライアント：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}国語：　 {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}タイルセット：{WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}地図�サイズ：{WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}サー��ージョン：{WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}サー�アドレス：{WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}開始�日付：{WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}�在�日付：{WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}パスワード�必��
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}サー��オフライン
-STR_NETWORK_SERVER_FULL                                         :{SILVER}サー�満員
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}�ージョン�一致
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF �一致
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}ゲーム��加
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}新�多人数ゲームを開始
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}ゲーム�：
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}他�プレヤー�見�る多人数ゲームメニュー�表示�るゲーム�を指定���
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}�ットワークゲーム�を入力
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}パスワードを指定
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}ゲームをパスワード��護�る�������。正��パスワードを入力�����接続����ん。
-STR_NETWORK_SELECT_MAP                                          :{BLACK}地図を�択：
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}プレイ�るマップを�択������
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :インター�ット
-STR_NETWORK_LAN_INTERNET                                        :LAN�インター�ット
-STR_NETWORK_INTERNET_ADVERTISE                                  :インター�ット（公開）
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}クライアント{NUM}人
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}最大接続数：
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}接続��るコンピュータ�最大数を�択���。
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}会社{NUM}�
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}最高交通会社数：
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}サー�上�会社上�を指定���
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}観客者{NUM}人
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}最高�観者人数：
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}サー�上��観者上�を指定���
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}言語：
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}サー�上�主�言語を表示���
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}ゲームを開始
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}ランダム�地図も���シナリオを用��新��ットワークゲームを開始���
-STR_NETWORK_LOAD_GAME                                           :{BLACK}ゲームを開�
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}以���存��多人数ゲームを�会���（注�：以���様�プレヤー���接続���れ��り��ん）
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}多人数ゲーム
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}プレヤー�：
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}他人�プレヤー�見�る��������
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}プレヤー�を入力
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}接続：
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}ローカル�ットワークも���インター�ット上�ゲームを�択���
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}サー�を開始
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}自分�サー�を開始���
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}��
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}ゲーム�
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}言語�サー��ージョン��
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}�択�る��リスト内�ゲームをクリック���
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}�回�加��サー�：
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}ホストアドレスを入力���
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}クライアント
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}オンライン�クライアント人数�最高クライアント人数{}オンライン�会社数�最高会社数
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}地図�サイズ
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}ゲーム�地図�サイズ{}クリック��地域�よ��並�替���
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}日付
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}ゲーム��在�日付を示���
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}実行年間
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}ゲーム�起動�ら{}�年間
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}ゲーム情報
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}クライアント：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}国語：　 {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}タイルセット：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}地図�サイズ：{WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}サー��ージョン：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}サー�アドレス：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}開始�日付：{WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}�在�日付：{WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}パスワード�必��
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}サー��オフライン
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}サー�満員
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}�ージョン�一致
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF �一致
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}ゲーム��加
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}新�多人数ゲームを開始
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}ゲーム�：
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}他�プレヤー�見�る多人数ゲームメニュー�表示�るゲーム�を指定���
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}�ットワークゲーム�を入力
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}パスワードを指定
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}ゲームをパスワード��護�る�������。正��パスワードを入力�����接続����ん。
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}地図を�択：
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}プレイ�るマップを�択������
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :インター�ット
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN�インター�ット
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :インター�ット（公開）
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}クライアント{NUM}人
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}最大接続数：
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}接続��るコンピュータ�最大数を�択���。
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}会社{NUM}�
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}最高交通会社数：
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}サー�上�会社上�を指定���
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}観客者{NUM}人
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}最高�観者人数：
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}サー�上��観者上�を指定���
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}言語：
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}サー�上�主�言語を表示���
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}ゲームを開始
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}ランダム�地図も���シナリオを用��新��ットワークゲームを開始���
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}ゲームを開�
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}以���存��多人数ゲームを�会���（注�：以���様�プレヤー���接続���れ��り��ん）
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :何�も
@@ -1336,33 +1336,33 @@ STR_NETWORK_LANG_GREEK                                          :ギリシア語
 STR_NETWORK_LANG_LATVIAN                                        :ラトビア語
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}多人数ゲームロビー
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}多人数ゲームロビー
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}次�ゲームを準備中：{ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}��ゲーム��在�加���る交通会社�リスト��。空�スロット����場���交�会社を開業����。����������経営���る交通会社��加����。
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}新�会社
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}新�交通会社を作����
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}ゲームを�観
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}�観者���ゲームを見��
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}会社�加入
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}��交通会社�経営��加���
-STR_NETWORK_REFRESH                                             :{BLACK}サー�を更新
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}サー�情報を更新���
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}次�ゲームを準備中：{ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}��ゲーム��在�加���る交通会社�リスト��。空�スロット����場���交�会社を開業����。����������経営���る交通会社��加����。
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}新�会社
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}新�交通会社を作����
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}ゲームを�観
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}�観者���ゲームを見��
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}会社�加入
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}��交通会社�経営��加���
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}サー�を更新
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}サー�情報を更新���
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}交通会社情報
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}交通会社情報
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}会社�：{WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}開業日付：{WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}�業価値：{WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}残�：{WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}昨年��益：{WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}パフォーマンス：{WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}会社�：{WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}開業日付：{WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}�業価値：{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}残�：{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}昨年��益：{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}パフォーマンス：{WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}車両：{WHITE}{NUM} {TRAIN}�{NUM} {LORRY}�{NUM} {BUS}�{NUM} {PLANE}�{NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}駅��ス��空港�埠頭：{WHITE}{NUM} {TRAIN}�{NUM} {LORRY}�{NUM} {BUS}�{NUM} {PLANE}�{NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}プレヤー：{WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}車両：{WHITE}{NUM} {TRAIN}�{NUM} {LORRY}�{NUM} {BUS}�{NUM} {PLANE}�{NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}駅��ス��空港�埠頭：{WHITE}{NUM} {TRAIN}�{NUM} {LORRY}�{NUM} {BUS}�{NUM} {PLANE}�{NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}プレヤー：{WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}接続中...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}接続中...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}（１�６）接続中...
@@ -1378,49 +1378,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}会社æƒ
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}先� {NUM} 人�プレヤー��る
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES}�{BYTES} �ダウンロード��
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}接続を解除
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}接続を解除
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}�金�����を入力
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}サー��接続�る��パスワードを入力������
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}会社�経営��加�る��パスワードを入力������
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}クライアントリスト
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}クライアントリスト
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}�観モード
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新会社
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}�ットワークデ�イス�見��り��ん���。ENABLE_NETWORK を切���コンパイル�れ��能性も�り��。
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}�ットワークゲーム�見��り��ん���
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}サー��応答���ん���
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}NewGRF �一致�よ��接続����ん���
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}�ットワークゲーム��期�失敗����
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}�ットワークゲーム��接続�解除�れ���
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}�存��ゲーム�開���ん���
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}サー��開始����ん���
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}接続����ん���
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}接続 {NUM} �タイムアウトエラー�発生����
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}プロトコルエラー�よ��接続�解除�れ���
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}クライアント�ージョン�サー��ージョン�一致�����ん
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}�正�パスワード
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}サー��満員��
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}��サー���止�れ����
-STR_NETWORK_ERR_KICKED                                          :{WHITE}�ーむ�ら蹴られ���
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}��サー�上��ートを許����ん
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}�ットワークデ�イス�見��り��ん���。ENABLE_NETWORK を切���コンパイル�れ��能性も�り��。
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}�ットワークゲーム�見��り��ん���
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}サー��応答���ん���
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}NewGRF �一致�よ��接続����ん���
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}�ットワークゲーム��期�失敗����
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}�ットワークゲーム��接続�解除�れ���
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}�存��ゲーム�開���ん���
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}サー��開始����ん���
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}接続����ん���
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}接続 {NUM} �タイムアウトエラー�発生����
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}プロトコルエラー�よ��接続�解除�れ���
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}クライアント�ージョン�サー��ージョン�一致�����ん
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}�正�パスワード
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}サー��満員��
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}��サー���止�れ����
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}�ーむ�ら蹴られ���
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}��サー�上��ートを許����ん
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :一般エラー
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :�期エラー
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :�存��ゲーム�開�����
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :接続解除
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :プロトコルエラー
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF �一致
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :�証�����
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :�明�パケットを�信��
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :対応������ージョン
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :プレヤー�����使用中
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :�正�パスワード
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :wrong company-id in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :サー��蹴られ�
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :�ート��試����
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :サー�満員
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :一般エラー
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :�期エラー
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :�存��ゲーム�開�����
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :接続解除
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :プロトコルエラー
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF �一致
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :�証�����
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :�明�パケットを�信��
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :対応������ージョン
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :プレヤー�����使用中
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :�正�パスワード
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :wrong company-id in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :サー��蹴られ�
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :�ート��試����
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :サー�満員
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1430,15 +1430,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :ゲーム�一
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :ゲーム�止解除（クライアント�接続済�）
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :ゲーム�止解除（クライアント�接続�失敗）
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :退出
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} ��加������
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} � 会社 #{2:NUM} �経営��加����。
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} ��観者����加����。
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} �新会社 (#{2:NUM}) を設立����。
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} �退出������（{2:STRING}）
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} ���を {STRING} �変更����
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} � {2:CURRENCY} を�金���れ���
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** {1:STRING} � {2:CURRENCY} を�金����
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :退出
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ��加������
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} � 会社 #{2:NUM} �経営��加����。
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ��観者����加����。
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} �新会社 (#{2:NUM}) を設立����。
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} �退出������（{2:STRING}）
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ���を {STRING} �変更����
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} � {2:CURRENCY} を�金���れ���
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** {1:STRING} � {2:CURRENCY} を�金����
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :『�ーム�：
 STR_NETWORK_CHAT_COMPANY                                        :『�ーム�{STRING}：{WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :『�ーム�{STRING}�：{WHITE}{STRING}
@@ -1448,8 +1448,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :『秘密�{ST
 STR_NETWORK_CHAT_ALL_CAPTION                                    :『全員�：
 STR_NETWORK_CHAT_ALL                                            :『全員�{STRING}：{WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}�ャット�メッセージを入力
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE}サー��セッションを終了����
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE}サー���起�中...{}��ら��待�����...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}サー��セッションを終了����
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}サー���起�中...{}��ら��待�����...
 
 STR_NETWORK_SERVER                                              :サー�
 STR_NETWORK_CLIENT                                              :クライアント
@@ -1463,19 +1463,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :�ーム�発
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :秘密メッセージ
 
 
-STR_NETWORK_SEND                                                :{BLACK}�信
+STR_NETWORK_CHAT_SEND                                           :{BLACK}�信
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}PNG ファイル�ら地形�読�込���ん...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...ファイル�見��り��ん���
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...イメージ�フォーマット�交�����ん���。256色も���1670万色�PNGファイル��対応�����ん。
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...�明�エラー�発生����。破���ファイル��能性��り��。
+STR_ERROR_PNGMAP                                                :{WHITE}PNG ファイル�ら地形�読�込���ん...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...ファイル�見��り��ん���
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...イメージ�フォーマット�交�����ん���。256色も���1670万色�PNGファイル��対応�����ん。
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...�明�エラー�発生����。破���ファイル��能性��り��。
 
-STR_BMPMAP_ERROR                                                :{WHITE}BMP ファイル�ら地形�読�込���ん...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...イメージ�フォーマット�交�����ん���。
+STR_ERROR_BMPMAP                                                :{WHITE}BMP ファイル�ら地形�読�込���ん...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...イメージ�フォーマット�交�����ん���。
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}価値：{CURRENCY}
@@ -1489,13 +1489,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}推定ã�
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}���土地を上�られ��ん
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}���土地を下�られ��ん
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}���土地を平������ん...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :岩石
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :�地
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :裸地
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :�地
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :ç”°ç•‘
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :�雪地域
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :ç ‚æ¼ 
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :岩石
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :�地
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :裸地
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :�地
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :ç”°ç•‘
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :�雪地域
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :ç ‚æ¼ 
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}土地�傾������
@@ -1503,11 +1503,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}ä¸�å�¯èƒ
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}掘削�る�トン�ル�破壊�れ��
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}���海水���
 STR_ERROR_TOO_HIGH                                              :{WHITE}高����
-STR_ALREADY_LEVELLED                                            :{WHITE}... ���平���。
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... ���平���。
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}�当�線路��り��ん
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...���建設�れ���
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}先�線路を破壊���れ��り��ん
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}�路�一方通行���進入�止��
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}�路�一方通行���進入�止��
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}鉄��建設
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}電鉄�建設
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}モノレール�建設
@@ -1531,41 +1531,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}鉄é�“ã�
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}鉄�橋を建設���
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}鉄��トン�ルを建設���
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}線路�信��建設�破壊を切り替���
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}橋��択 - �好��橋を建設�る��クリック���
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}橋��択 - �好��橋を建設�る��クリック���
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}鉄�車庫��置方�を�択���
-STR_RAILROAD_TRACK                                              :ç·šè·¯
-STR_RAILROAD_TRAIN_DEPOT                                        :鉄�車庫
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :ç·šè·¯
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :鉄�車庫
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...��土地�他�会社�所有�れ����
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :通常信���る線路
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :��信���る線路
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :後�信���る線路
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :統�信���る線路
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :パス信���る線路
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :一方通行パス信���る線路
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :通常信��入�従属信���る鉄�
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :通常信��出�従属信���る鉄�
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :通常信����信���る鉄�
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :通常信��パス信���る線路
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :通常信��一方通行パス信���る線路
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :入�従属信��出�従属信���る鉄�
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :入�従属信����信���る鉄�
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :入�信��パス信���る線路
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :入�信��一方通行パス信���る線路
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :出�従属信����信���る鉄�
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :出�信��パス信���る線路
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :出�信��一方通行パス信���る線路
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :コンボ信��パス信���る線路
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :コンボ信��一方通行パス信���る線路
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :パス信��一方通行パス信���る線路
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}先�駅を破壊���れ��り��ん
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}�����
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}駅を統�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :通常信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :��信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :後�信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :統�信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :一方通行パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :通常信��入�従属信���る鉄�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :通常信��出�従属信���る鉄�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :通常信����信���る鉄�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :通常信��パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :通常信��一方通行パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :入�従属信��出�従属信���る鉄�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :入�従属信����信���る鉄�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :入�信��パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :入�信��一方通行パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :出�従属信����信���る鉄�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :出�信��パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :出�信��一方通行パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :コンボ信��パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :コンボ信��一方通行パス信���る線路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :パス信��一方通行パス信���る線路
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}先�駅を破壊���れ��り��ん
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}�����
+STR_JOIN_STATION_CAPTION                                        :{BLACK}駅を統�
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}先��路を破壊���れ��り��ん
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}�路工事中
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}�路工事中
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}�路�建設
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}路�電車線�建設
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}�路橋を�択
@@ -1601,14 +1601,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}è·¯é�¢é›
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}一方通行��路を入�切
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}�路�建設�破壊を切り替���
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}路�電車線�建設�破壊を切り替���
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}車庫�設置方���択
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}路�電車庫��置を�択
-STR_ROAD_DESCRIPTION_ROAD                                       :�路
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :街路照明��る�路
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :並木�
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :車庫
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :�切
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :路�電車路線
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}車庫�設置方���択
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}路�電車庫��置を�択
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :�路
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :街路照明��る�路
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :並木�
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :車庫
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :�切
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :路�電車路線
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}�ス�を破壊����ん...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}�役所を破壊����ん...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}乗客用路�電車駅を破壊����ん...
@@ -1616,12 +1616,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}貨物ç”
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}市町�
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} （{COMMA}）
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} （{COMMA}）
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}���建物を破壊���れ��り��ん
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN}（市）
@@ -1634,9 +1634,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}ç”»é�¢ã‚
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}町�を変更���
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}先月�旅客：{ORANGE}{COMMA}人{BLACK}　最大：{ORANGE}{COMMA}人
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}先月�郵便袋：{ORANGE}{COMMA}袋{BLACK}　最大：{ORANGE}{COMMA}袋
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}町��長�必��貨物：
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} required
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :先月 {SETX 20}{ORANGE}{CARGO}{BLACK} ����れ�
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}町��長�必��貨物：
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} required
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :先月 {SETX 20}{ORANGE}{CARGO}{BLACK} ����れ�
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :超高層ビル
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :オフィスビル
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :アパート
@@ -1673,7 +1673,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING}�助�金を����{}今後一年間{STRING}を��{STATION}�ら{STATION}行�一便�{}２��％�助�金を��る�
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING}�助�金を����{}今後一年間{STRING}を��{STATION}�ら{STATION}行�一便�{}３��％�助�金を��る�
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN}町議会�町内�他�空港�建設を許����ん
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} �地方自治体�騒音公害�心��よ��空港�建設を許����ん。
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} �地方自治体�騒音公害�心��よ��空港�建設を許����ん。
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :�屋
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :家屋
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :アパート
@@ -1709,7 +1709,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}{TOWN}�渋滞�{}{}{STRING}�出資���路工事�６ヶ月間続��
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK}（{COMMA}）
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING}（工事中）
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING}（工事中）
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :イグルー
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :テント
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :茶瓶�屋
@@ -1722,17 +1722,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :標示を設置
 STR_PLANT_TREE_CAPTION                                          :{WHITE}木
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...木�既��り��
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}���木を�林����ん...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...標示�多����
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}���標示を設置����ん...
-STR_SIGN_DEFAULT                                                :標示
+STR_DEFAULT_SIGN_NAME                                           :標示
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}標示�テキストを編集
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}標示�テキストを変更����ん...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}標示を削除����ん
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}�林�る木�種類を�択
-STR_TREE_NAME_TREES                                             :木
-STR_TREE_NAME_RAINFOREST                                        :熱帯雨林
-STR_TREE_NAME_CACTUS_PLANTS                                     :サボテン
+STR_LAI_TREE_NAME_TREES                                         :木
+STR_LAI_TREE_NAME_RAINFOREST                                    :熱帯雨林
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :サボテン
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}駅��択
@@ -1752,7 +1752,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}å…ˆã�«é§
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}他�空港�近����
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}先�空港を破壊���れ��り��ん
 
-STR_QUERY_RENAME_STATION_CAPTION                                :駅��役所��称�変更
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :駅��役所��称�変更
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}駅�を変更����ん...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}評価
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}�入れ貨物
@@ -1770,10 +1770,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :最高
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}��駅�指令リスト�入���る����列車を表示���
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}���ス���役所�指令リスト�入���る�����路車両を表示���
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}��空港�指令リスト�入���る����飛行機を表示���
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}��埠頭�指令リスト�入���る����船舶を表示���
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}��駅�指令リスト�入���る����列車を表示���
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}���ス���役所�指令リスト�入���る�����路車両を表示���
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}��空港�指令リスト�入���る����飛行機を表示���
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}��埠頭�指令リスト�入���る����船舶を表示���
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}：{YELLOW}{STRING}（{COMMA}％）
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION}�今後{STRING}を�入れ��ん
@@ -1806,47 +1806,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}駅å��ã‚
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}�入れる貨物�リストを表示���
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}駅� - メイン画�を駅�場所�移動�る��駅�をクリック���
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}空港�サイズ�種類を�択���
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :駅
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :格�庫
-STR_STATION_DESCRIPTION_AIRPORT                                 :空港
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :�役所
-STR_STATION_DESCRIPTION_BUS_STATION                             :�ス�
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :埠頭
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :駅
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :格�庫
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :空港
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :�役所
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :�ス�
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :埠頭
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}駅��入れる地域を�イライト���
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}駅��入れる地域を�イライト���ん
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}駅��入れる地域を�イライト���
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}埠頭
-STR_STATION_DESCRIPTION_BUOY                                    :ブイ
+STR_LAI_STATION_DESCRIPTION_BUOY                                :ブイ
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...ブイ��り��
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...駅�広����
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...�統一�駅�建設����ん
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}複数�項目を�択�る��controlを押���
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...�統一�駅�建設����ん
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}複数�項目を�択�る��controlを押���
 
 STR_UNDEFINED                                                   :（�定義）
-STR_STAT_CLASS_DFLT                                             :デフォルト駅
-STR_STAT_CLASS_WAYP                                             :通�点
+STR_STATION_CLASS_DFLT                                          :デフォルト駅
+STR_STATION_CLASS_WAYP                                          :通�点
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}造船所��置
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...水上�建設���れ��り��ん
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}���造船所を建設����ん...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}造船所��置を�択���
-STR_WATER_DESCRIPTION_WATER                                     :æ°´
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :海岸����岸
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :造船所
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :水路橋
+STR_LAI_WATER_DESCRIPTION_WATER                                 :æ°´
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :海岸����岸
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :造船所
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :水路橋
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...水上�建設����ん
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}先��河を破壊���れ��り��ん
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}先��河を破壊���れ��り��ん
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}ゲームを�存
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}ゲームを開�
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}�存
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}削除
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}�{STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :観客�{SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}�{STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :観客�{SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} 使用�能
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}ドライブ�読�込���ん
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}ゲーム��存�失敗����{}{STRING}
@@ -1862,12 +1862,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}ドラã‚
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}ゲーム�ファイル�
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}�択��ゲームを削除���
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}指定��ファイル���在�ゲームを�存���
-STR_NETWORK_SERVER_RANDOM_GAME                                  :新�ランダムゲームを作�
-STR_LOAD_HEIGHTMAP                                              :{WHITE}�イトマップを開�
-STR_SAVE_OSKTITLE                                               :{BLACK}セーブゲーム�を入力
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :新�ランダムゲームを作�
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}�イトマップを開�
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}セーブゲーム�を入力
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING}��り��
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING}��り��
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :炭鉱
 STR_INDUSTRY_NAME_POWER_STATION                                 :発電所
@@ -1925,7 +1925,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}主�画�を産業�場所�移動���
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}新��{STRING}�{TOWN}町�工事中�
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}新��{STRING}�{TOWN}町��林中�
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}価格：{YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}価格：{YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}��産業を���建設����ん...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...雪線上����林����
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING}�間近�閉鎖�
@@ -1943,16 +1943,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}他�トン�ル�����り��
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}トン�ル���当�り�地図�外��り��。
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}トン�ル���当�り�地図�外��り��。
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}����土地を掘削����ん
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}先�トン�ルを破壊���れ��り��ん
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}先�橋を破壊���れ��り��ん
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}開始点�終了点����置�建設����ん
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}橋端���高����り��ん
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}橋�低����地形�対応�����ん
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}開始点�終了点����置�建設����ん
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}橋端���高����り��ん
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}橋�低����地形�対応�����ん
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}一直線�橋��建設����ん
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}��土地�トン�ル�入り����当��
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING}�{}　{VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING}�{}　{VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :�り橋�鋼鉄製
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :��橋�鋼鉄製
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :カン�レ�ー橋�鋼鉄製
@@ -1963,30 +1963,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :鋼管橋�鋼
 STR_BRIDGE_TUBULAR_SILICON                                      :鋼管橋�シリコン製
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}���橋を建設����ん...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}���トン�ルを建設����ん...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :鉄�トン�ル
-STR_TUNNEL_DESCRIPTION_ROAD                                     :�路トン�ル
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :�り橋�鋼鉄製
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :��橋�鋼鉄製
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :カン�レ�ー橋�鋼鉄製
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :�り橋�鉄筋コンクリート製
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :橋�木製
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :橋�コンクリート製
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :�り橋�鋼鉄製
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :��橋�鋼鉄製
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :カン�レ�ー橋�鋼鉄製
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :�り橋�鉄筋コンクリート製
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :橋�木製
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :橋�コンクリート製
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :鋼管橋
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :鋼管橋
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :鉄�トン�ル
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :�路トン�ル
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :�り橋�鋼鉄製
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :��橋�鋼鉄製
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :カン�レ�ー橋�鋼鉄製
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :�り橋�鉄筋コンクリート製
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :橋�木製
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :橋�コンクリート製
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :�り橋�鋼鉄製
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :��橋�鋼鉄製
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :カン�レ�ー橋�鋼鉄製
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :�り橋�鉄筋コンクリート製
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :橋�木製
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :橋�コンクリート製
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :鋼管橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :鋼管橋
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}����信機��り��
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :�信機
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :��
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :交通会社本部ビル
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :�信機
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :��
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :交通会社本部ビル
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...交通会社本部ビル��り��
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :会社�所有���る地域
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :会社�所有���る地域
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}��地域を購入����ん...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...���所有������
 
@@ -2032,7 +2032,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} 駅 {N
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}難易度
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}�存
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}�存
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}簡�
@@ -2105,8 +2105,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}カラー
 STR_LIVERY_CAPTION                                              :{WHITE}新�カラースキーム
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}会社�
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}社長���
-STR_QUERY_COMPANY_NAME_CAPTION                                  :会社�
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :社長���
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :会社�
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :社長���
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}会社��変更����ん...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}社長���を変更����ん...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY}�経営状�　{BLACK}{COMPANYNUM}
@@ -2130,11 +2130,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}�計：
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}�益グラフ
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}営業利益グラフ
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}残�
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}借入金
-STR_MAX_LOAN                                                    :{WHITE}最高借入金：{BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}最高借入金：{BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}{SKIP}{SKIP}{CURRENCY}を借りる
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}{SKIP}{SKIP}{CURRENCY}を返済
@@ -2143,7 +2143,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}よりå€
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...残���り��ん
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY}�必�
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}借入金�返済����ん...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}借入��資金��金����ん...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}借入��資金��金����ん...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}社長�新��顔を�択���
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}交通会社�カラースキームを変更
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}社長���を変更���
@@ -2153,10 +2153,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}返済
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}（社長）
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}開業日付：{WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}車両数：
-STR_TRAINS                                                      :{WHITE}列車{COMMA}本
-STR_ROAD_VEHICLES                                               :{WHITE}�路車両{COMMA}両
-STR_AIRCRAFT                                                    :{WHITE}飛行機{COMMA}機
-STR_SHIPS                                                       :{WHITE}船舶{COMMA}隻
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}列車{COMMA}本
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}�路車両{COMMA}両
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}飛行機{COMMA}機
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}船舶{COMMA}隻
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}��
 STR_FACE_CAPTION                                                :{WHITE}顔��択
 STR_FACE_MALE_BUTTON                                            :{BLACK}男性
@@ -2170,7 +2170,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}ランãƒ
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}説明
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}グラフ�説明を表示���
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}会社グラフ�説明
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}��会社をグラフ�表示�る����を切り替���
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}��会社をグラフ�表示�る����を切り替���
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}��済��貨物
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}会社�パフォーマンス率（最大�1000）
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}会社�価値
@@ -2204,23 +2204,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :社長
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :大物
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}本部ビルを建設
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}本部ビルを建設�見る
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}会社�本部ビルを移動���（価格：会社�価値�１％）
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}会社�本部ビルを移動���（価格：会社�価値�１％）
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}会社�本部ビルを建設����ん...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}本部ビルを見る
-STR_RELOCATE_HQ                                                 :{BLACK}本部ビルを移動
-STR_COMPANY_JOIN                                                :{BLACK}�加
-STR_COMPANY_JOIN_TIP                                            :{BLACK}��会社��加���
-STR_COMPANY_PASSWORD                                            :{BLACK}パスワード
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}他�プレヤー���会社�経営��加����よ���る���パスワード��護���
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}会社�パスワードを設定
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}本部ビルを移動
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}�加
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}��会社��加���
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}パスワード
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}他�プレヤー���会社�経営��加����よ���る���パスワード��護���
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}会社�パスワードを設定
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}入力��パスワードを�存���
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}�択��交通会社�新��パスワードを設定
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}交通会社�パスワード
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}デフォルト�交通会社�パスワード
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}��パスワードを新��交通会社�パスワード���使用
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}デフォルト�交通会社�パスワード
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}��パスワードを新��交通会社�パスワード���使用
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}世界中�景気�{}{}経済�スランプ�陥る�アナリスト��安説�
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}スランプ�終�り�{}{}経済�上昇気��産業�好転�
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}大������ウィンドウサイズを切り替���
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}大������ウィンドウサイズを切り替���
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}会社�価値：{WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}会社�２５％�株を買�
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}会社�２５％�株を販売
@@ -2230,7 +2230,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}ã�“ã�®ä¼
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}��会社�２５％�株�販売����ん...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}（{1:COMPANY}�{0:COMMA}％株��有）
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING}�{STRING}�買��
-STR_PROTECTED                                                   :{WHITE}��早������会社�株��引����ん...
+STR_ERROR_PROTECTED                                             :{WHITE}��早������会社�株��引����ん...
 
 STR_LIVERY_DEFAULT                                              :通常�カラースキーム
 STR_LIVERY_STEAM                                                :蒸気機関車
@@ -2256,14 +2256,14 @@ STR_LIVERY_LARGE_PLANE                                          :大型飛行機
 STR_LIVERY_PASSENGER_TRAM                                       :乗客用路�電車
 STR_LIVERY_FREIGHT_TRAM                                         :貨物用路�電車
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}一般�カラースキームを表示���
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}列車�カラースキームを表示���
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}�路車両�カラースキームを表示���
-STR_LIVERY_SHIP_TIP                                             :{BLACK}船舶�カラースキームを表示���
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}飛行機�カラースキームを表示���
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}�択��カラースキーム�主�色を�択���
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}�択��カラースキーム�二次色を�択���
-STR_LIVERY_PANEL_TIP                                            :{BLACK}変更�る��カラースキームを�択���。Control+クリック�る�多数�カラースキーム��択����。カラースキーム�使用を切り替�る���ックボックスをクリック���。
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}一般�カラースキームを表示���
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}列車�カラースキームを表示���
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}�路車両�カラースキームを表示���
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}船舶�カラースキームを表示���
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}飛行機�カラースキームを表示���
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}�択��カラースキーム�主�色を�択���
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}�択��カラースキーム�二次色を�択���
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}変更�る��カラースキームを�択���。Control+クリック�る�多数�カラースキーム��択����。カラースキーム�使用を切り替�る���ックボックスをクリック���。
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul社タンク機関車（蒸気動）
@@ -2563,9 +2563,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :（���を
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}�択��指令��止方法を変更���
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}�択��指令���込む方法を変更���
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}�択��指令����方法を変更���
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}詳��注文を挿入
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}詳��注文を挿入
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :近辺�電車庫�行�
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :近辺�格�庫�行�
 STR_ORDER_NEAREST_DEPOT                                         :最も近�
@@ -2575,9 +2575,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :回���修
 STR_ORDER_TRAIN_DEPOT                                           :電車庫
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :車庫
 STR_ORDER_SHIP_DEPOT                                            :造船所
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} 格�庫
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} 格�庫
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :常�行�
 STR_ORDER_DROP_SERVICE_DEPOT                                    :必���れ�修�
@@ -2600,10 +2600,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :より多�
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :以上�
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :��る
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :����
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :指令{COMMA}�飛�
-STR_CONDITIONAL_NUM                                             :{1:STRING} � {3:COMMA}{2:STRING}時�指令{0:COMMA}�飛�
-STR_CONDITIONAL_TRUE_FALSE                                      :{1:STRING}{2:STRING}時�指令{0:COMMA}�飛�
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :指令{COMMA}�飛�
+STR_ORDER_CONDITIONAL_NUM                                       :{1:STRING} � {3:COMMA}{2:STRING}時�指令{0:COMMA}�飛�
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :{1:STRING}{2:STRING}時�指令{0:COMMA}�飛�
 
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}�行（未計画）
 STR_TIMETABLE_TRAVEL_FOR                                        :{SETX 30}{STRING}�行
@@ -2624,17 +2624,17 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}列車ã�
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}スキップ
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}削除
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}駅を�択
-STR_REFIT                                                       :{BLACK}�装備
-STR_REFIT_TIP                                                   :{BLACK}貨物�種類を�択������。Control+クリック�る���装備をキャンセル���。
-STR_REFIT_ORDER                                                 :（{STRING}�改装）
-STR_STOP_ORDER                                                  :（�止）
-STR_TIMETABLE_VIEW                                              :{BLACK}時刻表
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}時刻表を表示���
-STR_ORDER_VIEW                                                  :{BLACK}指令
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}指令を表示���
+STR_ORDER_REFIT                                                 :{BLACK}�装備
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}貨物�種類を�択������。Control+クリック�る���装備をキャンセル���。
+STR_ORDER_REFIT_ORDER                                           :（{STRING}�改装）
+STR_ORDER_STOP_ORDER                                            :（�止）
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}時刻表
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}時刻表を表示���
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}指令
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}指令を表示���
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE}（指令）
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 指令終了 - -
-STR_SERVICE                                                     :{BLACK}修�
+STR_ORDER_SERVICE                                               :{BLACK}修�
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}　購入日付：{LTBLUE}{NUM}{BLACK}　価値：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}　価値：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2654,7 +2654,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}ã��ã�®é§
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}命令を共有使用��る乗り物���駅�行����出���ん。
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}��車輌を移動����ん...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}ダブルヘッド�場��後部�機関車�常��部�機関車����行���
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}電車庫��経路�見��り��ん
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}補修間隔：{LTBLUE}{COMMA}日間{BLACK}  最新�補修：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}修��間隔：{LTBLUE}{COMMA}％{BLACK}　最終�修�：{LTBLUE}{DATE_LONG}
@@ -2674,10 +2674,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}時刻è¡
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}�択��指令�実行時間を変更���
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}�択��指令�実行時間を消去���
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}�刻回数をリセット���車両�定刻��り��
-STR_SERVICE_HINT                                                :{BLACK}修��必�������指令をスキップ
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}価格：{CURRENCY}　��：{WEIGHT_S}{}最大速度：{VELOCITY}　出力：{POWER}{}�転費：一年間{CURRENCY}{}容�：{CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}値段：{CURRENCY}　最高速度：{VELOCITY}{}�容能力：{CARGO}�{CARGO}{}維�費：一年間{CURRENCY}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}値段：{CURRENCY}　最高速度：{VELOCITY}{}�容能力：{CARGO}{}維�費：一年間{CURRENCY}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}修��必�������指令をスキップ
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}価格：{CURRENCY}　��：{WEIGHT_S}{}最大速度：{VELOCITY}　出力：{POWER}{}�転費：一年間{CURRENCY}{}容�：{CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}値段：{CURRENCY}　最高速度：{VELOCITY}{}�容能力：{CARGO}�{CARGO}{}維�費：一年間{CURRENCY}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}値段：{CURRENCY}　最高速度：{VELOCITY}{}�容能力：{CARGO}{}維�費：一年間{CURRENCY}
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}年齢：{LTBLUE}{STRING}{BLACK}　維�費：一年間{LTBLUE}{CURRENCY}
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}最高速度：{LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}��：{LTBLUE}{WEIGHT_S}　{BLACK}力：{LTBLUE}{POWER}{BLACK}　最高速度：{LTBLUE}{VELOCITY}
@@ -2696,27 +2696,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}事故�
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}列車事故�{}{COMMA}人�死亡
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}列車を逆転����ん...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}多数�部分を�む車両�逆転����ん
-STR_CLEAR_TIME                                                  :{BLACK}時間を消去
-STR_RESET_LATENESS                                              :{BLACK}�刻回数をリセット
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}通�点���を変更�る
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}時間を消去
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}�刻回数をリセット
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}通�点���を変更�る
 
-STR_TRAIN_STOPPING                                              :{RED}�車中
-STR_TRAIN_STOPPING_VEL                                          :{RED}�車中�{VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :互�性���線路�種類
-STR_TRAIN_NO_POWER                                              :{RED}動力��り��ん
-STR_TRAIN_START_NO_CATENARY                                     :線路�架線��������列車�動���ん
-STR_TRAIN_STUCK                                                 :{ORANGE}空�経路待�中
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}�車中
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}�車中�{VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :互�性���線路�種類
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}動力��り��ん
+STR_ERROR_TRAIN_START_NO_CATENARY                               :線路�架線��������列車�動���ん
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}空�経路待�中
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}{STRING}�新登場�
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}{STRING}�新登場�ー{ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}破壊��車両�売�����ん...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}破壊��車両�改装����ん...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}破壊��車両�売�����ん...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}破壊��車両�改装����ん...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}��車両�時刻表を設定����ん...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}車両�駅��ス�����車����。
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}��車両���駅��ス���車���ん。
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}��車両�時刻表を設定����ん...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}車両�駅��ス�����車����。
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}��車両���駅��ス���車���ん。
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}時間を変更
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}��車両��在定刻�����
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}��車両��在{STRING}�刻�����
@@ -2729,7 +2729,7 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}自動æ™
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...車庫内��止���れ��り��ん
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}付近�車庫�見��り��ん
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}車両を逆転���
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}容�：{LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}容�：{LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
@@ -2754,11 +2754,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}通�点���使�るブイを設置���
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}���ブイを設置����ん
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}水路橋を建設
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}���水路橋を建設����ん...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}���水路橋を建設����ん...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE}(改装)
 STR_REFIT_TITLE                                                 :{GOLD}���る貨物�種類を�択：
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}改装後��載�：{GOLD}{CARGO}{}{BLACK}改装費用：{GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(改装�能)
+STR_PURCHASE_INFO_REFITTABLE                                    :(改装�能)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}空港
@@ -2771,7 +2771,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}空港ã‚
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}町民��賀�{}�飛行機�{STATION}�到��
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}墜�事故�{}{COMMA}人�{STATION}�死亡
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}墜�事故�{}燃料切れ�{COMMA}人�死亡
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE}（時刻表）
 
@@ -2784,13 +2784,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}炭鉱�地盤沈下�よ��{TOWN}�壊れ��
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}洪水�{}浸水後�{COMMA}人�死亡
 
-STR_BRIBE_FAILED                                                :{WHITE}買�未��
-STR_BRIBE_FAILED_2                                              :{WHITE}地方��敗防止監視機関�露見����
-STR_BUILD_DATE                                                  :{BLACK}購入年：{LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}買�未��
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}地方��敗防止監視機関�露見����
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}購入年：{LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}駅�クラス：{LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}駅�種類：{LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF：{LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}駅�クラス：{LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}駅�種類：{LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF：{LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}パフォーマンス評価�詳細
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}詳細
@@ -2810,28 +2810,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}資金ï¼
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}借入金：
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}�計：
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}車両数：�路車両�列車�船舶や飛行機を����
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}駅数：駅�����部分（駅��ス��空港）を一����数���
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}最��益��る（年齢2年以上�）車両��益を表示���
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}先一年間�最��益��る一ヶ月間��益を表示���
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}先一年間�最大�益��る一ヶ月間��益を表示���
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}一年間�����貨物��を表示���
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}直��四�期�����貨物種類数を表示���
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}��会社�残高を表示���
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}��会社�借入���る残�を表示���
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}最大�イント�ら�計�イント
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}車両数：�路車両�列車�船舶や飛行機を����
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}駅数：駅�����部分（駅��ス��空港）を一����数���
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}最��益��る（年齢2年以上�）車両��益を表示���
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}先一年間�最��益��る一ヶ月間��益を表示���
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}先一年間�最大�益��る一ヶ月間��益を表示���
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}一年間�����貨物��を表示���
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}直��四�期�����貨物種類数を表示���
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}��会社�残高を表示���
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}��会社�借入���る残�を表示���
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}最大�イント�ら�計�イント
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF�設定
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF �設定を表示
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF�設定
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}変更を�用
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}パレットを切り替�る
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}�択��パレットを切り替���。{}（�� NewGRF �スプライト�ピンク�������������作を試���。）
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}パラメータ�設定
-STR_NEWGRF_FILENAME                                             :{BLACK}ファイル�：{SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}パレット：{SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID：{SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}変更を�用
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}パレットを切り替�る
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}�択��パレットを切り替���。{}（�� NewGRF �スプライト�ピンク�������������作を試���。）
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}パラメータ�設定
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}ファイル�：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}パレット：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum：{SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}実行中�ゲーム�変更を�用���クラッシュ�リスク��り��。{}続��もよ������？
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2854,34 +2854,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :無効ã�ª ID ã�
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} �壊れ�スプライトを����。壊れ�スプライト�赤疑�符���表示�れ��。
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :複数� Action 8 �項目��む
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}�択��プリセットを開���
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}プリセットを�存
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}�在�リストをプリセット����存���
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}プリセット�を入力
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}プリセットを削除
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}�択��プリセットを削除���
-STR_NEWGRF_ADD                                                  :{BLACK}追加
-STR_NEWGRF_ADD_TIP                                              :{BLACK}NewGRFファイルをリスト�追加���
-STR_NEWGRF_REMOVE                                               :{BLACK}削除
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}NewGRFファイルをリスト�ら削除���
-STR_NEWGRF_MOVEUP                                               :{BLACK}上�
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}�択��NewGRFファイルを上�移動���
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}下�
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}�択��NewGRFファイルを下�移動���
-STR_NEWGRF_FILE_TIP                                             :{BLACK}インストール��NewGRFファイル�リスト��。設定を変更�る��ファイルをクリック���。
-STR_NEWGRF_PARAMETER                                            :{BLACK}設定：{SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF設定を入力
-STR_NEWGRF_NO_INFO                                              :{BLACK}情報��り��ん
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}�択��プリセットを開���
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}プリセットを�存
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}�在�リストをプリセット����存���
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}プリセット�を入力
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}プリセットを削除
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}�択��プリセットを削除���
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}追加
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}NewGRFファイルをリスト�追加���
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}削除
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}NewGRFファイルをリスト�ら削除���
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}上�
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}�択��NewGRFファイルを上�移動���
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}下�
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}�択��NewGRFファイルを下�移動���
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}インストール��NewGRFファイル�リスト��。設定を変更�る��ファイルをクリック���。
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}設定：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF設定を入力
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}情報��り��ん
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}使用�能NewGRFファイル
 STR_NEWGRF_ADD_FILE                                             :{BLACK}リスト�追加
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}�択��NewGRFファイルをリスト�追加���
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}ファイルを更新
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}使用�能�NewGRFファイル�リストを更新
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}�択��NewGRFファイルをリスト�追加���
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}ファイルを更新
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}使用�能�NewGRFファイル�リストを更新
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}ファイル�追加����ん：�複�GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}一致���るファイル�見��り��ん
-STR_NEWGRF_DISABLED                                             :{RED}切
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}一致���るファイル�見��り��ん
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}切
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}一致���るファイル�見��り��ん（代替 GRF を使用中）
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}見��ら��ファイル�代�り�対応���る代替 GRF ファイルを使用�����
@@ -2893,7 +2893,7 @@ STR_NEWGRF_BROKEN                                               :{WHITE}NewGRF '
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}「{1:COMPANY}��所有���る「{0:VEHICLE}����電車�無効�長���り��。使用���る NewGRF �原因��る�も�れ��ん。desync も���クラッシュ�行��能性��り���
 
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}��ゲーム�路�電車�対応������ージョン��存�れ����������路�電車�削除�れ���。
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}��ゲーム�路�電車�対応������ージョン��存�れ����������路�電車�削除�れ���。
 
 STR_CURRENCY_WINDOW                                             :{WHITE}カスタム通貨
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}為替レート：{ORANGE}{0:CURRENCY} � £ {1:COMMA}
@@ -2904,10 +2904,10 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}ユーã
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}ユーロ�切替�：{ORANGE}���
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}プレビュー：{ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}カスタム通貨�設定を変更
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}英�ンド�対�る�使��通貨�為替レートを減ら���
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}英�ンド�対�る�使��通貨�為替レートを増や���
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}英�ンド�対�る�使��通貨�為替レートを設定���
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}�使��通貨�£10,000（英�ンド）
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}英�ンド�対�る�使��通貨�為替レートを減ら���
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}英�ンド�対�る�使��通貨�為替レートを増や���
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}英�ンド�対�る�使��通貨�為替レートを設定���
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}�使��通貨�£10,000（英�ンド）
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2926,8 +2926,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - 船舶{COMMA}隻
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - 飛行機{COMMA}�
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA}��車両�共有指令
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}��指令リストを共有���る����車両を表示���
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA}��車両�共有指令
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}��指令リストを共有���る����車両を表示���
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} �電車庫内��車�����
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} �車庫�待機�����
@@ -3034,39 +3034,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}ä»–ã�®è²
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}他�種類�貨物を���る為�貨物船を改装���
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}他�種類�貨物を���る為�飛行機を改装
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN}電車庫�行�
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN}電車庫�行��{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN}車庫�回�
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN}車庫�回��{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}{TOWN}造船所�回�
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{TOWN}造船所�回��{VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION}格�庫�行�
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION}格�庫�行��{VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN}電車庫�修�
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN}電車庫�修��{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN}車庫�修�
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN}車庫�修��{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN}造船所�修�
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN}造船所�修��{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION}格�庫�修�
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION}格�庫�修��{VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}列車をクローン
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}�路車両をクローン
-STR_CLONE_SHIP                                                  :{BLACK}船舶をクローン
-STR_CLONE_AIRCRAFT                                              :{BLACK}飛行機をクローン
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}����車両を������列車を複製���。Control+クリック�る��指令を共有���。
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}�路車両を複製���。Control+クリック�る��指令を共有���。
-STR_CLONE_SHIP_INFO                                             :{BLACK}船舶を複製���。Control+クリック�る��指令を共有���
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}飛行機を複製���。Control+クリック�る��指令リストを共有���。
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}����車両を������列車を複製���。��ボタンをクリック���他�列車をクリック���。も電車庫内�も電車庫外�も�����ん。Control+クリック�る��指令を共有���。
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}�路車両を複製���。��ボタンをクリック���他�車両をクリック���。車庫内�も車庫外�も�����ん。Control+クリック�る��指令を共有���。
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}船舶を複製���。��ボタンをクリック���造船所内�よ�造船所外�船舶をクリック���。Control+クリック�る��指令を共有���
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}飛行機を複製���。��ボタンをクリック���格�庫内�よ�格�庫外�飛行機をクリック���。Control+クリック�る��指令リストを共有���。
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}{TOWN}電車庫�行�
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}{TOWN}電車庫�行��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}{TOWN}車庫�回�
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}{TOWN}車庫�回��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}{TOWN}造船所�回�
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}{TOWN}造船所�回��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}{STATION}格�庫�行�
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}{STATION}格�庫�行��{VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}{TOWN}電車庫�修�
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}{TOWN}電車庫�修��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}{TOWN}車庫�修�
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}{TOWN}車庫�修��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}{TOWN}造船所�修�
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}{TOWN}造船所�修��{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}{STATION}格�庫�修�
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}{STATION}格�庫�修��{VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}列車をクローン
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}�路車両をクローン
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}船舶をクローン
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}飛行機をクローン
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}����車両を������列車を複製���。Control+クリック�る��指令を共有���。
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}�路車両を複製���。Control+クリック�る��指令を共有���。
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}船舶を複製���。Control+クリック�る��指令を共有���
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}飛行機を複製���。Control+クリック�る��指令リストを共有���。
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}����車両を������列車を複製���。��ボタンをクリック���他�列車をクリック���。も電車庫内�も電車庫外�も�����ん。Control+クリック�る��指令を共有���。
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}�路車両を複製���。��ボタンをクリック���他�車両をクリック���。車庫内�も車庫外�も�����ん。Control+クリック�る��指令を共有���。
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}船舶を複製���。��ボタンをクリック���造船所内�よ�造船所外�船舶をクリック���。Control+クリック�る��指令を共有���
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}飛行機を複製���。��ボタンをクリック���格�庫内�よ�格�庫外�飛行機をクリック���。Control+クリック�る��指令リストを共有���。
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}新�鉄�車両
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}新�電動鉄�車両
@@ -3136,28 +3136,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}メイãƒ
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}車庫�格�庫�造船所内�����車両を売����。続��もよ������？
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :鉄�車庫�種類�一致�����ん
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :鉄�車庫�種類�一致�����ん
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}電車庫内�����列車を売����
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}車庫内������路車両を売����
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}造船所内�����船舶を売����
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}格�庫内�����飛行機を売����
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}電車庫内�����列車を売����
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}車庫内������路車両を売����
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}造船所内�����船舶を売����
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}格�庫内�����飛行機を売����
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}�択中�電車庫�指令リスト�入���る����列車�リストを表示���
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}�択中�車庫�指令リスト�入���る�����路車両�リストを表示���
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}�択中�造船所�指令リスト�入���る����船舶�リストを表示���
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}�択中�格�庫�指令リスト�入���る����飛行機�リストを表示���
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}�択中�電車庫�指令リスト�入���る����列車�リストを表示���
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}�択中�車庫�指令リスト�入���る�����路車両�リストを表示���
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}�択中�造船所�指令リスト�入���る����船舶�リストを表示���
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}�択中�格�庫�指令リスト�入���る����飛行機�リストを表示���
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}電車庫内�����列車を自動交����
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}車庫内������路車両を自動交����
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}造船所内�����船舶を自動交����
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}格�庫内�����飛行機を自動交����
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}電車庫内�����列車を自動交����
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}車庫内������路車両を自動交����
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}造船所内�����船舶を自動交����
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}格�庫内�����飛行機を自動交����
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING}を交�
 STR_REPLACE_VEHICLES_START                                      :{BLACK}車両�交�を開始
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}車両�交�を�止
-STR_NOT_REPLACING                                               :{BLACK}交������
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}�択��車両��り��ん
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}交������
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}�択��車両��り��ん
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}交��る機関車�種類を�択
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}左��択��機関車�種類�代�り�使用�る機関車�種類を�択
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}左��択��機関車�種類�交�を�止�る��クリック���
@@ -3169,26 +3169,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}自動äº
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}交�：{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}機関車�貨車�ウィンドウ�切り替���。
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}車を買���ん
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}車を買���ん
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}船を買���ん
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}飛行機を買���ん
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}車を買���ん
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}車を買���ん
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}船を買���ん
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}飛行機を買���ん
 
-STR_ENGINES                                                     :機関車
-STR_WAGONS                                                      :貨車
+STR_REPLACE_ENGINES                                             :機関車
+STR_REPLACE_WAGONS                                              :貨車
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}電車庫内�����列車を�車�る��クリック���
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}車庫内������路車両を�車�る��クリック���
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}造船所内�����船舶を�止�る��クリック���
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}格�庫内�����飛行機を�止�る��クリック���
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}電車庫内�����列車を�車�る��クリック���
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}車庫内������路車両を�車�る��クリック���
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}造船所内�����船舶を�止�る��クリック���
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}格�庫内�����飛行機を�止�る��クリック���
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}電車庫内�����列車を開始�る��クリック���
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}車庫内������路車両を開始�る��クリック���
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}造船所内�����船舶を開始�る��クリック���
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}格�庫内�����飛行機を開始�る��クリック���
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}電車庫内�����列車を開始�る��クリック���
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}車庫内������路車両を開始�る��クリック���
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}造船所内�����船舶を開始�る��クリック���
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}格�庫内�����飛行機を開始�る��クリック���
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}リスト�入���る����車両を�止�る��クリック���
-STR_MASS_START_LIST_TIP                                         :{BLACK}リスト�入���る����車両を開始�る��クリック���
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}リスト�入���る����車両を�止�る��クリック���
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}リスト�入���る����車両を開始�る��クリック���
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}標示�リスト - {COMMA}��標示
@@ -3196,14 +3196,14 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}標示ã�
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :鉄�車両
-STR_ELRAIL_VEHICLES                                             :電動鉄�車両
-STR_MONORAIL_VEHICLES                                           :モノレール車両
-STR_MAGLEV_VEHICLES                                             :�気浮上�鉄�車両
+STR_REPLACE_RAIL_VEHICLES                                       :鉄�車両
+STR_REPLACE_ELRAIL_VEHICLES                                     :電動鉄�車両
+STR_REPLACE_MONORAIL_VEHICLES                                   :モノレール車両
+STR_REPLACE_MAGLEV_VEHICLES                                     :�気浮上�鉄�車両
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}価格：{GOLD}{CURRENCY}{BLACK}　��：{GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}最大速度：{GOLD}{VELOCITY}{BLACK}　出力：{GOLD}{POWER}
@@ -3230,69 +3230,69 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}作�
-STR_RANDOM                                                      :{BLACK}ランダム化
-STR_RANDOM_HELP                                                 :{BLACK}地形作��ランダムシードを変更���
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}世界作�
-STR_RANDOM_SEED                                                 :{BLACK}ランダムシード：
-STR_RANDOM_SEED_HELP                                            :{BLACK}ランダムシードを入力�る��クリック���
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}ランダムシードを入力
-STR_LAND_GENERATOR                                              :{BLACK}地形作�：
-STR_TREE_PLACER                                                 :{BLACK}�林アルゴリズム：
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}�イトマップ�回転：
-STR_TERRAIN_TYPE                                                :{BLACK}地形種類：
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}海水�：
-STR_SMOOTHNESS                                                  :{BLACK}スムーズ度：
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}雪線��置：
-STR_DATE                                                        :{BLACK}日付：
-STR_NUMBER_OF_TOWNS                                             :{BLACK}市町�数：
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}産業数：
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}雪線を上�る
-STR_SNOW_LINE_DOWN                                              :{BLACK}雪線を下�る
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}雪線��置を変更
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}始�る年を変���
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}リサイズ警告
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}ソース地図をリサイズ���る����勧����ん。地形作�を続��もよ������？
-STR_HEIGHTMAP_NAME                                              :{BLACK}�イトマップ�：
-STR_HEIGHTMAP_SIZE                                              :{BLACK}サイズ：{ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}作�
+STR_MAPGEN_RANDOM                                               :{BLACK}ランダム化
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}地形作��ランダムシードを変更���
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}世界作�
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}ランダムシード：
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}ランダムシードを入力�る��クリック���
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}ランダムシードを入力
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}地形作�：
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}�林アルゴリズム：
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}�イトマップ�回転：
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}地形種類：
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}海水�：
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}スムーズ度：
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}雪線��置：
+STR_MAPGEN_DATE                                                 :{BLACK}日付：
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}市町�数：
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}産業数：
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}雪線を上�る
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}雪線を下�る
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}雪線��置を変更
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}始�る年を変���
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}リサイズ警告
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}ソース地図をリサイズ���る����勧����ん。地形作�を続��もよ������？
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}�イトマップ�：
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}サイズ：{ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}地形作�中...
 STR_GENERATION_ABORT                                            :{BLACK}キャンセル
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}地形作��キャンセル
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}地形作�をキャンセル��もよ������？
-STR_PROGRESS                                                    :{WHITE}{NUM}％完了
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM}�{NUM}
-STR_WORLD_GENERATION                                            :{BLACK}地形作�中
-STR_TREE_GENERATION                                             :{BLACK}�林中
-STR_UNMOVABLE_GENERATION                                        :{BLACK}����信機作�中
-STR_CLEARING_TILES                                              :{BLACK}岩石������地形を作�中
-STR_SETTINGUP_GAME                                              :{BLACK}ゲームを設定中
-STR_PREPARING_TILELOOP                                          :{BLACK}タイルループを実行中
-STR_PREPARING_GAME                                              :{BLACK}ゲームを準備中
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}��動作�よ��難易度�カスタム��り���。
-STR_SE_FLAT_WORLD                                               :{WHITE}平��地形
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}平��地形を作�
-STR_SE_RANDOM_LAND                                              :{WHITE}ランダム�地形
-STR_SE_NEW_WORLD                                                :{BLACK}新�シナリオを作�
-STR_SE_CAPTION                                                  :{WHITE}シナリオ�種類
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}平地�高�を下�る
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}平地�高�を上�る
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}平地�高�を変更
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}平地�土地�高�：
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}％完了
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM}�{NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}地形作�中
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}�林中
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}����信機作�中
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}岩石������地形を作�中
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}ゲームを設定中
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}タイルループを実行中
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}ゲームを準備中
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}��動作�よ��難易度�カスタム��り���。
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}平��地形
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}平��地形を作�
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}ランダム�地形
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}新�シナリオを作�
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}シナリオ�種類
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}平地�高�を下�る
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}平地�高�を上�る
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}平地�高�を変更
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}平地�土地�高�：
 
 STR_SMALLMAP_CENTER                                             :{BLACK}予約地図を�在�場所�移動���
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_NORTHWEST                                                   :{BLACK}西北
-STR_NORTHEAST                                                   :{BLACK}�北
-STR_SOUTHEAST                                                   :{BLACK}��
-STR_SOUTHWEST                                                   :{BLACK}西�
-STR_BORDER_FREEFORM                                             :{BLACK}自由�型
-STR_BORDER_WATER                                                :{BLACK}æ°´
-STR_BORDER_RANDOM                                               :{BLACK}ランダム
-STR_BORDER_RANDOMIZE                                            :{BLACK}ランダム
-STR_BORDER_MANUAL                                               :{BLACK}手動
+STR_MAPGEN_NORTHWEST                                            :{BLACK}西北
+STR_MAPGEN_NORTHEAST                                            :{BLACK}�北
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}��
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}西�
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}自由�型
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}æ°´
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}ランダム
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}ランダム
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}手動
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}町空港
@@ -3317,21 +3317,21 @@ STR_MEASURE_AREA                                                :{BLACK}地域ï¼
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}長�：{NUM}{}高����：{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}地域：{NUM} x {NUM}{}高����：{NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}振り替�クレジット: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...�れ�町����。
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...��方������。
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}��明設定
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK} 駅�サイン����明をスイッ�
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}木��明性を入�切
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}市町��建物��明性を入�切
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}工業��明性を入�切
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}交通社所有�建物�����表示を入�切
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}橋��明性を入�切
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}����信機����明性を入�切
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}懸垂索��明度を入�切���。CTRL+クリック�る��ロック���。
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}������表示��明性を切り替�
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}�明���り���視を使用
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}振り替�クレジット: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...�れ�町����。
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...��方������。
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}��明設定
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK} 駅�サイン����明をスイッ�
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}木��明性を入�切
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}市町��建物��明性を入�切
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}工業��明性を入�切
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}交通社所有�建物�����表示を入�切
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}橋��明性を入�切
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}����信機����明性を入�切
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}懸垂索��明度を入�切���。CTRL+クリック�る��ロック���。
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}������表示��明性を切り替�
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}�明���り���視を使用
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3341,7 +3341,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :����列車
 STR_GROUP_ALL_ROAD_VEHICLES                                     :�����路車両
 STR_GROUP_ALL_SHIPS                                             :����船舶
@@ -3350,24 +3350,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :無所属�列
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :無所属��路車両
 STR_GROUP_DEFAULT_SHIPS                                         :無所属�船舶
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :グループ��れ��飛行機
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :共有車両を追加
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :����車両を�り除�
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}グループ�を変更
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}グループ�作�����ん...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}グループ�削除����ん...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}グループ�を変更����ん...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}グループ内�����車両を�り除���ん...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}��車両���グループ�追加����ん...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}グループ�共有車両を追加����ん...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}グループ�作�����ん...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}グループ�削除����ん...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}グループ�を変更����ん...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}グループ内�����車両を�り除���ん...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}��車両���グループ�追加����ん...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}グループ�共有車両を追加����ん...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}グループ - グループをクリック��グループ内�����車両�リストを表示���
-STR_GROUP_CREATE_TIP                                            :{BLACK}クリック��グループを作����
-STR_GROUP_DELETE_TIP                                            :{BLACK}�択��グループを削除���
-STR_GROUP_RENAME_TIP                                            :{BLACK}�択��グループ��称を変更���
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}��グループ内�車両を自動交����ん
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}グループ - グループをクリック��グループ内�����車両�リストを表示���
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}クリック��グループを作����
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}�択��グループを削除���
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}�択��グループ��称を変更���
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}��グループ内�車両を自動交����ん
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3428,35 +3428,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}���唯一���れ��り��ん
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}���唯一���れ��り��ん
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}次�標示�移動
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}��標示�移動
-STR_SIGN_OSKTITLE                                               :{BLACK}サイン�を入力
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}次�標示�移動
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}��標示�移動
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}サイン�を入力
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}出資
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}調査
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}建設
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}�当�産業を�択���
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}出資
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}調査
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}建設
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}�当�産業を�択���
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}詳��
-STR_FACE_ADVANCED_TIP                                           :{BLACK}顔を詳���択���。
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}顔を詳���択���。
 STR_FACE_SIMPLE                                                 :{BLACK}簡�
-STR_FACE_SIMPLE_TIP                                             :{BLACK}顔を簡���択���。
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}顔を簡���択���。
 STR_FACE_LOAD                                                   :{BLACK}開�
-STR_FACE_LOAD_TIP                                               :{BLACK}�好��顔を開���。
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}�好��顔を開���。
 STR_FACE_LOAD_DONE                                              :{WHITE}�好��顔� OpenTTD �設定ファイル�ら読�込����。
 STR_FACE_FACECODE                                               :{BLACK}プレヤー�顔番�
-STR_FACE_FACECODE_TIP                                           :{BLACK}プレヤー�顔番�を表示�変更
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}プレヤー�顔番�を表示�変更
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}プレヤー�顔番�を表示�変更
 STR_FACE_FACECODE_SET                                           :{WHITE}新��顔番��設定�れ���。
 STR_FACE_FACECODE_ERR                                           :{WHITE}顔記��設定����ん��� - 0 � 4,294,967,295 �間�数値���り��ん。
 STR_FACE_SAVE                                                   :{BLACK}�存
-STR_FACE_SAVE_TIP                                               :{BLACK}�好��顔を�存���。
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}�好��顔を�存���。
 STR_FACE_SAVE_DONE                                              :{WHITE}��顔を�好��顔��� OpenTTD �設定ファイル��存���。
 STR_FACE_EUROPEAN                                               :{BLACK}白人
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}白人�顔を�択���
@@ -3464,51 +3464,51 @@ STR_FACE_AFRICAN                                                :{BLACK}黒人
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}黒人�顔を�択���
 STR_FACE_YES                                                    :��
 STR_FACE_NO                                                     :���
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}���も���イヤリングを表示
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}���も���イヤリングを表示
 STR_FACE_HAIR                                                   :髪�毛：
-STR_FACE_HAIR_TIP                                               :{BLACK}髪�毛を変更
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}髪�毛を変更
 STR_FACE_EYEBROWS                                               :�ゆ：
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}�ゆを変更
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}�ゆを変更
 STR_FACE_EYECOLOUR                                              :目�色：
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}目�色を変更
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}目�色を変更
 STR_FACE_GLASSES                                                :眼�：
-STR_FACE_GLASSES_TIP                                            :{BLACK}眼�を��る
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}眼�を変更
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}眼�を��る
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}眼�を変更
 STR_FACE_NOSE                                                   :鼻：
-STR_FACE_NOSE_TIP                                               :{BLACK}鼻を変更：
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}鼻を変更：
 STR_FACE_LIPS                                                   :�唇：
 STR_FACE_MOUSTACHE                                              :���：
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}�唇����を変更
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}�唇����を変更
 STR_FACE_CHIN                                                   :顎：
-STR_FACE_CHIN_TIP                                               :{BLACK}顎を変更
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}顎を変更
 STR_FACE_JACKET                                                 :ジャケット：
-STR_FACE_JACKET_TIP                                             :{BLACK}ジャケットを変更：
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}ジャケットを変更：
 STR_FACE_COLLAR                                                 :襟：
-STR_FACE_COLLAR_TIP                                             :{BLACK}襟を変更：
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}襟を変更：
 STR_FACE_TIE                                                    :�クタイ：
 STR_FACE_EARRING                                                :イヤリング：
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}�クタイ�イヤリングを変更
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}�クタイ�イヤリングを変更
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}信���択
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}���信�を交�����ん...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}通常�信�（腕木�）{}線路上�複数�電車を走ら�る場���事故を��る為�信��必���り��。
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}入�信�（腕木�）{}信��先�区間��る出�信����最低1個����れ����り��。
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}出�信�（腕木�）{}動作�通常�信���様����入��コンボ信�を使用�る場��必���り��。
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}コンボ信�（腕木�）{}コンボ信��入�信��出�信��機能を併��も���。
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}パス信� (腕木�) {}パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。標準パス信��信��背��ら通��る�������。
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}一方通行パス信� (腕木�) {}パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。一方通行パス信��信��背��ら通��る�������ん。
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}通常�信�（電��）{}線路上�複数�電車を走行��る場���事故を��る為�信��必���り��。
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}入�信�（電��）{}信��先�区間��る出�信����最低1個����れ����り��。
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}出�信�（電��）{}動作�通常�信���様����入��コンボ信�を使用�る場��必���り��。
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}コンボ信�（電��）{}コンボ信��入�信��出�信��機能を併��も���。
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}パス信� (電��) {} パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。標準パス信��信��背��ら通��る�������。
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}一方通行パス信� (電��) {} パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。一方通行パス信��信��背��ら通��る�������ん。
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}信�を交�{}���設置��信�をクリック������択��信��書類�交����。
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}ドラッグ時�信�設置密度
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}ドラッグ時�信�設置密度を減ら�
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}ドラッグ時�信�設置密度を増や�
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}信���択
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}���信�を交�����ん...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}通常�信�（腕木�）{}線路上�複数�電車を走ら�る場���事故を��る為�信��必���り��。
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}入�信�（腕木�）{}信��先�区間��る出�信����最低1個����れ����り��。
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}出�信�（腕木�）{}動作�通常�信���様����入��コンボ信�を使用�る場��必���り��。
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}コンボ信�（腕木�）{}コンボ信��入�信��出�信��機能を併��も���。
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}パス信� (腕木�) {}パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。標準パス信��信��背��ら通��る�������。
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}一方通行パス信� (腕木�) {}パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。一方通行パス信��信��背��ら通��る�������ん。
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}通常�信�（電��）{}線路上�複数�電車を走行��る場���事故を��る為�信��必���り��。
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}入�信�（電��）{}信��先�区間��る出�信����最低1個����れ����り��。
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}出�信�（電��）{}動作�通常�信���様����入��コンボ信�を使用�る場��必���り��。
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}コンボ信�（電��）{}コンボ信��入�信��出�信��機能を併��も���。
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}パス信� (電��) {} パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。標準パス信��信��背��ら通��る�������。
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}一方通行パス信� (電��) {} パス信���1編�以上�列車�対��列車�安全��止�置���経路を予約��る場��時�信�区間�進入�る事を許����。一方通行パス信��信��背��ら通��る�������ん。
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}信�を交�{}���設置��信�をクリック������択��信��書類�交����。
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}ドラッグ時�信�設置密度
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}ドラッグ時�信�設置密度を減ら�
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}ドラッグ時�信�設置密度を増や�
 ########
 
 ############ on screen keyboard
@@ -3520,36 +3520,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI �設定
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}AI �設定を表示���
 STR_AI_DEBUG                                                    :{WHITE}AI デ�ッグ
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}AI ���
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}AI ���
 STR_AI_DEBUG_RELOAD                                             :{BLACK}AI を�起動
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}AI を�止���スクリプトを読�込ん��AI を�起動���。
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI デ�ッグウインドウ�サー����使用�る�������。
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}AI を�止���スクリプトを読�込ん��AI を�起動���。
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI デ�ッグウインドウ�サー����使用�る�������。
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI �設定
-STR_AI_CHANGE                                                   :{BLACK}AI を�択
-STR_AI_CONFIGURE                                                :{BLACK}設定
-STR_AI_CHANGE_TIP                                               :{BLACK}��� AI を開���
-STR_AI_CONFIGURE_TIP                                            :{BLACK}AI �パラメータを設定���
-STR_AI_LIST_TIP                                                 :{BLACK}次�ゲーム�����使用�る AI を表示���。
+STR_AI_CONFIG_CHANGE                                            :{BLACK}AI を�択
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}設定
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}��� AI を開���
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}AI �パラメータを設定���
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}次�ゲーム�����使用�る AI を表示���。
 STR_AI_LIST_CAPTION                                             :{WHITE}使用�能� AI
-STR_AI_AILIST_TIP                                               :{BLACK}クリック�� AI を�択���。
-STR_AI_ACCEPT                                                   :{BLACK}OK
-STR_AI_ACCEPT_TIP                                               :{BLACK}�択�� AI を使用���。
-STR_AI_CANCEL                                                   :{BLACK}キャンセル
-STR_AI_CANCEL_TIP                                               :{BLACK}AI を変更���ん
-STR_AI_CLOSE                                                    :{BLACK}閉�る
-STR_AI_RESET                                                    :{BLACK}リセット
-STR_AI_HUMAN_PLAYER                                             :人間�プレヤー
-STR_AI_RANDOM_AI                                                :ランダム� AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}クリック�� AI を�択���。
+STR_AI_LIST_ACCEPT                                              :{BLACK}OK
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}�択�� AI を使用���。
+STR_AI_LIST_CANCEL                                              :{BLACK}キャンセル
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}AI を変更���ん
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}閉�る
+STR_AI_SETTINGS_RESET                                           :{BLACK}リセット
+STR_AI_CONFIG_HUMAN_PLAYER                                      :人間�プレヤー
+STR_AI_CONFIG_RANDOM_AI                                         :ランダム� AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI �パラメータ
-STR_AI_AUTHOR                                                   :{BLACK}作�者： {STRING}
-STR_AI_VERSION                                                  :{BLACK}�ージョン： {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}実行中� AI �一��予期���終了����。AI �作者� AI デ�ッグ�ウインドウ�スクリーンショット��む電�メールを��信����。
+STR_AI_LIST_AUTHOR                                              :{BLACK}作�者： {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}�ージョン： {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}実行中� AI �一��予期���終了����。AI �作者� AI デ�ッグ�ウインドウ�スクリーンショット��む電�メールを��信����。
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}市内�雑音制�：{ORANGE}{COMMA}{BLACK} 最大：{ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}発生��雑音：{GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}市内�雑音制�：{ORANGE}{COMMA}{BLACK} 最大：{ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}発生��雑音：{GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3563,21 +3563,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :シナリオ
 STR_CONTENT_TYPE_HEIGHTMAP                                      :�イトマップ
 STR_CONTENT_TITLE                                               :{WHITE}ダウンロード中
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}種類
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}項目�種類
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}項目�種類
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}��
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}項目���
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}項目をキリック��詳��表示���。{}ダウンロード�る���ェックボックスを付���。
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}項目���
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}項目をキリック��詳��表示���。{}ダウンロード�る���ェックボックスを付���。
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}���を�択
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}����項目を�択���。
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}����項目を�択���。
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}アップデートを�択
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}���ダウンロード��項目����アップデートを����択���。
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}���ダウンロード��項目����アップデートを����択���。
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}�択を解除
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}何も�択�����よ�����
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}何も�択�����よ�����
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}フィルタを入力
-STR_CONTENT_FILTER_TIP                                          :{BLACK}フィルタ�キーワードを入力���。
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}フィルタ�キーワードを入力���。
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}タグ����フィルタ：
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}ダウンロード
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}�択��項目�ダウンロードを開始���。
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}�択��項目�ダウンロードを開始���。
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}�計ダウンロードサイズ：{WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}項目�情報
 STR_CONTENT_DETAIL_NAME                                         :{SILVER}項目�：{WHITE}{STRING}
@@ -3601,6 +3601,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}...フã‚
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}ダウンロード��ファイルを開展�る�������ん���
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}オンライン�項目を確�
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}抜���る項目をオンライン�検索
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}抜���る項目�インター�ット�検索���。
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}抜���る項目をオンライン�検索
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}抜���る項目�インター�ット�検索���。
 ########
diff --git a/src/lang/korean.txt b/src/lang/korean.txt
index 648b8f000..e5899bcbf 100644
--- a/src/lang/korean.txt
+++ b/src/lang/korean.txt
@@ -454,11 +454,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}� 화물� 대한 그래프 켜기/�기
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}�세 성취�를 봅니다
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}�세 성취�를 봅니다
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}회사 그래프� 키를 보여�니다.
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}특정 회사� 그래프를 켜거나 숨기려면 �릭하세요
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}특정 회사� 그래프를 켜거나 숨기려면 �릭하세요
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}회사 성취� 순위
@@ -493,16 +493,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}재정:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}대출:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}종합:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}차량� 수를 나타냅니다. ��차, 열차, 선박, 항공기� �함입니다.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}� 역사� 수를 나타냅니다. 한개� 역으로 묶여있다고 해� 모든 역� 부분(기차역, 버스정류장, 항구, 공항)� 개별�으로 셉니다.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}모든 차량� 통틀어 가장 낮� 수입� 가진 열차� ��입니다. (2년 ��� 열차� 한함)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}지난 12분기�안 최소 ��� 달성한 열차가 번 �� 양입니다.
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}지난 12분기�안 최대 ��� 달성한 열차가 번 �� 양입니다.
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}지난 4분기�안 수송한 화물량입니다.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}지난 1분기� 수송한 화물� 종류 수입니다.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}회사가 소지한 재정입니다.
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}회사가 대출해간 재정� 양입니다.
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}산출 가능한 �수들� � 합계 �수입니다.
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}차량� 수를 나타냅니다. ��차, 열차, 선박, 항공기� �함입니다.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}� 역사� 수를 나타냅니다. 한개� 역으로 묶여있다고 해� 모든 역� 부분(기차역, 버스정류장, 항구, 공항)� 개별�으로 셉니다.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}모든 차량� 통틀어 가장 낮� 수입� 가진 열차� ��입니다. (2년 ��� 열차� 한함)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}지난 12분기�안 최소 ��� 달성한 열차가 번 �� 양입니다.
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}지난 12분기�안 최대 ��� 달성한 열차가 번 �� 양입니다.
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}지난 4분기�안 수송한 화물량입니다.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}지난 1분기� 수송한 화물� 종류 수입니다.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}회사가 소지한 재정입니다.
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}회사가 대출해간 재정� 양입니다.
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}산출 가능한 �수들� � 합계 �수입니다.
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}재즈 쥬�박스
@@ -630,8 +630,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  게ì
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}메시지 기�
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}최근 뉴스 메시지� 기�입니다
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}최근 뉴스 메시지� 기�입니다
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}메시지
@@ -852,7 +852,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}사용í•
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}전체화면
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}OpenTTD를 전체화면으로 플레�하려면 �릭하세요
-STR_FULLSCREEN_FAILED                                           :{WHITE}풀스�린 모드 실패
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}풀스�린 모드 실패
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}화면 해��
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}사용하실 화면 해��를 선�하세요
@@ -905,7 +905,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}OpenTTDë
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}치트
-STR_CHEATS_TIP                                                  :{BLACK}체�박스는 �전� 사용한 치트를 나타냅니다.
+STR_CHEATS_TOOLTIP                                              :{BLACK}체�박스는 �전� 사용한 치트를 나타냅니다.
 STR_CHEATS_WARNING                                              :{BLACK}경고! 치트는 경��를 ��는 행위입니다. 치트 기�� 절대로 지워지지 않�� 명심하십시오.
 STR_CHEAT_MONEY                                                 :{LTBLUE}재정� {CURRENCY} 만� �가
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}다� 회사로 플레�중: {ORANGE}{COMMA}
@@ -920,14 +920,14 @@ STR_CHEAT_SETUP_PROD                                            :{LTBLUE}ì‚°ì—…ì
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}새 색�
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}�반 색� 선�
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}열차 색� 선�
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}��차 색� 선�
-STR_LIVERY_SHIP_TIP                                             :{BLACK}선박 색� 선�
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}항공기 색� 선�
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}선�한 색�� 1차 색�으로 선�
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}선�한 색�� 2차 색�으로 선�
-STR_LIVERY_PANEL_TIP                                            :{BLACK}색� 스키마 변경� �하시면 선�하세요. (2개 �� 선�시 CTRL+�릭). 박스를 �릭하여 스키마를 전환합니다.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}�반 색� 선�
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}열차 색� 선�
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}��차 색� 선�
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}선박 색� 선�
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}항공기 색� 선�
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}선�한 색�� 1차 색�으로 선�
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}선�한 색�� 2차 색�으로 선�
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}색� 스키마 변경� �하시면 선�하세요. (2개 �� 선�시 CTRL+�릭). 박스를 �릭하여 스키마를 전환합니다.
 
 STR_LIVERY_DEFAULT                                              :기본 색�
 STR_LIVERY_STEAM                                                :�기 기관차
@@ -965,19 +965,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}여성ì�
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}새 얼굴
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}얼굴� 만듭니다.
 STR_FACE_ADVANCED                                               :{BLACK}고급
-STR_FACE_ADVANCED_TIP                                           :{BLACK}고급 얼굴 선�
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}고급 얼굴 선�
 STR_FACE_SIMPLE                                                 :{BLACK}간단
-STR_FACE_SIMPLE_TIP                                             :{BLACK}간단한 얼굴 선�
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}간단한 얼굴 선�
 STR_FACE_LOAD                                                   :{BLACK}불러오기
-STR_FACE_LOAD_TIP                                               :{BLACK}�겨찾는 얼굴 불러오기
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}�겨찾는 얼굴 불러오기
 STR_FACE_LOAD_DONE                                              :{WHITE}당신� �겨찾는 얼굴� OpenTTD 설정 파�로부터 불러왔습니다.
 STR_FACE_FACECODE                                               :{BLACK}플레�어 얼굴 번호
-STR_FACE_FACECODE_TIP                                           :{BLACK}플레�어 얼굴 번호 보기/설정
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}플레�어 얼굴 번호 보기/설정
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}플레�어 얼굴 번호 보기/설정
 STR_FACE_FACECODE_SET                                           :{WHITE}새 얼굴 번호 코드가 설정�었습니다.
 STR_FACE_FACECODE_ERR                                           :{WHITE}플레�어 얼굴 번호를 설정할 수 없습니다 - 0�서 4,294,967,295 사�� 값� 입력하십시오!
 STR_FACE_SAVE                                                   :{BLACK}저장
-STR_FACE_SAVE_TIP                                               :{BLACK}�겨찾는 얼굴로 저장
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}�겨찾는 얼굴로 저장
 STR_FACE_SAVE_DONE                                              :{WHITE}� 얼굴� OpenTTD 설정 파�� �겨찾는 얼굴로 저장� 것입니다.
 STR_FACE_EUROPEAN                                               :{BLACK}유럽�
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}유럽� 얼굴 선�
@@ -985,49 +985,49 @@ STR_FACE_AFRICAN                                                :{BLACK}��
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}�� 얼굴 선�
 STR_FACE_YES                                                    :예
 STR_FACE_NO                                                     :아니요
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}콧수염�나 귀걸� 착용
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}콧수염�나 귀걸� 착용
 STR_FACE_HAIR                                                   :머리:
-STR_FACE_HAIR_TIP                                               :{BLACK}머리 변경
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}머리 변경
 STR_FACE_EYEBROWS                                               :눈�:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}눈� 변경
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}눈� 변경
 STR_FACE_EYECOLOUR                                              :눈�� 색:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}눈��색 변경
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}눈��색 변경
 STR_FACE_GLASSES                                                :안경:
-STR_FACE_GLASSES_TIP                                            :{BLACK}안경 착용
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}안경 변경
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}안경 착용
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}안경 변경
 STR_FACE_NOSE                                                   :ì½”:
-STR_FACE_NOSE_TIP                                               :{BLACK}코 변경
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}코 변경
 STR_FACE_LIPS                                                   :입술:
 STR_FACE_MOUSTACHE                                              :콧수염:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}입술/콧수염 변경
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}입술/콧수염 변경
 STR_FACE_CHIN                                                   :턱:
-STR_FACE_CHIN_TIP                                               :{BLACK}턱 변경
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}턱 변경
 STR_FACE_JACKET                                                 :�켓:
-STR_FACE_JACKET_TIP                                             :{BLACK}�켓 변경
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}�켓 변경
 STR_FACE_COLLAR                                                 :옷깃:
-STR_FACE_COLLAR_TIP                                             :{BLACK}옷깃 변경
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}옷깃 변경
 STR_FACE_TIE                                                    :넥타�:
 STR_FACE_EARRING                                                :귀걸�:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}넥타�/귀걸� 변경
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}넥타�/귀걸� 변경
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}콘�츠 다운로드
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}종류
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}콘�츠� 종류
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}콘�츠� 종류
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}�름
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}콘�츠� �름
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}항목� �릭하면 �세히 볼 수 있습니다{}다운로드할 항목� 누르세요
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}콘�츠� �름
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}항목� �릭하면 �세히 볼 수 있습니다{}다운로드할 항목� 누르세요
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}모� 선�
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}모든 콘�츠를 선�합니다.
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}모든 콘�츠를 선�합니다.
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}업��트 선�
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}업��트 항목� 있는 컨�츠를 선�합니다.
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}업��트 항목� 있는 컨�츠를 선�합니다.
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}모� 선�해제
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}모든 콘�츠� 선�� 해제합니다.
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}모든 콘�츠� 선�� 해제합니다.
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}검색할 문�를 입력하세요
-STR_CONTENT_FILTER_TIP                                          :{BLACK}검색할 키워드를 입력하세요
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}검색할 키워드를 입력하세요
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}태그/�름 검색:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}다운로드
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}선�한 콘�츠� 다운로드를 시작합니다.
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}선�한 콘�츠� 다운로드를 시작합니다.
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}� 파� �기: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}콘�츠 정보
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}당신� �것� 선�하지 않았습니다
@@ -1064,17 +1064,17 @@ STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}다운ë¡
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} / {BYTES} 다운로드 ({NUM} %)
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}투명 옵션
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}역명� 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}나무 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}집 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}산업시설 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}정거장, 차량기지, 웨���트와 같� 건설 가능한 것들� 대한 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}다리를 투명하게 합니다. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}등대나 안테나 같� 구조물 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}전차선 보�기/숨기기. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}�재 정� 투명 전환. 고정하려면 CTRL+�릭하세요.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}투명� 아니� 아예 안보�게 할 항목� 선�하세요
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}투명 옵션
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}역명� 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}나무 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}집 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}산업시설 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}정거장, 차량기지, 웨���트와 같� 건설 가능한 것들� 대한 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}다리를 투명하게 합니다. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}등대나 안테나 같� 구조물 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}전차선 보�기/숨기기. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}�재 정� 투명 전환. 고정하려면 CTRL+�릭하세요.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}투명� 아니� 아예 안보�게 할 항목� 선�하세요
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}역세권 하���트
@@ -1112,28 +1112,28 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}기차ì—
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}드래그 & 드롭
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}드래그 & 드롭으로 역 건설
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}표시할 역� 종류를 선�합니다
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}건설할 역� 종류를 선�합니다
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}표시할 역� 종류를 선�합니다
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}건설할 역� 종류를 선�합니다
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}신호기 선�
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}�곳� 신호기를 변환할 수 없습니다...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}�색 신호기 (까치발){}가장 기본�� 신호기 형�입니다. 단 한 대� 열차만� � �색 구간� 통과할 수 있습니다.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}입구 신호기 (까치발){}다� �색 구간� 출구 신호기가 하나�� 파란불�면 파란불� �며, 다른 경우�는 빨간불� �니다.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}출구-신호기 (까치발){}�반 신호기와 같� 방법으로 만들�, 입구 & 콤보 신호기와 올바르게 연계�어야 합니다.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}콤보-신호기 (까치발){}콤보-신호기는 입구/출구 신호기� 역할� �시� 합니다. � 신호기는 전면신호기� 거대한 "나뭇가지 구조"를 건설할 수 있게 �와�니다.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}경로 신호기 (까치발){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. 경로 신호기는 반대편�서 통과가 가능합니다.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}�방통행 경로 신호기 (까치발){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. �방통행 신호기는 반대편�서 통과가 불가능합니다.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}�색 신호기 (전��){}가장 기본�� 신호기 형�입니다. 단 한 대� 열차만� � �색 구간� 통과할 수 있습니다.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}입구-신호기 (전��){}다� �색 구간� 출구 신호기가 하나�� 파란불�면 파란불� �며, 다른 경우�는 빨간불� �니다.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}출구-신호기 (전��){}�반 신호기와 같� 방법으로 만들�, 입구 & 콤보 신호기와 올바르게 연계�어야 합니다.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}콤보-신호기 (전��){}콤보-신호기는 입구/출구 신호기� 역할� �시� 합니다. � 신호기는 전면신호기�  거대한 "나뭇가지 구조"를 건설할 수 있게 �와�니다.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}경로 신호기 (전��){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. 경로 신호기는 반대편�서 통과가 가능합니다.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}�방통행 경로 신호기 (전��){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. �방통행 경로 신호기는 반대편�서 통과가 불가능합니다.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}신호기 변환{}선�했� 때, �미 설치한 신호기를 �릭하면 선�한 신호기� 타입과 종류를 변경하게 �고, CTRL+�릭� 존재하는 종류를 토글할 것입니다.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}드래그시 신호기 간격
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}드래그시 신호기 간격 �소
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}드래그시 신호기 �가
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}신호기 선�
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}�곳� 신호기를 변환할 수 없습니다...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}�색 신호기 (까치발){}가장 기본�� 신호기 형�입니다. 단 한 대� 열차만� � �색 구간� 통과할 수 있습니다.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}입구 신호기 (까치발){}다� �색 구간� 출구 신호기가 하나�� 파란불�면 파란불� �며, 다른 경우�는 빨간불� �니다.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}출구-신호기 (까치발){}�반 신호기와 같� 방법으로 만들�, 입구 & 콤보 신호기와 올바르게 연계�어야 합니다.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}콤보-신호기 (까치발){}콤보-신호기는 입구/출구 신호기� 역할� �시� 합니다. � 신호기는 전면신호기� 거대한 "나뭇가지 구조"를 건설할 수 있게 �와�니다.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}경로 신호기 (까치발){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. 경로 신호기는 반대편�서 통과가 가능합니다.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}�방통행 경로 신호기 (까치발){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. �방통행 신호기는 반대편�서 통과가 불가능합니다.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}�색 신호기 (전��){}가장 기본�� 신호기 형�입니다. 단 한 대� 열차만� � �색 구간� 통과할 수 있습니다.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}입구-신호기 (전��){}다� �색 구간� 출구 신호기가 하나�� 파란불�면 파란불� �며, 다른 경우�는 빨간불� �니다.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}출구-신호기 (전��){}�반 신호기와 같� 방법으로 만들�, 입구 & 콤보 신호기와 올바르게 연계�어야 합니다.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}콤보-신호기 (전��){}콤보-신호기는 입구/출구 신호기� 역할� �시� 합니다. � 신호기는 전면신호기�  거대한 "나뭇가지 구조"를 건설할 수 있게 �와�니다.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}경로 신호기 (전��){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. 경로 신호기는 반대편�서 통과가 가능합니다.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}�방통행 경로 신호기 (전��){}경로 신호기는 경로가 겹치지 않는 경우� 한 대 ��� 열차가 한 �색 구간� �시� 들어갈 수 있게 해�니다. �방통행 경로 신호기는 반대편�서 통과가 불가능합니다.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}신호기 변환{}선�했� 때, �미 설치한 신호기를 �릭하면 선�한 신호기� 타입과 종류를 변경하게 �고, CTRL+�릭� 존재하는 종류를 토글할 것입니다.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}드래그시 신호기 간격
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}드래그시 신호기 간격 �소
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}드래그시 신호기 �가
 
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}�로 건설
@@ -1158,9 +1158,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}ì „ì°»ê¸
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}차고 방향
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}차고� 방향� 선�하십시오
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}차고� 방향� 선�하십시오
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}차량기지 방향
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}차량기지� 방향� 선�하세요
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}차량기지� 방향� 선�하세요
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}버스 정류장 방향
@@ -1224,40 +1224,40 @@ STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({1:STATION}�서 온 {0:SHORTCARGO})
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}받�: {WHITE}
 
-STR_NO_WAITING_CARGO                                            :{BLACK}대기 중� 화물� 없습니다.
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}모든 시설 선�
-STR_SELECT_ALL_TYPES                                            :{BLACK}모든 종류� 화물� 선� (대기하지 않는 화물 �함)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}� 차량 타입� 사용할 수 있는 기관차� 목� 보기
-STR_MANAGE_LIST                                                 :{BLACK}관리
-STR_MANAGE_LIST_TIP                                             :{BLACK}� 목�� 있는 모든 열차�게 지시
-STR_REPLACE_VEHICLES                                            :차량 �체
-STR_SEND_FOR_SERVICING                                          :�검하러 보냄
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}대기 중� 화물� 없습니다.
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}모든 시설 선�
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}모든 종류� 화물� 선� (대기하지 않는 화물 �함)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}� 차량 타입� 사용할 수 있는 기관차� 목� 보기
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}관리
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}� 목�� 있는 모든 열차�게 지시
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :차량 �체
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :�검하러 보냄
 
 STR_ERROR_OWNED_BY                                              :{WHITE}... {STRING}� 소유입니다.
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}화물
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}ì •ë³´
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}수용량
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}� 화물량
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}� 열차� � 수용량:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}� 열차� � 수용량:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
-STR_MAPSIZE                                                     :{BLACK}맵 �기:
-STR_BY                                                          :{BLACK}x
+STR_MAPGEN_MAPSIZE                                              :{BLACK}맵 �기:
+STR_MAPGEN_BY                                                   :{BLACK}x
 
 STR_COMPANY_SOMEONE                                             :누군가{SKIP}{SKIP}
 
 STR_ABOUT_OPENTTD                                               :{WHITE}OpenTTD� 대해서
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}정� � 게임� 종료하고 메�으로 ��하시겠습니까?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}게임 그만하기
-STR_SORT_ORDER_TIP                                              :{BLACK}정렬 방법� 선�하십시오 (내림차순/오름차순)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}정렬 기준 선�
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}필터� 기준 선�
-STR_SORT_BY                                                     :{BLACK}ì •ë ¬
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}정렬 방법� 선�하십시오 (내림차순/오름차순)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}정렬 기준 선�
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}필터� 기준 선�
+STR_BUTTON_SORT_BY                                              :{BLACK}ì •ë ¬
 
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}알림
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}{STRING}{G 0 "�" "가"} 보낸 메시지
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}경고!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}경고!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}그렇게 할 수 없습니다....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}� 지역� 파괴할 수 없습니다....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -1265,45 +1265,45 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD 개발팀
 
 STR_QUIT_CAPTION                                                :{WHITE}종료
-STR_YES                                                         :{BLACK}예
-STR_NO                                                          :{BLACK}아니요
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}정� � 게임� �내고 {STRING}{G 0 "으" ""}로 �아가시겠습니까?
+STR_QUIT_YES                                                    :{BLACK}예
+STR_QUIT_NO                                                     :{BLACK}아니요
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}정� � 게임� �내고 {STRING}{G 0 "으" ""}로 �아가시겠습니까?
 
 STR_JUST_NOTHING                                                :없�
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}게임� 차량� 너무 많습니다!
 STR_BUTTON_LOCATION                                             :{BLACK}위치
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}기본값
-STR_QUERY_CANCEL                                                :{BLACK}취소
-STR_QUERY_OK                                                    :{BLACK}확�
-STR_QUERY_RENAME                                                :{BLACK}�름 바꾸기
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}기본값
+STR_BUTTON_CANCEL                                               :{BLACK}취소
+STR_BUTTON_OK                                                   :{BLACK}확�
+STR_BUTTON_RENAME                                               :{BLACK}�름 바꾸기
 
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}�검 기간 간격� 바꿀 수 없습니다...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}창 닫기
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}창 제목 - 창� 움��려면 여기를 드래그하세요
-STR_STICKY_BUTTON                                               :{BLACK}� 창� '모든 창 닫기' 키로 닫� 수 없게 하기
-STR_RESIZE_BUTTON                                               :{BLACK}� 창� �기를 조절하려면 여기를 �릭하고 드래그하세요
+STR_TOOLTIP_STICKY                                              :{BLACK}� 창� '모든 창 닫기' 키로 닫� 수 없게 하기
+STR_TOOLTIP_RESIZE                                              :{BLACK}� 창� �기를 조절하려면 여기를 �릭하고 드래그하세요
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}기본 저장/불러오기 ��로 ��하려면 여기를 �릭하세요
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}사�형 모양� 땅� 있는 건물과 땅 등� 부숩니다.
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}땅� 모��를 낮춥니다.
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}땅� 모��를 높입니다.
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}땅� 모��를 낮춥니다.
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}땅� 모��를 높입니다.
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}스�롤바 - 목�� �/하로 스�롤하세요
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}스�롤바 - 목�� 좌/우로 스�롤하세요
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}올해 수입: {CURRENCY} (작년: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA}ë…„ ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA}ë…„ ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA}ë…„ ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA}ë…„ ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :{G=f}ì—´ì°¨
-STR_VEHICLE_ROAD_VEHICLE                                        :{G=f}��차
-STR_VEHICLE_SHIP                                                :{G=m}ì„ ë°•
-STR_VEHICLE_AIRCRAFT                                            :{G=f}항공기
+STR_REPLACE_VEHICLE_TRAIN                                       :{G=f}ì—´ì°¨
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :{G=f}��차
+STR_REPLACE_VEHICLE_SHIP                                        :{G=m}ì„ ë°•
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :{G=f}항공기
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}� 지역� 지형 정보
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}초기화 가격: {LTBLUE}없�
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}초기화 가격: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}제거시 들어오는 환불금: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}제거시 들어오는 환불금: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :없�
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}소유주: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}�로 소유주: {LTBLUE}{STRING}
@@ -1312,11 +1312,11 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}ì² ë�„ ì
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}지역 당국: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :없�
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}�름
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}화물 �수: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}산업시설/�시가 있는 곳으로 ��하려면 �릭
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}산업시설/�시가 있는 곳으로 ��하려면 �릭
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...�전� 목�지로부터 너무 멉니다
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
@@ -1327,7 +1327,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}지형 í
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}무작위로 지형 만들기
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}지형만 남기기
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}플레�어 소유물 제거
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}맵�서 모든 플레�어 소유� �산� 제거
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}맵�서 모든 플레�어 소유� �산� 제거
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}� 작업� 기본 지형(�시 �함) �외� 모든 플레�어� 소유물(철�,�로 등)� 제거할 것입니다. 계�하시겠습니까?
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}�시 만들기
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}새 �시
@@ -1337,11 +1337,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...맵 ê
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...다른 �시와 너무 가�습니다!
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...알맞지 않� 장소입니다!
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...�시가 너무 많습니다!
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�시를 만들 수 없습니다!
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...맵� ��� 공간� 없습니다!
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�시를 만들 수 없습니다!
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...맵� ��� 공간� 없습니다!
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}�시 �기 키우기
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}확장하기
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}�시가 �로를 짓지 않� 것입니다. [고급설정->경제->�시]�서 �로를 지� 수 있�� 설정� 변경하실 수 있습니다.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}�시가 �로를 짓지 않� 것입니다. [고급설정->경제->�시]�서 �로를 지� 수 있�� 설정� 변경하실 수 있습니다.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}무작위 �시 건설
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}무작위로 �시를 건설합니다.
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}여기� {STRING}{G 0 "�" "를"} 건설할 수 없습니다...
@@ -1355,20 +1355,20 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}ì•”ì„� ì
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}등대를 놓습니다.
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}송신기를 놓습니다.
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}사막 지역� 지정합니다.{}CTRL키를 누른채로 지우십시오.
-STR_CREATE_LAKE                                                 :{BLACK}벽으로 물� 막고 있는 운하를 만듭니다.{}가장 낮� 곳�서 CTRL� 누르면 (벽 없�) 물� �성하여 주변� 물로 채�니다.
-STR_CREATE_RIVER                                                :{BLACK}강� 만듦.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}벽으로 물� 막고 있는 운하를 만듭니다.{}가장 낮� 곳�서 CTRL� 누르면 (벽 없�) 물� �성하여 주변� 물로 채�니다.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}강� 만듦.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}삭제
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}� �시를 완전히 삭제
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :시나리오 저장
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :시나리오 불러오기
-STR_MENU_LOAD_HEIGHTMAP                                         :Heightmap 불러오기
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Heightmap 불러오기
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :�디터 종료
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :게임 종료
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}시나리오 저장, 불러오기, �디터 종료, 게임 종료 등
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}시나리오 불러오기
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}시나리오 저장하기
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}정� � 시나리오를 종료하시겠습니까?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}정� � 시나리오를 종료하시겠습니까?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...�구 1200명 ��� �시�만 건설할 수 있습니다!
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}시작년�를 1년 앞당�니다.
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}시작년�를 1년 늦춥니다.
@@ -1376,19 +1376,19 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...다ë¦
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}소형
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}중형
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}대형
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}임�
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}임�
 STR_FOUND_TOWN_CITY                                             :{BLACK}대�시로 만듦
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}대�시는 �시보다 빠르게 성장합니다.{}�시를 만들었� 때, 위 설정� 따� �욱 커집니다.
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}�시 �기 선�
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}�시 �기:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}�시 �로 설계:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}� �시� 사용할 �로 설계를 선�합니다
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}오리지�
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}개선� �로
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 칸
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 칸
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}임�
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}�시 �로 설계:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}� �시� 사용할 �로 설계를 선�합니다
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}오리지�
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}개선� �로
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 칸
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 칸
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}임�
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}새 산업시설 건설
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...열대우림 지역�만 건설할 수 있습니다!
@@ -1397,15 +1397,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...사ë§
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}스�린 샷� 다�과 같� 저장�었습니다 : '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}스�린 샷� �지 못했습니다!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}나중� 그 땅� 사용하기 위해 소유권� 사 놓습니다
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}저장중입니다,{}�날때까지 기다려주세요
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}나중� 그 땅� 사용하기 위해 소유권� 사 놓습니다
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}저장중입니다,{}�날때까지 기다려주세요
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}�� 저장 실패
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}�� 저장 실패
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}{STATION}{G 0 "으" ""}로 향하는 중
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}{STATION}{G 0 "으" ""}로 향하는 중 ({VELOCITY})
-STR_NO_ORDERS                                                   :{LTBLUE}경로 없�
-STR_NO_ORDERS_VEL                                               :{LTBLUE}경로 없� ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}{STATION}{G 0 "으" ""}로 향하는 중
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}{STATION}{G 0 "으" ""}로 향하는 중 ({VELOCITY})
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}경로 없�
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}경로 없� ({VELOCITY})
 
 STR_PASSENGERS                                                  :{G=m}승�
 STR_BAGS                                                        :{G=f}�루
@@ -1416,9 +1416,9 @@ STR_CRATES                                                      :{G=f}��
 STR_RES_OTHER                                                   :{G=f}기타
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}경로를 공유할 수 없습니다...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}경로를 복사할 수 없습니다...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 공유� 경로� � - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}경로를 공유할 수 없습니다...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}경로를 복사할 수 없습니다...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - 공유� 경로� � - -
 
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE}{P "가" "�"} �체�지 너무 오래�었습니다
 STR_ERROR_AUTOREPLACE_NOTHING_TO_DO                             :{WHITE}���체/갱신 규칙� �용�지 않았습니다.
@@ -1671,170 +1671,170 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}맵�
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :사용불가
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}설정값 변경
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}설정값 변경
 
-STR_TEMPERATE_LANDSCAPE                                         :온대 기후
-STR_SUB_ARCTIC_LANDSCAPE                                        :냉대 기후
-STR_SUB_TROPICAL_LANDSCAPE                                      :아열대 기후
-STR_TOYLAND_LANDSCAPE                                           :장난� 나�
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :온대 기후
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :냉대 기후
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :아열대 기후
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :장난� 나�
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}{WAYPOINT}{G 0 "으" ""}로 향하는 중
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}{WAYPOINT}{G 0 "으" ""}로 향하는 중, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}{WAYPOINT}{G 0 "으" ""}로 향하는 중
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}{WAYPOINT}{G 0 "으" ""}로 향하는 중, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :완행 경유 {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :�행 경유 {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :완행 경유 {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :�행 경유 {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :웨���트 {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :웨���트 {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} 부�
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} 부� #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :웨���트
+STR_FORMAT_WAYPOINT_NAME                                        :웨���트 {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :웨���트 {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} 부�
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} 부� #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :웨���트
 
-STR_WAYPOINT                                                    :{WHITE}웨���트
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}웨���트 종류 설정
+STR_WAYPOINT_CAPTION                                            :{WHITE}웨���트
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}웨���트 종류 설정
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}웨���트 �름 설정
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}웨���트 �름� 변경할 수 없습니다...
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}여기� 웨���트를 건설할 수 없습니다.
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}� 웨���트를 제거할 수 없습니다.
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}웨���트 �름� 변경할 수 없습니다...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}여기� 웨���트를 건설할 수 없습니다.
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}� 웨���트를 제거할 수 없습니다.
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...시나리오� �시가 없습니다.
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}맵 �성� 중지�었습니다...{}...�시 위치가 부�절합니다
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...시나리오� �시가 없습니다.
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}맵 �성� 중지�었습니다...{}...�시 위치가 부�절합니다
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}�시 여러개를 무작위 건설
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}무작위로 �시를 건설합니다.
-STR_MANY_RANDOM_INDUSTRIES                                      :무작위 산업시설 건설
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}무작위로 산업시설� 건설합니다.
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}산업시설� 만들 수 없습니다...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}�시 여러개를 무작위 건설
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}무작위로 �시를 건설합니다.
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :무작위 산업시설 건설
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}무작위로 산업시설� 건설합니다.
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}산업시설� 만들 수 없습니다...
 
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}지�편집
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}땅� ��하게 고릅니다.
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}땅� ��하게 고릅니다.
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}무작위 나무
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}나무를 무작위로 심습니다.
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}나무를 무작위로 심습니다.
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}여기� 운하를 건설할 수 없습니다...
-STR_LANDINFO_CANAL                                              :운하
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}여기� 운하를 건설할 수 없습니다...
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :운하
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}여기� 갑문� 지� 수 없습니다...
-STR_LANDINFO_LOCK                                               :갑문
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}여기� 갑문� 지� 수 없습니다...
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :갑문
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}여기� 강� 만들 수 없습니다...
-STR_LANDINFO_RIVER                                              :ê°•
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}여기� 강� 만들 수 없습니다...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :ê°•
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...사용중� 부�입니다!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...사용중� 부�입니다!
 
-STR_LANDINFO_COORDS                                             :{BLACK}좌표: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}좌표: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}역� �부를 제거할 수 없습니다...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}�곳� 철로 형�� 바꿀 수 없습니다...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}역� �부를 제거할 수 없습니다...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}�곳� 철로 형�� 바꿀 수 없습니다...
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}열차 전체를 팔려면 기관차를 여기로 드래그하세요
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}열차 전체를 팔려면 기관차를 여기로 드래그하세요
 
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}모� 사용 안함
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}모� 사용
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}모� 사용 안함
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}모� 사용
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}산업시설
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% 운반�)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}%가 �� 운반�)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}산업시설 �름 - 산업시설� 가운�� 보려면 �릭하세요
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}산업시설
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% 운반�)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}%가 �� 운반�)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}산업시설 �름 - 산업시설� 가운�� 보려면 �릭하세요
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...다른 산업시설과 너무 가�습니다.
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...다른 산업시설과 너무 가�습니다.
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}�산량 변경
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}멀티 플레�
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}플레�어 �름:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}다른 사람들�게 보여줄 당신� �름입니다.
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}�름� 입력하세요
-STR_NETWORK_CONNECTION                                          :{BLACK}접�방법:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}�터넷/네트워� 게임중� 하나를 선�하세요.
-
-STR_NETWORK_START_SERVER                                        :{BLACK}서버 열기
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}당신� 서버가 �어 게임� 진행합니다.
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}�름
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}게임 �름
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}언어, 서버 버전 등
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}선�하려면 목��서 게임� �릭하세요
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}최근� 접�한 서버:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}최근� 플레�한 서버를 선�하려면 �릭하세요
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}서버 검색
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}서버를 네트워��서 검색합니다
-STR_NETWORK_ADD_SERVER                                          :{BLACK}서버 추가
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}(게임� 실행�는 �안 항� 체��) 서버를 목�� 추가합니다.
-STR_NETWORK_ENTER_IP                                            :{BLACK}호스트(IP) 주소 입력
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}���언트
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}���언트 온�� / 최대 접��수{}회사 온�� / 최대 회사수
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}맵 �기
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}게임� 맵 사�즈{}�기별로 정렬하려면 �릭
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}날짜
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}현재 날짜
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}진행 년�
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}게임� 진행� 년� 수
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}게임 정보
-STR_NETWORK_CLIENTS                                             :{SILVER}���언트: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}언어: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}기후: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}맵 �기: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}서버 버전: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}서버 주소: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}시작 날짜: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}현재 날짜: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}암호가 걸려있습니다!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}서버 오프��
-STR_NETWORK_SERVER_FULL                                         :{SILVER}서버가 꽉 참
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}버전 다름
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NewGRF 다름
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}게임 참여
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}새로운 멀티플레� 게임� 시작
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}게임 제목:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}멀티플레� 게임 선� 메뉴�서 보여질 게임 제목입니다.
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}네트워� 게임�서 사용할 �름� 입력하세요
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}암호 설정
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}�유로운 접근� 막고 싶� 때 암호를 설정할 수 있습니다
-STR_NETWORK_SELECT_MAP                                          :{BLACK}맵 선�:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}어떤 맵� 선�하시겠습니까?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :�터넷
-STR_NETWORK_LAN_INTERNET                                        :LAN / �터넷
-STR_NETWORK_INTERNET_ADVERTISE                                  :�터넷 (광고 허용)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM}명
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}최대 접�� 수:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}최대 접��수를 선�합니다. 모든 슬롯� 차있� 필요는 없습니다.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}개
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}최대 회사수:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}서버� 회사� 수를 제한합니다
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}명
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}최대 관전�수:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}게임� 관전하는 접��� 수를 제한합니다
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}대화 언어:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}서버�서 주로 사용하는 언어를 고르십시오.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}서버 열기
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}무작위 맵�나 시나리오로 새로운 네트워� 게임� 시작합니다.
-STR_NETWORK_LOAD_GAME                                           :{BLACK}맵 불러오기
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}�미 저장� 멀티플레� 게임� 불러옵니다 (올바른 플레�어로 연결하시기 바�니다)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}멀티 플레�
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}플레�어 �름:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}다른 사람들�게 보여줄 당신� �름입니다.
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}�름� 입력하세요
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}접�방법:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}�터넷/네트워� 게임중� 하나를 선�하세요.
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}서버 열기
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}당신� 서버가 �어 게임� 진행합니다.
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}�름
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}게임 �름
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}언어, 서버 버전 등
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}선�하려면 목��서 게임� �릭하세요
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}최근� 접�한 서버:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}호스트(IP) 주소 입력
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}���언트
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}���언트 온�� / 최대 접��수{}회사 온�� / 최대 회사수
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}맵 �기
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}게임� 맵 사�즈{}�기별로 정렬하려면 �릭
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}날짜
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}현재 날짜
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}진행 년�
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}게임� 진행� 년� 수
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}게임 정보
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}���언트: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}언어: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}기후: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}맵 �기: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}서버 버전: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}서버 주소: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}시작 날짜: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}현재 날짜: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}암호가 걸려있습니다!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}서버 오프��
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}서버가 꽉 참
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}버전 다름
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NewGRF 다름
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}게임 참여
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}새로운 멀티플레� 게임� 시작
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}게임 제목:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}멀티플레� 게임 선� 메뉴�서 보여질 게임 제목입니다.
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}네트워� 게임�서 사용할 �름� 입력하세요
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}암호 설정
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}�유로운 접근� 막고 싶� 때 암호를 설정할 수 있습니다
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}맵 선�:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}어떤 맵� 선�하시겠습니까?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :�터넷
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / �터넷
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :�터넷 (광고 허용)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM}명
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}최대 접�� 수:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}최대 접��수를 선�합니다. 모든 슬롯� 차있� 필요는 없습니다.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}개
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}최대 회사수:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}서버� 회사� 수를 제한합니다
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}명
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}최대 관전�수:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}게임� 관전하는 접��� 수를 제한합니다
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}대화 언어:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}서버�서 주로 사용하는 언어를 고르십시오.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}서버 열기
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}무작위 맵�나 시나리오로 새로운 네트워� 게임� 시작합니다.
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}맵 불러오기
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}�미 저장� 멀티플레� 게임� 불러옵니다 (올바른 플레�어로 연결하시기 바�니다)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :모든 언어
@@ -1875,33 +1875,33 @@ STR_NETWORK_LANG_GREEK                                          :그리스
 STR_NETWORK_LANG_LATVIAN                                        :�트비아
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}멀티플레� 준비
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}멀티플레� 준비
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}참가 준비중: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}� 게임� 있는 회사� 목�입니다. 다른 회사� 같� 참가하거나 (빈 슬롯� 있� 경우) 새로운 회사로 시작할 수 있습니다.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}새 회사
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}새 회사를 만듭니다
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}게임 관전
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}게임� 참여하지 않고 보기만 합니다.
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}회사 참여
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}� 회사를 �와 플레�합니다.
-STR_NETWORK_REFRESH                                             :{BLACK}새로고침
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}서버 정보를 새로 고칩니다.
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}참가 준비중: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}� 게임� 있는 회사� 목�입니다. 다른 회사� 같� 참가하거나 (빈 슬롯� 있� 경우) 새로운 회사로 시작할 수 있습니다.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}새 회사
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}새 회사를 만듭니다
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}게임 관전
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}게임� 참여하지 않고 보기만 합니다.
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}회사 참여
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}� 회사를 �와 플레�합니다.
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}새로고침
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}서버 정보를 새로 고칩니다.
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}회사 정보
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}회사 정보
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}회사 �름: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}설립: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}회사가치: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}재정 수�: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}작년 수�: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}��먼스: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}회사 �름: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}설립: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}회사가치: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}재정 수�: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}작년 수�: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}��먼스: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}차량: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}ì—­: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}플레�어: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}차량: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}ì—­: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}플레�어: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}접�중...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}접�중...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) 접�중입니다..
@@ -1917,49 +1917,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}회사 ì
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM}명� 접��가 먼저 기다리고 있습니다
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} 다운로드
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}접� �기
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}접� �기
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}송금하고 싶� 양� 입력하세요.
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}서버 암호가 걸려있습니다. 암호를 입력하세요.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}회사 암호가 걸려있습니다. 암호를 입력하세요.
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}접�� 목�
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}접�� 목�
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}관전
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}새 회사
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} 네트워� 장치를 찾�수 없거나 컴파��지 않았습니다.
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} 네트워� 게임� 존재하지 않습니다.
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} 서버가 요청� 받지 않습니다.
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} NewGRF� 맞지 않아서 연결할 수 없습니다
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} 네트워� 게임 �기화 실패
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} 네트워� 게임 연결 �실
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} 세�브 게임� 불러올 수 없습니다
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} 서버를 시작할 수 없습니다
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} 접�할 수 없습니다
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} 연결 #{NUM}가 시간초과�었습니다.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} 프로토콜 오류가 발��어 연결� �어졌습니다
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} � 접��� �정내용� 서버� 것과 �치하지 않습니다.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} 잘못� 암호입니다
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} 서버가 가� 찼습니다.
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} 당신� 서버�서 �구 접� 차단�었습니다.
-STR_NETWORK_ERR_KICKED                                          :{WHITE} 당신� 서버�서 강제 추방 �었습니다.
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} � 서버�서 치트를 사용할 수 없습니다!
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} 네트워� 장치를 찾�수 없거나 컴파��지 않았습니다.
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} 네트워� 게임� 존재하지 않습니다.
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} 서버가 요청� 받지 않습니다.
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} NewGRF� 맞지 않아서 연결할 수 없습니다
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} 네트워� 게임 �기화 실패
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} 네트워� 게임 연결 �실
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} 세�브 게임� 불러올 수 없습니다
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} 서버를 시작할 수 없습니다
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} 접�할 수 없습니다
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} 연결 #{NUM}가 시간초과�었습니다.
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} 프로토콜 오류가 발��어 연결� �어졌습니다
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} � 접��� �정내용� 서버� 것과 �치하지 않습니다.
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} 잘못� 암호입니다
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} 서버가 가� 찼습니다.
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} 당신� 서버�서 �구 접� 차단�었습니다.
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} 당신� 서버�서 강제 추방 �었습니다.
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} � 서버�서 치트를 사용할 수 없습니다!
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :�반 오류
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :비�기화 오류
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :맵 불러오기 실패
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :연결 �실
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :프로토콜 오류
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF 안맞�
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :권한 없�
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :�� 패킷 수신
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :잘못� 버전
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :�미 사용중� �름
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :잘못� 암호
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :DoCommand�서� 잘못� 회사 번호
-STR_NETWORK_ERR_CLIENT_KICKED                                   :강제추방
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :치트 사용 시�
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :서버 꽉참
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :�반 오류
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :비�기화 오류
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :맵 불러오기 실패
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :연결 �실
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :프로토콜 오류
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF 안맞�
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :권한 없�
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :�� 패킷 수신
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :잘못� 버전
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :�미 사용중� �름
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :잘못� 암호
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :DoCommand�서� 잘못� 회사 번호
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :강제추방
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :치트 사용 시�
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :서버 꽉참
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1969,15 +1969,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :게임 ì�¼ì‹œì 
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :게임 재개� (���언트 연결�)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :게임 재개� (���언트가 연결� 실패했습니다)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :떠남
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING}님� 게임� 참여했습니다
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING}님� 회사 #{2:NUM}� 참가하셨습니다
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING}님� 관전� 시작하셨습니다
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING}님� 새 회사 #{2:NUM}� 창업하셨습니다
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING}님� 게임�서 나갔습니다 ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} 가 �름� {STRING}으로 바꿨습니다
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} 가 당신� 회사�게 {2:CURRENCY}를 송금하였습니다
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** 당신�  {1:STRING} �게 {2:CURRENCY}를 송금하였습니다
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :떠남
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING}님� 게임� 참여했습니다
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING}님� 회사 #{2:NUM}� 참가하셨습니다
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING}님� 관전� 시작하셨습니다
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING}님� 새 회사 #{2:NUM}� 창업하셨습니다
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING}님� 게임�서 나갔습니다 ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} 가 �름� {STRING}으로 바꿨습니다
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} 가 당신� 회사�게 {2:CURRENCY}를 송금하였습니다
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** 당신�  {1:STRING} �게 {2:CURRENCY}를 송금하였습니다
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[팀] :
 STR_NETWORK_CHAT_COMPANY                                        :[팀] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[팀] {STRING}�게: {WHITE}{STRING}
@@ -1987,8 +1987,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[귓��] {ST
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[모�] :
 STR_NETWORK_CHAT_ALL                                            :[모�] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}네트워� 채팅� 위한 �스트를 입력하세요
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} 서버가 세션� 종료하였습니다
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} 서버 재가�중...{}기다려주세요...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} 서버가 세션� 종료하였습니다
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} 서버 재가�중...{}기다려주세요...
 
 STR_NETWORK_SERVER                                              :서버
 STR_NETWORK_CLIENT                                              :접��
@@ -2002,19 +2002,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :우리 회사ì—
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :귓��하기
 
 
-STR_NETWORK_SEND                                                :{BLACK}보내기
+STR_NETWORK_CHAT_SEND                                           :{BLACK}보내기
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}PNG파�로부터 지형� 불러올 수 없습니다...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...파�� 없습니다.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...�미지 타입� 변경할 수 없습니다. 8 �는 24-bit� PNG �미지가 필요합니다.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...뭔가 잘못�었습니다. 죄송합니다. (��� 파�로 추정�)
+STR_ERROR_PNGMAP                                                :{WHITE}PNG파�로부터 지형� 불러올 수 없습니다...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...파�� 없습니다.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...�미지 타입� 변경할 수 없습니다. 8 �는 24-bit� PNG �미지가 필요합니다.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...뭔가 잘못�었습니다. 죄송합니다. (��� 파�로 추정�)
 
-STR_BMPMAP_ERROR                                                :{WHITE}BMP파�로부터 지형� 불러올 수 없습니다...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...�미지 타입� 변경할 수 없습니다.
+STR_ERROR_BMPMAP                                                :{WHITE}BMP파�로부터 지형� 불러올 수 없습니다...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...�미지 타입� 변경할 수 없습니다.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}가격: {CURRENCY}
@@ -2028,13 +2028,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}예ìƒ� ì
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}�곳� 땅� 올릴 수 없습니다...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}�곳� 땅� 내릴 수 없습니다...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}� 땅� 높�를 조절할 수 없습니다...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :암�
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :거친 땅
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :맨 땅
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :초�
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :들�
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :눈�� 땅
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :사막
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :암�
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :거친 땅
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :맨 땅
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :초�
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :들�
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :눈�� 땅
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :사막
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}잘못� 방향으로 땅� 기울어졌습니다
@@ -2042,11 +2042,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}불가ëŠ
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}터� 때문� 지형� 편집할 수 없습니다.
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}�미 해수면� �달했습니다
 STR_ERROR_TOO_HIGH                                              :{WHITE}너무 높습니다!
-STR_ALREADY_LEVELLED                                            :{WHITE}... �미 ��합니다.
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... �미 ��합니다.
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}알맞지 않� 철로입니다.
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...�미 지어져있습니다
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}철로를 먼저 제거하십시오
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}�로가 �방통행�거나 막혔습니다
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}�로가 �방통행�거나 막혔습니다
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}철� 건설
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}전기철� 건설
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}모노레� 건설
@@ -2058,43 +2058,43 @@ STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}여기ì—
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}여기� 철로를 건설할 수 없습니다...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}�곳� 철로를 제거할 수 없습니다...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}�곳� 신호기를 제거할 수 없습니다...
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}다리 건설 - �하는 다리 종류를 선�하세요
-STR_RAILROAD_TRACK                                              :철로
-STR_RAILROAD_TRAIN_DEPOT                                        :철� 차량기지
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}다리 건설 - �하는 다리 종류를 선�하세요
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :철로
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :철� 차량기지
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...다른 회사� 소유지입니다!
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :�반 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :프리 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :출구 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :콤보 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :�방통행 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :�반 신호등과 프리 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :�반 신호등과 출구 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :�반, 콤보 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :�반 � 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :�반 � �방통행 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :프리 신호등과 출구 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :프리, 콤보 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :프리 � 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :프리 � �방통행 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :출구, 콤보 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :출구 � 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :출구 � �방통행 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :콤보 � 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :콤보 � �방통행 경로 신호기가 있는 철로
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :경로 � �방통행 경로 신호기가 있는 철로
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}먼저 기차 정거장� 제거해야 합니다
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}철� 웨���트를 먼저 제거하십시오
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}분리� 역� 새로 만들기
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}분리� 웨���트를 새로 만들기
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}같� �름으로 정거장 만들기
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}연결할 웨���트
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :�반 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :프리 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :출구 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :콤보 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :�방통행 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :�반 신호등과 프리 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :�반 신호등과 출구 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :�반, 콤보 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :�반 � 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :�반 � �방통행 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :프리 신호등과 출구 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :프리, 콤보 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :프리 � 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :프리 � �방통행 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :출구, 콤보 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :출구 � 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :출구 � �방통행 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :콤보 � 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :콤보 � �방통행 경로 신호기가 있는 철로
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :경로 � �방통행 경로 신호기가 있는 철로
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}먼저 기차 정거장� 제거해야 합니다
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}철� 웨���트를 먼저 제거하십시오
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}분리� 역� 새로 만들기
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}분리� 웨���트를 새로 만들기
+STR_JOIN_STATION_CAPTION                                        :{BLACK}같� �름으로 정거장 만들기
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}연결할 웨���트
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}�로를 먼저 제거하십시오
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}�로 작업� 진행중입니다
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}�로 작업� 진행중입니다
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}다리 종류를 선�하십시오
 STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... �방통행 �로는 �차로를 만들 수 없습니다
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}�로를 건설할 수 없습니다...
@@ -2107,12 +2107,12 @@ STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}버스 ì
 STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}트럭 �하장� 지� 수 없습니다...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}여기� 승� 전차 정거장� 건설할 수 없습니다...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}여기� 화물 전차 정거장� 건설할 수 없습니다...
-STR_ROAD_DESCRIPTION_ROAD                                       :�로
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :가로등� 있는 �로
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :가로수가 있는 �로
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :차고
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :철� 건�목
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :전찻길
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :�로
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :가로등� 있는 �로
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :가로수가 있는 �로
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :차고
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :철� 건�목
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :전찻길
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}버스정류장� 제거할 수 없습니다...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}트럭 터미�� 제거할 수 없습니다...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}승� 전차 정거장� 제거할 수 없습니다...
@@ -2120,12 +2120,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}화물 ì
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}�시 목�
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}건물� 먼저 제거하십시오!
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (대�시)
@@ -2138,9 +2138,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}ì�´ ë�„ì
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}�시 �름 변경
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}지난달 승�수: {ORANGE}{COMMA}{BLACK}  최고: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}지난달 우편수: {ORANGE}{COMMA}{BLACK}  최고: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}�시가 성장하기 위해 필요한 화물:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK}{G 0 "�" "가"} 필요함
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK}{G 0 "�" "가"} 지난달� 수송�
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}�시가 성장하기 위해 필요한 화물:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK}{G 0 "�" "가"} 필요함
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK}{G 0 "�" "가"} 지난달� 수송�
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :고층 사무 구�
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :사무 구�
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :소규모� �지 구�
@@ -2170,7 +2170,7 @@ STR_SUBSIDIES_NONE                                              :{ORANGE}없�
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}�미 지급� 보조금:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{1:STATION}�서 {2:STATION}까지 {0:STRING} 수송{YELLOW} ({3:COMPANY}{YELLOW}, {DATE_SHORT}까지)
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} 지역당국� � �시� 다른 공항� 들어서는 것� 거부합니다!
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} 지역 당국� 소� 문제로 �해 공항 건설� 거부하였습니다
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} 지역 당국� 소� 문제로 �해 공항 건설� 거부하였습니다
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :아담한 집
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :집
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :�지
@@ -2204,7 +2204,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{WHITE}{STRING}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{WHITE}{STRING}{}{YELLOW} 1년간� 수송 권한 ��권� 구입합니다. �시 당국� 오� 당신 회사� 역�만 승�과 화물� 허용할 것입니다.{}가격: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}{}{YELLOW} 성취�를 올리기 위해 처벌� �수하고 지역 당국� 뇌물� �니다.{}가격: {CURRENCY}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (공사중)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (공사중)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :�글루
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :천막
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :찻잔 집
@@ -2214,17 +2214,17 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :ë�¼ì§€ 저금í†
 STR_PLANT_TREE_CAPTION                                          :{WHITE}나무
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...�미 나무가 심어져 있습니다.
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}여기� 나무를 심� 수 없습니다...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...팻� 수가 너무 많습니다
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}여기� 팻�� 달 수 없습니다...
-STR_SIGN_DEFAULT                                                :팻�
+STR_DEFAULT_SIGN_NAME                                           :팻�
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}팻� 내용 고치기
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}팻� 내용� 고칠 수 없습니다...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}팻�� 삭제할 수 없습니다...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}심� 나무� 종류 선�
-STR_TREE_NAME_TREES                                             :나무
-STR_TREE_NAME_RAINFOREST                                        :열대우림
-STR_TREE_NAME_CACTUS_PLANTS                                     :선�장
+STR_LAI_TREE_NAME_TREES                                         :나무
+STR_LAI_TREE_NAME_RAINFOREST                                    :열대우림
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :선�장
 
 ##id 0x3000
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}다른 기차역과 너무 가�습니다!
@@ -2241,7 +2241,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}기차ì—
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}다른 공항과 너무 가�습니다!
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}공항� 먼저 제거하십시오!
 
-STR_QUERY_RENAME_STATION_CAPTION                                :역 �름 변경
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :역 �름 변경
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}역 �름� 바꿀 수 없습니다...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}등급
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}받�
@@ -2259,10 +2259,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :매우 훌륭í•
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}� 역� 거�가는 모든 열차를 표시합니다
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}� 역� 거�가는 모든 ��차를 표시합니다
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}� 역� 거�가는 모든 항공기를 표시합니다
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}� 역� 거�가는 모든 선박� 표시합니다
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}� 역� 거�가는 모든 열차를 표시합니다
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}� 역� 거�가는 모든 ��차를 표시합니다
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}� 역� 거�가는 모든 항공기를 표시합니다
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}� 역� 거�가는 모든 선박� 표시합니다
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}버스 정류장� 먼저 제거하십시오.
@@ -2283,41 +2283,41 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}ì—­ ì�´ë
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}받는 화물� 목� 표시
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}역 �름 - � 역� 있는 곳으로 ��하려면 �릭하세요
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}공항� �기/종류를 선�합니다.
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :철�역
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :항공기 격납고
-STR_STATION_DESCRIPTION_AIRPORT                                 :공항
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :트럭 �하장
-STR_STATION_DESCRIPTION_BUS_STATION                             :버스 정류장
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :항구
-STR_STATION_DESCRIPTION_BUOY                                    :부�
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :철�역
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :항공기 격납고
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :공항
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :트럭 �하장
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :버스 정류장
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :항구
+STR_LAI_STATION_DESCRIPTION_BUOY                                :부�
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...�중� 부�가 있습니다.
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...역� 너무 �니다.
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...역� 결합할 수 없습니다! (패치 구성 참고)
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}1개 ��� 아�템� 선�하려면 CTRL키를 누르고 계십시오.
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...역� 결합할 수 없습니다! (패치 구성 참고)
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}1개 ��� 아�템� 선�하려면 CTRL키를 누르고 계십시오.
 
 STR_UNDEFINED                                                   :(정��지 않� 문�열)
-STR_STAT_CLASS_DFLT                                             :기본 역사
-STR_STAT_CLASS_WAYP                                             :웨���트
+STR_STATION_CLASS_DFLT                                          :기본 역사
+STR_STATION_CLASS_WAYP                                          :웨���트
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...물 위� 지어져야 합니다!
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}여기� 정박소를 지� 수 없습니다...
-STR_WATER_DESCRIPTION_WATER                                     :물
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :해안 �는 강기슭
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :정박소
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :수��
+STR_LAI_WATER_DESCRIPTION_WATER                                 :물
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :해안 �는 강기슭
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :정박소
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :수��
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...물 위� 지� 수 없습니다
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}운하를 먼저 제거하십시오
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}운하를 먼저 제거하십시오
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}게임 저장
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}게임 불러오기
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}저장
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}파� 삭제
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :관전�, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :관전�, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} 남�
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}드��브를 �� 수 없�
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}게임 저장 실패{}{STRING}
@@ -2333,12 +2333,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}ë“œë�¼ì�
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}저장� 세�브 파�� �름입니다.
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}선�� 세�브 파�� 삭제합니다.
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}선�한 �름으로 현재 게임� 저장합니다
-STR_NETWORK_SERVER_RANDOM_GAME                                  :신규 무작위 게임 만들기
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Heightmap 불러오기
-STR_SAVE_OSKTITLE                                               :{BLACK}게임� 저장할 파�명� 입력하세요
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :신규 무작위 게임 만들기
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Heightmap 불러오기
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}게임� 저장할 파�명� 입력하세요
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}중간� {STRING}{G 0 "�" "가"} 있습니다.
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}중간� {STRING}{G 0 "�" "가"} 있습니다.
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=m}�탄 광산
 STR_INDUSTRY_NAME_POWER_STATION                                 :{G=f}발전소
@@ -2394,23 +2394,23 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}�산:
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}지난달 �산량:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% 수송�)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}� 산업시설� 있는 곳으로 ��
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}가격: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}가격: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}여기� � 산업시설� 건설할 수 없습니다...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...숲� 만년설 높� ��� 고��만 심� 수 있습니다.
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...맵 가장�리�만 위치할 수 있습니다.
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}�중� 다른 터�� 있습니다
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}터�� 맵 �� 통과합니다
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}터�� 맵 �� 통과합니다
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}지형 문제로 터�� 반대쪽 출구를 만들 수 없습니다
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}터�� 먼저 제거하십시오
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}다리를 먼저 제거하십시오
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}같� 위치�서 시작하고 �낼 수 없습니다
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}다리는 같� 높�를 연결해야 합니다
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}그 지형� 다리를 건설하기� 너무 낮습니다
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}같� 위치�서 시작하고 �낼 수 없습니다
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}다리는 같� 높�를 연결해야 합니다
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}그 지형� 다리를 건설하기� 너무 낮습니다
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}시작과 �� 한 줄 위� 있어야 합니다
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}터� 입구� 알맞지 않� 장소입니다
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :강철 현수�
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :강철 거��
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :강철 캔틸레버�
@@ -2421,30 +2421,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :ê°•ì²  ì›�통í˜
 STR_BRIDGE_TUBULAR_SILICON                                      :실리콘 �통형 다리
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}여기� 다리를 지� 수 없습니다...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}여기� 터�� 지� 수 없습니다...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :철�용 터�
-STR_TUNNEL_DESCRIPTION_ROAD                                     :�로용 터�
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :강철 현수 철�
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :강철 들보 철�
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :강철 캔틸레버 철�
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :철근 콘�리트 현수 철�
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :나무 철�
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :콘�리트 철�
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :강철 현수�
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :강철 들보�
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :강철 캔틸레버�
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :철근 콘트리트 현수� (�로용)
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :나무 다리
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :콘�리트�
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :�통형 철�
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :�통형 다리
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :철�용 터�
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :�로용 터�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :강철 현수 철�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :강철 들보 철�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :강철 캔틸레버 철�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :철근 콘�리트 현수 철�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :나무 철�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :콘�리트 철�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :강철 현수�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :강철 들보�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :강철 캔틸레버�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :철근 콘트리트 현수� (�로용)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :나무 다리
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :콘�리트�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :�통형 철�
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :�통형 다리
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}중간� 오브�트가 있습니다
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :송신기
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :등대
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :회사 HQ
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :송신기
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :등대
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :회사 HQ
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...중간� 회사 HQ가 있습니다.
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :회사 소유지
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :회사 소유지
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}� 지역� 매입할 수 없습니다...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...�미 소유중입니다!
 
@@ -2492,7 +2492,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} ì •ê±°
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}난��
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}저장
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}저장
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}쉬움
@@ -2564,8 +2564,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}색�
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}색�:
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}회사 �름
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}매니저 �름
-STR_QUERY_COMPANY_NAME_CAPTION                                  :회사 �름
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :매니저 �름
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :회사 �름
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :매니저 �름
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}회사 �름� 바꿀 수 없습니다...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}매니저 �름� 바꿀 수 없습니다...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY}� 재정 {BLACK}{COMPANYNUM}
@@ -2590,7 +2590,7 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}�계:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}소유금
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}대출
-STR_MAX_LOAN                                                    :{WHITE}최대 대출: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}최대 대출: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}{SKIP}{SKIP}{CURRENCY} 빌리기
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}{SKIP}{SKIP}{CURRENCY} 갚기
@@ -2599,7 +2599,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}ë�”ì�´ìƒ
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...값아야할 대출금� 없습니다.
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} 필요합니다.
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}대출금� 갚� 수 없습니다...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}�행�서 빌린 �� 송금할 수 없습니다...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}�행�서 빌린 �� 송금할 수 없습니다...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}매니저� 얼굴� 선�합니다.
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}회사 차량� 색�� 변경합니다.
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}매니저� �름� 변경합니다.
@@ -2609,31 +2609,31 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}ë�ˆì�„ ê
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(매니저)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}설립: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}차량:
-STR_TRAINS                                                      :{WHITE}열차 {COMMA}대
-STR_ROAD_VEHICLES                                               :{WHITE}��차 {COMMA}대
-STR_AIRCRAFT                                                    :{WHITE}항공기 {COMMA}대
-STR_SHIPS                                                       :{WHITE}선박 {COMMA}대
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}열차 {COMMA}대
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}��차 {COMMA}대
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}항공기 {COMMA}대
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}선박 {COMMA}대
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}없�
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENTNAME}{}(매니저)
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}저� 회사를 거�어주실 운송회사를 찾고있습니다.{}{}저� {COMPANY} 회사를 {CURRENCY}� 가격으로 �수합병하시겠습니까?
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}회사를 �수할 수 없습니다...
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}본사(HQ) 건설
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}본사를 건설합니다 / 본사를 봅니다
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}회사가치� 1% 가격으로 본사를 다른 위치� 재건축합니다.
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}회사가치� 1% 가격으로 본사를 다른 위치� 재건축합니다.
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}본사를 건설할 수 없습니다...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}본사 보기
-STR_RELOCATE_HQ                                                 :{BLACK}본사 재위치
-STR_COMPANY_JOIN                                                :{BLACK}참여
-STR_COMPANY_JOIN_TIP                                            :{BLACK}� 회사로 참가해서 플레�합니다
-STR_COMPANY_PASSWORD                                            :{BLACK}암호
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}다른 참가�가 � 회사로� 플레�를 하지 못하�� 암호로 보호합니다
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}회사 암호 설정
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}본사 재위치
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}참여
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}� 회사로 참가해서 플레�합니다
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}암호
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}다른 참가�가 � 회사로� 플레�를 하지 못하�� 암호로 보호합니다
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}회사 암호 설정
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}입력한 비밀번호는 저장하지 않기
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}� 회사� 새 비밀번호 부여
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}회사 비밀번호
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}회사 비밀번호 기본값
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}� 회사 비밀번호를 새 회사� 비밀번호 기본값으로 사용
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}대형/소형 창 �기 토글
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}회사 비밀번호 기본값
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}� 회사 비밀번호를 새 회사� 비밀번호 기본값으로 사용
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}대형/소형 창 �기 토글
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}회사가치: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}회사 주�� 25%를 매입
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}회사 주�� 25%를 매�
@@ -2642,7 +2642,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}ì�´ 회ì
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}� 회사 주�� 25%를 매입할 수 없습니다...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}� 회사 주�� 25%를 매�할 수 없습니다...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% {COMPANY}� 소유)
-STR_PROTECTED                                                   :{WHITE}� 회사는 주�� 거래할 만� 오래�지 않았습니다...
+STR_ERROR_PROTECTED                                             :{WHITE}� 회사는 주�� 거래할 만� 오래�지 않았습니다...
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (�기)
@@ -2949,9 +2949,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(내리지 ì•Šê
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}선�한 목�지�서� 정차 방�� 변경합니다
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}선�한 목�지�서� 화물 �재 방�� 변경합니다
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}선�한 목�지�서� 화물 하차 방�� 변경합니다
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}확장� ��경로를 입력합니다
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}확장� ��경로를 입력합니다
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :가까운 차량기지로
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :가까운 격납고로
 STR_ORDER_NEAREST_DEPOT                                         :가까운
@@ -2961,9 +2961,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :�행 �검
 STR_ORDER_TRAIN_DEPOT                                           :차량기지
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :차고
 STR_ORDER_SHIP_DEPOT                                            :정박소
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} 격납고
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} 격납고
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :항� �
 STR_ORDER_DROP_SERVICE_DEPOT                                    :필요하면 �검
@@ -2988,10 +2988,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :＞
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :≥
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :� 있� 때
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :� 없� 때
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :{COMMA}(으)로 건너뛰기
-STR_CONDITIONAL_NUM                                             :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING} {COMMA} �때)
-STR_CONDITIONAL_TRUE_FALSE                                      :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING})
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :{COMMA}(으)로 건너뛰기
+STR_ORDER_CONDITIONAL_NUM                                       :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING} {COMMA} �때)
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :[조건 경로] {COMMA}번째 경로로 건너뛰기 ({STRING} {STRING})
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}운행정보 없�
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}여행 (시간표 없�)
@@ -3014,18 +3014,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}차량ê¸
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}건너뛰기
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}삭제
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}행선지
-STR_REFIT                                                       :{BLACK}개조
-STR_REFIT_TIP                                                   :{BLACK}� 경로�서 어떤 화물� 받� 것�지 선�하십시오. CTRL+�릭� 제거입니다.
-STR_REFIT_ORDER                                                 :({STRING}(으)로 개조)
-STR_REFIT_STOP_ORDER                                            :({STRING}�서 수리 후 멈춤)
-STR_STOP_ORDER                                                  :(멈춤)
-STR_TIMETABLE_VIEW                                              :{BLACK}시간표
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}시간표 보기 전환
-STR_ORDER_VIEW                                                  :{BLACK}순서
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}순서 보기로 변경
+STR_ORDER_REFIT                                                 :{BLACK}개조
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}� 경로�서 어떤 화물� 받� 것�지 선�하십시오. CTRL+�릭� 제거입니다.
+STR_ORDER_REFIT_ORDER                                           :({STRING}(으)로 개조)
+STR_ORDER_REFIT_STOP_ORDER                                      :({STRING}�서 수리 후 멈춤)
+STR_ORDER_STOP_ORDER                                            :(멈춤)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}시간표
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}시간표 보기 전환
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}순서
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}순서 보기로 변경
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (경로)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 경로� � - -
-STR_SERVICE                                                     :{BLACK}�검
+STR_ORDER_SERVICE                                               :{BLACK}�검
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   �산: {LTBLUE}{NUM}{BLACK} 가격: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   가격: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3045,7 +3045,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}차량ì�
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}경로를 공유하고 있는 차량� 그 정거장� 갈 수 없습니다.
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}차량� 옮길 수 없습니다...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}뒷쪽 기관차는 앞쪽것� 항� 따�다� 것입니다.
-STR_CARGO_N_A                                                   :없�{SKIP}
+STR_QUANTITY_N_A                                                :없�{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}근처� 있는 차량기지로 가는 길� 찾� 수 없습니다
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}�검 간격: {LTBLUE}{COMMA}�마다{BLACK}   최근 �검: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}�검 간격: {LTBLUE}{COMMA}%{BLACK}   최근 �검: {LTBLUE}{DATE_LONG}
@@ -3065,10 +3065,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}시간í‘
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}선�한 경로가 대기하고 있� 시간 변경
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}선�한 경로� 시간 초기화
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}지� 카운터 초기화, 차량� 제시간으로 운행합니다.
-STR_SERVICE_HINT                                                :{BLACK}�검� 필요하면 � 경로를 건너�니다.
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}가격: {CURRENCY} 무게: {WEIGHT_S}{}��: {VELOCITY}  힘: {POWER}{}운행비용: {CURRENCY}/년{}수송량: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}가격: {CURRENCY} 최고�력: {VELOCITY}{}수송량: {CARGO}, {CARGO}{}운행비용: {CURRENCY}/년
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}가격: {CURRENCY} 최고�력: {VELOCITY}{}수송량: {CARGO}{}운행비용: {CURRENCY}/년
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}�검� 필요하면 � 경로를 건너�니다.
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}가격: {CURRENCY} 무게: {WEIGHT_S}{}��: {VELOCITY}  힘: {POWER}{}운행비용: {CURRENCY}/년{}수송량: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}가격: {CURRENCY} 최고�력: {VELOCITY}{}수송량: {CARGO}, {CARGO}{}운행비용: {CURRENCY}/년
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}가격: {CURRENCY} 최고�력: {VELOCITY}{}수송량: {CARGO}{}운행비용: {CURRENCY}/년
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}수명: {LTBLUE}{STRING}{BLACK}   운행비용: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}최고 �력: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}무게: {LTBLUE}{WEIGHT_S} {BLACK}힘: {LTBLUE}{POWER}{BLACK} 최고�력: {LTBLUE}{VELOCITY}
@@ -3087,24 +3087,24 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}충�!!
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}열차를 회차시킬 수 없습니다...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}차량� 방향� 뒤집� 수 없습니다...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}여러 대가 연결� 차량� 뒤집� 수 없습니다...
-STR_CLEAR_TIME                                                  :{BLACK}시간 초기화
-STR_RESET_LATENESS                                              :{BLACK}지연 카운터 초기화
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}웨���트 �름 변경
-STR_CHANGE_BUOY_NAME                                            :{BLACK}부� �름 바꾸기
-
-STR_TRAIN_STOPPING                                              :{RED}정지중
-STR_TRAIN_STOPPING_VEL                                          :{RED}{VELOCITY}� ��로 정지중
-STR_INCOMPATIBLE_RAIL_TYPES                                     :알맞지 않� 철� 타입
-STR_TRAIN_NO_POWER                                              :{RED}기관차 없�
-STR_TRAIN_START_NO_CATENARY                                     :전차선� 없어서 운행할 수 없습니다.
-STR_TRAIN_STUCK                                                 :{ORANGE}빈 경로 �색중
-
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}�발한 차량� 팔 수 없습니다...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}파괴� 차량� 개조할 수 없습니다...
-
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}차량� 시간표를 정할 수 없습니다...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}차량� 정거장�서만 기다릴 수 있습니다.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}� 차량� � 정거장� 서지 않습니다.
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}시간 초기화
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}지연 카운터 초기화
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}웨���트 �름 변경
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}부� �름 바꾸기
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}정지중
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}{VELOCITY}� ��로 정지중
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :알맞지 않� 철� 타입
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}기관차 없�
+STR_ERROR_TRAIN_START_NO_CATENARY                               :전차선� 없어서 운행할 수 없습니다.
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}빈 경로 �색중
+
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}�발한 차량� 팔 수 없습니다...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}파괴� 차량� 개조할 수 없습니다...
+
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}차량� 시간표를 정할 수 없습니다...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}차량� 정거장�서만 기다릴 수 있습니다.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}� 차량� � 정거장� 서지 않습니다.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}시간 변경
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}� 차량� 현재 제시간� 운행하고 있습니다
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}� 차량� 현재 {STRING} 늦게 운행하고 있습니다
@@ -3118,7 +3118,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}다ì�Œ ì
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...차고 안�서 정지해있어야 합니다!
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}�접한 차고를 찾� 수 없습니다
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}차량� U턴시킵니다.
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}수송량: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}수송량: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} 차량{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3131,39 +3131,39 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}여기ì—
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}정박소 내�서 정지해있어야 합니다!
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}여기� 부�를 설치할 수 없습니다...
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}여기� 수��를 지� 수 없습니다...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}여기� 수��를 지� 수 없습니다...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (개조)
 STR_REFIT_TITLE                                                 :{GOLD}수송할 화물 선�:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}새 수송량: {GOLD}{CARGO}{}{BLACK}개조 가격: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(개조 가능)
+STR_PURCHASE_INFO_REFITTABLE                                    :(개조 가능)
 
 ##id 0xA000
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}여기� 공항� 만들 수 없습니다...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}항공기가 운항중입니다
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}격납고 내�서 정지해있어야합니다
 
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (시간표)
 
 ##id 0xB000
-STR_BRIBE_FAILED                                                :{WHITE}당신� 뇌물 수수 행위가
-STR_BRIBE_FAILED_2                                              :{WHITE}지역 당국� �해 발��었습니다!
-STR_BUILD_DATE                                                  :{BLACK}건설날짜: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}당신� 뇌물 수수 행위가
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}지역 당국� �해 발��었습니다!
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}건설날짜: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}정거장 등급: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}정거장 종류: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}정거장 등급: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}정거장 종류: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF 설정
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}변경사항 �용
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}팔레트 바꾸기
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}NewGRF� 팔레트를 바꿉니다.{}게임�서 그래픽� 분�색으로 보�때 � 기능� 사용하십시오.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}파�미터 설정
-STR_NEWGRF_FILENAME                                             :{BLACK}파�명: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}팔레트: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}변경사항 �용
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}팔레트 바꾸기
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}NewGRF� 팔레트를 바꿉니다.{}게임�서 그래픽� 분�색으로 보�때 � 기능� 사용하십시오.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}파�미터 설정
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}파�명: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}팔레트: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}게임 진행중� 설정� 변경하면 게임� 충�할 수� 있습니다.{}정�로 설정� 변경하시겠습니까?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3186,34 +3186,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :유효하지 ì•
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} � ��� 스프��트가 있습니다. 모든 ��� 스프��트는 붉� 물�표(?)로 보� 것입니다.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Action 8 엔트리가 여러개 존재합니다.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}선�한 프리셋� 불러옵니다
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}프리셋 저장
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}현재 목�� 프리셋으로 저장
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}프리셋 �름 입력
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}프리셋 제거
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}현재 선�한 프리셋 제거
-STR_NEWGRF_ADD                                                  :{BLACK}추가
-STR_NEWGRF_ADD_TIP                                              :{BLACK}NewGRF 파�� 목�� 추가
-STR_NEWGRF_REMOVE                                               :{BLACK}제거
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}선�한 NewGRF 파�� 목��서 제거
-STR_NEWGRF_MOVEUP                                               :{BLACK}위로
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}선�한 NewGRF 파�� 위로 올림
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}아래로
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}선�한 NewGRF 파�� 아래로 내림
-STR_NEWGRF_FILE_TIP                                             :{BLACK}설치� NewGRF� 목�입니다. 파�미터를 변경하려면 �릭하세요.
-STR_NEWGRF_PARAMETER                                            :{BLACK}파�미터: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF 파�미터 입력
-STR_NEWGRF_NO_INFO                                              :{BLACK}사용가능한 정보 없�
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}선�한 프리셋� 불러옵니다
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}프리셋 저장
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}현재 목�� 프리셋으로 저장
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}프리셋 �름 입력
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}프리셋 제거
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}현재 선�한 프리셋 제거
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}추가
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}NewGRF 파�� 목�� 추가
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}제거
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}선�한 NewGRF 파�� 목��서 제거
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}위로
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}선�한 NewGRF 파�� 위로 올림
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}아래로
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}선�한 NewGRF 파�� 아래로 내림
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}설치� NewGRF� 목�입니다. 파�미터를 변경하려면 �릭하세요.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}파�미터: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF 파�미터 입력
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}사용가능한 정보 없�
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}사용가능한 NewGRF 파�
 STR_NEWGRF_ADD_FILE                                             :{BLACK}선�목�� 추가
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}설정� 선�한 NewGRF 추가
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}파� 재검색
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}사용 가능한 NewGRF 파� 목�� 업��트합니다
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}설정� 선�한 NewGRF 추가
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}파� 재검색
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}사용 가능한 NewGRF 파� 목�� 업��트합니다
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}파� 추가 불가: 중복� GRF 아�디
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}�치하는 파�� 찾� 수 없습니다
-STR_NEWGRF_DISABLED                                             :{RED}사용안함
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}�치하는 파�� 찾� 수 없습니다
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}사용안함
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}매치�는 파�� 찾� 수 없� (호환�는 GRF 불러옴)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}빠진 파� 대신� 호환�는 GRF를 불러왔습니다
@@ -3229,7 +3229,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}{1:ENGINE}� 위한 화물/개조 정보가 건설 후 구매 목�과 다릅니다. �것� ���체�서 개조를 실패를 초래할 수 있습니다.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' 때문� 결과물 콜백 과정�서 무한 루프가 발�하고 있습니다.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}전차를 지�하지 않는 버전으로 게임� 저장�었습니다. 모든 전차는 제거�었습니다.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}전차를 지�하지 않는 버전으로 게임� 저장�었습니다. 모든 전차는 제거�었습니다.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}사용� 화� 단위
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}환율: {ORANGE}{0:CURRENCY} = {1:COMMA}파운드
@@ -3240,16 +3240,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}유로í
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}유로화로 전환: {ORANGE}안함
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}미리보기: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}사용� 화� 변수 변경
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}(1 파운드(£)� 대한) 사용� 화� 단위양� �소시킵니다.
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}(1 파운드(£)� 대한) 사용� 화� 단위양� �가시킵니다.
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}1 파운드(£)� 해당하는 사용� 화� 단위� 환율� 설정하십시오.
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}사용� 화� 단위� 단위 구분�를 설정하십시오.
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}사용� 화� 단위 앞� 붙는 문구를 설정하십시오.
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}사용� 화� 단위 뒤� 붙는 문구를 설정하십시오.
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}유로화(€) 전환 연�를 앞으로 당�니다.
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}유로화(€) 전환 연�를 늦춥니다.
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}유로화(€) 전환 연�를 설정하십시오.
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 파운드(£)� 해당하는 사용� 화� 단위입니다.
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}(1 파운드(£)� 대한) 사용� 화� 단위양� �소시킵니다.
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}(1 파운드(£)� 대한) 사용� 화� 단위양� �가시킵니다.
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}1 파운드(£)� 해당하는 사용� 화� 단위� 환율� 설정하십시오.
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}사용� 화� 단위� 단위 구분�를 설정하십시오.
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}사용� 화� 단위 앞� 붙는 문구를 설정하십시오.
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}사용� 화� 단위 뒤� 붙는 문구를 설정하십시오.
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}유로화(€) 전환 연�를 앞으로 당�니다.
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}유로화(€) 전환 연�를 늦춥니다.
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}유로화(€) 전환 연�를 설정하십시오.
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 파운드(£)� 해당하는 사용� 화� 단위입니다.
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3268,8 +3268,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA}대� 선박
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA}대� 항공기
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} 차량� 공유� 경로 목�
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}� 경로를 공유하고 있는 모든 차량� 표시합니다.
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA} 차량� 공유� 경로 목�
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}� 경로를 공유하고 있는 모든 차량� 표시합니다.
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}열차 개조
 STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}��차 개조
@@ -3371,39 +3371,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}ìž�ë�™ì°
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}� 선박� 다른 종류� 화물� 싣�� 개조
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}� 항공기가 다른 종류� 화물� 싣�� 개조
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} 차량기지로 가는 중
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN} 차량기지로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} 차고로 가는 중
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN} 차고로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}{TOWN} 정박소로 가는 중
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}{TOWN} 정박소로 가는 중 ({VELOCITY})
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION}공항 격납고로 가는 중
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} 차량기지로 �검하러 가는중
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN} 차량기지로 �검하러 가는 중 ({VELOCITY})
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN} 차고로 �검하러 가는중
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN} 차고로 �검하러 가는중 ({VELOCITY})
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} 정박소로 �검하러 가는 중
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN} 정박소로 �검하러 가는 중 ({VELOCITY})
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION}공항 격납고로 �검하러 가는 중
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION}공항 격납고로 �검하러 가는 중 ({VELOCITY})
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}기차 복제
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}차량 복제
-STR_CLONE_SHIP                                                  :{BLACK}선박 복제
-STR_CLONE_AIRCRAFT                                              :{BLACK}항공기 복제
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}� 버튼� �차/화물차를 �함한 열차 전체를 복제할 것입니다. CTRL+�릭하면 경로� 같� 공유�니다.
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}� 버튼� ��차를 복제할 것입니다. CTRL+�릭하시면 경로� 같� 공유�니다.
-STR_CLONE_SHIP_INFO                                             :{BLACK}� 버튼� 선박� 복제할 것입니다. CTRL+�릭� 경로를 같� 공유합니다.
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}� 버튼� 항공기를 복제할 것입니다. CTRL+�릭� 경로를 같� 공유합니다.
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}� 버튼� �차/화물차를 �함한 열차 전체를 복제할 것입니다. � 버튼� �릭하고 차고 안/밖� 있는 차량� �릭하십시오. CTRL+�릭하면 경로� 같� 공유�니다.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}� 버튼� ��차를 복제할 것입니다. � 버튼� �릭하고 차고 안/밖� 있는 차량� �릭하십시오. CTRL+�릭하면 경로� 같� 공유�니다.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}� 버튼� 누르고 복제를 �하는 선박� �릭하십시오. CTRL+�릭� 경로를 같� 공유합니다.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}� 버튼� 누르고 복제를 �하는 항공기를 �릭하십시오. CTRL+�릭� 경로를 같� 공유합니다.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}{TOWN} 차량기지로 가는 중
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}{TOWN} 차량기지로 가는 중 ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}{TOWN} 차고로 가는 중
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}{TOWN} 차고로 가는 중 ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}{TOWN} 정박소로 가는 중
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}{TOWN} 정박소로 가는 중 ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}{STATION}공항 격납고로 가는 중
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}{STATION}공항 격납고로 가는 중 ({VELOCITY})
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}{TOWN} 차량기지로 �검하러 가는중
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}{TOWN} 차량기지로 �검하러 가는 중 ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}{TOWN} 차고로 �검하러 가는중
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}{TOWN} 차고로 �검하러 가는중 ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}{TOWN} 정박소로 �검하러 가는 중
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}{TOWN} 정박소로 �검하러 가는 중 ({VELOCITY})
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}{STATION}공항 격납고로 �검하러 가는 중
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}{STATION}공항 격납고로 �검하러 가는 중 ({VELOCITY})
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}기차 복제
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}차량 복제
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}선박 복제
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}항공기 복제
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}� 버튼� �차/화물차를 �함한 열차 전체를 복제할 것입니다. CTRL+�릭하면 경로� 같� 공유�니다.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}� 버튼� ��차를 복제할 것입니다. CTRL+�릭하시면 경로� 같� 공유�니다.
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}� 버튼� 선박� 복제할 것입니다. CTRL+�릭� 경로를 같� 공유합니다.
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}� 버튼� 항공기를 복제할 것입니다. CTRL+�릭� 경로를 같� 공유합니다.
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}� 버튼� �차/화물차를 �함한 열차 전체를 복제할 것입니다. � 버튼� �릭하고 차고 안/밖� 있는 차량� �릭하십시오. CTRL+�릭하면 경로� 같� 공유�니다.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}� 버튼� ��차를 복제할 것입니다. � 버튼� �릭하고 차고 안/밖� 있는 차량� �릭하십시오. CTRL+�릭하면 경로� 같� 공유�니다.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}� 버튼� 누르고 복제를 �하는 선박� �릭하십시오. CTRL+�릭� 경로를 같� 공유합니다.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}� 버튼� 누르고 복제를 �하는 항공기를 �릭하십시오. CTRL+�릭� 경로를 같� 공유합니다.
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}새 기차
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}새 전기 기차
@@ -3473,38 +3473,38 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}ì�´ 격ë
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}� 안� 있는 모든 차량� �매하려고 합니다. 정� �매하시겠습니까?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :잘못� 차량기지 종류
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :잘못� 차량기지 종류
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}� 차량기지� 있는 모든 열차를 �니다.
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}� 차량기지� 있는 모든 ��차를 �니다.
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}� 차량기지� 있는 모든 선박� �니다.
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}� 차량기지� 있는 모든 항공기를 �니다.
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}� 차량기지� 있는 모든 열차를 �니다.
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}� 차량기지� 있는 모든 ��차를 �니다.
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}� 차량기지� 있는 모든 선박� �니다.
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}� 차량기지� 있는 모든 항공기를 �니다.
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}� 차량기지를 거�가는 모든 열차� 목�� 보여�니다.
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}� 차고지를 거�가는 모든 ��차� 목�� 보여�니다.
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}� 정박소를 거�가는 모든 선박� 목�� 보여�니다.
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}� 격납고를 거�가는 모든 항공기� 목�� 보여�니다.
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}� 차량기지를 거�가는 모든 열차� 목�� 보여�니다.
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}� 차고지를 거�가는 모든 ��차� 목�� 보여�니다.
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}� 정박소를 거�가는 모든 선박� 목�� 보여�니다.
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}� 격납고를 거�가는 모든 항공기� 목�� 보여�니다.
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}� 차량기지� 있는 모든 열차를 ��으로 �체합니다.
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}� 차고지� 있는 모든 ��차를 ��으로 �체합니다.
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}� 정박소� 있는 모든 선박� ��으로 �체합니다.
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}� 격납고� 있는 모든 항공기를 ��으로 �체합니다.
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}� 차량기지� 있는 모든 열차를 ��으로 �체합니다.
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}� 차고지� 있는 모든 ��차를 ��으로 �체합니다.
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}� 정박소� 있는 모든 선박� ��으로 �체합니다.
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}� 격납고� 있는 모든 항공기를 ��으로 �체합니다.
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}사용 가능 열차
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}사용 가능 ��차
-STR_AVAILABLE_SHIPS                                             :{BLACK}사용 가능 선박
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}사용 가능 항공기
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}사용 가능 열차
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}사용 가능 ��차
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}사용 가능 선박
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}사용 가능 항공기
 
-STR_SEND_TRAIN_TO_DEPOT                                         :차량기지로 보내기
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :차고로 보내기
-STR_SEND_SHIP_TO_DEPOT                                          :정박소로 보내기
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :격납고로 보내기
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :차량기지로 보내기
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :차고로 보내기
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :정박소로 보내기
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :격납고로 보내기
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} �체
 STR_REPLACE_VEHICLES_START                                      :{BLACK}차량 �체 시작
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}차량 �체 중지
-STR_NOT_REPLACING                                               :{BLACK}�체 안�
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}차량� 선��지 않았�
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}�체 안�
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}차량� 선��지 않았�
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}�체할 기관차 종류를 선�하십시오
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}좌측�서 선�한 기관차 종류를 �체할 새로운 기관차로 선�하십시오.
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}좌측�서 선�한 기관차 종류� �체를 중지하려면 누르세요
@@ -3516,40 +3516,40 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}ìž�ë�™êµ
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}�체중: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}기관차/화물차 �체 창� 번갈아 ��니다
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}열차는 불가능합니다
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}차량� 불가능합니다
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}선박� 불가능합니다
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}항공기는 불가능합니다
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}열차는 불가능합니다
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}차량� 불가능합니다
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}선박� 불가능합니다
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}항공기는 불가능합니다
 
-STR_ENGINES                                                     :기관차
-STR_WAGONS                                                      :화물차
+STR_REPLACE_ENGINES                                             :기관차
+STR_REPLACE_WAGONS                                              :화물차
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}� 차량기지 안� 있는 모든 열차� 운행� 중지시킵니다.
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}� 차고 내� 모든 ��차� 운행� 중지시킵니다.
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}� 정박소 안� 있는 모든 선박� 운행� 중지시킵니다.
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}� 격납고 안� 있는 모든 항공기� 운행� 중지시킵니다.
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}� 차량기지 안� 있는 모든 열차� 운행� 중지시킵니다.
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}� 차고 내� 모든 ��차� 운행� 중지시킵니다.
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}� 정박소 안� 있는 모든 선박� 운행� 중지시킵니다.
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}� 격납고 안� 있는 모든 항공기� 운행� 중지시킵니다.
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}� 차량기지 안� 있는 모든 열차� 운행� 시작합니다.
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}� 차고 내� 모든 ��차� 운행� 시작합니다.
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}� 정박소 안� 있는 모든 선박� 운행� 시작합니다.
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}� 격납고 안� 있는 모든 항공기� 운행� 시작합니다.
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}� 차량기지 안� 있는 모든 열차� 운행� 시작합니다.
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}� 차고 내� 모든 ��차� 운행� 시작합니다.
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}� 정박소 안� 있는 모든 선박� 운행� 시작합니다.
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}� 격납고 안� 있는 모든 항공기� 운행� 시작합니다.
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}� 목�� 모든 차량� 운행� 중지시킵니다.
-STR_MASS_START_LIST_TIP                                         :{BLACK}� 목�� 있는 모든 차량� 운행� 시작합니다.
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}� 목�� 모든 차량� 운행� 중지시킵니다.
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}� 목�� 있는 모든 차량� 운행� 시작합니다.
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}팻� 목� - 팻� {COMMA}개
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :철� 차량
-STR_ELRAIL_VEHICLES                                             :전기 철�
-STR_MONORAIL_VEHICLES                                           :모노레� 차량
-STR_MAGLEV_VEHICLES                                             :�기부�
+STR_REPLACE_RAIL_VEHICLES                                       :철� 차량
+STR_REPLACE_ELRAIL_VEHICLES                                     :전기 철�
+STR_REPLACE_MONORAIL_VEHICLES                                   :모노레� 차량
+STR_REPLACE_MAGLEV_VEHICLES                                     :�기부�
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}가격: {GOLD}{CURRENCY}{BLACK} 중량: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}�력: {GOLD}{VELOCITY}{BLACK} 힘: {GOLD}{POWER}
@@ -3576,67 +3576,67 @@ STR_NUM_3                                                       :{G=m}{BLACK}{SK
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}만들기
-STR_RANDOM                                                      :{BLACK}무작위화
-STR_RANDOM_HELP                                                 :{BLACK}지형 만들기를 위한 무작위수치 변경
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}세계 창조
-STR_RANDOM_SEED                                                 :{BLACK}무작위수치:
-STR_RANDOM_SEED_HELP                                            :{BLACK}무작위수치를 입력하세요
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}임� 설정값 입력
-STR_LAND_GENERATOR                                              :{BLACK}지형 만들기:
-STR_TREE_PLACER                                                 :{BLACK}나무 알고리즘:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Heightmap ë°©í–¥:
-STR_TERRAIN_TYPE                                                :{BLACK}지형 종류:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}해수면:
-STR_SMOOTHNESS                                                  :{BLACK}지표면� 깎는 방�:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}만년설 고�:
-STR_DATE                                                        :{BLACK}날짜:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}�시� 수:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}산업시설 수:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}만년설 높�를 1칸 높입니다
-STR_SNOW_LINE_DOWN                                              :{BLACK}만년설 높�를 1칸 낮춥니다
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}만년설� 높�를 변경
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}시작 연�를 변경합니다.
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}맵 �기 경고
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}�본 맵� �기를 많� 조정하는 것� 좋지 않습니다. 만들기를 계�하시겠습니까?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Heightmap �름:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}�기: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}만들기
+STR_MAPGEN_RANDOM                                               :{BLACK}무작위화
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}지형 만들기를 위한 무작위수치 변경
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}세계 창조
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}무작위수치:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}무작위수치를 입력하세요
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}임� 설정값 입력
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}지형 만들기:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}나무 알고리즘:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Heightmap ë°©í–¥:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}지형 종류:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}해수면:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}지표면� 깎는 방�:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}만년설 고�:
+STR_MAPGEN_DATE                                                 :{BLACK}날짜:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}�시� 수:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}산업시설 수:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}만년설 높�를 1칸 높입니다
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}만년설 높�를 1칸 낮춥니다
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}만년설� 높�를 변경
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}시작 연�를 변경합니다.
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}맵 �기 경고
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}�본 맵� �기를 많� 조정하는 것� 좋지 않습니다. 만들기를 계�하시겠습니까?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Heightmap �름:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}�기: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}세계 만드는 중..
 STR_GENERATION_ABORT                                            :{BLACK}중지
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}세계 만들기 중단
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}세계 만들기를 중단하시겠습니까?
-STR_PROGRESS                                                    :{WHITE}{NUM}% 완료
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}지형 만드는 중
-STR_TREE_GENERATION                                             :{BLACK}나무 심는 중
-STR_UNMOVABLE_GENERATION                                        :{BLACK}움��수 없는 �체 만드는 중
-STR_CLEARING_TILES                                              :{BLACK}거친 암�지대 만드는 중
-STR_SETTINGUP_GAME                                              :{BLACK}게임 설정 중
-STR_PREPARING_TILELOOP                                          :{BLACK}타� 루프 작�중
-STR_PREPARING_GAME                                              :{BLACK}게임 준비중
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}� 행위는 난��를 사용� 설정으로 변경합니다
-STR_SE_FLAT_WORLD                                               :{WHITE}��한 지형
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}��한 땅 만들기
-STR_SE_RANDOM_LAND                                              :{WHITE}무작위 지형
-STR_SE_NEW_WORLD                                                :{BLACK}새 시나리오 만들기
-STR_SE_CAPTION                                                  :{WHITE}시나리오 종류
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}�지� 높�를 1칸 낮춥니다.
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}�지� 높�를 1칸 낮춥니다
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}�지� 높� 변경
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}�지� 높�:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% 완료
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}지형 만드는 중
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}나무 심는 중
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}움��수 없는 �체 만드는 중
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}거친 암�지대 만드는 중
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}게임 설정 중
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}타� 루프 작�중
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}게임 준비중
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}� 행위는 난��를 사용� 설정으로 변경합니다
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}��한 지형
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}��한 땅 만들기
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}무작위 지형
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}새 시나리오 만들기
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}시나리오 종류
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}�지� 높�를 1칸 낮춥니다.
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}�지� 높�를 1칸 낮춥니다
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}�지� 높� 변경
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}�지� 높�:
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}맵 가장�리:
-STR_NORTHWEST                                                   :{BLACK}�서
-STR_NORTHEAST                                                   :{BLACK}��
-STR_SOUTHEAST                                                   :{BLACK}남�
-STR_SOUTHWEST                                                   :{BLACK}남서
-STR_BORDER_FREEFORM                                             :{BLACK}변경 가능
-STR_BORDER_WATER                                                :{BLACK}물
-STR_BORDER_RANDOM                                               :{BLACK}임�
-STR_BORDER_RANDOMIZE                                            :{BLACK}임�
-STR_BORDER_MANUAL                                               :{BLACK}사용� 정�
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}맵 가장�리:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}�서
+STR_MAPGEN_NORTHEAST                                            :{BLACK}��
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}남�
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}남서
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}변경 가능
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}물
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}임�
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}임�
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}사용� 정�
 
 ############ Tooltip measurment
 
@@ -3645,9 +3645,9 @@ STR_MEASURE_AREA                                                :{BLACK}넓�:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}길�: {NUM}{}고�차: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}넓�: {NUM} x {NUM}{}고�차: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}환승 단위: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...여기는 �시 소유� �로 입니다
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...�로가 잘못� 방향� 향하고 있습니다
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}환승 단위: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...여기는 �시 소유� �로 입니다
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...�로가 잘못� 방향� 향하고 있습니다
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3657,7 +3657,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :모든 기차
 STR_GROUP_ALL_ROAD_VEHICLES                                     :모든 차량
 STR_GROUP_ALL_SHIPS                                             :모든 선박
@@ -3666,24 +3666,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :그룹ì—� ì†�í•
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :그룹� �하지 않� 차량
 STR_GROUP_DEFAULT_SHIPS                                         :그룹� �하지 않� 선박
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :그룹� �하지 않� 항공기
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :공유� 차량 추가
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :모든 차량 제거
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}그룹 �름 바꾸기
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}그룹� 만들 수 없습니다...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}� 그룹� 지울 수 없습니다...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}그룹� �름� 바꿀 수 없습니다.
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}� 그룹� 모든 차량� 제거할 수 없습니다.
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}� 그룹� 차량� 추가할 수 없습니다...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}� 그룹� 공유� 차량� 추가할 수 없습니다...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}그룹� 만들 수 없습니다...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}� 그룹� 지울 수 없습니다...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}그룹� �름� 바꿀 수 없습니다.
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}� 그룹� 모든 차량� 제거할 수 없습니다.
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}� 그룹� 차량� 추가할 수 없습니다...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}� 그룹� 공유� 차량� 추가할 수 없습니다...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}그룹 - �릭해서 그룹� �한 차량� 모� 나열합니다.
-STR_GROUP_CREATE_TIP                                            :{BLACK}그룹 만들기
-STR_GROUP_DELETE_TIP                                            :{BLACK}선�한 그룹 삭제
-STR_GROUP_RENAME_TIP                                            :{BLACK}선�한 그룹 �름 바꾸기
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}�릭하여 전체 �� �체로부터 � 그룹� 보호합니다.
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}그룹 - �릭해서 그룹� �한 차량� 모� 나열합니다.
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}그룹 만들기
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}선�한 그룹 삭제
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}선�한 그룹 �름 바꾸기
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}�릭하여 전체 �� �체로부터 � 그룹� 보호합니다.
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3700,7 +3700,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3745,19 +3745,19 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{G=m}{BLACK}6
 STR_BLACK_7                                                     :{G=m}{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}�름� 유�해야 합니다
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}�름� 유�해야 합니다
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}다� 팻�로 가기
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}�전 팻�로 가기
-STR_SIGN_OSKTITLE                                               :{BLACK}팻� �름� 입력하세요
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}다� 팻�로 가기
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}�전 팻�로 가기
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}팻� �름� 입력하세요
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}투�
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}답사
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}건설
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}목��서 �당한 산업시설� 선�하십시오
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}투�
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}답사
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}건설
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}목��서 �당한 산업시설� 선�하십시오
 
 ############ on screen keyboard
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -3766,37 +3766,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 
 ############ AI GUI
 STR_AI_DEBUG                                                    :{WHITE}AI 디버그
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}AI� �름
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}AI� �름
 STR_AI_DEBUG_RELOAD                                             :{BLACK}AI 재시작
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}AI를 종료시키고, 스�립트를 다시 불러와, AI를 재시작합니다
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI 디버그창� 오� 서버만 사용 가능합니다
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}AI를 종료시키고, 스�립트를 다시 불러와, AI를 재시작합니다
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI 디버그창� 오� 서버만 사용 가능합니다
 STR_AI_CONFIG_CAPTION                                           :{WHITE}�공지능 설정
-STR_AI_CHANGE                                                   :{BLACK}�공지능 선�
-STR_AI_CONFIGURE                                                :{BLACK}설정
-STR_AI_CHANGE_TIP                                               :{BLACK}다른 �공지능 불러오기
-STR_AI_CONFIGURE_TIP                                            :{BLACK}�공지능 파�미터 설정
-STR_AI_LIST_TIP                                                 :{BLACK}다� 게임부터 모든 �공지능� 불러옵니다
+STR_AI_CONFIG_CHANGE                                            :{BLACK}�공지능 선�
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}설정
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}다른 �공지능 불러오기
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}�공지능 파�미터 설정
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}다� 게임부터 모든 �공지능� 불러옵니다
 STR_AI_LIST_CAPTION                                             :{WHITE}사용 가능한 �공지능
-STR_AI_AILIST_TIP                                               :{BLACK}�릭하여 AI를 선�하세요
-STR_AI_ACCEPT                                                   :{BLACK}�용
-STR_AI_ACCEPT_TIP                                               :{BLACK}하���트� AI 선�
-STR_AI_CANCEL                                                   :{BLACK}취소
-STR_AI_CANCEL_TIP                                               :{BLACK}�공지능� 바꾸지 않습니다
-STR_AI_CLOSE                                                    :{BLACK}닫기
-STR_AI_RESET                                                    :{BLACK}초기화
-STR_AI_HUMAN_PLAYER                                             :사용� 플레�어
-STR_AI_RANDOM_AI                                                :무작위 �공지능
+STR_AI_LIST_TOOLTIP                                             :{BLACK}�릭하여 AI를 선�하세요
+STR_AI_LIST_ACCEPT                                              :{BLACK}�용
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}하���트� AI 선�
+STR_AI_LIST_CANCEL                                              :{BLACK}취소
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�공지능� 바꾸지 않습니다
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}닫기
+STR_AI_SETTINGS_RESET                                           :{BLACK}초기화
+STR_AI_CONFIG_HUMAN_PLAYER                                      :사용� 플레�어
+STR_AI_CONFIG_RANDOM_AI                                         :무작위 �공지능
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}�공지능 파�미터
-STR_AI_AUTHOR                                                   :{BLACK}저�: {STRING}
-STR_AI_VERSION                                                  :{BLACK}버젼: {NUM}
-STR_AI_URL                                                      :{BLACK}주소: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}작�중� �공지능 중 하나가 충�했습니다. �공지능 디버그 창�서 스�린샷� �어 �공지능 제작��게 보고하십시오.
-STR_AI_NO_AI_FOUND                                              :불러올 �공지능� 없습니다.{}� �공지능� 아무것� 하지 않는 �미입니다.{}'온�� 컨�츠 체�' 기능으로 �공지능� 다운받으세요.
+STR_AI_LIST_AUTHOR                                              :{BLACK}저�: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}버젼: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}주소: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}작�중� �공지능 중 하나가 충�했습니다. �공지능 디버그 창�서 스�린샷� �어 �공지능 제작��게 보고하십시오.
+STR_ERROR_AI_NO_AI_FOUND                                        :불러올 �공지능� 없습니다.{}� �공지능� 아무것� 하지 않는 �미입니다.{}'온�� 컨�츠 체�' 기능으로 �공지능� 다운받으세요.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}�시 소� 제한: {ORANGE}{COMMA}{BLACK}  최고: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}발� 소�: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}�시 소� 제한: {ORANGE}{COMMA}{BLACK}  최고: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}발� 소�: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3806,6 +3806,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... ì ‘ì
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... 파� 쓰기 실패
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}다운로드한 파�� 압축� 풀 수 없습니다
 
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}빠져있는 콘�츠를 온��으로 찾습니다.
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}빠져있는 콘�츠를 온��으로 찾� 수 있는지 검사합니다.
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}빠져있는 콘�츠를 온��으로 찾습니다.
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}빠져있는 콘�츠를 온��으로 찾� 수 있는지 검사합니다.
 ########
diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt
index 239cc050c..9e3577ae0 100644
--- a/src/lang/latvian.txt
+++ b/src/lang/latvian.txt
@@ -160,7 +160,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Karte -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spēles opcijas
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Ziņa
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Ziņa no {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Uzmanību!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Uzmanību!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}T� nevar darīt....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Šo laukumu nevar nolīdzin�t...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Orģin�l�s autortiesības {COPYRIGHT} 1995 Chris Sawyer, Visas tiesības rezervētas
@@ -168,9 +168,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD grupa
 
 STR_QUIT_CAPTION                                                :{WHITE}Iziet
-STR_YES                                                         :{BLACK}J�
-STR_NO                                                          :{BLACK}NÄ“
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Vai Tu tieš�m gribi pamest šo spēli un atgriezties uz {STRING}?
+STR_QUIT_YES                                                    :{BLACK}J�
+STR_QUIT_NO                                                     :{BLACK}NÄ“
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Vai Tu tieš�m gribi pamest šo spēli un atgriezties uz {STRING}?
 
 STR_JUST_NOTHING                                                :Nek�
 STR_COLOUR_DARK_BLUE                                            :Tumši zils
@@ -231,11 +231,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Tuksnesis
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sniegs
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Ziņa
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Noklusējums
-STR_QUERY_CANCEL                                                :{BLACK}Atcelt
-STR_QUERY_OK                                                    :{BLACK}Labi
-STR_QUERY_RENAME                                                :{BLACK}P�rsaukt
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Noklusējums
+STR_BUTTON_CANCEL                                               :{BLACK}Atcelt
+STR_BUTTON_OK                                                   :{BLACK}Labi
+STR_BUTTON_RENAME                                               :{BLACK}P�rsaukt
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -252,16 +252,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Krava
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Inform�cija
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Ietilpība
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Krava kop�
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Kopēj� kravas ietilpība:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Kopēj� kravas ietilpība:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Jauna spēle
 STR_INTRO_LOAD_GAME                                             :{BLACK}Iel�dēt spēli
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Tīkla spēle
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scen�riju redaktors
 
-STR_MAPSIZE                                                     :{BLACK}Kartes izmērii:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kartes izmērii:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spēles opcijas
 
 STR_COMPANY_SOMEONE                                             :k�ds{SKIP}{SKIP}
@@ -310,9 +310,9 @@ STR_FILE_MENU_QUIT_GAME                                         :Pamest spēli
 STR_FILE_MENU_EXIT                                              :Iziet
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Vai jūs tieš�m vēlaties p�rtraukt šo spēli?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Pamest spēli
-STR_SORT_ORDER_TIP                                              :{BLACK}Izvēlieties k�rtošanas secību (dilstošs/augošs)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Izvēlieties k�rtošanas kritēriju
-STR_SORT_BY                                                     :{BLACK}K�rtot pēc
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Izvēlieties k�rtošanas secību (dilstošs/augošs)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Izvēlieties k�rtošanas kritēriju
+STR_BUTTON_SORT_BY                                              :{BLACK}K�rtot pēc
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Iedzīvot�ju skaita
@@ -342,24 +342,24 @@ STR_SORT_BY_RUNNING_COST                                        :Lietošanas izm
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Jaudas/lietošanas izmaksas
 STR_SORT_BY_CARGO_CAPACITY                                      :Kravnesība
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Neviena veida krava negaida
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Izvēlēties visu aprīkojumu
-STR_SELECT_ALL_TYPES                                            :{BLACK}Izvēlēties visus kravas veidus (ieskaitot, kas negaida)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Apskatīties visus vilcējus, kas pieejami šim transportlīdzekļu veidam.
-STR_MANAGE_LIST                                                 :{BLACK}Labot sarakstu
-STR_MANAGE_LIST_TIP                                             :{BLACK}Dot nor�dījumus visiem transportlīdzekļiem, kas ir šaj� sarakst�
-STR_REPLACE_VEHICLES                                            :Nomainīt transportlīdzekļus
-STR_SEND_FOR_SERVICING                                          :Sūtīt uz apkopi
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Pieejamie vilcieni
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Pieejamie transportlīdzekļi
-STR_AVAILABLE_SHIPS                                             :{BLACK}Pieejamie kuģi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Pieejamie lidapar�ti
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Sūtīt uz depo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Sūtīt uz depo
-STR_SEND_SHIP_TO_DEPOT                                          :Sūtīt uz depo
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Sūtīt uz ang�ru
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Neviena veida krava negaida
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Izvēlēties visu aprīkojumu
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Izvēlēties visus kravas veidus (ieskaitot, kas negaida)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Apskatīties visus vilcējus, kas pieejami šim transportlīdzekļu veidam.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Labot sarakstu
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Dot nor�dījumus visiem transportlīdzekļiem, kas ir šaj� sarakst�
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Nomainīt transportlīdzekļus
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Sūtīt uz apkopi
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Pieejamie vilcieni
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Pieejamie transportlīdzekļi
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Pieejamie kuģi
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Pieejamie lidapar�ti
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Sūtīt uz depo
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Sūtīt uz depo
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Sūtīt uz depo
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Sūtīt uz ang�ru
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -389,12 +389,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcijas
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nevar mainīt apkopes interv�lu...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Aizvērt logu
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Loga virsraksts - velc šo, lai p�rvietotu logu
-STR_STICKY_BUTTON                                               :{BLACK}Atzīmēt šo logu k� neaizveramu ar "Aizvērt visus logus" pogu
-STR_RESIZE_BUTTON                                               :{BLACK}Klik un velc, lai mainītu šī loga lielumu
+STR_TOOLTIP_STICKY                                              :{BLACK}Atzīmēt šo logu k� neaizveramu ar "Aizvērt visus logus" pogu
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik un velc, lai mainītu šī loga lielumu
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klik te, lai ietu uz tekošo saglab�šanas/iel�dēšanas mapi
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Nojaukt celtnes u.c. uz zemes pleÄ·a
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Pazemin�t zemes stūri
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Pacelt zemes stūri
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Pazemin�t zemes stūri
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Pacelt zemes stūri
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Ritjosla - bīda sarakstu augšup/lejup
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Ritjosla - bīda sarakstu pa kreisi/labi
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}R�dīt zemes kontūras uz kartes
@@ -407,21 +407,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}R�dīt/
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Peļņa šogad: {CURRENCY} (pērn: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} gad{P s i u} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} gad{P s i u} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} gad{P s i u} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} gad{P s i u} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Vilciens
-STR_VEHICLE_ROAD_VEHICLE                                        :Autotransports
-STR_VEHICLE_SHIP                                                :Kuģis
-STR_VEHICLE_AIRCRAFT                                            :Lidapar�ts
+STR_REPLACE_VEHICLE_TRAIN                                       :Vilciens
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Autotransports
+STR_REPLACE_VEHICLE_SHIP                                        :Kuģis
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Lidapar�ts
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} pamaz�m noveco
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} ir kļuvis ļoti vecs
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} ir kļuvis ļoti vecs un tam steidzami nepieciešama nomaiņa
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Zemes laukuma inform�cija
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Izmaksas nolīdzin�šanai: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Izmaksas nolīdzin�šanai: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Ieņēmumi pēc notīrīšanas: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Ieņēmumi pēc notīrīšanas: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Nav
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Īpašnieks: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Ceļa īpašnieks: {LTBLUE}{STRING}
@@ -430,7 +430,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}DzelzceÄ
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Pašvaldība: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neviens/neviena
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}V�rds
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -542,7 +542,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klik uz
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klik uz dziesmas, lai to izdzēstu no šībrīža programmas (tikai Piel�got�1 un Piel�got�2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Ieslēgt/izslēgt mūzikas saraksta jaukšanu
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Par�dīt mūzikas saraksta izvēlēšan�s logu
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik uz servisa, lai iecentrētu skatu uz rūpnīcu vai pilsētu
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik uz servisa, lai iecentrētu skatu uz rūpnīcu vai pilsētu
 STR_INTRO_DIFFICULTY                                            :{BLACK}Grūtības pak�pe ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Pēdēj� ziņa
@@ -591,7 +591,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}SamazinÄ
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Ģenerēt nejaušu zemi
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Atjaunot zemes virsmu
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Atjaunot zemes virsmu
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Nov�kt visus spēlēt�jam piederošos īpašumus no kartes
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Nov�kt visus spēlēt�jam piederošos īpašumus no kartes
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Vai esat drošs, ka vēlaties nov�kt visus spēlēt�jam piederošos īpašumus?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Zemes virsmas ģenerēšana
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Pilsētu ģenerēšana
@@ -605,8 +605,8 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...pÄ�rÄ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...p�r�k tuvu citai pilsētai
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...vieta nav piemērota
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...p�r�k daudz pilsētu
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nevar uzbūvēt pilsētas
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...uz kartes nav vair�k vietas
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nevar uzbūvēt pilsētas
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...uz kartes nav vair�k vietas
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Palielin�t pilsētas izmērus
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Paplašin�t
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Nejauša pilsēta
@@ -622,13 +622,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Novietot
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Būvēt b�ku
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Būvēt raidīt�ju
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Nor�dīt tuksneša platību.{}Klik+Ctrl, lai to izdzēstu
-STR_CREATE_LAKE                                                 :{BLACK}Definēt ūdens laukumu.{}Veidot kan�lu. Ja nospiests CTRL jūras līmenī, tad appludin�s apk�rtni
-STR_CREATE_RIVER                                                :{BLACK}Izvietot upes
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definēt ūdens laukumu.{}Veidot kan�lu. Ja nospiests CTRL jūras līmenī, tad appludin�s apk�rtni
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Izvietot upes
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Izdzēst
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Pilnīb� dzēst šo pilsētu
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Saglab�t scen�riju
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Iel�dēt scen�riju
-STR_MENU_LOAD_HEIGHTMAP                                         :Iel�dēt augstumu karti
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Iel�dēt augstumu karti
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Iziet no redaktora
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Iziet
@@ -638,7 +638,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Saglab�
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Spēlēt scen�riju
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spēlēt augstumu karti
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}S�kt jaunu spēli, izmantojot augstumkarti priekš ainavas reljefa
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Vai esat p�rliecin�ts, ka vēlaties pamest šo scen�riju?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Vai esat p�rliecin�ts, ka vēlaties pamest šo scen�riju?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...atļauts būvēt tikai pilsēt�s ar iedzīvot�ju skaitu vismaz 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}P�rvietot s�kšanas datumu 1 gadu atpakaļ
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}P�rvietot s�kuma datumu 1 gadu uz priekšu
@@ -646,21 +646,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...abiem
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Mazs
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Vidējs
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Liels
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Nejaušs
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Nejaušs
 STR_FOUND_TOWN_CITY                                             :{BLACK}Pilsēta
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Lielpilsētas attīst�s �tr�k k� mazpilsētas{}Atkarīb� no uzst�dījumiem t�s dibin�šanas brīdī ir liel�kas.
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Nor�dīt pilsētas izmērus
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Pilsētas izmēri:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Pilsētas ceļu izskats:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Uzslēgt pilsētas ceļa izskatu
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Oriģin�ls
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Lab�ks ceļš
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 režģis
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 režģis
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Nejaušs
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Pilsētas ceļu izskats:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Uzslēgt pilsētas ceļa izskatu
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Oriģin�ls
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Lab�ks ceļš
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 režģis
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 režģis
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Nejaušs
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Par�dīt pēdējo ziņojumu vai avīzes rakstu
 STR_NEWS_MESSAGES_OFF                                           :Nav
 STR_NEWS_MESSAGES_SUMMARY                                       :Kopsavilkums
@@ -760,10 +760,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekr�na kopija saglab�ta k�  '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ekr�na kopijas veidošana neizdev�s!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Pirkt zemi vēl�kai lietošanai
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Pirkt zemi vēl�kai lietošanai
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOSAGLABĀŠANA
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  Spēle tiek saglab�ta *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Notiek saglab�šana,{}lLūdzu uzgaidiet!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Notiek saglab�šana,{}lLūdzu uzgaidiet!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Izvēlēties 'Ezy Ielas muzikas stila' programmu
 
 ############ start of townname region
@@ -826,7 +826,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Interfei
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pilnekr�ns
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Iezīmē ķeksi, lai spēlētu OpenTTD pilna ekr�na režīm�
-STR_FULLSCREEN_FAILED                                           :{WHITE}Nevar uzst�dīt pilnekr�na rezīmu
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Nevar uzst�dīt pilnekr�na rezīmu
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekr�na izšķirtspēja
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Ekr�na izšķirtspējas izvēle
@@ -837,12 +837,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Ekr�na
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Pamata grafika komplekts
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Uzslēgt pamat grafikas komplektu lietošanai
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autom�tisk� saglab�šana neizdev�s
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autom�tisk� saglab�šana neizdev�s
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Dodas uz {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Dodas uz {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Nav rīkojumu
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Nav rīkojumu, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Dodas uz {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Dodas uz {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Nav rīkojumu
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Nav rīkojumu, {VELOCITY}
 
 STR_PASSENGERS                                                  :pasažieri
 STR_BAGS                                                        :maisi
@@ -853,9 +853,9 @@ STR_CRATES                                                      :kastes
 STR_RES_OTHER                                                   :cita
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nevar dalīties ar rīkojumu sarakstu...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nevar kopēt rīkojumu sarakstu...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Dalīto rīkojumu beigas - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nevar dalīties ar rīkojumu sarakstu...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nevar kopēt rīkojumu sarakstu...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Dalīto rīkojumu beigas - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} nevar atrast ceļu, lai turpin�tu
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} ir apmaldījies
@@ -1119,15 +1119,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Kartes
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :atspējots
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Mainīt iestatījuma vērtību
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Mainīt iestatījuma vērtību
 
-STR_TEMPERATE_LANDSCAPE                                         :MÄ“renais klimats
-STR_SUB_ARCTIC_LANDSCAPE                                        :Subarktiskais klimats
-STR_SUB_TROPICAL_LANDSCAPE                                      :Subtropiskais klimats
-STR_TOYLAND_LANDSCAPE                                           :Rotaļlietu zeme
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :MÄ“renais klimats
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Subarktiskais klimats
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Subtropiskais klimats
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Rotaļlietu zeme
 
 STR_CHEATS                                                      :{WHITE}Blēdības
-STR_CHEATS_TIP                                                  :{BLACK}Atzīmēt�s rūtiņas nor�da uz to, vai esat jau izmantojis šo blēdību
+STR_CHEATS_TOOLTIP                                              :{BLACK}Atzīmēt�s rūtiņas nor�da uz to, vai esat jau izmantojis šo blēdību
 STR_CHEATS_WARNING                                              :{BLACK}Uzmanību! Jūs tūliņ nodosiet savus biedrus konkurentus. Paturi pr�t�, ka š�ds g�jiens tiks pieminēts mūžīgi.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Palielin�t naudas līdzekļus par {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spēlēt k� komp�nija: {ORANGE}{COMMA}
@@ -1139,177 +1139,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Klimata
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Datuma maiņa: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ļauj izmainīt produkcijas vērtības: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Dodas uz {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Dodas uz {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Dodas uz {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Dodas uz {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Caur {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Brauc caur {WAYPOINT} bez apst�šan�s
+STR_ORDER_GO_TO_WAYPOINT                                        :Caur {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Brauc caur {WAYPOINT} bez apst�šan�s
 
-STR_WAYPOINTNAME_CITY                                           :Kontrolpunkts {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrolpunkts {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Kontrolpunkts
+STR_FORMAT_WAYPOINT_NAME                                        :Kontrolpunkts {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Kontrolpunkts {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrolpunkts
 
-STR_WAYPOINT                                                    :{WHITE}Kontrolpunkts
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Izvēlaties kontrolpunkta veidu
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrolpunkts
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Izvēlaties kontrolpunkta veidu
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Labot kontrolpunkta nosaukumu
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nevar p�rsaukt kontrolpunktu...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nevar p�rsaukt kontrolpunktu...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}P�rvērst sliedes par kontrolpunktu
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nevar šeit uzbūvēt vilcienu kontrolpunktu...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nevar šeit noņemt vilcienu kontrolpunktu...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Nevar šeit uzbūvēt vilcienu kontrolpunktu...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Nevar šeit noņemt vilcienu kontrolpunktu...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Būvēt dzelzceļu izmantojot autosliežu režīmu
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...šaj� scen�rij� nav pilsētu
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kartes ģenerēšana apturēta...{}...nav piemērotas pozīcijas pilsēt�m
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...šaj� scen�rij� nav pilsētu
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kartes ģenerēšana apturēta...{}...nav piemērotas pozīcijas pilsēt�m
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Daudz nejauši izveidotu pilsētu
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}P�kl�t karti ar nejauši izvietot�m pilsēt�m
-STR_MANY_RANDOM_INDUSTRIES                                      :Daudz nejauši izveidotu rūpniecu
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}P�kl�t karti ar nejauši izvietot�m rūpniecīb�m
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nevar izveidot rūpniecības...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Daudz nejauši izveidotu pilsētu
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}P�kl�t karti ar nejauši izvietot�m pilsēt�m
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Daudz nejauši izveidotu rūpniecu
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}P�kl�t karti ar nejauši izvietot�m rūpniecīb�m
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nevar izveidot rūpniecības...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Atvērt aiznavas rīkjoslu, lai mainītu zemes līmeni, st�dīt kokus utt.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Ainava
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Izlīdzin�t zemi
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Izlīdzin�t zemi
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Nejauši izvēlēta veida koki
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Nejauši izveitot kokus
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Nejauši izveitot kokus
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Nedrīkst šeit būvēt kan�lus...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Nedrīkst šeit būvēt kan�lus...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Būvēt kan�lus. Nospiediet CTRL, lai izvietotu jūras šūnas (tikai jūras līmenī)
-STR_LANDINFO_CANAL                                              :Kan�ls
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kan�ls
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Nevar šeit būvēt slūžas...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Nevar šeit būvēt slūžas...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Būvēt slūžas
-STR_LANDINFO_LOCK                                               :Slūžas
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Slūžas
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Upes Å¡eit likt nevar...
-STR_LANDINFO_RIVER                                              :Upe
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Upes Å¡eit likt nevar...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Upe
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...boja jau tiek lietota!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...boja jau tiek lietota!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordin�tes: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordin�tes: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nevar nov�kt daļu stacijas...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Nevar p�rveidot sliežu veidu šeit...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nevar nov�kt daļu stacijas...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Nevar p�rveidot sliežu veidu šeit...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}P�rveidot/uzlabot sliežu veidu
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}P�rvēlciet šeit vilciena lokomotīvi, lai p�rdotu visu vilcienu
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}P�rvēlciet šeit vilciena lokomotīvi, lai p�rdotu visu vilcienu
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Vilkt un nomest
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Būvēt staciju izmantojot "vilkt un nomest"
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Izvēlaties, k�du stacijas klasi r�dīt
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Izvēlaties, k�du stacijas veidu būvēt
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Izvēlaties, k�du stacijas klasi r�dīt
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Izvēlaties, k�du stacijas veidu būvēt
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Pa�trin�ta spēle
 STR_MESSAGE_HISTORY                                             :{WHITE}Ziņojumu vēsture
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Neseno ziņu saraksts
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Atspējot visu
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Iespējot visu
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Neseno ziņu saraksts
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Atspējot visu
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Iespējot visu
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Rūpnīcas
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% p�rvad�ti)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% p�rvad�ti)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}IRūpnīcu v�rdi - klik uz v�rda, lai centrētu skatu uz rūpnīcu
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Rūpnīcas
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% p�rvad�ti)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% p�rvad�ti)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}IRūpnīcu v�rdi - klik uz v�rda, lai centrētu skatu uz rūpnīcu
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...p�r�k tuvu citai rūpnīcai
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...p�r�k tuvu citai rūpnīcai
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Mainīt produkciju
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Vair�k spēlēt�ju režīms
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spēlēt�ja v�rds:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Šis v�rds, pēc kura jūs pazīs citi spēlēt�ji
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Ievadiet savu v�rdu
-STR_NETWORK_CONNECTION                                          :{BLACK}Savienojums:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Izvēlaties starp spēli caur internetu vai spēli lok�laj� tīkl�
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Palaist serveri
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Palaist jūsu personīgo serveri
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}V�rds
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Spēles nosaukums
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Valoda, servera versija utt.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klik uz spēles sarakst�, lai to izvēlētos
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Serveris, kuram Jūs pievienoj�ties pēdējoreiz:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klik, lai izvēlētos serveri, kur� Jūs spēlēj�t pag�šreiz
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Atrast serveri
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Meklēt serveri tīkl�
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Pievienot serveri
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Pievieno serveri sarakstam, kurš vienmēr tiks p�rbaudīts, vai taj� nav palaistas spēles.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Ievadiet servera adresi
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienti tiešsaitē / Maks. klientu skaits{}Uzņēmumi tiešsaistē / Maks. uzņēmumu skaits
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kartes izmērs
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Spēles kartes izmērs{}Klik, lai šķirotu pa zon�m
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datums
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Šībrīža datums
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Gadi
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Gadu skaits{}spēle ir palaista
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPÄ’LES INFORMÄ€CIJA
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Valoda:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Attēlu komplekts:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartes izmērs:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Servera versija:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Servera adrese:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}S�kuma datums:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Šībrīža datums:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Aizsarg�ts ar paroli!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVERIS NAV TIEÅ SAISTÄ’
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVERIS IR PILNS
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIJU NESAKRITĪBA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NESAKRITĪBA
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Pievienoties spēlei
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}S�kt jaunu vair�kspēlēt�ju spēli
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spēles nosaukums:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Spēles nosaukums, kas tiks attēlots citiem spēlētajiem vair�kspēlēt�ju spēļu izvēlnē
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Ievadiet tīkla spēles nosaukumu
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Uzst�dīt paroli
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Aizsarg� jūsu spēli ar paroli, ja jūs nevēlaties, lai t� būtu publiski pieejama
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Izvēlaties karti:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Kuru karti jūs vēlaties spēlēt?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internets
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internets
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internets (reklamēt)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P s i u}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maks. klientu sk.:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Izvēlaties maks. klientu skaitu. Ne visiem slotiem ir j�būt aizpildītiem
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} komp�nij{P a as u}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks. uzņēmumu sk.:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Ierobežo serveri noteiktam uzņēmumu skaitam
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} novērot�j{P s i u}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks. novērot�ju sk.:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ierobežo serveri noteiktam novērot�ju skaitam
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Valodu, kur� run�:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Citi lietot�ji zin�s, kur� valod� tiek run�ts uz servera
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}S�kt spēli
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}S�k jaunu tīkla spēli ar nejaušu karti vai scen�riju
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Iel�dēt spēli
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Ats�kt iepriekš saglab�tu vair�kspēlēt�ju spēli (esi p�rliecin�ts, ka ats�kat k� pareizs spēlēt�js)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Vair�k spēlēt�ju režīms
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spēlēt�ja v�rds:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Šis v�rds, pēc kura jūs pazīs citi spēlēt�ji
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Ievadiet savu v�rdu
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Savienojums:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Izvēlaties starp spēli caur internetu vai spēli lok�laj� tīkl�
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Palaist serveri
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Palaist jūsu personīgo serveri
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}V�rds
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Spēles nosaukums
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Valoda, servera versija utt.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klik uz spēles sarakst�, lai to izvēlētos
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Serveris, kuram Jūs pievienoj�ties pēdējoreiz:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klik, lai izvēlētos serveri, kur� Jūs spēlēj�t pag�šreiz
+
+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}Pievieno serveri sarakstam, kurš vienmēr tiks p�rbaudīts, vai taj� nav palaistas spēles.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Ievadiet servera adresi
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klienti
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klienti tiešsaitē / Maks. klientu skaits{}Uzņēmumi tiešsaistē / Maks. uzņēmumu skaits
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kartes izmērs
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Spēles kartes izmērs{}Klik, lai šķirotu pa zon�m
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datums
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Šībrīža datums
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Gadi
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Gadu skaits{}spēle ir palaista
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPÄ’LES INFORMÄ€CIJA
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klienti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Valoda:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Attēlu komplekts:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kartes izmērs:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Servera versija:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Servera adrese:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}S�kuma datums:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Šībrīža datums:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Aizsarg�ts ar paroli!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVERIS NAV TIEÅ SAISTÄ’
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVERIS IR PILNS
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIJU NESAKRITĪBA
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF NESAKRITĪBA
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pievienoties spēlei
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}S�kt jaunu vair�kspēlēt�ju spēli
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spēles nosaukums:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Spēles nosaukums, kas tiks attēlots citiem spēlētajiem vair�kspēlēt�ju spēļu izvēlnē
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Ievadiet tīkla spēles nosaukumu
+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 jūs nevēlaties, lai t� būtu publiski pieejama
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Izvēlaties karti:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Kuru karti jūs vēlaties spēlēt?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internets
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internets
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internets (reklamēt)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P s i u}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maks. klientu sk.:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Izvēlaties maks. klientu skaitu. Ne visiem slotiem ir j�būt aizpildītiem
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} komp�nij{P a as u}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maks. uzņēmumu sk.:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Ierobežo serveri noteiktam uzņēmumu skaitam
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} novērot�j{P s i u}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maks. novērot�ju sk.:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Ierobežo serveri noteiktam novērot�ju skaitam
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Valodu, kur� run�:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Citi lietot�ji zin�s, kur� valod� tiek run�ts uz servera
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}S�kt spēli
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}S�k jaunu tīkla spēli ar nejaušu karti vai scen�riju
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Iel�dēt spēli
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Ats�kt iepriekš saglab�tu vair�kspēlēt�ju spēli (esi p�rliecin�ts, ka ats�kat k� pareizs spēlēt�js)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Jebkur�
@@ -1350,33 +1350,33 @@ STR_NETWORK_LANG_GREEK                                          :GrieÄ·u
 STR_NETWORK_LANG_LATVIAN                                        :Latviešu
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Tīkla spēles vestibils
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Tīkla spēles vestibils
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Gatavojos pievienoties:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Spēlē esošo komp�niju saraksts. Jūs varat vai nu pievienoties k�dai, vai arī s�kt jaunu, ja ir brīvs komp�nijas slots
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Jauna komp�nija
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Izveidot jaunu komp�niju
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Novērot spēli
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Skatīties spēli k� novērot�jam
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Pievienoties komp�nijai
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Palīdzēt vadīt šo komp�niju
-STR_NETWORK_REFRESH                                             :{BLACK}Atjaunin�t serveri
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Atjaunin�t servera inform�ciju
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Gatavojos pievienoties:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Spēlē esošo komp�niju saraksts. Jūs varat vai nu pievienoties k�dai, vai arī s�kt jaunu, ja ir brīvs komp�nijas slots
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Jauna komp�nija
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Izveidot jaunu komp�niju
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Novērot spēli
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Skatīties spēli k� novērot�jam
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Pievienoties komp�nijai
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Palīdzēt vadīt šo komp�niju
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atjaunin�t serveri
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atjaunin�t servera inform�ciju
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}KOMPÄ€NIJAS INFO
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}KOMPÄ€NIJAS INFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Komp�nijas nosaukums:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Atkl�šana:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Uzņēmuma vērtība:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Šībrīža bilance:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ien�kumi pērn:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Veiktspēja:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Komp�nijas nosaukums:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Atkl�šana:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Uzņēmuma vērtība:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Šībrīža bilance:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Ien�kumi pērn:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Veiktspēja:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Satiksmes līdzekļi:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stacijas:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spēlēt�ji:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Satiksmes līdzekļi:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stacijas:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spēlēt�ji:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Savienojas...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Savienojas...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Savienojos..
@@ -1392,49 +1392,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Pieņemu
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P s i u} tav� priekš�
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} lejupl�dēti līdz šim
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Atvienoties
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Atvienoties
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Ievadiet cik daudz naudas vēlaties dot
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris ir aizsarg�ts. Ieraksti paroli
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Uzņēmums ir aizsarg�ts. Ieraksti paroli
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientu saraksts
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientu saraksts
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Skatīt
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Jauna Komp�nija
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Neviena tīkla iek�rta nav atrasta vai kompilēta bez ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nevar atrast nevienu interneta spēli
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Serveris neadbildēja uz pieprasījumu
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nevar pieslēgties sakar� ar NewGRF nesaderību
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Tīkla-Spēļu sinhroniz�cija neveiksmīga
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Interneta spēlei zudis savienojums
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nevar iel�dēt saglab�to spēli
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nevar uzs�kt servera darbību
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nevar savienot
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Savienojums #{NUM} beidzies
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Tika pielaista protokola kļūda un savienojums tika slēgts
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Klienta p�rskats neatbilst servera p�rskatam
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Nepareiza Parole
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Serveris ir pilns
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Jūs esat izraidīts no šī severa
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Tu esi izmests no šīs spēles
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Kr�pšan�s nav atļauta uz šī servera
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Neviena tīkla iek�rta nav atrasta vai kompilēta bez ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Nevar atrast nevienu interneta spēli
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Serveris neadbildēja uz pieprasījumu
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Nevar pieslēgties sakar� ar NewGRF nesaderību
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Tīkla-Spēļu sinhroniz�cija neveiksmīga
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Interneta spēlei zudis savienojums
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Nevar iel�dēt saglab�to spēli
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Nevar uzs�kt servera darbību
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Nevar savienot
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Savienojums #{NUM} beidzies
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Tika pielaista protokola kļūda un savienojums tika slēgts
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Klienta p�rskats neatbilst servera p�rskatam
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Nepareiza Parole
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Serveris ir pilns
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Jūs esat izraidīts no šī severa
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Tu esi izmests no šīs spēles
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Kr�pšan�s nav atļauta uz šī servera
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :galven� kļūda
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :asinhroniz�cijas kļūda
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nevar iel�dēt karti
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :zuduši sakari
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokola kļūda
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF nesaderība
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nav autorizēts
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :saņemta sav�da pakete
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :nepareiza versija
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :šo v�rdu jau lieto
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :nepareiza parole
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :VeiktKomandas nepareizs komp�nijas-id
-STR_NETWORK_ERR_CLIENT_KICKED                                   :serveris tevi izmeta
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :mēģin�ja kr�pties
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serveris pilns
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :galven� kļūda
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :asinhroniz�cijas kļūda
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :nevar iel�dēt karti
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :zuduši sakari
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokola kļūda
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF nesaderība
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nav autorizēts
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :saņemta sav�da pakete
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :nepareiza versija
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :šo v�rdu jau lieto
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :nepareiza parole
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :VeiktKomandas nepareizs komp�nijas-id
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :serveris tevi izmeta
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :mēģin�ja kr�pties
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serveris pilns
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1444,15 +1444,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spēle nopauzē
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spēle ats�kta (dalībnieks pieslēdzies)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spēle ats�kta (dalībniekam neizdev�s pieslēgties)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :aizeju
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} ir pievienojies spēlei
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} ir pievienojies komp�nijai #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} ir pievienojis skatīt�jus
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ir nodibin�jis jaunu komp�niju (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} ir pametis spēli ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} ir nomainījis savu v�rdu uz {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} iedeva tavai komp�nijai {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Jūs iedev�t {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :aizeju
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ir pievienojies spēlei
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ir pievienojies komp�nijai #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ir pievienojis skatīt�jus
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ir nodibin�jis jaunu komp�niju (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ir pametis spēli ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ir nomainījis savu v�rdu uz {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} iedeva tavai komp�nijai {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Jūs iedev�t {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Komanda] :
 STR_NETWORK_CHAT_COMPANY                                        :[Komanda] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Komanda] Uz {STRING}: {WHITE}{STRING}
@@ -1462,8 +1462,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Priv�ti] Uz {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Visiem] :
 STR_NETWORK_CHAT_ALL                                            :[Visiem] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Ievadiet tekstu tīkla tērzēšanai
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Serveris beidza sesiju
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Serveris p�rstartējas...{}Lūdzu uzgaidiet...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Serveris beidza sesiju
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Serveris p�rstartējas...{}Lūdzu uzgaidiet...
 
 STR_NETWORK_SERVER                                              :Serveris
 STR_NETWORK_CLIENT                                              :Klients
@@ -1477,19 +1477,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :RunÄ�t ar kompÄ
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Priv�ts ziņojums
 
 
-STR_NETWORK_SEND                                                :{BLACK}Sūtīt
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Sūtīt
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nevar iel�dēt reljefu no PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fails nav atrasts.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nav iespējams p�rkonvertēt šo attēla veidu. Vajadzīgs 8 vai 24-bitu PNG attēls.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...kaut kas nog�ja greizi. Atvainojiet. (iespējams boj�ts fails)
+STR_ERROR_PNGMAP                                                :{WHITE}Nevar iel�dēt reljefu no PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fails nav atrasts.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nav iespējams p�rkonvertēt šo attēla veidu. Vajadzīgs 8 vai 24-bitu PNG attēls.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...kaut kas nog�ja greizi. Atvainojiet. (iespējams boj�ts fails)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Nevar iel�dēt no BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nav iespējams p�rkonvertēt šo attēla veidu.
+STR_ERROR_BMPMAP                                                :{WHITE}Nevar iel�dēt no BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nav iespējams p�rkonvertēt šo attēla veidu.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Izmaksas: {CURRENCY}
@@ -1503,13 +1503,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Pl�noti
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Šeit nevar uzbērt augst�k...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Šeit nevar norakt zem�k...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Šaj� viet� nevar izlīdzīn�t zemi...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Akmeņi
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Nelīdzena zeme
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Kaila zeme
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Z�l�js
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Lauki
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Apsnigusi zeme
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Tuksnesis
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Akmeņi
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Nelīdzena zeme
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Kaila zeme
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Z�l�js
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Lauki
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Apsnigusi zeme
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Tuksnesis
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Nog�ze ir uz nepareizo pusi
@@ -1517,11 +1517,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Neiespē
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Rakšana saboj�s tuneli
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}...jau ir jūras līmenī
 STR_ERROR_TOO_HIGH                                              :{WHITE}...p�r�k augstu
-STR_ALREADY_LEVELLED                                            :{WHITE}... ir jau plakans
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... ir jau plakans
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nepiemērotas sliedes
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...jau uzbūvēts
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Vispirms j�nojauc sliedes
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Ceļs ir bloķēts vai vienvirziena
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Ceļs ir bloķēts vai vienvirziena
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Dzelzceļa būvēšana
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrisk� dzelzceļa būve
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Viensliežu būvēšana
@@ -1545,41 +1545,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Būvēt
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Būvēt dzelzceļa tiltu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Būvēt dzelzceļa tuneli
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}P�rslēgties starp sliežu un semaforu būvēšanas/nojaukšanas režīmiem
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Tilta izvēle - klik uz vēlamo tiltu, lai to uzbūvētu
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Tilta izvēle - klik uz vēlamo tiltu, lai to uzbūvētu
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Izvēlieties vilcienu depo orient�ciju
-STR_RAILROAD_TRACK                                              :Sliežu ceļš
-STR_RAILROAD_TRAIN_DEPOT                                        :Vilcienu depo
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Sliežu ceļš
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Vilcienu depo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...zemes gabals pieder citam uzņēmumam
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Sliedes ar bloka sign�liem
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Sliedes ar pirms-sign�liem
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Sliedes ar izejas sign�liem
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Sliedes ar kombinētiem sign�liem
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Sliedes ar virziena sign�liem
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Sliedes ar vienvirziena sign�liem
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Sliedes ar bloku un pirms-sign�liem
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Sliedes ar bloku un izejas sign�liem
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Sliedes ar bloku un kombinētiem sign�liem
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Sliedes ar bloku un virziena sign�liem
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Sliedes ar bloka un vienvirziena sign�liem
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Sliedes ar pirms un izejas sign�liem
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Sliedes ar pirms un kombinētiem sign�liem
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Sliedes ar pirms un virziena sign�liem
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Sliedes ar pirms un vienvirziena sign�liem
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Sliedes ar izejas un kombinētiem sign�liem
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Sliedes ar izejas un virziena sign�liem
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Sliedes ar izejas un vienvirziena sign�liem
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Sliedes ar kombinētiem un virziena sign�liem
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Sliedes ar kombinētiem un vienvirziena sign�liem
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Sliedes ar virziena un vienvirziena sign�liem
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Virspirms j�nov�c stacija
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Būvēt atdalītu staciju
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Pievienot staciju
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Sliedes ar bloka sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Sliedes ar pirms-sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Sliedes ar izejas sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Sliedes ar kombinētiem sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Sliedes ar virziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Sliedes ar vienvirziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Sliedes ar bloku un pirms-sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Sliedes ar bloku un izejas sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Sliedes ar bloku un kombinētiem sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Sliedes ar bloku un virziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Sliedes ar bloka un vienvirziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Sliedes ar pirms un izejas sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Sliedes ar pirms un kombinētiem sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Sliedes ar pirms un virziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Sliedes ar pirms un vienvirziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Sliedes ar izejas un kombinētiem sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Sliedes ar izejas un virziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Sliedes ar izejas un vienvirziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Sliedes ar kombinētiem un virziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Sliedes ar kombinētiem un vienvirziena sign�liem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Sliedes ar virziena un vienvirziena sign�liem
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Virspirms j�nov�c stacija
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Būvēt atdalītu staciju
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Pievienot staciju
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Vispirms j�nojauc ceļš
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Notiek ceļa remonts
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Notiek ceļa remonts
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Ceļa būvēšana
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Tramvaju būvēšana
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Izvēlieties tiltu
@@ -1615,14 +1615,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Būvēt
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Ieslēgt/izslēgt vienvirziena ceļus
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}P�rslēgties starp ceļa būvēšanas/nojaukšanas režīmiem
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}P�rslēgt būvēt/nov�kt tramvaju būvei
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Izvēlieties automašīnu depo orient�ciju
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Izvēlēties tramvaja depo orient�ciju
-STR_ROAD_DESCRIPTION_ROAD                                       :Ceļš
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Apgaismots ceļš
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Aleja
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Automašīnu depo
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :P�rbrauktuve
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramvajs
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Izvēlieties automašīnu depo orient�ciju
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Izvēlēties tramvaja depo orient�ciju
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Ceļš
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Apgaismots ceļš
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Aleja
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Automašīnu depo
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :P�rbrauktuve
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramvajs
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nevar nov�kt autobusa pieturu...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nevar nov�kt kravas auto pieturu...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nevar nov�kt tramvaja pasažieru pieturu...
@@ -1630,12 +1630,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nevar no
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Pilsētas
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Vispirms j�nojauc ēka
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Pilsēta)
@@ -1648,8 +1648,8 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}IecentrÄ
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}P�rsaukt pilsētu
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Pasažieru sk. pag�juš� mēnesī: {ORANGE}{COMMA}{BLACK}  Maks. sk.: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Pasts pag�juš� mēnesī: {ORANGE}{COMMA}{BLACK}  Maks. apjoms: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Krava nepieciešama pilsētas attīstībai:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} nepieciešams
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Krava nepieciešama pilsētas attīstībai:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} nepieciešams
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Augstceltne
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Biroju Ä“ka
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Maza dzīvokļu ēka
@@ -1686,7 +1686,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}P�rvad�jumu subsīdija piešķirta {STRING}!{}{}{STRING} p�rvad�jumi no {STATION} uz {STATION} saņems trīsk�ršu samaksu vienu gadu!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}P�rvad�jumu subsīdija piešķirta {STRING}!{}{}{STRING} p�rvad�jumi no {STATION} uz {STATION} saņems �etrk�ršu samaksu vienu gadu!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} vietēj� pašvaldība aizliedz būvēt vēl vienu lidostu šaj� pilset�
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} vietēj� pašvaldība atsaka atļauju lidostai sakar� ar paaugstin�tu trokšņa līmeni
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} vietēj� pašvaldība atsaka atļauju lidostai sakar� ar paaugstin�tu trokšņa līmeni
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Vasarnīcas
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :M�jas
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Dzīvokļi
@@ -1722,7 +1722,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Satiksmes haoss {TOWN}!{}{}{STRING} apmaks�tie ielu p�rbūves darbi rada v�jpr�tu uz iel�m pusgada garum�!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (notiek būvdarbi)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (notiek būvdarbi)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igla
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvams
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tējkannas namiņš
@@ -1735,17 +1735,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Novietot zīmi
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Koki
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...Å¡eit jau aug koks
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Šeit nevar iest�dīt koku..
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...p�r�k daudz zīmju
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Šeit nevar novietot zīmi...
-STR_SIGN_DEFAULT                                                :ZÄ«me
+STR_DEFAULT_SIGN_NAME                                           :ZÄ«me
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Labot zīmi
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nevar izmainīt zīmes v�rdu...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nevar dzēst zīmi...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Izvēlies koka tipu st�dīšanai
-STR_TREE_NAME_TREES                                             :Koki
-STR_TREE_NAME_RAINFOREST                                        :Lietus meži
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusi
+STR_LAI_TREE_NAME_TREES                                         :Koki
+STR_LAI_TREE_NAME_RAINFOREST                                    :Lietus meži
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusi
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Dzelzceļa stacijas izvēle
@@ -1765,7 +1765,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Vispirms
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}P�r�k tuvu citai lidostai
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Vispirms j�nojauc lidosta
 
-STR_QUERY_RENAME_STATION_CAPTION                                :P�rsaukt staciju/iekraušanas zonu
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :P�rsaukt staciju/iekraušanas zonu
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nevar p�rsaukt staciju...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Reitingi
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Pieņem
@@ -1783,10 +1783,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Izcils
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}R�dīt vilcienus, kuru rīkojumu sarakstos ir šī stacija
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}R�dīt mašīnas, kuru rīkojumu sarakstos ir šī stacija
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}R�dīt lidapar�tus, kuru rīkojumu sarakstos ir šī stacija
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}R�dīt kuģus, kuru rīkojumu sarakstos ir šī stacija
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}R�dīt vilcienus, kuru rīkojumu sarakstos ir šī stacija
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}R�dīt mašīnas, kuru rīkojumu sarakstos ir šī stacija
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}R�dīt lidapar�tus, kuru rīkojumu sarakstos ir šī stacija
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}R�dīt kuģus, kuru rīkojumu sarakstos ir šī stacija
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} vairs nepieņem {STRING}
@@ -1819,47 +1819,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}P�rsauk
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}R�dīt pieņemamo kravas sarakstu
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Staciju nosaukumi - klik uz nosaukuma, lai centrētu galveno skatu uz staciju
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Izvēlieties lidostas izmēru/veidu
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Dzelzceļa stacija
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Lidapar�tu ang�rs
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lidosta
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Kravas iekraušanas zona
-STR_STATION_DESCRIPTION_BUS_STATION                             :Autoosta
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Osta
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Dzelzceļa stacija
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Lidapar�tu ang�rs
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lidosta
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Kravas iekraušanas zona
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Autoosta
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Osta
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Iezīmēt jaunceļam� objekta p�rkl�jumu
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Neiezīmēt jaunceļam� objekta p�rkl�jumu
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}P�rkl�juma iezīmēšana
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Doks
-STR_STATION_DESCRIPTION_BUOY                                    :Boja
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boja
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boja traucē
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stacija ir p�r�k izplesta
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...neregul�ras stacijas atspējotas
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Nospiediet CTRL lai izvēlētos vair�kus
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...neregul�ras stacijas atspējotas
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Nospiediet CTRL lai izvēlētos vair�kus
 
 STR_UNDEFINED                                                   :(nedefinēta rinda)
-STR_STAT_CLASS_DFLT                                             :Noklusēt� stacija
-STR_STAT_CLASS_WAYP                                             :Waypoints
+STR_STATION_CLASS_DFLT                                          :Noklusēt� stacija
+STR_STATION_CLASS_WAYP                                          :Waypoints
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Kuģu depo virziens
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...j�būvē uz ūdens
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Šeit nevar būvēt ķuģu depo...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Izvēlies kuģu depo virzienu
-STR_WATER_DESCRIPTION_WATER                                     :Ūdens
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :JÅ«ras vai upes krasts
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Kuģu depo
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvadukts
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Ūdens
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :JÅ«ras vai upes krasts
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Kuģu depo
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukts
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Nevar būvēt uz ūdens
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Vispirms j�nojauc kan�ls
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Vispirms j�nojauc kan�ls
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Saglab�t spēli
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Iel�dēt spēli
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Saglab�t
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Dzēst
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Skatīt�js, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Skatīt�js, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} brīv{P s i u}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Nevar lasīt disku
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Spēles saglab�šana neizdev�s{}{STRING}
@@ -1875,12 +1875,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Disku, m
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Šobrīd izvēlētais saglab�jam�s spēles nosaukums
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Dzēst izvēlēto saglab�to spēli
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Saglab�t šo spēli izmantojot izvēlēto v�rdu
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Ģenerēt jaunu spēli pēc gadījuma principa
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Iel�dēt topogr�fisko karti
-STR_SAVE_OSKTITLE                                               :{BLACK}Ievadiet saglab�t�s spēles nosaukumu
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Ģenerēt jaunu spēli pēc gadījuma principa
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Iel�dēt topogr�fisko karti
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Ievadiet saglab�t�s spēles nosaukumu
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} traucē
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} traucē
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Ogļu raktuves
 STR_INDUSTRY_NAME_POWER_STATION                                 :Spēkstacija
@@ -1938,7 +1938,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Iecentrēt galveno skatu uz rūpnīcu
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Tiek būvēta jauna {STRING} net�lu no {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Jauns {STRING} tiek st�dīts net�lu no {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Izmaks�: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Izmaks�: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Šeit nevar būvēt šī tipa rūpnīcu...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...mežus atļauts st�dīt tikai virs sniega līnijas
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} paziņo par tūlītēju darbības p�rtraukšanu!
@@ -1956,16 +1956,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Traucē cits tunelis
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunelis beigsies �rpus kartes
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunelis beigsies �rpus kartes
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nevar izrakt citu tuneli
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Vispirms j�nojauc tunelis
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Vispirms j�nojauc tilts
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Nevar s�kties un beigties taj� paša viet�
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Tilta gali nav vien� līmenī
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Tilts ir p�r�k zems priekš šī zemes veida
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Nevar s�kties un beigties taj� paša viet�
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Tilta gali nav vien� līmenī
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Tilts ir p�r�k zems priekš šī zemes veida
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}S�kumam un beig�m j�būt uz vienas līnijas
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Nederīga vieta tuneļa s�kumam
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Vanšu, Tērauda
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Tērauda spraišļu
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Konsole, TÄ“rauda
@@ -1976,30 +1976,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cauruļveida, T
 STR_BRIDGE_TUBULAR_SILICON                                      :Cauruļveida, silikona
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Šeit nevar būvēt tiltu..
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Šeit nevar būvēt tuneli
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Dzelzceļa tunelis
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Autoceļa tunelis
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Tērauda vanšu dzelzceļa tilts
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Tērauda dzelzceļa tilts
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Tērauda konsoles dzelzceļa tilts
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Dzelzbetona vanšu dzelzceļa tilts
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Koka dzelzeļa tilts
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betona dzelzceļa tilts
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Tērauda vanšu tilts
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :TÄ“rauda tilts
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :TÄ“rauda konsoles tilts
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Dzelzbetona vanšu tilts
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Koka tilts
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betona tilts
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Cauruļveida dzelzceļa tilts
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Cauruļveida tilts
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Dzelzceļa tunelis
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Autoceļa tunelis
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Tērauda vanšu dzelzceļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Tērauda dzelzceļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Tērauda konsoles dzelzceļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Dzelzbetona vanšu dzelzceļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Koka dzelzeļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betona dzelzceļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Tērauda vanšu tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :TÄ“rauda tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :TÄ“rauda konsoles tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Dzelzbetona vanšu tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Koka tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betona tilts
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Cauruļveida dzelzceļa tilts
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Cauruļveida tilts
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Traucējošs objekts
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Raidīt�js
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :B�ka
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Uzņēmuma birojs
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Raidīt�js
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :B�ka
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Uzņēmuma birojs
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...traucē uzņēmuma birojs
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Uzņēmumam piederoša zeme
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Uzņēmumam piederoša zeme
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Nevar nopirkt Å¡o zemes pleÄ·i...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...tev jau t� pieder!
 
@@ -2045,7 +2045,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stacij
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Grūtības līmenis
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Saglabât
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Saglabât
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Viegls
@@ -2118,8 +2118,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Kr�su id
 STR_LIVERY_CAPTION                                              :{WHITE}Jauna kr�su identit�te
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Uzņēmuma v�rds
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Vadīt�ja v�rds
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Uzņēmuma v�rds
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Vadīt�ja v�rds
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Uzņēmuma v�rds
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Vadīt�ja v�rds
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Nevar mainīt uzņēmuma nosaukumu..
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Nevar mainīt vadīt�ja v�rdu..
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanses {BLACK}{COMPANYNUM}
@@ -2143,11 +2143,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Kop�:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Ien�kumu grafiks
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Darbības peļņas grafiks
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bankas bilance
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Aizdevums
-STR_MAX_LOAN                                                    :{WHITE}Pieejamais aizdevums:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Pieejamais aizdevums:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Aizņemties {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Atmaks�t {SKIP}{SKIP}{CURRENCY}
@@ -2156,7 +2156,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nevar ai
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...visi kredīti atmaks�ti
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} nepieciešams
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nevar atmaks�t aizdevumu...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Bankas aizdoto naudu, nevar dot prom...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Bankas aizdoto naudu, nevar dot prom...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Izvēlieties jaunu seju vadīt�jam
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Izmainīt uzņēmuma transportlīdzekļu izskatu
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Mainīt vadīt�ja v�rdu
@@ -2166,10 +2166,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Atmaks�
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Vadīt�js)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Dibin�ts: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Transportl.:
-STR_TRAINS                                                      :{WHITE}{COMMA} vilcien{P s i u}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} mašīn{P a as u}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} lidapar�t{P s i u}
-STR_SHIPS                                                       :{WHITE}{COMMA} kuģ{P is i u}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vilcien{P s i u}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} mašīn{P a as u}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lidapar�t{P s i u}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} kuģ{P is i u}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Neviens
 STR_FACE_CAPTION                                                :{WHITE}Sejas izvēle
 STR_FACE_MALE_BUTTON                                            :{BLACK}VÄ«rietis
@@ -2183,7 +2183,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Ģenerē
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Leģenda
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Grafikos r�dīt leģendas
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Leģendas komp�niju grafikos
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klik šeit, lai izlēgtu/ieslēgtu komp�niju grafik�
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik šeit, lai izlēgtu/ieslēgtu komp�niju grafik�
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}P�rvad�t�s kravas vienības
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Uzņēmuma veiktspējas tabula (Maks. 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Uzņēmuma vērtības
@@ -2217,23 +2217,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Prezidents
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magn�ts
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Celt biroju
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Būvēt uzņēmuma biroju / skatīt uzņēmuma biroju
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}P�rcelt komp�nijas centr�lo biroju uz citu vietu samaks�jot 1% no komp�nijas vērtības
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}P�rcelt komp�nijas centr�lo biroju uz citu vietu samaks�jot 1% no komp�nijas vērtības
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nevar uzbūvēt uzņēmuma biroju...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Skatīt biroju
-STR_RELOCATE_HQ                                                 :{BLACK}P�rvietot biroju
-STR_COMPANY_JOIN                                                :{BLACK}Pievienoties
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Pievienoties un spēlēt ar šo komp�niju
-STR_COMPANY_PASSWORD                                            :{BLACK}Parole
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Uzst�dīt paroli, lai aizsarg�tu savu komp�niju pret neautorizētu lietot�ju pievienošanos.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Uzst�dīt komp�nijas paroli
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}P�rvietot biroju
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Pievienoties
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Pievienoties un spēlēt ar šo komp�niju
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Parole
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Uzst�dīt paroli, lai aizsarg�tu savu komp�niju pret neautorizētu lietot�ju pievienošanos.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Uzst�dīt komp�nijas paroli
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nesaglab�t ievadīto paroli
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Piešķirt komp�nijai jaunu paroli
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Komp�nijas parole
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Noklusēt� komp�nijas parole
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Izmantot šo paroli k� noklusēto jaun�m komp�nij�m
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Noklusēt� komp�nijas parole
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Izmantot šo paroli k� noklusēto jaun�m komp�nij�m
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Pasaule ieslīgst recesij�!{}{}Ekonomika atrodas smag� krīzes st�voklī!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Recesija beigusies!{}{}Tirdzniecības apjomu pieaugums dod p�rliecību par ekonomikas nostiprin�šanos!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}P�rslēgties starp lielu/mazu loga izmēru
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}P�rslēgties starp lielu/mazu loga izmēru
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Uzņēmuma vērtība: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Nopirkt 25% daļu uzņēmum�
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}P�rdot 25% daļu uzņēmum�
@@ -2243,7 +2243,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Nevar no
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Nevar p�rdot 25% daļu šaj� uzņēmum�...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% piederoši {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} tiek p�rņemts {STRING} izpildījum�!
-STR_PROTECTED                                                   :{WHITE}Šī komp�nija ir par jaunu, lai tirgotu akcijas...
+STR_ERROR_PROTECTED                                             :{WHITE}Šī komp�nija ir par jaunu, lai tirgotu akcijas...
 
 STR_LIVERY_DEFAULT                                              :Standarta pajūgs
 STR_LIVERY_STEAM                                                :Tvaika dzinējs
@@ -2269,14 +2269,14 @@ STR_LIVERY_LARGE_PLANE                                          :Liela lidmašī
 STR_LIVERY_PASSENGER_TRAM                                       :Pasažieru tramvajs
 STR_LIVERY_FREIGHT_TRAM                                         :Kravas tramvajs
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}R�dīt visp�rējo kr�su shēmu
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}R�dīt tramvaju kr�su shēmu
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}R�dīt mašīnu kr�su shēmu
-STR_LIVERY_SHIP_TIP                                             :{BLACK}R�dīt kuģu kr�su shēmu
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}R�dīt lidapar�tu kr�su shēmas
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Izvēlieties prim�ro kr�su izvēlētai shēmai
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Izvēlieties sekund�ro kr�su izvēlētai shēmai
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Izvēlieties, kuru shēmu mainīt vai vair�kas ar CTRL+klik. Klikot uz �etrstūra, lai p�rslēgtu shēmas izmantošanu
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}R�dīt visp�rējo kr�su shēmu
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}R�dīt tramvaju kr�su shēmu
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}R�dīt mašīnu kr�su shēmu
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}R�dīt kuģu kr�su shēmu
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}R�dīt lidapar�tu kr�su shēmas
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Izvēlieties prim�ro kr�su izvēlētai shēmai
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Izvēlieties sekund�ro kr�su izvēlētai shēmai
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Izvēlieties, kuru shēmu mainīt vai vair�kas ar CTRL+klik. Klikot uz �etrstūra, lai p�rslēgtu shēmas izmantošanu
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Tvaika)
@@ -2581,9 +2581,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Neizkraut un g
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Izmainīt apst�šan�s veidu izvēlētajai komandai
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Izmainīt iekraušanas veidu izvēlētajai komandai
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Izmainīt izkraušanas veidu izvēlētajai komandai
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Ievietot sarežģīt�ku komandu
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Ievietot sarežģīt�ku komandu
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Braukt uz tuv�ko depo
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Braukt uz tuv�ko ang�ru
 STR_ORDER_NEAREST_DEPOT                                         :tuv�kais
@@ -2593,9 +2593,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Bez apst�jas a
 STR_ORDER_TRAIN_DEPOT                                           :Vilcienu depo
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Ceļu transporta depo
 STR_ORDER_SHIP_DEPOT                                            :Kuģu depo
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Ang�rs
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Ang�rs
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Vienmēr doties
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Apkope, ja nepieciešama
@@ -2620,10 +2620,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :ir liel�ks par
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :ir liel�ks un vien�ds ar
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :ir patiess
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :ir nepatiess
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Lekt uz rīkojumu nr. {COMMA}
-STR_CONDITIONAL_NUM                                             :Lekt uz rīkojumu nr. {COMMA}, kad {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Lekt uz rīkojumu nr. {COMMA}, kad {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Lekt uz rīkojumu nr. {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Lekt uz rīkojumu nr. {COMMA}, kad {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Lekt uz rīkojumu nr. {COMMA}, kad {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Bez braukšanas
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Braukšana (nav pēc saraksta )
@@ -2646,18 +2646,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vilcienu
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Izlaist
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Izdzēst
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Doties uz
-STR_REFIT                                                       :{BLACK}P�rbūvēt
-STR_REFIT_TIP                                                   :{BLACK}Izvēlēties k�du kravas veidu iemontēt norīkojum�. Kontroles klikšķis, lai atceltu iemontēto instrukciju.
-STR_REFIT_ORDER                                                 :(P�rbūvēt uz {STRING})
-STR_REFIT_STOP_ORDER                                            :(Nomainīt uz {STRING} un apst�ties)
-STR_STOP_ORDER                                                  :(Apst�din�t)
-STR_TIMETABLE_VIEW                                              :{BLACK}Saraksts
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}P�rslēgties uz Saraksta skatu
-STR_ORDER_VIEW                                                  :{BLACK}RÄ«kojumi
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}P�rslēgt uz rīkojumu skatu
+STR_ORDER_REFIT                                                 :{BLACK}P�rbūvēt
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Izvēlēties k�du kravas veidu iemontēt norīkojum�. Kontroles klikšķis, lai atceltu iemontēto instrukciju.
+STR_ORDER_REFIT_ORDER                                           :(P�rbūvēt uz {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Nomainīt uz {STRING} un apst�ties)
+STR_ORDER_STOP_ORDER                                            :(Apst�din�t)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Saraksts
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}P�rslēgties uz Saraksta skatu
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}RÄ«kojumi
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}P�rslēgt uz rīkojumu skatu
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (RÄ«kojumi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - RÄ«kojumu beigas - -
-STR_SERVICE                                                     :{BLACK}Serviss
+STR_ORDER_SERVICE                                               :{BLACK}Serviss
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}  Uzbūvēts: {LTBLUE}{NUM}{BLACK} Vērtība: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vērtība: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2677,7 +2677,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}transpor
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}transportlīdzeklis, kas dala šo maršrutu nespēj doties uz nor�dīto staciju
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Transporta līdzekli nevar p�rvietot...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Aizmugures dzinējs vienmēr sekos priekšējam dzinējam
-STR_CARGO_N_A                                                   :Nav info{SKIP}
+STR_QUANTITY_N_A                                                :Nav info{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nevar atrast ceļu uz vietējo depo
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Apkopes interv�ls: {LTBLUE}{COMMA}dienas{BLACK}   Pēdēj� apkope: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Apkopes interv�ls: {LTBLUE}{COMMA}%{BLACK}   Pēdēj� apkope: {LTBLUE}{DATE_LONG}
@@ -2697,8 +2697,8 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Saraksts
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Mainīt laiku,kas izceltajam maršrutam nepieciešams
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Dzēst laiku izceltajam maršrutam
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Atslēgt skaitīt�ju,lai transportlīdzeklis būtu laik�
-STR_SERVICE_HINT                                                :{BLACK}Izlaist šo rīkojumu, izņemot, ja vajadzīga apkope
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Svars: {WEIGHT_S}{}Ātrums: {VELOCITY} Jauda: {POWER}{}tekoš�s izmaksas: {CURRENCY}/yr{}Ietilpība:  {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Izlaist šo rīkojumu, izņemot, ja vajadzīga apkope
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY} Svars: {WEIGHT_S}{}Ātrums: {VELOCITY} Jauda: {POWER}{}tekoš�s izmaksas: {CURRENCY}/yr{}Ietilpība:  {CARGO}
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Apst�din�ts
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Vilciens nevar šķērsot sign�lu briesm�s...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Cietis av�rij�!
@@ -2706,27 +2706,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Cietis avÄ
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Vilciena av�rija!{}{COMMA} mirušie
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Vilcienu nevar apgriezt...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nevar pagriezt transportlīdzekļus, kas sast�v no vair�k�m daļ�m
-STR_CLEAR_TIME                                                  :{BLACK}Notīrīt laiku
-STR_RESET_LATENESS                                              :{BLACK}Nomest kavējuma skaitīt�ju
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}P�rsaukt kontrolpunktu
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Notīrīt laiku
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nomest kavējuma skaitīt�ju
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}P�rsaukt kontrolpunktu
 
-STR_TRAIN_STOPPING                                              :{RED}Apst�jas
-STR_TRAIN_STOPPING_VEL                                          :{RED}Apst�jas, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Nesaderīgi sliežu tipi
-STR_TRAIN_NO_POWER                                              :{RED} Nav jaudas
-STR_TRAIN_START_NO_CATENARY                                     :Šīs sliedas iz boj�tas, t�dēļ vilciens nevar s�kt braucienu
-STR_TRAIN_STUCK                                                 :{ORANGE}Gaida pēc brīva ceļa
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Apst�jas
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Apst�jas, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Nesaderīgi sliežu tipi
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED} Nav jaudas
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Šīs sliedas iz boj�tas, t�dēļ vilciens nevar s�kt braucienu
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Gaida pēc brīva ceļa
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Jauns {STRING} tagad pieejams!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Jauns {STRING} tagad pieejams!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Nevar p�rdot iznīcin�tu transporta līdzekli...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nevar p�rveidot iznīcin�tu transporta līdzekli...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Nevar p�rdot iznīcin�tu transporta līdzekli...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nevar p�rveidot iznīcin�tu transporta līdzekli...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Nav iespējams pan�kt, ka transportalīdzeklis iekļaujas sarakst�
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Transportl. var gaidīt tikai stacij�s
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Šis transportl. šaj� stacij� nest�sies
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Nav iespējams pan�kt, ka transportalīdzeklis iekļaujas sarakst�
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Transportl. var gaidīt tikai stacij�s
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Šis transportl. šaj� stacij� nest�sies
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Mainīt laiku
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Patreiz šis transportlīdzeklis iekļaujas laik�
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Transports pašlaik {STRING} kavē
@@ -2740,7 +2740,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}AizpildÄ
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...j�būt apst�din�tam depo iekšpusē
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nevar atrast vietējo depo
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Piespiest transportl. apgriezties
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Ietilpība: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Ietilpība: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} transportlīdzek{P lis ļi ļu}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2766,11 +2766,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Izvieto boju, kura var kalpot k� ceļa r�dīt�js
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Å eit nevar novietot boju...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Būvēt akveduktu
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Šeit nevar uzbūvēt akveduktu...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Šeit nevar uzbūvēt akveduktu...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (P�rbūvēt)
 STR_REFIT_TITLE                                                 :{GOLD}Izvēlies kravas tipu, ko vest:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Jaun� ietilpība: {GOLD}{CARGO}{}{BLACK}P�rveidošanas izmaksas: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(p�rveidojams)
+STR_PURCHASE_INFO_REFITTABLE                                    :(p�rveidojams)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lidostas
@@ -2783,7 +2783,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Būvēt
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Iedzīvot�ji svin svētkus . . .{}Pirmais lidapar�ts ierodas {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Lidmašīna nog�zusies!{}{COMMA} iet boj� ugunī {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Lidapar�ta av�rija!{}Lidapar�tam pietrūka degviela, {COMMA} miruši!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Laiku saraksts)
 
@@ -2796,13 +2796,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Ogļu raktuves iebrukšana atst�j boj�jumu joslu net�lu no {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Plūdi!{}Vismaz {COMMA} pazuduši bez vēsts, iespējams g�juši boj� plūdos!
 
-STR_BRIBE_FAILED                                                :{WHITE}Jūsu mēģin�jumu piekukuļot
-STR_BRIBE_FAILED_2                                              :{WHITE}atkl�jis reģion�lais izmeklēt�js
-STR_BUILD_DATE                                                  :{BLACK}Uzbūvēts: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Jūsu mēģin�jumu piekukuļot
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}atkl�jis reģion�lais izmeklēt�js
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Uzbūvēts: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stacijas klase: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stacijas tips: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}JaunsGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stacijas klase: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stacijas tips: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}JaunsGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detalizēts sasniegumu reitings
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalizēti
@@ -2822,28 +2822,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Nauda:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Aizdevums:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Kop�:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Transportl. sk. (kravas mašīnas, vilcieni, kuģi un lidapar�ti)
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Staciju daļu skaits. Katra stacijas daļa tiek skaitīta, pat ja t�s ir savienotas k� viena stacija
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Transportlīdzekļa peļņa, kuram ir maz�kie ien�kumi (vair�k par 2 gadiem)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Sapelnītais naudas daudzums mēnesī ar vismaz�ko  peļņu pēdējos 12 ceturkšņos
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Sapelnītais naudas daudzums mēnesī ar visliel�ko  peļņu pēdējos 12 ceturkšņos
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Objektu skaits, kas nog�d�ti pēdējos 4 ceturkšņos
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Kravu skaits, kas nog�d�ti pēdēj� ceturksnī
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Naudas daudzums komp�nijai, kas atrodas bank�
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Naudas apjoms, ko šī komp�nijas paņēmusi k� aizdevumus
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Punkti kop� no iespējamiem
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Transportl. sk. (kravas mašīnas, vilcieni, kuģi un lidapar�ti)
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Staciju daļu skaits. Katra stacijas daļa tiek skaitīta, pat ja t�s ir savienotas k� viena stacija
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Transportlīdzekļa peļņa, kuram ir maz�kie ien�kumi (vair�k par 2 gadiem)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Sapelnītais naudas daudzums mēnesī ar vismaz�ko  peļņu pēdējos 12 ceturkšņos
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Sapelnītais naudas daudzums mēnesī ar visliel�ko  peļņu pēdējos 12 ceturkšņos
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Objektu skaits, kas nog�d�ti pēdējos 4 ceturkšņos
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Kravu skaits, kas nog�d�ti pēdēj� ceturksnī
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Naudas daudzums komp�nijai, kas atrodas bank�
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Naudas apjoms, ko šī komp�nijas paņēmusi k� aizdevumus
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Punkti kop� no iespējamiem
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF opcijas
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Par�dīt NewGRF uzst�dijumus
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF opcijas
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Lietot izmaiņas
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Iespējot paleti
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Mainīt iezīmēt� New GRF paleti.{}Tas j�dara ,kad grafiks no NewGRF izskat�s r�z�
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Likt parametrus
-STR_NEWGRF_FILENAME                                             :{BLACK}Faila nosaukums: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palete: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Lietot izmaiņas
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Iespējot paleti
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Mainīt iezīmēt� New GRF paleti.{}Tas j�dara ,kad grafiks no NewGRF izskat�s r�z�
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Likt parametrus
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Faila nosaukums: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palete: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Jūs grasieties veikt izmaiņas pašreizējai spēlei. Var notik OpenTTD av�rija.{}Vai tu esi pilnīb� drošs?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2866,34 +2866,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :MÄ“Ä£ina lietot
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} satur boj�tu spraitu.Visi boj�tie spraiti tiks par�dīti ar sarkanu jaut�juma zīmi (?)
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Satur daudzēj�du Darbību 8 ierakstus
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Iel�dēt izvēlēto shēmu
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Saglab�t shēmu
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Saglab�t šo sarakstu k� shēmu
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Ievadiet shēmas v�rdu
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Dzēst shēmu
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Dzēst izvēlēto shēmu
-STR_NEWGRF_ADD                                                  :{BLACK}Pievienot
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Pievienot NewGRF failu sarakstam
-STR_NEWGRF_REMOVE                                               :{BLACK}Noņemt
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Noņemt izvēlēto NewGRF failu no saraksta
-STR_NEWGRF_MOVEUP                                               :{BLACK}Uz augšu
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}P�rvietot atlasīto NewGRF failu saraksta augš�
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Uz leju
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}P�rvietot atlasīto NewGRF failu saraksta apakš�
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Instalēto NewGRF failu saraksts. Klik uz faila, lai mainītu t� parametrus
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametri: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Ievadi NewGRF parametrus
-STR_NEWGRF_NO_INFO                                              :{BLACK}Inform�cija nav pieejama
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Iel�dēt izvēlēto shēmu
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Saglab�t shēmu
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Saglab�t šo sarakstu k� shēmu
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Ievadiet shēmas v�rdu
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Dzēst shēmu
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Dzēst izvēlēto shēmu
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Pievienot
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Pievienot NewGRF failu sarakstam
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Noņemt
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Noņemt izvēlēto NewGRF failu no saraksta
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Uz augšu
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}P�rvietot atlasīto NewGRF failu saraksta augš�
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Uz leju
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}P�rvietot atlasīto NewGRF failu saraksta apakš�
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Instalēto NewGRF failu saraksts. Klik uz faila, lai mainītu t� parametrus
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametri: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Ievadi NewGRF parametrus
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Inform�cija nav pieejama
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Pieejami NewGRF faili
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Pievienot atlasei
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Pievienot atlasītos NewGRF failus tavai konfigur�cijai
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}P�rskenēt failus
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Atjaunin�t pieejamo NewGRF failu sarakstu
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Pievienot atlasītos NewGRF failus tavai konfigur�cijai
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}P�rskenēt failus
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Atjaunin�t pieejamo NewGRF failu sarakstu
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nevar pievienot failu: vien�das GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Nevar atrast saskanīgo failu
-STR_NEWGRF_DISABLED                                             :{RED}Atspējots
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Nevar atrast saskanīgo failu
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Atspējots
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Atbilstošs fails nav atrass (savienojams GRF iel�dēts)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Saderīgs GRF(s) iel�dēts pazudusajiem failiem
@@ -2907,7 +2907,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Vilciens
 
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' sniedz nekorektu inform�ciju.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spēle bija saglab�ta bez tramvaju atbalsta. Visi tramvaji tikuši aizv�kti.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spēle bija saglab�ta bez tramvaju atbalsta. Visi tramvaji tikuši aizv�kti.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Cita valūta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Maiņas kurss: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2936,8 +2936,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Kuģ{P is i u}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lidapar�ts
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Dalītie uzdevumi {COMMA} transportlīdzek{P lim ļiem ļiem}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}R�dīt visus ar šo pl�nu saistītos transportlīdzekļus
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Dalītie uzdevumi {COMMA} transportlīdzek{P lim ļiem ļiem}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}R�dīt visus ar šo pl�nu saistītos transportlīdzekļus
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} gaida depo
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} gaida depo
@@ -3044,39 +3044,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Nomainī
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}P�rveidot kravas kuģi, lai varētu p�rvietot citu kravas tipu
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}P�rbūvēt lidapar�tu citam kravas veidam
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Dodas uz {TOWN} vilcienu depo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Dodas uz {TOWN} vilcienu depo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Dodas uz {TOWN} depo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Dodas uz {TOWN} depo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Dodas uz {TOWN} kuģu depo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Dodas uz {TOWN} kuģu depo, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Dodas uz {STATION} ang�ru
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Ietur kursu uz {STATION} Ang�rs, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Apkope {TOWN} vilcienu depo
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Apkope {TOWN} vilcienu depo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Apkope {TOWN} depo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Apkope {TOWN} depo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Apkope {TOWN} kuģu depo
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Apkope {TOWN} kuģu depo, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Apkope {STATION} ang�r�
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Apkope {STATION} ang�r�, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Kopēt vilcienu
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonēt Satiksmes Līdzekli
-STR_CLONE_SHIP                                                  :{BLACK}Klonēt kuģi
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonēt lidapar�tu
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Šis uzbūvēs autotransporta kopiju, Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
-STR_CLONE_SHIP_INFO                                             :{BLACK}Šis uzbūvēs kuģa kopiju, Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Šis uzbūvēs lidapar�ta kopiju, Izmantojot CTRL+klik, lidapar�ti dalīsies ar rīkojumiem
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Klik uz šīs pogas un pēc tam uz vilciena. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Šis uzbūvēs autotransporta kopiju, Klik uz pogas un pēc tam uz autotransporta. Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Šis uzbūvēs kuģa kopiju, Klik uz pogas un pēc tam uz kuģa. Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Šis uzbūvēs lidapar�ta kopiju, Klik uz pogas un pēc tam uz lidapar�ta. Izmantojot CTRL+klik, lidapar�ti dalīsies ar rīkojumiem
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Dodas uz {TOWN} vilcienu depo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Dodas uz {TOWN} vilcienu depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Dodas uz {TOWN} depo
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Dodas uz {TOWN} depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Dodas uz {TOWN} kuģu depo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Dodas uz {TOWN} kuģu depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Dodas uz {STATION} ang�ru
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Ietur kursu uz {STATION} Ang�rs, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Apkope {TOWN} vilcienu depo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Apkope {TOWN} vilcienu depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Apkope {TOWN} depo
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Apkope {TOWN} depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Apkope {TOWN} kuģu depo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Apkope {TOWN} kuģu depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Apkope {STATION} ang�r�
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Apkope {STATION} ang�r�, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kopēt vilcienu
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonēt Satiksmes Līdzekli
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonēt kuģi
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonēt lidapar�tu
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Šis uzbūvēs autotransporta kopiju, Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Šis uzbūvēs kuģa kopiju, Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Šis uzbūvēs lidapar�ta kopiju, Izmantojot CTRL+klik, lidapar�ti dalīsies ar rīkojumiem
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Šis uzbūvēs vilciena kopiju ar visiem vagoniem. Klik uz šīs pogas un pēc tam uz vilciena. Izmantojot CTRL+klik, vilcieni dalīsies ar rīkojumiem
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Šis uzbūvēs autotransporta kopiju, Klik uz pogas un pēc tam uz autotransporta. Izmantojot CTRL+klik, autotransporti dalīsies ar rīkojumiem
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Šis uzbūvēs kuģa kopiju, Klik uz pogas un pēc tam uz kuģa. Izmantojot CTRL+klik, kuģi dalīsies ar rīkojumiem
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Šis uzbūvēs lidapar�ta kopiju, Klik uz pogas un pēc tam uz lidapar�ta. Izmantojot CTRL+klik, lidapar�ti dalīsies ar rīkojumiem
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Jauni vilcieni
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Jauni Elektrisk� Dzelzceļa Satiksmes Līdzekļi
@@ -3146,28 +3146,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrēt
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Tu grasies p�rdot visus transportus, kas atrodas depo. Vai tu esi drošs?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Nepareiz depo veids
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Nepareiz depo veids
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}P�rdot visus vilcienus, kas atrodas depo
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}P�rdot visus transportus, kas atrodas depo
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}P�rdot visus kuģus, kas atrodas depo
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}P�rdot visus lidapar�tus, kas atrodas ang�r�
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}P�rdot visus vilcienus, kas atrodas depo
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}P�rdot visus transportus, kas atrodas depo
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}P�rdot visus kuģus, kas atrodas depo
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}P�rdot visus lidapar�tus, kas atrodas ang�r�
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Iegūt vilcienu sarakstu, kuru rīkojumos ir pašreizējais depo
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Iegūt transportu sarakstu, kuru rīkojumos ir pašreizējais depo
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Iegūt kuģ sarakstu, kuru rīkojumos ir pašreizējais depo
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Iegūt lidapar�tu sarakstu, kuru rīkojumos ir ang�ri no šīs lidostas
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Iegūt vilcienu sarakstu, kuru rīkojumos ir pašreizējais depo
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Iegūt transportu sarakstu, kuru rīkojumos ir pašreizējais depo
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Iegūt kuģ sarakstu, kuru rīkojumos ir pašreizējais depo
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Iegūt lidapar�tu sarakstu, kuru rīkojumos ir ang�ri no šīs lidostas
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autom�tiski nomainīt visus vilcienu depo
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autom�tiski nomainīt visus transportus depo
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autom�tiski nomainīt visus kuģus depo
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autom�tiski nomainīt visus lidapar�tus ang�r�
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autom�tiski nomainīt visus vilcienu depo
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autom�tiski nomainīt visus transportus depo
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autom�tiski nomainīt visus kuģus depo
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autom�tiski nomainīt visus lidapar�tus ang�r�
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Nomainīt {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}S�kt transportlīdzekļu nomaiņu
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}P�rtraukt transportlīdzekļu nomaiņu
-STR_NOT_REPLACING                                               :{BLACK}Netiks nomainîts
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nav izvēlēt transportlīdzekļa
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Netiks nomainîts
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nav izvēlēt transportlīdzekļa
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izvēlies lokomatīves tipu, kuru vēlies mainīt
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Izvēlies jaun�s lokomatīves tipu, kuru vēlies lietot kreis� pusē atzīmēt�s lokomatīves viet�
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Nospied, lai apturētu atzīmēt�s lokomatīves aizvietošanu
@@ -3179,26 +3179,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Auto-aiz
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Aizvietošana: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Parslēgties starp dzinēja un vagona aizvietošanas logiem
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Tranportl. nav pieejams
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Mašīna nav pieejama
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Kuģis nav pieejams
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Lidapar�ts nav pieejams
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Tranportl. nav pieejams
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Mašīna nav pieejama
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Kuģis nav pieejams
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Lidapar�ts nav pieejams
 
-STR_ENGINES                                                     :Lokomotīves
-STR_WAGONS                                                      :Vagoni
+STR_REPLACE_ENGINES                                             :Lokomotīves
+STR_REPLACE_WAGONS                                              :Vagoni
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klik, lai apst�din�tu visus vilcienus, kas atrodas depo
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klik, lai apst�din�tu visas mašīnas, kas atrodas depo
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klik, lai apst�din�tu visus kuģus, kas atrodas depo
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klik, lai apst�din�tu visus lidapar�tus, kas atrodas ang�r�
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klik, lai apst�din�tu visus vilcienus, kas atrodas depo
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klik, lai apst�din�tu visas mašīnas, kas atrodas depo
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klik, lai apst�din�tu visus kuģus, kas atrodas depo
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klik, lai apst�din�tu visus lidapar�tus, kas atrodas ang�r�
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klik, lai iedarbin�tu visus vilcienus, kas atrodas depo
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klik, lai iedarbin�tu visas mašīnas, kas atrodas depo
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klik, lai iedarbin�tu visus kuģus, kas atrodas depo
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klik, lai iedarbin�tu visus lidapar�tus, kas atrodas ang�r�
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klik, lai iedarbin�tu visus vilcienus, kas atrodas depo
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klik, lai iedarbin�tu visas mašīnas, kas atrodas depo
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klik, lai iedarbin�tu visus kuģus, kas atrodas depo
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klik, lai iedarbin�tu visus lidapar�tus, kas atrodas ang�r�
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klik, lai apst�din�tu visas mašīnas, kas ir sarakst�
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klik, lai iedarbin�tu visas mašīnas, kas ir sarakst�
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klik, lai apst�din�tu visas mašīnas, kas ir sarakst�
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klik, lai iedarbin�tu visas mašīnas, kas ir sarakst�
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}ZÄ«mju saraksts- {COMMA} ZÄ«m{P e es ju}
@@ -3207,14 +3207,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}SalabotÄ
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Sliežu transportlīdzekļi
-STR_ELRAIL_VEHICLES                                             :Elektrisko sliežu vilcieni
-STR_MONORAIL_VEHICLES                                           :Viensliežu transportlīdzekļi
-STR_MAGLEV_VEHICLES                                             :Magleva transportlīdzekļi
+STR_REPLACE_RAIL_VEHICLES                                       :Sliežu transportlīdzekļi
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrisko sliežu vilcieni
+STR_REPLACE_MONORAIL_VEHICLES                                   :Viensliežu transportlīdzekļi
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magleva transportlīdzekļi
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Svars: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Ä€trums: {GOLD}{VELOCITY}{BLACK}   Jauda: {GOLD}{POWER}
@@ -3240,70 +3240,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Radīt
-STR_RANDOM                                                      :{BLACK}Nejaušs
-STR_RANDOM_HELP                                                 :{BLACK}Mainīts nejaušais s�kums, kas izmantots Virsmas Veidošan�.
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Pasaules ģenerēšana
-STR_RANDOM_SEED                                                 :{BLACK}Nejaušs s�kums
-STR_RANDOM_SEED_HELP                                            :{BLACK}Noklikšķiniet,lai ievadītu nejaušu s�kumu
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Ievadiet nejaušu s�kumu
-STR_LAND_GENERATOR                                              :{BLACK}Zemes radīt�js:
-STR_TREE_PLACER                                                 :{BLACK}Koka algoritms:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Reliefa kartes rot�cija:
-STR_TERRAIN_TYPE                                                :{BLACK}Apgabala tips:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Jūras līmenis:
-STR_SMOOTHNESS                                                  :{BLACK}Gludums:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Sniega līnijas augstums
-STR_DATE                                                        :{BLACK}Datums:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Pilsētu sk.:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Rūpnīcu sk.:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Paaugstin�t sniega līnijas augstumu
-STR_SNOW_LINE_DOWN                                              :{BLACK}Pazemin�t sniega līnijas augstumu
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Mainīt sniega līnijas augstumu
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Mainīt s�kšanas gadu
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Līmeņa brīdin�jums
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}P�r�k Izmainīt pamatkarti nav ieteicams. Turpin�t ģenerēšanu?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Reliefkartes nosaukums:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Lielums: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Radīt
+STR_MAPGEN_RANDOM                                               :{BLACK}Nejaušs
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Mainīts nejaušais s�kums, kas izmantots Virsmas Veidošan�.
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Pasaules ģenerēšana
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Nejaušs s�kums
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Noklikšķiniet,lai ievadītu nejaušu s�kumu
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Ievadiet nejaušu s�kumu
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Zemes radīt�js:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Koka algoritms:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Reliefa kartes rot�cija:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Apgabala tips:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Jūras līmenis:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Gludums:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Sniega līnijas augstums
+STR_MAPGEN_DATE                                                 :{BLACK}Datums:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Pilsētu sk.:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Rūpnīcu sk.:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Paaugstin�t sniega līnijas augstumu
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Pazemin�t sniega līnijas augstumu
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Mainīt sniega līnijas augstumu
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Mainīt s�kšanas gadu
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Līmeņa brīdin�jums
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}P�r�k Izmainīt pamatkarti nav ieteicams. Turpin�t ģenerēšanu?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Reliefkartes nosaukums:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Lielums: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Izveido pasauli...
 STR_GENERATION_ABORT                                            :{BLACK}Atcelt
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Atcelt pasaules radīšanu
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Vai tu patieš�m vēlies atcelt radīšanu?
-STR_PROGRESS                                                    :{WHITE}{NUM}% pabeigti
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Pasaules ģenerēšana
-STR_TREE_GENERATION                                             :{BLACK}Koka radīšana
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Nep�rvietojama radīšana
-STR_CLEARING_TILES                                              :{BLACK}Klinšaina un akmeņaina apvidus ģener�cija
-STR_SETTINGUP_GAME                                              :{BLACK}Uzst�dīt spēli
-STR_PREPARING_TILELOOP                                          :{BLACK}Skrejošs nosaukums
-STR_PREPARING_GAME                                              :{BLACK}Sagatavo spēli
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Šī rīcība nomainīja grūtības līmeni uz citu
-STR_SE_FLAT_WORLD                                               :{WHITE}Plakana zeme
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Radīt plakanu zemi
-STR_SE_RANDOM_LAND                                              :{WHITE}Nejauša zeme
-STR_SE_NEW_WORLD                                                :{BLACK}Izveidot jaunu scen�riju
-STR_SE_CAPTION                                                  :{WHITE}Scen�rija tips
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Par vienu līmeni samaziniet augstumu.
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Par vienu līmeni paaugstiniet augstumu.
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}mainiet zemes augstumu
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Lēzen�s zemes augstums
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% pabeigti
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Pasaules ģenerēšana
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Koka radīšana
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Nep�rvietojama radīšana
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Klinšaina un akmeņaina apvidus ģener�cija
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Uzst�dīt spēli
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Skrejošs nosaukums
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Sagatavo spēli
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Šī rīcība nomainīja grūtības līmeni uz citu
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Plakana zeme
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Radīt plakanu zemi
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Nejauša zeme
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Izveidot jaunu scen�riju
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scen�rija tips
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Par vienu līmeni samaziniet augstumu.
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Par vienu līmeni paaugstiniet augstumu.
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}mainiet zemes augstumu
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Lēzen�s zemes augstums
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrēt minikartes patreizējo pozīciju
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kartes malas:
-STR_NORTHWEST                                                   :{BLACK}Ziemeļrietumi
-STR_NORTHEAST                                                   :{BLACK}Ziemeļaustrumi
-STR_SOUTHEAST                                                   :{BLACK}Dienvidaustrumi
-STR_SOUTHWEST                                                   :{BLACK}Dienvidrietumi
-STR_BORDER_FREEFORM                                             :{BLACK}Brīv� forma
-STR_BORDER_WATER                                                :{BLACK}Ūdens
-STR_BORDER_RANDOM                                               :{BLACK}Nejaušs
-STR_BORDER_RANDOMIZE                                            :{BLACK}Nejaušs
-STR_BORDER_MANUAL                                               :{BLACK}Rokas vadība
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kartes malas:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Ziemeļrietumi
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Ziemeļaustrumi
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Dienvidaustrumi
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Dienvidrietumi
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Brīv� forma
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Ūdens
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Nejaušs
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Nejaušs
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Rokas vadība
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Maza
@@ -3328,21 +3328,21 @@ STR_MEASURE_AREA                                                :{BLACK}Lauks: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Garums: {NUM}{}Augstuma atšķirība: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Lauks: {NUM} x {NUM}{}Augstuma atšķirība: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...šis ceļš pieder pilsētai
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...ceļš novietots nepareiz� virzien�
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Caurspīdības opcija
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}P�rslēgt stacijas zīmju caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}P�rslēgt koku caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}P�rslēgt ēku caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}P�rslēgt rūpniecības ēku caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}P�rslēgt caurspīdību t�d�m ēk�m k� depo,stacijas un ceļapunkti. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}P�rslēgt tiltu caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}P�rslēgt caurspīdību t�d�m ēk�m k� b�kas un antenas. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}P�rslēgt catenary caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}P�rslēgt iel�des indik�toru caurspīdību. CTRL+klikšķis lai slēgtu.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Caurspīdības viet� padarīt objektus neredzamus
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer Credits: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...šis ceļš pieder pilsētai
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...ceļš novietots nepareiz� virzien�
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Caurspīdības opcija
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}P�rslēgt stacijas zīmju caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}P�rslēgt koku caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}P�rslēgt ēku caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}P�rslēgt rūpniecības ēku caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}P�rslēgt caurspīdību t�d�m ēk�m k� depo,stacijas un ceļapunkti. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}P�rslēgt tiltu caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}P�rslēgt caurspīdību t�d�m ēk�m k� b�kas un antenas. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}P�rslēgt catenary caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}P�rslēgt iel�des indik�toru caurspīdību. CTRL+klikšķis lai slēgtu.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Caurspīdības viet� padarīt objektus neredzamus
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3352,7 +3352,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Visi vilcieni
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Visi transportlīdzekļi
 STR_GROUP_ALL_SHIPS                                             :Visi kuģi
@@ -3361,24 +3361,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Negrupēti vilc
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Negrupēti transportlīdzekļi
 STR_GROUP_DEFAULT_SHIPS                                         :Negrupēti kuģi
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Negrupēti lidapar�ti
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Pievienot kopējos transportus
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Izņemt visus transportus
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}P�rsaukt grupu
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nevar izveidot grupu...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nevar izdzēst šo grupu...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nevar p�rsaukt grupu...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nevar noņemt visus transportus no šīs grupas...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nevar pievienot transportus šaj� grup�...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nevar pievienot kopējos transportus šaj� grup�...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nevar izveidot grupu...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nevar izdzēst šo grupu...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nevar p�rsaukt grupu...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nevar noņemt visus transportus no šīs grupas...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nevar pievienot transportus šaj� grup�...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nevar pievienot kopējos transportus šaj� grup�...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupas - Klik uz grupas, lai iegūtu grupas transportu sarakstu
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klik, lai izveidotu grupu
-STR_GROUP_DELETE_TIP                                            :{BLACK}Dzēst izvēlēto grupu
-STR_GROUP_RENAME_TIP                                            :{BLACK}P�rsaukt izvēlēto grupu
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klik, lai aizsarg�tu šo grupu no visp�rējas autoaizst�šanas
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupas - Klik uz grupas, lai iegūtu grupas transportu sarakstu
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klik, lai izveidotu grupu
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Dzēst izvēlēto grupu
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}P�rsaukt izvēlēto grupu
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klik, lai aizsarg�tu šo grupu no visp�rējas autoaizst�šanas
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3439,35 +3439,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}V�rdam j�būt unik�lam
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}V�rdam j�būt unik�lam
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Doties uz n�kamo zīmi
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Doties uz iepriekšējo zīmi
-STR_SIGN_OSKTITLE                                               :{BLACK}Ievadiet zīmes nosaukumu
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Doties uz n�kamo zīmi
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Doties uz iepriekšējo zīmi
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Ievadiet zīmes nosaukumu
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Ieguldīt
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Pētīt
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Būvēt
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Izvēlies atbilstošu rūonīcu no saraksta
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Ieguldīt
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Pētīt
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Būvēt
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Izvēlies atbilstošu rūonīcu no saraksta
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Papildus
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Papildus seju izvēle.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Papildus seju izvēle.
 STR_FACE_SIMPLE                                                 :{BLACK}Vienk�ršs
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Vienk�rša seju izvēle
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Vienk�rša seju izvēle
 STR_FACE_LOAD                                                   :{BLACK}Iel�dēt
-STR_FACE_LOAD_TIP                                               :{BLACK}Iel�dēt iemīļoto seju
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Iel�dēt iemīļoto seju
 STR_FACE_LOAD_DONE                                              :{WHITE}Jūsu iemīļot� seja tikusi iel�dēta no OpenTDD iestatījumu faila
 STR_FACE_FACECODE                                               :{BLACK}Spēlēt�ja sejas nr.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Skatīt un/vai pielikt spēlēt�ja sejas nr.
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Skatīt un/vai pielikt spēlēt�ja sejas nr.
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Skatīt un/vai pielikt spēlēt�ja sejas nr.
 STR_FACE_FACECODE_SET                                           :{WHITE}Jauns sejas nr. ir pielikts
 STR_FACE_FACECODE_ERR                                           :{WHITE}Nevar pielikt nr. spēlēt�ja sejai - nr, j�būt ciparu no 0 līdz 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Saglab�t
-STR_FACE_SAVE_TIP                                               :{BLACK}Saglab�t iemīļoto seju
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Saglab�t iemīļoto seju
 STR_FACE_SAVE_DONE                                              :{WHITE}Šī seja tiks saglab�ta OpenTDD iestatījumu fail� k� iemīļot� seja
 STR_FACE_EUROPEAN                                               :{BLACK}Eiropietis
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Izvēlēties eiropiešu sejas
@@ -3475,51 +3475,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrik�n
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Izvēlēties afrik�ņu sejas
 STR_FACE_YES                                                    :Ir
 STR_FACE_NO                                                     :Nav
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Iespējot ūsas vai auskarus
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Iespējot ūsas vai auskarus
 STR_FACE_HAIR                                                   :Mati:
-STR_FACE_HAIR_TIP                                               :{BLACK}Mainīt matus
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Mainīt matus
 STR_FACE_EYEBROWS                                               :Uzacis:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Mainīt uzacis
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Mainīt uzacis
 STR_FACE_EYECOLOUR                                              :Acu kr�sa:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Mainīt acu kr�su
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Mainīt acu kr�su
 STR_FACE_GLASSES                                                :Brilles:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Iespējot brilles
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Mainīt brilles
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Iespējot brilles
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Mainīt brilles
 STR_FACE_NOSE                                                   :Deguns:
-STR_FACE_NOSE_TIP                                               :{BLACK}Mainīt degunu
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Mainīt degunu
 STR_FACE_LIPS                                                   :LÅ«pas:
 STR_FACE_MOUSTACHE                                              :Ūsas:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Mainīt lūpas vai ūsas
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Mainīt lūpas vai ūsas
 STR_FACE_CHIN                                                   :Zods:
-STR_FACE_CHIN_TIP                                               :{BLACK}Mainīt zodu
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Mainīt zodu
 STR_FACE_JACKET                                                 :Jaka:
-STR_FACE_JACKET_TIP                                             :{BLACK}Mainīt jaku
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Mainīt jaku
 STR_FACE_COLLAR                                                 :Apkakle:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Mainīt apkakli
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Mainīt apkakli
 STR_FACE_TIE                                                    :Kaklasaite:
 STR_FACE_EARRING                                                :Auskars:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Mainīt kaklasaiti vai auskarus
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Mainīt kaklasaiti vai auskarus
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Sign�la izvēle
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Šeit nevar p�rveidot sign�lus,,,
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Bloķēt sign�lu(semafors){}Šis ir pats vienk�rš�kais sign�la veids, kas ļauj vienlaicīgi tikai vienam vilcienam atrasties uz sliedēm.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Ievade-Sign�ls (semafors){}Žaļš kamēr ie viena vai vair�kas zaļas izejas- sign�ls no sekojošas sekcijas vai sliedes. Cit�di sign�ls būs sarkans.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Sign�ls-Izeja (semaphore){}Uzvedas t�pat k� bloķēšanas sign�ls, bet nepieciešams labot ievades kr�su un sakombinēt pirmssign�lus.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Sign�ls-komibētais (semaphore){}  Kombinētais sign�ls darbojas gan k� izejas, gan ieejas sign�ls. Tas ļauj radīt lielus pirmssign�lu tīklus.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Ceļa sign�ls (semaphore){}Ceļa sign�ls ļauj vair�k k� vienam vilcienam iebraukt sign�la blok� vienlaicīgi, ja vien vilciens rezervējis drošu apst�šan�s punktu. Standart ceļa sign�li var tikt padots no muguras.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Viena veida ceļa sign�ls (semaphore){}Viena veida ceļa sign�ls ļauj vair�k k� vienam vilcienam iebraukt sign�la blok� vienlaicīgi, ja vien vilciens rezervējis drošu apst�šan�s punktu.Šis sign�ls nevar tikt padots no muguras.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Bloķējoš sign�ls (elektrisks){}Šis ir pamata sign�ls,kas ļauj vienlaicīgi tikai vienam vilcienam atrasties uz konkrētaj�m sliedēm, vai bloka.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Izejas zign�ls (electric){}Zaļš līdz par�d�s vēl viena zaļ� izeja-sign�ls no konkrēt�m sekcijas sliedēm. Cit�di tas par�d�s sarkans.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Izejas-Sign�ls (electric){}Izturas t� pat k� bloka sign�ls, bet nepieciešamības gadījum� var p�rvērsties korekt�  izejas kr�s� arī kominētajiem sign�liem.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombo-sign�ls (electric){}Kominētais sign�ls darbojas k� ieejas un izejas sign�ls.tas ļauj radīt lielu sign�lu tīklu.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Ceļa-Sign�ls (electric){}Ceļa sign�ls ļaj vair�k k� vienam vilcienam iebraukt sign�la blok� t�j� pat laik�,ja vien ir pieejams drošs apst�šan�s ceļš. Standarta sign�ls var tikt izvietots no mugurpuses
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Viena ceļa sign�ls (electric){}Sign�ls ļauj vair�kiem vilcieniem iebraukt sign�la blok�, ja vien rodams drošs apst�šan�s ceļš.šis sign�ls nav izvietojams no muguras.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Sign�la p�rveidot�js (electric){}kad aktivizēts jau esošs sign�ls kļūs par nor�dīto sign�la tipu un variantuCTRL un klikšķis, lai iezīmētu patreizējo variantu.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Vilkt sign�lu biežumu
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Samazin�t sign�lu biežumu
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Palielin�t sign�lu biežumu
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Sign�la izvēle
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Šeit nevar p�rveidot sign�lus,,,
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Bloķēt sign�lu(semafors){}Šis ir pats vienk�rš�kais sign�la veids, kas ļauj vienlaicīgi tikai vienam vilcienam atrasties uz sliedēm.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Ievade-Sign�ls (semafors){}Žaļš kamēr ie viena vai vair�kas zaļas izejas- sign�ls no sekojošas sekcijas vai sliedes. Cit�di sign�ls būs sarkans.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Sign�ls-Izeja (semaphore){}Uzvedas t�pat k� bloķēšanas sign�ls, bet nepieciešams labot ievades kr�su un sakombinēt pirmssign�lus.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Sign�ls-komibētais (semaphore){}  Kombinētais sign�ls darbojas gan k� izejas, gan ieejas sign�ls. Tas ļauj radīt lielus pirmssign�lu tīklus.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Ceļa sign�ls (semaphore){}Ceļa sign�ls ļauj vair�k k� vienam vilcienam iebraukt sign�la blok� vienlaicīgi, ja vien vilciens rezervējis drošu apst�šan�s punktu. Standart ceļa sign�li var tikt padots no muguras.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Viena veida ceļa sign�ls (semaphore){}Viena veida ceļa sign�ls ļauj vair�k k� vienam vilcienam iebraukt sign�la blok� vienlaicīgi, ja vien vilciens rezervējis drošu apst�šan�s punktu.Šis sign�ls nevar tikt padots no muguras.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Bloķējoš sign�ls (elektrisks){}Šis ir pamata sign�ls,kas ļauj vienlaicīgi tikai vienam vilcienam atrasties uz konkrētaj�m sliedēm, vai bloka.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Izejas zign�ls (electric){}Zaļš līdz par�d�s vēl viena zaļ� izeja-sign�ls no konkrēt�m sekcijas sliedēm. Cit�di tas par�d�s sarkans.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Izejas-Sign�ls (electric){}Izturas t� pat k� bloka sign�ls, bet nepieciešamības gadījum� var p�rvērsties korekt�  izejas kr�s� arī kominētajiem sign�liem.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombo-sign�ls (electric){}Kominētais sign�ls darbojas k� ieejas un izejas sign�ls.tas ļauj radīt lielu sign�lu tīklu.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Ceļa-Sign�ls (electric){}Ceļa sign�ls ļaj vair�k k� vienam vilcienam iebraukt sign�la blok� t�j� pat laik�,ja vien ir pieejams drošs apst�šan�s ceļš. Standarta sign�ls var tikt izvietots no mugurpuses
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Viena ceļa sign�ls (electric){}Sign�ls ļauj vair�kiem vilcieniem iebraukt sign�la blok�, ja vien rodams drošs apst�šan�s ceļš.šis sign�ls nav izvietojams no muguras.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Sign�la p�rveidot�js (electric){}kad aktivizēts jau esošs sign�ls kļūs par nor�dīto sign�la tipu un variantuCTRL un klikšķis, lai iezīmētu patreizējo variantu.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Vilkt sign�lu biežumu
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Samazin�t sign�lu biežumu
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Palielin�t sign�lu biežumu
 ########
 
 ############ on screen keyboard
@@ -3531,35 +3531,35 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI uzst�dījumi
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Par�dīt m�kslīg� intelekta uzst�dījumus
 STR_AI_DEBUG                                                    :{WHITE}AI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Al v�rds
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Al v�rds
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Iel�dēt Al
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Kill the AI, reload the script, and restart the AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI Debug window is only available for the server
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Kill the AI, reload the script, and restart the AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI Debug window is only available for the server
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AL Konfigur�cija
-STR_AI_CHANGE                                                   :{BLACK} Ieslēgt AL
-STR_AI_CONFIGURE                                                :{BLACK}Konfigurēt
-STR_AI_CHANGE_TIP                                               :{BLACK}Iel�dēt citu Alu
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Mainīt ALa parametrus
-STR_AI_LIST_TIP                                                 :{BLACK}Visi Ali tiks iel�dēti n�kamaj� spēlē
+STR_AI_CONFIG_CHANGE                                            :{BLACK} Ieslēgt AL
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurēt
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Iel�dēt citu Alu
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Mainīt ALa parametrus
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Visi Ali tiks iel�dēti n�kamaj� spēlē
 STR_AI_LIST_CAPTION                                             :{WHITE}Pieejamie Ali
-STR_AI_AILIST_TIP                                               :{BLACK}Nosiediet, lai izvēlētos Al
-STR_AI_ACCEPT                                                   :{BLACK}Apstiprin�t
-STR_AI_ACCEPT_TIP                                               :{BLACK}Nospiediet izcelto Al
-STR_AI_CANCEL                                                   :{BLACK}Atcelt
-STR_AI_CANCEL_TIP                                               :{BLACK}Nemainiet AL
-STR_AI_CLOSE                                                    :{BLACK}Tuvu
-STR_AI_RESET                                                    :{BLACK}P�rspiest
-STR_AI_HUMAN_PLAYER                                             :Spēlēt�js-cilvēks
-STR_AI_RANDOM_AI                                                :Nejaušš Al
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Nosiediet, lai izvēlētos Al
+STR_AI_LIST_ACCEPT                                              :{BLACK}Apstiprin�t
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Nospiediet izcelto Al
+STR_AI_LIST_CANCEL                                              :{BLACK}Atcelt
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemainiet AL
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tuvu
+STR_AI_SETTINGS_RESET                                           :{BLACK}P�rspiest
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Spēlēt�js-cilvēks
+STR_AI_CONFIG_RANDOM_AI                                         :Nejaušš Al
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Ala Parametri
-STR_AI_AUTHOR                                                   :{BLACK}Autors: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versija: {NUM}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Viens no m�kslīg� intelekta spēlēt�jiem nobruka. Lūdzu paziņojiet par šo gadījumu m�kslīg� intelekta autoram, pievienojot ekr�nš�viņu ar m�kslīg� intelekta atkļūdošanas logu.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autors: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versija: {NUM}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Viens no m�kslīg� intelekta spēlēt�jiem nobruka. Lūdzu paziņojiet par šo gadījumu m�kslīg� intelekta autoram, pievienojot ekr�nš�viņu ar m�kslīg� intelekta atkļūdošanas logu.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Trokšņu limits pilsēt�: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Radītais troksnis: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Trokšņu limits pilsēt�: {ORANGE}{COMMA}{BLACK}  maks.: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Radītais troksnis: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3573,21 +3573,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scen�rijs
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Reliefa karte
 STR_CONTENT_TITLE                                               :{WHITE}Satura lejupiel�de
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tips
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Satura tips
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Satura tips
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}V�rds
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}SAtura v�rds
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klikšķiniet uz līnijas lai redzētu detaļas{}Klikšķiniet kvadr�t�, lai iezīmētu to lejupiel�dei
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}SAtura v�rds
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klikšķiniet uz līnijas lai redzētu detaļas{}Klikšķiniet kvadr�t�, lai iezīmētu to lejupiel�dei
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Iezīmēt visu
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Iezīmēt visu saturu lejupiel�dei
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Iezīmēt visu saturu lejupiel�dei
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Nor�diet uzlabojumus
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Iezīmējiet visu saturu lejupiel�dei, lai, tas ir uzlabojums eksistējošam saturam
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Iezīmējiet visu saturu lejupiel�dei, lai, tas ir uzlabojums eksistējošam saturam
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Atcelt visa iezīmēšanu
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Iezīmēt visu saturu lejupiel�dei
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Iezīmēt visu saturu lejupiel�dei
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Ievadīt filtra stīgu
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Ievadiet atslēgv�rdu, lai filtrētu sarakstu
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Ievadiet atslēgv�rdu, lai filtrētu sarakstu
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Taga/v�rda filtrs:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Lejupiel�de
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}S�kt nor�dīt� lejupiel�di
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}S�kt nor�dīt� lejupiel�di
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Kopējais apjoms: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}SAtura inform�cija
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Jūs neesat šo iezīmējuši lejupiel�dei
@@ -3620,6 +3620,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}NeizdevÄ
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}P�rbaudiet tiešaistes saturu
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}P�rbaudiet vai nav pieejami atjaunin�jumi
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Meklējiet pazudušo saturu tiešaisaistē
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}P�rbaudīt vai pazudušais saturs nav atrodams tiešsaistē.
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Meklējiet pazudušo saturu tiešaisaistē
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}P�rbaudīt vai pazudušais saturs nav atrodams tiešsaistē.
 ########
diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt
index 31f969bad..82e14e76b 100644
--- a/src/lang/lithuanian.txt
+++ b/src/lang/lithuanian.txt
@@ -192,7 +192,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Žemėla
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Žaidimo nustatymai
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Žinutė
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Žinutė nuo {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Įspėjimas!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Įspėjimas!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}To daryti negalima....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Negalima griauti Å¡ios teritorijos....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}PradinÄ—s versijos teisÄ—s priklauso {COPYRIGHT} 1995 Chris Sawyer, Visos teisÄ—s saugomos
@@ -200,9 +200,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD komanda
 
 STR_QUIT_CAPTION                                                :{WHITE}Baigti
-STR_YES                                                         :{BLACK}Taip
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ar jūs tikrai norite nutraukti žaidimą ir grižti į {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Taip
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ar jūs tikrai norite nutraukti žaidimą ir grižti į {STRING}?
 
 STR_JUST_NOTHING                                                :Nieko
 STR_COLOUR_DARK_BLUE                                            :Tamsiai mÄ—lyna
@@ -263,11 +263,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Dykuma
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sniegas
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Pranešimas
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Nutylint
-STR_QUERY_CANCEL                                                :{BLACK}Atšaukti
-STR_QUERY_OK                                                    :{BLACK}Gerai
-STR_QUERY_RENAME                                                :{BLACK}Pervadinti
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Nutylint
+STR_BUTTON_CANCEL                                               :{BLACK}Atšaukti
+STR_BUTTON_OK                                                   :{BLACK}Gerai
+STR_BUTTON_RENAME                                               :{BLACK}Pervadinti
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -284,16 +284,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Keliamoj
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informacija
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Talpumas
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Visa keliamoji galia
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Visa traukinio keliamoji galia:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Visa traukinio keliamoji galia:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Naujas žaidimas
 STR_INTRO_LOAD_GAME                                             :{BLACK}Įkelti žaidimą
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Žaidimas tinkle
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scenarijaus redaktorius
 
-STR_MAPSIZE                                                     :{BLACK}Zemelapio dydis:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Zemelapio dydis:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Žaidimo nustatymai
 
 STR_COMPANY_SOMEONE                                             :kažkas{SKIP}{SKIP}
@@ -342,9 +342,9 @@ STR_FILE_MENU_QUIT_GAME                                         :Nutraukti žaid
 STR_FILE_MENU_EXIT                                              :IÅ¡eiti
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Ar tikrai norite išeiti iš žaidimo?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Nutraukti žaidimą
-STR_SORT_ORDER_TIP                                              :{BLACK}Pasirink rikiavimo tvarka (mazejimo/didejimo)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Pasirink rikiavimo kriteriju
-STR_SORT_BY                                                     :{BLACK}Rikiuoti pagal
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Pasirink rikiavimo tvarka (mazejimo/didejimo)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Pasirink rikiavimo kriteriju
+STR_BUTTON_SORT_BY                                              :{BLACK}Rikiuoti pagal
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}PopuliacijÄ…
@@ -374,24 +374,24 @@ STR_SORT_BY_RUNNING_COST                                        :Eksplotacijos i
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Galią/Eksplotacijos išlaidas
 STR_SORT_BY_CARGO_CAPACITY                                      :Vagono talpÄ…
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Jokių krovinių nėra pakrovimui
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pažymėti visus pastatus
-STR_SELECT_ALL_TYPES                                            :{BLACK}Pažymėti visus krovinio tipus (įskaitant nelaukian�ius krovinių)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Peržiūrėti galimų variklių sąrašą tinkamų šiai transporto priemonei.
-STR_MANAGE_LIST                                                 :{BLACK}Tvarkyti sąrašą
-STR_MANAGE_LIST_TIP                                             :{BLACK}Siųsti nurodymus visoms šio sąrašo tr. priemonėms
-STR_REPLACE_VEHICLES                                            :Keisti tr. priemones
-STR_SEND_FOR_SERVICING                                          :Siųsti techninės apžiūros
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Galimi traukiniai
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Galimi automobiliai
-STR_AVAILABLE_SHIPS                                             :{BLACK}Galimi laivai
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Galimi lÄ—ktuvai
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Siųsti į depą
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Siųsti į depą
-STR_SEND_SHIP_TO_DEPOT                                          :Siųsti į depą
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Siųsti į angarą
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Jokių krovinių nėra pakrovimui
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Pažymėti visus pastatus
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Pažymėti visus krovinio tipus (įskaitant nelaukian�ius krovinių)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Peržiūrėti galimų variklių sąrašą tinkamų šiai transporto priemonei.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Tvarkyti sąrašą
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Siųsti nurodymus visoms šio sąrašo tr. priemonėms
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Keisti tr. priemones
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Siųsti techninės apžiūros
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Galimi traukiniai
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Galimi automobiliai
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Galimi laivai
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Galimi lÄ—ktuvai
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Siųsti į depą
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Siųsti į depą
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Siųsti į depą
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Siųsti į angarą
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -421,12 +421,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Nustatym
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Aptarnavimo intervalo keisti negalima...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Uždaryti langą
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Lango pavadinimas - už jo tempiant galima judinti langą
-STR_STICKY_BUTTON                                               :{BLACK}Pažymėti šį langą kaip neuždaromą komandos 'Uždaryti visus langus' pagalba (arba 'Delete' klavišas)
-STR_RESIZE_BUTTON                                               :{BLACK}Spragtelk ir trauk, jei nori pakeisti lango dydį
+STR_TOOLTIP_STICKY                                              :{BLACK}Pažymėti šį langą kaip neuždaromą komandos 'Uždaryti visus langus' pagalba (arba 'Delete' klavišas)
+STR_TOOLTIP_RESIZE                                              :{BLACK}Spragtelk ir trauk, jei nori pakeisti lango dydį
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Spausti �ia perėjimui į numatytąją saugojimo/įkrovimo direktoriją
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Nugriauti pastatus ir kitą pasirinktame žemės plote
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Pažeminti žemės lygį
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Paaukštinti žemės lygį
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Pažeminti žemės lygį
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Paaukštinti žemės lygį
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Slinkjuostė - paslenka sąrašą aukštyn/žemyn
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Slinkjuostė - paslenka sąrašą į kairę/dešinę
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Rodyti žemės kontūrus žemėlapyje
@@ -439,21 +439,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Rodyti/s
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Šių metų pelnas: {CURRENCY} (praėjusių metų: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} metai ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} metai ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} metai ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} metai ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Traukinys
-STR_VEHICLE_ROAD_VEHICLE                                        :Automobilis
-STR_VEHICLE_SHIP                                                :Laivas
-STR_VEHICLE_AIRCRAFT                                            :LÄ—ktuvas
+STR_REPLACE_VEHICLE_TRAIN                                       :Traukinys
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Automobilis
+STR_REPLACE_VEHICLE_SHIP                                        :Laivas
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :LÄ—ktuvas
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} paseno
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} labai paseno
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} labai paseno ir  skubiai reikia pakeisti
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informacija apie žemės plotą
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}IÅ¡valymo kaina: {LTBLUE}NÄ–RA
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}IÅ¡valymo kaina: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}pajamos ištrynus: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}pajamos ištrynus: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :NÄ–RA
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Savininkas: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Kelio savininkas: {LTBLUE}{STRING}
@@ -462,7 +462,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Geležin
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Vietos valdžia: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :NÄ—ra
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Vardas
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -574,7 +574,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Paspausk
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Spragtelėjus takelį, jis pašalinamas iš dabartinės programos (tik „Speciali 1“ ir „Speciali 2“)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Programos „Atsitiktiniai takeliai“ įj./išj.
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Rodyti muzikos takelių pasirinkimo langą
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Paspauskite ant paslaugos, norėdami pamatyti įmonę/miestą
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Paspauskite ant paslaugos, norėdami pamatyti įmonę/miestą
 STR_INTRO_DIFFICULTY                                            :{BLACK}Sunkumo lygis ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Paskutinė žinutė/naujiena
@@ -623,7 +623,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Sumažin
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Kurti atsitiktinÄ™ sausumÄ…
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Anuliuoti kraštovaizdį
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Anuliuoti kraštovaizdį
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Pašalinti visas žaidėjo turimas transporto priemones nuo žemėlapio
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Pašalinti visas žaidėjo turimas transporto priemones nuo žemėlapio
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ar tikrai norite pašalinti visas žaidėjo turimas transporto priemones?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Kraštovaizdžio kūrimas
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Miesto įkūrimas
@@ -637,11 +637,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...per a
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...per arti kito miesto
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...netinkamas sklypas
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...per daug miestų
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Neimanoma statyti jokiu miestu
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...daugiau nera vietos zemelapyje
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Neimanoma statyti jokiu miestu
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...daugiau nera vietos zemelapyje
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Padidinti miesto dydį
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}IÅ¡plÄ—sti
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Miestas nestatys kelių. Jūs galite įjungti kelių statyba per Sudėtingesni nustatymai>Ekonomika>Miestai.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Miestas nestatys kelių. Jūs galite įjungti kelių statyba per Sudėtingesni nustatymai>Ekonomika>Miestai.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Atsitiktinis miestas
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Pastatyti miestÄ… atsitiktinÄ—je vietoje
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}{STRING} �ia negali būti pastatyta...
@@ -655,13 +655,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Sukurti
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Statyti švyturį
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Statyti siųstuvą
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Nurodyti dykumos plotus{}Laikant nuspaustą VALD (CTRL) galima ją pašalinti
-STR_CREATE_LAKE                                                 :{BLACK}Nurodykite vandens viena.{}Sukurkit kanalą. Jeigu nuspaustas CTRL jūros lygyje, tada aplinka bus užlieta
-STR_CREATE_RIVER                                                :{BLACK}Kasti upes.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Nurodykite vandens viena.{}Sukurkit kanalą. Jeigu nuspaustas CTRL jūros lygyje, tada aplinka bus užlieta
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Kasti upes.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Å alinti
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Šalinti šį miestą
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Išsaugoti scenarijų
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Įkelti scenarijų
-STR_MENU_LOAD_HEIGHTMAP                                         :Atverti aukš�ių žemėlapį
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Atverti aukš�ių žemėlapį
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Uždaryti redaktorių
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :IÅ¡eiti
@@ -671,7 +671,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}IÅ¡saugo
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Išbandyti scenarijų (žaisti)
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Žaisti papildomame žemėlapyje
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Pradėti žaidimą naudojant papildomą žemėlapį ir žemtvarką
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Ar tikrai norite išeiti iš šio scenarijaus?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Ar tikrai norite išeiti iš šio scenarijaus?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...gali būti pastatyta tik miestuose, kuriuose yra bent 1200 gyventojų
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Žaidimo pradžios datą sumažinti 1 metais
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Žaidimo pradžios datą padidinti 1 metais
@@ -679,21 +679,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...abu t
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Mažas
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Vidutinis
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Didelis
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Atsitiktinai
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Atsitiktinai
 STR_FOUND_TOWN_CITY                                             :{BLACK}Miestas
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Didemies�iai auga grei�iau nei įprasti miestai{}Pagal tam tikras nuostatas, jie didesni, nuo atsiradimo
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Išsirinkite miesto dydį
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Miesto dydis:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Miesto kelių išdėstymas:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Pasirinkti kelio išdėstymą šiam miestui
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originalus
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Geresni keliai
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 tinklelis
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 tinklelis
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Atsitiktinai
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Miesto kelių išdėstymas:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Pasirinkti kelio išdėstymą šiam miestui
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalus
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Geresni keliai
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 tinklelis
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 tinklelis
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Atsitiktinai
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Parodyti paskutinę žinutę ar spaudos pranešimą
 STR_NEWS_MESSAGES_OFF                                           :Isjungta
 STR_NEWS_MESSAGES_SUMMARY                                       :Santrauka
@@ -793,10 +793,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *   S
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekrano vaizdas išsaugotas kaip „{STRING}“
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ekrano vaizdas neišsaugotas!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Nusipirkti žemę vėlesniam naudojimui
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Nusipirkti žemę vėlesniam naudojimui
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOMATINIS SAUGOJIMAS
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  Išsaugomas žaidimas  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Vyksta išsaugojimas,{}palaukite kol baigsis!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Vyksta išsaugojimas,{}palaukite kol baigsis!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Pasirink „Ezy Street“ muzikos stiliaus programą
 
 ############ start of townname region
@@ -859,7 +859,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pasirink
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Visu ekranu
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Pažymėkite šį langelį, jeigu norite OpenTTD žaisti visu ekranu
-STR_FULLSCREEN_FAILED                                           :{WHITE}Viso ekrano nustatymas nepavyko
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Viso ekrano nustatymas nepavyko
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekrano raiška
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pasirinkite ekrano raišką
@@ -870,12 +870,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Pasirink
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Bazinis grafikos rinkinys
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Pasirinkti naudojimui bazinę grafikos rinkinį
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Automatinis išsaugojimas nepavyko
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Automatinis išsaugojimas nepavyko
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Laukiama {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Važiuojama į {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Neturi užduo�ių
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Neturi užduo�ių, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Laukiama {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Važiuojama į {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Neturi užduo�ių
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Neturi užduo�ių, {VELOCITY}
 
 STR_PASSENGERS                                                  :keleiviai
 STR_BAGS                                                        :maišai
@@ -886,9 +886,9 @@ STR_CRATES                                                      :dežių
 STR_RES_OTHER                                                   :Kita
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Užduo�ių sąrašu dalintis negalima...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Užduo�ių sąrašo kopijuoti negalima...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Bendrų užduo�ių pabaiga - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Užduo�ių sąrašu dalintis negalima...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Užduo�ių sąrašo kopijuoti negalima...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Bendrų užduo�ių pabaiga - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} negali rasti kelio
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} pasimetÄ—
@@ -1141,15 +1141,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Zemelap
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :išjungta
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Keisti reikšmes
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Keisti reikšmes
 
-STR_TEMPERATE_LANDSCAPE                                         :Normalus klimatas
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-arktinis klimatas
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropinis klimatas
-STR_TOYLAND_LANDSCAPE                                           :'Žaislinis' klimatas
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Normalus klimatas
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub-arktinis klimatas
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub-tropinis klimatas
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :'Žaislinis' klimatas
 
 STR_CHEATS                                                      :{WHITE}Suk�iavimai
-STR_CHEATS_TIP                                                  :{BLACK}Laukeliai rodo ar jus naudojote šį triuką prieš tai
+STR_CHEATS_TOOLTIP                                              :{BLACK}Laukeliai rodo ar jus naudojote šį triuką prieš tai
 STR_CHEATS_WARNING                                              :{BLACK}Dėmesio! Tu bandai išduoti vargšus savo varžovus. Tai bus tavo gėda visiems laikams ir niekada neužmiršta.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Padauginti pinigų {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Žaidiama už kompaniją: {ORANGE}{COMMA}
@@ -1161,176 +1161,176 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Perjung
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Pakeisti datÄ…: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Leisti keisti produkcijos vertes: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Juda į {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Juda į {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Juda į {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Juda į {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Važiuoti per {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Važiuoti be sustojimo per {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Važiuoti per {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Važiuoti be sustojimo per {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :KontrolÄ—s punktas {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} kontrolÄ—s punktas#{COMMA}
-STR_LANDINFO_WAYPOINT                                           :KontrolÄ—s punktas
+STR_FORMAT_WAYPOINT_NAME                                        :KontrolÄ—s punktas {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} kontrolÄ—s punktas#{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :KontrolÄ—s punktas
 
-STR_WAYPOINT                                                    :{WHITE}KontrolÄ—s punktas
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Pasirinkite punkto tipÄ…
+STR_WAYPOINT_CAPTION                                            :{WHITE}KontrolÄ—s punktas
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Pasirinkite punkto tipÄ…
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Redaguoti punkto vardÄ…
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Neįmanoma pakeisti punkto vardo...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Neįmanoma pakeisti punkto vardo...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Paversti bėgius į kontrolės punktą
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Čia neįmanoma pastatyti traukinių kontrolės punkto...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nepavyko pašalinti šio traukinių kontrolės punkto
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Čia neįmanoma pastatyti traukinių kontrolės punkto...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Nepavyko pašalinti šio traukinių kontrolės punkto
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Statyti geležinkelio bėgius naudojant automatinį režimą
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...šiame scenarijuje nėra miestų
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...šiame scenarijuje nėra miestų
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Daug atsitiktinių miestų
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Sukuria miestus atsitiktinėse žemėlapio vietose
-STR_MANY_RANDOM_INDUSTRIES                                      :Daug atsitiktinių pramonės įmonių
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Sukuria pramonės įmones atsitiktinėse žemėlapio vietose
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Neįmanoma sukurti pramonės įmonių...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Daug atsitiktinių miestų
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Sukuria miestus atsitiktinėse žemėlapio vietose
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Daug atsitiktinių pramonės įmonių
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Sukuria pramonės įmones atsitiktinėse žemėlapio vietose
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Neįmanoma sukurti pramonės įmonių...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Atidaro žemės tvarkymo įrankių juostą, skirtą pakelti/nuleisti žemės lygiui, sodinti medžius ir t.t.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Žemės tvarkymas
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Žemės lygis
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Žemės lygis
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Atsitiktiniai medžiai
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Sodina atsitiktinės rūšies medžius
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Sodina atsitiktinės rūšies medžius
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Neimanoma cia iskasti kanalu...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Neimanoma cia iskasti kanalu...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Statyk kanalus.
-STR_LANDINFO_CANAL                                              :Kanalas
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanalas
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Neįmanoma �ia įrengti šliuzų...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Neįmanoma �ia įrengti šliuzų...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Įrengti šliuzus
-STR_LANDINFO_LOCK                                               :Å liuzai
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Å liuzai
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Upių �ia iškasti negalima...
-STR_LANDINFO_RIVER                                              :UpÄ—
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Upių �ia iškasti negalima...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :UpÄ—
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...pluduras naudojamas!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...pluduras naudojamas!
 
-STR_LANDINFO_COORDS                                             :{BLACK}KoordinatÄ—s: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}KoordinatÄ—s: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Neįmanoma pašalinti stoties dalies...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Neįmanoma �ia pakeisti bėgio tipo...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Neįmanoma pašalinti stoties dalies...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Neįmanoma �ia pakeisti bėgio tipo...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Pakeisti ar pagerinti bÄ—gio tipÄ…
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Nutempkite lokomotyvą �ia, norėdami parduoti visą traukinį
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Nutempkite lokomotyvą �ia, norėdami parduoti visą traukinį
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Nutempti
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Statyti stotelę užbrėžiant jos dydį
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Pasirinkti stoties klasÄ™ rodymui
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Pasirinkti stoties statymo tipÄ…
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Pasirinkti stoties klasÄ™ rodymui
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Pasirinkti stoties statymo tipÄ…
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Pagreitinti laiko tekmÄ™
 STR_MESSAGE_HISTORY                                             :{WHITE}Žinu�ių istorija
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Paskutinių žinu�ių sąrašas
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}IÅ¡jungti visas
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Įjungti visas
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Paskutinių žinu�ių sąrašas
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}IÅ¡jungti visas
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Įjungti visas
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Gamyklos
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportuota)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportuota)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}PramonÄ—s pavadinimai  - spragtelÄ—jus ant pavadinimo, pramonÄ— rodoma ekrano centre
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Gamyklos
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportuota)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportuota)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}PramonÄ—s pavadinimai  - spragtelÄ—jus ant pavadinimo, pramonÄ— rodoma ekrano centre
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...per arti kitos gamyklos
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...per arti kitos gamyklos
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Keisti produkcijÄ…
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Žaidimas tinkle
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Žaidėjo vardas:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Tai vardas, pagal kuri kiti žaidejai tave pažins
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Įrašykite savo vardą
-STR_NETWORK_CONNECTION                                          :{BLACK}Ryšys:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Pasirinkti žaidimą internete ar vietiniame tinkle (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Sukurti serverį
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Sukurti savo serverį
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Vardas
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Žaidimo pavadinimas
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Kalba, serverio versija ir kt.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Pasirink iš sąrašo žaidimą
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Serveris, kuriame žaidėte paskutinį kartą:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Spragtelkite ant serverio, kuriame žaidėte paskutinį kartą
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Rasti serveri
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Ieškoti serverio
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Pridėti serverį
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Prideda serverį į sąrašą, kuris tikrinamas ieškant žaidimų
-STR_NETWORK_ENTER_IP                                            :{BLACK}Įvesk adresą (IP)
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Žaidejai
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Žaidžia / maksimaliai žaidėjų
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Žemėlapio dydis
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Žaidimo žemėlapio dydis{}Pragtelėjus rušiuojama pagal dydį
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}DabartinÄ— data
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Metai
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Metų skai�ius{}vykstan�io žaidimo
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}Žaidimo informacija
-STR_NETWORK_CLIENTS                                             :{SILVER}Žaidėjai:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Kalba:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Pavadinimas:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Žemėlapio dydis:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverio versija:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serverio adresas:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Žaidimo pradžia:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}DabartinÄ— data:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Apsaugota slaptazodžiu!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVERIS IÅ JUNGTAS
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVERIS PILNAS
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIJŲ NESUTAPIMAS
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}PAPILD. GRAFIKOS NEATITIKIMAS
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Jungtis
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Pradėti naują daugiažaidėjinį žaidimą
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Žaidimo vardas:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Žaidimo pavadinimas bus rodomas kitiems žaidėjams meniu
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Įveskite tinklo žaidimo pavadinimą
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Nustatyti slaptažodi
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Apsaugokite savo žaidimą slaptažodžiu, jei nenorite, kad jis būtų viešai prieinamas
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Pasirinkite žemėlapį:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Kuriame žemėlapyje norite žaisti?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Vietinis tinklas
-STR_NETWORK_INTERNET                                            :Internetas
-STR_NETWORK_LAN_INTERNET                                        :Vietinis tinklas/ Internetas
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internetas (visiems)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P as ai ų}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maksimalus klientų skai�ius:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Pasirinkite maksimalų klientų skai�ių. Nebūtinai visos jungtys turi buti užpildytos
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanij{P a os ų}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Daugiausia kompanijų:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Riboti serverį iki tam tikro skai�iaus kompanijų
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} stebėtoj{P as ai ų}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Daugiausia žiurovų:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Riboti serverį iki tam tikro skai�iaus žiurovų
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Kalba:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Kiti žaidėjai žinos kokia kalba kalbama serveryje
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Pradėti žaidimą
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Predėti naują žaidimą tinkle (atsitiktinis žemėlapis ar scenarijus)
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Atverti žaidimą
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Atstatyti anks�iau išsaugotą žaidimą tinkle (įsitikink kad prisijungei prie to pa�io žaidėjo)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Žaidimas tinkle
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Žaidėjo vardas:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Tai vardas, pagal kuri kiti žaidejai tave pažins
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Įrašykite savo vardą
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Ryšys:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Pasirinkti žaidimą internete ar vietiniame tinkle (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Sukurti serverį
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Sukurti savo serverį
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Vardas
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Žaidimo pavadinimas
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Kalba, serverio versija ir kt.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Pasirink iš sąrašo žaidimą
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Serveris, kuriame žaidėte paskutinį kartą:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Spragtelkite ant serverio, kuriame žaidėte paskutinį kartą
+
+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_ENTER_IP                                :{BLACK}Įvesk adresą (IP)
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Žaidejai
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Žaidžia / maksimaliai žaidėjų
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Žemėlapio dydis
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Žaidimo žemėlapio dydis{}Pragtelėjus rušiuojama pagal dydį
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}DabartinÄ— data
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Metai
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Metų skai�ius{}vykstan�io žaidimo
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}Žaidimo informacija
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Žaidėjai:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Kalba:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Pavadinimas:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Žemėlapio dydis:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Serverio versija:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serverio adresas:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Žaidimo pradžia:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}DabartinÄ— data:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Apsaugota slaptazodžiu!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVERIS IÅ JUNGTAS
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVERIS PILNAS
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIJŲ NESUTAPIMAS
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}PAPILD. GRAFIKOS NEATITIKIMAS
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Jungtis
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Pradėti naują daugiažaidėjinį žaidimą
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Žaidimo vardas:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Žaidimo pavadinimas bus rodomas kitiems žaidėjams meniu
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Įveskite tinklo žaidimo pavadinimą
+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_SELECT_MAP                             :{BLACK}Pasirinkite žemėlapį:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Kuriame žemėlapyje norite žaisti?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Vietinis tinklas
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internetas
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Vietinis tinklas/ Internetas
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internetas (visiems)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P as ai ų}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maksimalus klientų skai�ius:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Pasirinkite maksimalų klientų skai�ių. Nebūtinai visos jungtys turi buti užpildytos
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanij{P a os ų}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Daugiausia kompanijų:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Riboti serverį iki tam tikro skai�iaus kompanijų
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} stebėtoj{P as ai ų}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Daugiausia žiurovų:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Riboti serverį iki tam tikro skai�iaus žiurovų
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Kalba:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Kiti žaidėjai žinos kokia kalba kalbama serveryje
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Pradėti žaidimą
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Predėti naują žaidimą tinkle (atsitiktinis žemėlapis ar scenarijus)
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Atverti žaidimą
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Atstatyti anks�iau išsaugotą žaidimą tinkle (įsitikink kad prisijungei prie to pa�io žaidėjo)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Bet kokia
@@ -1371,33 +1371,33 @@ STR_NETWORK_LANG_GREEK                                          :Graikų
 STR_NETWORK_LANG_LATVIAN                                        :Latvių
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Kelių žaidėjų meniu
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Kelių žaidėjų meniu
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Ruošiamasi prisijungti:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Sąrašas visų kompanijų žaidime. Gali arba prisijungti prie kurios nors, arba sukurti naują kompaniją (jei yra laisvų vietų)
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nauja kompanija
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Sukursi naujÄ… kompanijÄ…
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Stebėti žaidimą
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Stebėsi žaidimą kaip žiūrovas
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Prisijungti prie kompanijos
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}PadÄ—si valdyti Å¡iÄ… kompanijÄ…
-STR_NETWORK_REFRESH                                             :{BLACK}Atnaujinti serverį
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Atnaujinti serverio informacijÄ…
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Ruošiamasi prisijungti:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Sąrašas visų kompanijų žaidime. Gali arba prisijungti prie kurios nors, arba sukurti naują kompaniją (jei yra laisvų vietų)
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nauja kompanija
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Sukursi naujÄ… kompanijÄ…
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Stebėti žaidimą
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Stebėsi žaidimą kaip žiūrovas
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Prisijungti prie kompanijos
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}PadÄ—si valdyti Å¡iÄ… kompanijÄ…
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Atnaujinti serverį
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Atnaujinti serverio informacijÄ…
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}KOMPANIJOS INFORMACIJA
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}KOMPANIJOS INFORMACIJA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Kompanijos pavadinimas:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Pradėjo žaisti:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Kompanijos vertÄ—:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Dabartinis balansas:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Praeitų metų pajamos:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Sparta:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Kompanijos pavadinimas:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Pradėjo žaisti:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Kompanijos vertÄ—:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Dabartinis balansas:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Praeitų metų pajamos:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Sparta:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Transporto priemonÄ—s:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}StotelÄ—s:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Žaidejai:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Transporto priemonÄ—s:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}StotelÄ—s:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Žaidejai:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Jungiamasi...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Jungiamasi...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Jungiamasi..
@@ -1413,48 +1413,48 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Gaunama
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} vartotoj{P as ai ų} prieš tave
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} parsiųsta
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Atsijungti
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Atsijungti
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Įveskite kiekį pinigų, kuriuos norite gauti
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serveris apsaugotas. Įvesk slaptažodį
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Kompanija apsaugota. Įvesk slaptažodį
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Žaidėjų sąrašas
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Žaidėjų sąrašas
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}StebÄ—ti
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nauja kompanija
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Nerastas tinklo įrenginys arba sukompiliuota be ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nerado nei vieno žaidimo tinkle
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Serveris neatsakė į užklausą
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nepavyko prisijungti dÄ—l Papild. grafikos neatitikimo
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Žaidimo tinkle sinchronizacija nepavyko
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Nutruko ryšys
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Negali atverti išsaugoto žaidimo
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Negali paleisti serverio
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Negali prisijungti
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} BaigÄ—si prisijungimo #{NUM} laikas
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Protokolo klaida. Prisijungimas baigtas
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Žaidimo versija neatitinka serverio žaidimo versijos
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Blogas slaptažodis
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Serveris pilnas
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Tau uždrausta prisijungti prie šio serverio (BAN)
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Tu išmestas iš žaidimo (KICK)
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Suk�iavimas neleidžiamas tinklo žaidime
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Nerastas tinklo įrenginys arba sukompiliuota be ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Nerado nei vieno žaidimo tinkle
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Serveris neatsakė į užklausą
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Nepavyko prisijungti dÄ—l Papild. grafikos neatitikimo
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Žaidimo tinkle sinchronizacija nepavyko
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Nutruko ryšys
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Negali atverti išsaugoto žaidimo
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Negali paleisti serverio
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Negali prisijungti
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} BaigÄ—si prisijungimo #{NUM} laikas
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Protokolo klaida. Prisijungimas baigtas
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Žaidimo versija neatitinka serverio žaidimo versijos
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Blogas slaptažodis
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Serveris pilnas
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Tau uždrausta prisijungti prie šio serverio (BAN)
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Tu išmestas iš žaidimo (KICK)
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Suk�iavimas neleidžiamas tinklo žaidime
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :klaida
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :sinchronizacijos klaida
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :negali užkrauti žemėlapio
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :prarastas ryšys
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokolo klaida
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Papild. grafikos neatitikimas
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Neautorizuota
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :gautas neteisingas paketas
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :bloga versija
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :toks vardas jau naudojamas
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :blogas žaidimo slaptažodis
-STR_NETWORK_ERR_CLIENT_KICKED                                   :išmestas serverio
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :bandė suk�iauti
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serveris pilnas
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :klaida
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :sinchronizacijos klaida
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :negali užkrauti žemėlapio
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :prarastas ryšys
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokolo klaida
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Papild. grafikos neatitikimas
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :Neautorizuota
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :gautas neteisingas paketas
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :bloga versija
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :toks vardas jau naudojamas
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :blogas žaidimo slaptažodis
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :išmestas serverio
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :bandė suk�iauti
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serveris pilnas
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1464,12 +1464,12 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Žaidimas susta
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Žaidimas veikia (Klientas pajungtas)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Žaidimas tęsiamas (Klientas neprisijungė)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :išeinama
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} prisijungė prie žaidimo
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} prisijungė prie stebėtojų
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} paliko žaidimą ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} pasikeitė vardą į {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} turi savo kompanijÄ… {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :išeinama
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} prisijungė prie žaidimo
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} prisijungė prie stebėtojų
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} paliko žaidimą ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} pasikeitė vardą į {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} turi savo kompanijÄ… {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Komandai] :
 STR_NETWORK_CHAT_COMPANY                                        :[Komandai] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Komandai] {STRING}: {WHITE}{STRING}
@@ -1479,8 +1479,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Priva�iai] {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Visiems] :
 STR_NETWORK_CHAT_ALL                                            :[Visiems] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Įveskite tekstą internetiniam pokalbiui
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Serveris užsidarė
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Serveris persikrauna...{}Prašau palaukti...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Serveris užsidarė
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Serveris persikrauna...{}Prašau palaukti...
 
 STR_NETWORK_SERVER                                              :Serveris
 STR_NETWORK_CLIENT                                              :Žaidėjas
@@ -1494,19 +1494,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Sakyti kompanij
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privati žinutė
 
 
-STR_NETWORK_SEND                                                :{BLACK}Siųsti
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Siųsti
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Neina pakrauti žemėtvarkos iš  PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...failas nerastas.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...Negali perversti paveiklsÄ—lio. 8 arba 24-bit PNG paveikslÄ—lis reikalingas.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...kažkas buvo ne taip. Atsiprašome. (grei�iausiai pažeistas failas)
+STR_ERROR_PNGMAP                                                :{WHITE}Neina pakrauti žemėtvarkos iš  PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...failas nerastas.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...Negali perversti paveiklsÄ—lio. 8 arba 24-bit PNG paveikslÄ—lis reikalingas.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...kažkas buvo ne taip. Atsiprašome. (grei�iausiai pažeistas failas)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Negalima nuskaityti kraštovaizdžio iš BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nepavyko pakeisti vaizdo failo formato.
+STR_ERROR_BMPMAP                                                :{WHITE}Negalima nuskaityti kraštovaizdžio iš BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nepavyko pakeisti vaizdo failo formato.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Kaina: {CURRENCY}
@@ -1520,13 +1520,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Numatomo
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Žemės lygio �ia paaukštinti negalima...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Žemės lygio �ia pažeminti negalima...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Negalima nukasti �ia žemės...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Akmenys
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Nelygi žemė
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Lygi žemė
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Žolė
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Laukai
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Užpustyta žemė
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Dykuma
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Akmenys
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Nelygi žemė
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Lygi žemė
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Žolė
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Laukai
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Užpustyta žemė
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Dykuma
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Neteisingas žemės nuolydis
@@ -1534,11 +1534,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Neįmano
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Kasinėjimai apgadins tunelį
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Jau siekia jūros lygį
 STR_ERROR_TOO_HIGH                                              :{WHITE}Per aukštai
-STR_ALREADY_LEVELLED                                            :{WHITE}... jau plokš�ia
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... jau plokš�ia
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Netinkamas bÄ—gis
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...jau pastatyta
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Pirmiau pašalinkite geležinkelio bėgius
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Kelias vienpusis ar užblokuotas
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Kelias vienpusis ar užblokuotas
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Geležinkelio statyba
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrifikuoto Gelezinkelio Statyba
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Vienbėgio geležinkelio statyba
@@ -1562,40 +1562,40 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Statyti
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Statyti geležinkelio tiltą
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Statyti geležinkelio tunelį
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Pašalina bėgius/šviesoforus
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Tilto statyba - spragtelkite ant pageidaujamo tilto
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Tilto statyba - spragtelkite ant pageidaujamo tilto
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Pasirinkite geležinkelio depo padėtį
-STR_RAILROAD_TRACK                                              :Geležinkelio bėgiai
-STR_RAILROAD_TRAIN_DEPOT                                        :Traukinių depas
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Geležinkelio bėgiai
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Traukinių depas
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...ši žemė priklauso kitai kompanijai
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Gelezinkelio bÄ—giai su paprastais Å¡viesoforais
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Gelezinkelio bÄ—giai su pre-Å¡viesoforais
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Gelezinkelio bÄ—giai su exit-Å¡viesoforais
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :geležinkelio bėgiai su kombo signalais
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Geležinkelis su krypties šviesoforais
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Geležinkelis su vienpusiais krypties signalais
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Geležinkelis su paprastais ir pre-signalais
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Geležinkelis su paprastais ir išėjimo signalais
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Geležinkelis su paprastais ir kombo-signalais
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Geležinkelis su paprastais ir krypties signalais
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Geležinkelis su paprastais ir vienpusiais kelio signalais
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Geležinkelis su pre- ir išėjimo signalais
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Geležinkelis su pre- ir kombo- signalais
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Geležinkelis su pre- ir krypties signalais
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Geležinkelis su išėjimo ir kombo- šviesoforais
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Geležinkelis su išėjimo ir krypties šviesoforais
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Geležinkelis su išėjimo ir vienpusiais krypties šviesoforais
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :BÄ—giai su kombo ir krypties signalais
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :BÄ—giai su combo- ir vienpusiais krypties signalais
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :BÄ—giai su krypties ir vienpusiais krypties Å¡viesoforais
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Pašalinkite stotelę prieš tęsdami!
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Statyti perskirtą stotį
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Sujungti stotį
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Gelezinkelio bÄ—giai su paprastais Å¡viesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Gelezinkelio bÄ—giai su pre-Å¡viesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Gelezinkelio bÄ—giai su exit-Å¡viesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :geležinkelio bėgiai su kombo signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Geležinkelis su krypties šviesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Geležinkelis su vienpusiais krypties signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Geležinkelis su paprastais ir pre-signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Geležinkelis su paprastais ir išėjimo signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Geležinkelis su paprastais ir kombo-signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Geležinkelis su paprastais ir krypties signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Geležinkelis su paprastais ir vienpusiais kelio signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Geležinkelis su pre- ir išėjimo signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Geležinkelis su pre- ir kombo- signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Geležinkelis su pre- ir krypties signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Geležinkelis su išėjimo ir kombo- šviesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Geležinkelis su išėjimo ir krypties šviesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Geležinkelis su išėjimo ir vienpusiais krypties šviesoforais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :BÄ—giai su kombo ir krypties signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :BÄ—giai su combo- ir vienpusiais krypties signalais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :BÄ—giai su krypties ir vienpusiais krypties Å¡viesoforais
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Pašalinkite stotelę prieš tęsdami!
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Statyti perskirtą stotį
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Sujungti stotį
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Pirmiausia reikia pašalinti kelią
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vyksta kelio darbai
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vyksta kelio darbai
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Kelio tiesimas
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Tramvajaus konstrukcija
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Pasirinkite tilto tipÄ…
@@ -1631,14 +1631,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Statyti
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Įjungti/Išjungti vienpusio kelio statymo rėžimą
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Kelių konstrukcijų statyba/šalinimas
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Keisti statybos griovimo rėžimus
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Pasirink automobilių garažo padėtį
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Pasirinkti tramvajų depo orientaciją
-STR_ROAD_DESCRIPTION_ROAD                                       :Kelias
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Kelias su žibintais
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Trijuostis kelias
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Automobilių garažas
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Geležinkelio pervaža
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramvajus
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Pasirink automobilių garažo padėtį
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Pasirinkti tramvajų depo orientaciją
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Kelias
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Kelias su žibintais
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Trijuostis kelias
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Automobilių garažas
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Geležinkelio pervaža
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramvajus
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Neįmanoma statyti autobuso stotelės...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Neįmanoma griauti sunkvežimių stotelės...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Neįmanoma griauti keleivinio tramvajaus stotelės...
@@ -1646,12 +1646,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Neįmano
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Miestai
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Pirmiau reikia nugriauti pastatÄ…
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Miestas)
@@ -1664,9 +1664,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Rodyti m
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Keisti miesto vardÄ…
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Praėjusio mėnesio keleivių sk.: {ORANGE}{COMMA}{BLACK}  Daugiausia: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Praėjusio mėnesio pašto siuntų sk.: {ORANGE}{COMMA}{BLACK}  Daugiausia: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Kad miestas augtų reikalingi kroviniai:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} reikia
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} pervežta praeitą mėnesį
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Kad miestas augtų reikalingi kroviniai:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} reikia
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} pervežta praeitą mėnesį
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Administracinis kompleksas
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Administracinis pastatas
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Nedidelis daugiabutis
@@ -1703,7 +1703,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subsidijos suteiktos {STRING}!{}{}{STRING}  pervežimas iš {STATION} į {STATION} visus metus bus apmokamas trigubai!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subsidijos suteiktos {STRING}!{}{}{STRING} pervežimas iš {STATION} į {STATION} bus metus apmokamas keturgubai!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} vietinė valdžia neleidžia statyti kito oro uosto šiame mieste
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} vietos valdžia atsisako suteikti leidimą statyti oro uosta dėl triukšmo problemų
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} vietos valdžia atsisako suteikti leidimą statyti oro uosta dėl triukšmo problemų
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Vasarnamiai
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Namai
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Butai
@@ -1739,7 +1739,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}{TOWN}: Sutriko susisiekimas keliais!{}{}Kelių rekonstrukcija, finansuojama {STRING}, sutrigdė susisiekimą keliais 6 mėnesiams!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (statoma)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (statoma)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglus
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvamai
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Arbatos namai
@@ -1752,17 +1752,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Statyti ženklÄ
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Medžiai
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...medis jau yra
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Neįmanoma pasodinti medžio...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...per daug ženklų
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Čia ženklo statyti negalima...
-STR_SIGN_DEFAULT                                                :Ženklas
+STR_DEFAULT_SIGN_NAME                                           :Ženklas
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Redaguoti ženklo tekstą
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Ženklo pavadinimo keisti negalima...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Neįmanoma naikinti ženklo...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Pasirinkite norimų sodinti medžių tipą
-STR_TREE_NAME_TREES                                             :Medžiai
-STR_TREE_NAME_RAINFOREST                                        :Atogrąžų miškas
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusiniai augalai
+STR_LAI_TREE_NAME_TREES                                         :Medžiai
+STR_LAI_TREE_NAME_RAINFOREST                                    :Atogrąžų miškas
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusiniai augalai
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Geležinkelio stoties pasirinkimas
@@ -1782,7 +1782,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Pirmiaus
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Per arti kito oro uosto
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Pirmiausia reikia nugriauti oro uostÄ…
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Pervardinti stotelÄ™
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Pervardinti stotelÄ™
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}StotelÄ—s pervardinti negalima...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Reitingai
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Priima
@@ -1800,10 +1800,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Nuostabus
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Rodyti visus traukinius, kuriu uzduotuse yra itraukta si stotele
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Rodyti visus automobilius, kuriu uzduotyse yra pamineta si stotele
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Rodyti visus lektuvus, kuriu uzduotyse yra pamineta si stotele
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Rodyti visus laivus, kuriu uzduotyse yra pamineta si stotele
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Rodyti visus traukinius, kuriu uzduotuse yra itraukta si stotele
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Rodyti visus automobilius, kuriu uzduotyse yra pamineta si stotele
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Rodyti visus lektuvus, kuriu uzduotyse yra pamineta si stotele
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Rodyti visus laivus, kuriu uzduotyse yra pamineta si stotele
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} nebepriima {STRING}
@@ -1836,47 +1836,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Pakeisti
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Rodyti priimamų krovinių sąrašą
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Paspausk ant stotelÄ—s pavadinimo, kad pamatytum jÄ… ekrano centre
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Pasirinkite oro uosto dydį/tipą
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Geležinkelio stotis
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :LÄ—ktuvo angaras
-STR_STATION_DESCRIPTION_AIRPORT                                 :Oro uostas
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Sunkvežimių pakrovimo aikštelė
-STR_STATION_DESCRIPTION_BUS_STATION                             :Autobusų stotelė
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Laivų prieplauka
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Geležinkelio stotis
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :LÄ—ktuvo angaras
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Oro uostas
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Sunkvežimių pakrovimo aikštelė
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Autobusų stotelė
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Laivų prieplauka
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Rodyti stotelÄ—s aptarnaujamÄ… teritorijÄ…
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nerodyti stotelÄ—s aptarnaujamos teritorijos
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Rodyk aptarnaujamÄ… teritorijÄ…
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Prieplauka
-STR_STATION_DESCRIPTION_BUOY                                    :Plūduras
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Plūduras
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...plūduras pakeliui
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stotis per daug išsiplėtusi
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...nestandartines stoteles atjungtos
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Laikant nuspaustą VALD (CTRL) galima pažymėti daugiau nei vieną
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...nestandartines stoteles atjungtos
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Laikant nuspaustą VALD (CTRL) galima pažymėti daugiau nei vieną
 
 STR_UNDEFINED                                                   :(neapibrėžta eilutė)
-STR_STAT_CLASS_DFLT                                             :Numatytoji stotis
-STR_STAT_CLASS_WAYP                                             :Keliarodžiai
+STR_STATION_CLASS_DFLT                                          :Numatytoji stotis
+STR_STATION_CLASS_WAYP                                          :Keliarodžiai
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Laivų depo orientacija
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...turi buti statoma ant vandens
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Laivų depo statyti negalima...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Pasirink laivų depo orientaciją
-STR_WATER_DESCRIPTION_WATER                                     :Vanduo
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :JÅ«ros ar upÄ—s krantas
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Laivų depas
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvedukas
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vanduo
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :JÅ«ros ar upÄ—s krantas
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Laivų depas
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvedukas
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Negalima statyti ant vandens
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Sunaikinkite kanalus prieš tęsdami!
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Sunaikinkite kanalus prieš tęsdami!
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Išsaugoti žaidimą
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Įkelti žaidimą
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}IÅ¡saugoti
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Å alinti
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :StebÄ—tojas, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :StebÄ—tojas, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} laisva
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Negali pasiekti disko
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Žaidimo išsaugoti nepavyko{}{STRING}
@@ -1892,12 +1892,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Diskų,
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Pasirinktas žaidimas
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Ištrinti pasirinktą žaidimą
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Išsaugoti žaidimą pasirinktu vardu
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Sukurti atsitiktinį naują žaidimą
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Atverti aukš�ių žemėlapį
-STR_SAVE_OSKTITLE                                               :{BLACK}Įveskite Išsaugomo žaidimo vardą
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Sukurti atsitiktinį naują žaidimą
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Atverti aukš�ių žemėlapį
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Įveskite Išsaugomo žaidimo vardą
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} kelyje
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} kelyje
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :anglies kasykla
 STR_INDUSTRY_NAME_POWER_STATION                                 :elektrinÄ—
@@ -1955,7 +1955,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Rodyti gamyklÄ… ekrano centre
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Statomas naujas {STRING} netoli miesto: {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Sodinamas naujas {STRING} netoli miesto: {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kaina: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kaina: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Neįmanoma �ia pastatyti šio tipo pramonės įmonės...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...miškas gali būti pasodintas tik žemiau sniego ribos
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} praneša apie neatidėliotina uždarymą!
@@ -1973,16 +1973,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Trukdo kitas tunelis
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunelis bus žemėlapio gale
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunelis bus žemėlapio gale
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nepavyko iškasti žemės kitame tunelio gale
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Pirmiau reikia pašalinti tunelį
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Pirmiau reikia pašalinti tiltą
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Negalima pradeti ir baigti tuo paciu metu
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Tilto pirminės atramos turi būti tame pa�iame aukštyje
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Tiltas per žemas reljefui
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Negalima pradeti ir baigti tuo paciu metu
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Tilto pirminės atramos turi būti tame pa�iame aukštyje
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Tiltas per žemas reljefui
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Pradžia ir pabaiga turi būti vienoje linijoje
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Vieta netinkama įvažiavimui į tunelį
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Kabantis (plienas)
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Plieno sijų
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Plieno konstrukcijų
@@ -1993,30 +1993,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Vamzdinis (plie
 STR_BRIDGE_TUBULAR_SILICON                                      :Vamzdinis (silicio pluostas)
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Negalima �ia statyti tilto...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Negalima �ia statyti tunelio...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Geležinkelio tunelis
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunelis
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Plieninis kabantis geležinkelio tiltas
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Plieno sijų geležinkelio tiltas
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Plieno konstrukciju gelezinkelio tiltas
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Betoninis kabantis geležinkelio tiltas
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Medinis geležinkelio tiltas
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betoninis gelezinkelio tiltas
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Plieninis pakabinamas tiltas
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Plieno sijų tiltas
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Plieno konstrukciju tiltas
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Pakabinamas tiltas su betono atramomis
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Medinis tiltas
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betoninis tiltas
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Vamzdinis geležinkelio tiltas
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Vamzdinis tiltas
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Geležinkelio tunelis
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunelis
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Plieninis kabantis geležinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Plieno sijų geležinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Plieno konstrukciju gelezinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Betoninis kabantis geležinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Medinis geležinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betoninis gelezinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Plieninis pakabinamas tiltas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Plieno sijų tiltas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Plieno konstrukciju tiltas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Pakabinamas tiltas su betono atramomis
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Medinis tiltas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betoninis tiltas
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Vamzdinis geležinkelio tiltas
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Vamzdinis tiltas
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Kelyje objektas
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Radijo siųstuvas
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Å vyturys
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Kompanijos būstinė
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Radijo siųstuvas
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Å vyturys
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Kompanijos būstinė
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...trukdo kompanijos būstinė
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Kompanijos žemė
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Kompanijos žemė
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Neįmanoma užsisakyti šio langelio...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...jis ir taip priklauso jums!
 
@@ -2062,7 +2062,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stotel
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Sunkumo lygis
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}IÅ¡saugoti
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}IÅ¡saugoti
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lengvas
@@ -2135,8 +2135,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Spalva:
 STR_LIVERY_CAPTION                                              :{WHITE}Nauja spalva
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Kompanijos pavadinimas
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Direktoriaus vardas
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Kompanijos pavadinimas
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Direktoriaus vardas
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Kompanijos pavadinimas
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Direktoriaus vardas
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kompanijos vardo pakeisti negalima...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Direktoriaus vardo pakeisti negalima...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finansai {BLACK}{COMPANYNUM}
@@ -2160,11 +2160,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Viso:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Pajamų diagrama
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Įprastinės veiklos pelno diagrama
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}SÄ…skaitos balansas
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Paskola
-STR_MAX_LOAN                                                    :{WHITE}Maksimali paskola:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maksimali paskola:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Skolintis{SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Gražinti{SKIP}{SKIP}{CURRENCY}
@@ -2173,7 +2173,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Daugiau
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...kreditas grąžintas
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} reikia
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Skolos grąžinti negalima...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Negalima dovanoti iš banko pasiskolintų pinigų...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Negalima dovanoti iš banko pasiskolintų pinigų...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Pasirink naujÄ… veidÄ…
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Kei�ia kompanijos transporto priemonių spalvą
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Kei�ia kompanijos direktoriaus vardą
@@ -2183,10 +2183,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Grąžin
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Direktorius)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Eina pareigas nuo: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Transporto priemonÄ—s:
-STR_TRAINS                                                      :{WHITE}{COMMA} traukin{P ys iai ių}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} automobili{P s ai ų}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} lektuvai
-STR_SHIPS                                                       :{WHITE}{COMMA} laiv{P as ai ų}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} traukin{P ys iai ių}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automobili{P s ai ų}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lektuvai
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} laiv{P as ai ų}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Neturi
 STR_FACE_CAPTION                                                :{WHITE}Veido pasirinkimas
 STR_FACE_MALE_BUTTON                                            :{BLACK}Vyras
@@ -2200,7 +2200,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Parinka
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Spalva
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Rodo žaidėjų spalvas
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Kompanijų spalvos
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Paspausk, kad rodyti/paslÄ—pti kompanijos grafikÄ…
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Paspausk, kad rodyti/paslÄ—pti kompanijos grafikÄ…
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Prekių vienetų pervežta
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Kompanijos pajÄ—gumo reitingas (maksimalus=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Kompanijos vertÄ—
@@ -2234,23 +2234,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Prezidentas
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnatas
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Pastatyti firmos bustinÄ™
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Statyti/apžiurėti kompanijos bustinę
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Perstatyti kompanijos bustinę kitur už 1% kompanijos vertės
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Perstatyti kompanijos bustinę kitur už 1% kompanijos vertės
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Neįmanoma pastatyti kompanijos būstinės...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Apžiūrėti būstinę
-STR_RELOCATE_HQ                                                 :{BLACK}Perkelti bustinÄ™
-STR_COMPANY_JOIN                                                :{BLACK}Prisijungti
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Prisijunkite ir žaiskite kaip šios kompanijos
-STR_COMPANY_PASSWORD                                            :{BLACK}Slaptažodis
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Slaptažodis apsaugo tavo kompanija nuo neleistinų vartotojų prisijungimo.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Įvesti slaptažodį
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Perkelti bustinÄ™
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Prisijungti
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Prisijunkite ir žaiskite kaip šios kompanijos
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Slaptažodis
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Slaptažodis apsaugo tavo kompanija nuo neleistinų vartotojų prisijungimo.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Įvesti slaptažodį
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neišsaugotas įvestas slaptažodis
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Suteiktas kompanijai naujas slaptažodis
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Kompanijos slaptažodis
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Numatytasis kompanijos slaptažodis
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Naudoti kompanijos slaptažodį kaip pagrindinį naujoms kompanijoms
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Numatytasis kompanijos slaptažodis
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Naudoti kompanijos slaptažodį kaip pagrindinį naujoms kompanijoms
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Pasaulinė krizė!{}{}Ekonomikai griūvant, finansų ekspertai bijo paties blogiausio!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Krizė įveikta!{}{}Prekybos pagyvejimas suteikia naujų vil�ių pramonės įmonėms!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Pakeisti lango dydį
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Pakeisti lango dydį
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Kompanijos vertÄ—: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Pirkti 25% kompanijos akcijų
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Parduoti 25% kompanijos akcijų
@@ -2260,7 +2260,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Negalima
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Negalima parduoti 25% šios kompanijos akcijų...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% priklauso {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} buvo perimta {STRING}!
-STR_PROTECTED                                                   :{WHITE}Ši kompanija dar pernelyg jauna, kad galetų pardavinėti savo akcijas...
+STR_ERROR_PROTECTED                                             :{WHITE}Ši kompanija dar pernelyg jauna, kad galetų pardavinėti savo akcijas...
 
 STR_LIVERY_DEFAULT                                              :Standartinis Livery
 STR_LIVERY_STEAM                                                :Garo Variklis
@@ -2286,14 +2286,14 @@ STR_LIVERY_LARGE_PLANE                                          :Didelis Orlaivi
 STR_LIVERY_PASSENGER_TRAM                                       :Keleivinis tramvajus
 STR_LIVERY_FREIGHT_TRAM                                         :Krovininis tramvajus
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Rodyti pagrinidines spalvų parinktis
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Rodyti traukiniš spalvas
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Rodyti mašinų spalvas
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Rodyti laivų spalvas
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Rodyti lėktuvų parinktas spalvas
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Pasirinkite pirminÄ™ spalva
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Pasirinkite antrinÄ™ spalva
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Pasirinkite spalvą pažymėjimui arba multi-spalvas CTRL+click. Paspauskite spalvos naudojimui
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Rodyti pagrinidines spalvų parinktis
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Rodyti traukiniš spalvas
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Rodyti mašinų spalvas
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Rodyti laivų spalvas
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Rodyti lėktuvų parinktas spalvas
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Pasirinkite pirminÄ™ spalva
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Pasirinkite antrinÄ™ spalva
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Pasirinkite spalvą pažymėjimui arba multi-spalvas CTRL+click. Paspauskite spalvos naudojimui
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Garai)
@@ -2595,9 +2595,9 @@ STR_ORDER_TRANSFER_NO_LOAD                                      :(Perkelti ir pa
 STR_ORDER_NO_UNLOAD                                             :(Neiškrauti ir paimti krovinį)
 STR_ORDER_NO_UNLOAD_FULL_LOAD                                   :(Neiškrauti ir laukti pilno pakrovimo)
 STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Neiškrauti ir laukti bet kokio pilno pakrovimo)
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Įterpti užsakymą
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Įterpti užsakymą
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Grįžti į artimiausią depą
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Skristi į artimiausią angarą
 STR_ORDER_NEAREST_DEPOT                                         :artimiausias
@@ -2606,9 +2606,9 @@ STR_ORDER_SERVICE_AT                                            :Aptarnavimas
 STR_ORDER_TRAIN_DEPOT                                           :Lokomotyvų depas
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Automobilių garažas
 STR_ORDER_SHIP_DEPOT                                            :Laivų statykla
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Angaras
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Angaras
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Važiuoti be sustojimo
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Taisytis, jei reikia
@@ -2630,10 +2630,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :daugiau negu
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :daugiau arba lygu
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :tiesa
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :klaida
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Pereiti į užsakymą {COMMA}
-STR_CONDITIONAL_NUM                                             :Pereiti į užsakymą {COMMA} kai {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Pereiti į užsakymą {COMMA} kai {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Pereiti į užsakymą {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Pereiti į užsakymą {COMMA} kai {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Pereiti į užsakymą {COMMA} kai {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nėra kelionių
 
@@ -2650,17 +2650,17 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Sukeisti
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Praleisti
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Istrinti
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Vaziuoti
-STR_REFIT                                                       :{BLACK}Naujinti
-STR_REFIT_TIP                                                   :{BLACK}Pasirinkite kurį vagonų tipą kuriuo tipu pakeisti (eilės tvarka). Spragtelėjus laikant VALD (CTRL) nurodymas pašalinamas
-STR_REFIT_ORDER                                                 :(Keisti į {STRING})
-STR_STOP_ORDER                                                  :(Sustoti)
-STR_TIMETABLE_VIEW                                              :{BLACK}Tvarkaraštis
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Pereiti į tvarkaraštį
-STR_ORDER_VIEW                                                  :{BLACK}Užduotys
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Pereiti į užsakymą
+STR_ORDER_REFIT                                                 :{BLACK}Naujinti
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Pasirinkite kurį vagonų tipą kuriuo tipu pakeisti (eilės tvarka). Spragtelėjus laikant VALD (CTRL) nurodymas pašalinamas
+STR_ORDER_REFIT_ORDER                                           :(Keisti į {STRING})
+STR_ORDER_STOP_ORDER                                            :(Sustoti)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Tvarkaraštis
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Pereiti į tvarkaraštį
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Užduotys
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Pereiti į užsakymą
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Uzduotys)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Uzduociu pabaiga- -
-STR_SERVICE                                                     :{BLACK}Remontas
+STR_ORDER_SERVICE                                               :{BLACK}Remontas
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Pastatyta: {LTBLUE}{NUM}{BLACK} Verte: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verte: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2680,7 +2680,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}automobi
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}automobilis dalinantis grafikÄ… negali nukakti iki stotelÄ—s
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Transporto priemones perkelti negalima...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Galinis variklis visada seks is paskos priekio
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Neranda kelio iki artimiausio garazo
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Remonto intervalas: {LTBLUE}{COMMA}dienos{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Remonto intervalas: {LTBLUE}{COMMA}%{BLACK}   Paskutinis remontas: {LTBLUE}{DATE_LONG}
@@ -2697,8 +2697,8 @@ STR_ORDERS_SKIP_TOOLTIP                                         :{BLACK}Praleist
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Istrinti pazymeta uzduoti
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Iterpti nauja uzduoti pries pazymeta, arba iterpti saraso pabaigoje
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Grafikas - spausti ant nurodymo paryškinant jį.
-STR_SERVICE_HINT                                                :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kaina: {CURRENCY} Svoris: {WEIGHT_S}{}Greitis: {VELOCITY}  Galia: {POWER}{}Eksplotacijos išlaidos: {CURRENCY}/metus{}Talpa: {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Nevykdyti sios uzduoties iki tol, kol nereikes remonto
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kaina: {CURRENCY} Svoris: {WEIGHT_S}{}Greitis: {VELOCITY}  Galia: {POWER}{}Eksplotacijos išlaidos: {CURRENCY}/metus{}Talpa: {CARGO}
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Sustabdyta
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Neimanoma priversti traukinio vaziuoti nesaugiai...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Avarija!
@@ -2706,27 +2706,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Avarija!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Traukinio avarija!{}{COMMA} zuvo liepsnose po katastrofos
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Traukinio vaziavimo krypties pakeisti negalima...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}negalima pajudinti automobiliu sudarytu is keliu vienetu
-STR_CLEAR_TIME                                                  :{BLACK}IÅ¡trinti laikÄ…
-STR_RESET_LATENESS                                              :{BLACK}Paleisti vėlavimo skaitiklį
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Keisti waypoint pavadinimÄ…
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}IÅ¡trinti laikÄ…
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Paleisti vėlavimo skaitiklį
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Keisti waypoint pavadinimÄ…
 
-STR_TRAIN_STOPPING                                              :{RED}Stabdoma
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stabdomas, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Nesuderinami begiai
-STR_TRAIN_NO_POWER                                              :{RED}NÄ—ra energijos
-STR_TRAIN_START_NO_CATENARY                                     :Šiuose bėgiuose trūkta grandies, taigi traukiniai negali judėti
-STR_TRAIN_STUCK                                                 :{ORANGE}Laukiama laisvo kelio
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stabdoma
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stabdomas, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Nesuderinami begiai
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}NÄ—ra energijos
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Šiuose bėgiuose trūkta grandies, taigi traukiniai negali judėti
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Laukiama laisvo kelio
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Naujų{STRING} nėra!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Naujas{STRING} -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Neįmanoma parduoti sunaikintos transporto priemonės...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Neįmanoma pertvarkyti sunaikinto transporto...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Neįmanoma parduoti sunaikintos transporto priemonės...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Neįmanoma pertvarkyti sunaikinto transporto...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Neįmanoma sudaryti grafiko...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Transportas gali laukti tik stotelÄ—se.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}transporto priemonė �ia nestoja.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Neįmanoma sudaryti grafiko...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Transportas gali laukti tik stotelÄ—se.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}transporto priemonė �ia nestoja.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Keisti laikÄ…
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Transporto priemonė atvažiuoja laiku
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Transporto priemonÄ— vÄ—luoja {STRING}
@@ -2739,7 +2739,7 @@ STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto už
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...automobilis turi buti sustabdytas garaze
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Negalima rasti garazo
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Apgrezti automobili
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Talpa: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Talpa: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
 
@@ -2764,11 +2764,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Statyti pludura, kuris bus naudojamas kaip tarpine stotele
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Negalima cia statyti pluduro...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Statyti akvedukÄ…
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}ÄŒia akveduko nepastatysite...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}ÄŒia akveduko nepastatysite...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Perorientuoti)
 STR_REFIT_TITLE                                                 :{GOLD}Pasirink 'sergimo' krovinio tipa:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nauja talpa: {GOLD}{CARGO}{}{BLACK}Remonto kaina: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(perorientuotinas)
+STR_PURCHASE_INFO_REFITTABLE                                    :(perorientuotinas)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Oro uostai
@@ -2781,7 +2781,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Statyti
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Gyventojai dziugauja. . .{}Pirmas lektuvas atvyko i {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Lektuvo katastrofa!{}Prie {1:STATION} liepsnose žuvo {0:COMMA} keleiv{P is iai ių}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Lėktuvo katastrofa!{}Lėktuvas pritrūko degalų, {COMMA} nukrito ant žemės!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tvarkaraštis)
 
@@ -2794,13 +2794,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Anglies kasyklose salia {TOWN} sedantis gruntas sukele katastrofa - kasykla nenaudojama!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Potvynis!{}Automobilio {COMMA} buvo pasigesta, kaip spejama, tai susije su potvyniu!
 
-STR_BRIBE_FAILED                                                :{WHITE}Tavo meginimas papirkti buvo
-STR_BRIBE_FAILED_2                                              :{WHITE}issaiskinta vietiniu pareigunu
-STR_BUILD_DATE                                                  :{BLACK}Pastatytas: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Tavo meginimas papirkti buvo
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}issaiskinta vietiniu pareigunu
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Pastatytas: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stotelės rūšis: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}StotelÄ—s tipas: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stotelės rūšis: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}StotelÄ—s tipas: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Issamus veiklos ivertinimas
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detaliai
@@ -2820,28 +2820,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Pinigai:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Skola:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Viso:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Transporto priemonių ska�ius; šis ska�ius susideda iš automobilių, traukinių, laivų ir lėktuvų
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Stotelių kiekis. Kiekviena stotelė (pvz. traukinių, autobusų ar lėktuvų yra skai�iuojama, net jei jos ir yra apjungtos į vieną bendrą stotį
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Mažiausiai pajamų atnešusios tr. priemonės pelnas (iš visų tr. priermonių, senesnių nei 2 metai)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Kiekis uždirbtų pinigų per mėnesį su žemiausiu pelno rodikliu per paskutinius 12 ketvir�ių
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Kiekis uždirbtų pinigų per menesį su didžiausiu paskutiniu 12 mėnesių pelnu
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Per paskutinius metus (4 ketv.) kroviniu kiekis
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Per paskutini ketvirti perveztu kroviniu rusiu kiekis
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Kompanijos pinigų kiekis banko sąskaitoje
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Kompanijos pasiskolintu pinigu kiekis
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Viso taškų (iš visų galimų)
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Transporto priemonių ska�ius; šis ska�ius susideda iš automobilių, traukinių, laivų ir lėktuvų
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Stotelių kiekis. Kiekviena stotelė (pvz. traukinių, autobusų ar lėktuvų yra skai�iuojama, net jei jos ir yra apjungtos į vieną bendrą stotį
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Mažiausiai pajamų atnešusios tr. priemonės pelnas (iš visų tr. priermonių, senesnių nei 2 metai)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Kiekis uždirbtų pinigų per mėnesį su žemiausiu pelno rodikliu per paskutinius 12 ketvir�ių
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Kiekis uždirbtų pinigų per menesį su didžiausiu paskutiniu 12 mėnesių pelnu
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Per paskutinius metus (4 ketv.) kroviniu kiekis
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Per paskutini ketvirti perveztu kroviniu rusiu kiekis
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Kompanijos pinigų kiekis banko sąskaitoje
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Kompanijos pasiskolintu pinigu kiekis
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Viso taškų (iš visų galimų)
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Papild. grafikos nustatymai
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Atvaizduoti NewGRF nustatymus
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Papild. grafikos nustatymai (NewGRF)
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Įvykdyti pakeitimus
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Kaitalioti paletÄ™
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Kaitalioja parinkto NewGRF paletę.{}Darykite jei pajungta grafika nuspalvinta rožine spalva
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Nustatyti parametrus
-STR_NEWGRF_FILENAME                                             :{BLACK}Failo vardas: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}PaletÄ—: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5suma: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Įvykdyti pakeitimus
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Kaitalioti paletÄ™
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Kaitalioja parinkto NewGRF paletę.{}Darykite jei pajungta grafika nuspalvinta rožine spalva
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nustatyti parametrus
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Failo vardas: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}PaletÄ—: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5suma: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Jūs norite atlikti pakeitimus veikian�iam žaidimui: OpenTTD gali pakibti.{}Ar jūs tikrai norite tai atlikti?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2864,34 +2864,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Bandymas naudot
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} turi sugadintÄ… spraitÄ…. Visi sugadinti spraitai bus rodomi kaip raudoni klaustukai (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Turi veiksmo (Action 8) kelis vienetus.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Užkrauti parinktą nustatymą
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}IÅ¡saugoti nustatymÄ…
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Išsaugoti esamą sąrašą kaip nuostatą
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Įvesti vardą nuostatai
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}IÅ¡trinti nustatymus
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}IÅ¡trinti dabar parinktas nuostatas
-STR_NEWGRF_ADD                                                  :{BLACK}PridÄ—ti
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Pridėti Papild. grafikos failą į sąrašą
-STR_NEWGRF_REMOVE                                               :{BLACK}Pašalinti
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Pašalinti pažymėtą Papild. grafikos failą iš sąrašo
-STR_NEWGRF_MOVEUP                                               :{BLACK}Aukštyn
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Perkelti pažymėtus Papild. grafikos failus sąraše aukštyn
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Žemyn
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Perkelti pažymėtus Papild. grafikos failus sąraše žemyn
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Įdiegtų Papild. grafikos filų sąrašas. Sragtelėjus pavadinimą galima keisti jų nustatymus
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametrai: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Įveskite Papild. grafikos parametrus
-STR_NEWGRF_NO_INFO                                              :{BLACK}Informacijos nÄ—ra
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Užkrauti parinktą nustatymą
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}IÅ¡saugoti nustatymÄ…
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Išsaugoti esamą sąrašą kaip nuostatą
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Įvesti vardą nuostatai
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}IÅ¡trinti nustatymus
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}IÅ¡trinti dabar parinktas nuostatas
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}PridÄ—ti
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Pridėti Papild. grafikos failą į sąrašą
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Pašalinti
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Pašalinti pažymėtą Papild. grafikos failą iš sąrašo
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Aukštyn
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Perkelti pažymėtus Papild. grafikos failus sąraše aukštyn
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Žemyn
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Perkelti pažymėtus Papild. grafikos failus sąraše žemyn
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Įdiegtų Papild. grafikos filų sąrašas. Sragtelėjus pavadinimą galima keisti jų nustatymus
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametrai: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Įveskite Papild. grafikos parametrus
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Informacijos nÄ—ra
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Prieinami Papild. grafikos failai
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Pridėti prie pažymėjimo
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Įtraukti pažymėtus Papild. grafikos failus į jūsų nustatymus
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Atnaujinti sąrašą
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Atnaujinti prieinamų Papild. grafikos failų sąrašą
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Įtraukti pažymėtus Papild. grafikos failus į jūsų nustatymus
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Atnaujinti sąrašą
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Atnaujinti prieinamų Papild. grafikos failų sąrašą
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Negalima pridÄ—ti failo: pasikartojantis GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Atitinkamas failas nerastas
-STR_NEWGRF_DISABLED                                             :{RED}Uždrausta
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Atitinkamas failas nerastas
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Uždrausta
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Atitinkamas failas nerastas (panaudotas suderinamas grafikos failas)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Suderinami grafikos failai panaudoti vietoj trūkstamų
@@ -2930,8 +2930,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Laivai
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lektuvai
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Nurodymais dalijasi {COMMA} tr. priemon{P ė ės ių}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Parodyti visas tr. priemones, kurios dalijasi Å¡iais nurodymais
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Nurodymais dalijasi {COMMA} tr. priemon{P ė ės ių}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Parodyti visas tr. priemones, kurios dalijasi Å¡iais nurodymais
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} laukia depe
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} laukia depe
@@ -3038,39 +3038,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Perkompl
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Perorientuoti laivo pervezamo krovinio tipa
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Pakeisti lektuvo pervezamu kroviniu tipa
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Kursas i {TOWN} depa
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Kursas i {TOWN} depa, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Uzduotis: {TOWN} garazas
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Uzduotis: {TOWN} garazas, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Kursas: {TOWN} laivu depas
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Kursas: {TOWN} laivu depas, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Kursas: {STATION} angaras
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Kursas: {STATION} angarasangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisas {TOWN} Traukiniu Depe
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisas {TOWN} Traukiniu Depe, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisas{TOWN} Masinu Depe
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisas {TOWN} Masinu Depe, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisas{TOWN} Laivu Depe
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisas {TOWN} Laivu Depe, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Sevisas {STATION} Angare
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisas{STATION} Angare, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Kopijuoti traukinį
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kopijuoti automobilį
-STR_CLONE_SHIP                                                  :{BLACK}Kopijuoti laivÄ…
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kopijuoti lÄ—ktuvÄ…
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Tai pagamins traukinio kopijÄ… su visais vagonais. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Tai pagamins automobilio kopijÄ…. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_SHIP_INFO                                             :{BLACK}Tai pagamins laivo kopijÄ…. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Tai pagamins lÄ—ktuvo kopijÄ…. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tai pagamins traukinio kopiją su visais vagonais. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Tai pagamins automobilio kopiją. Spragtelkite šį mygtuką, o tada automobilį esantį garaže arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Tai pagamins laivo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Tai pagamins lėktuvo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį angare arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Kursas i {TOWN} depa
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Kursas i {TOWN} depa, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Uzduotis: {TOWN} garazas
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Uzduotis: {TOWN} garazas, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Kursas: {TOWN} laivu depas
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Kursas: {TOWN} laivu depas, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Kursas: {STATION} angaras
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Kursas: {STATION} angarasangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servisas {TOWN} Traukiniu Depe
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servisas {TOWN} Traukiniu Depe, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Servisas{TOWN} Masinu Depe
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servisas {TOWN} Masinu Depe, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servisas{TOWN} Laivu Depe
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servisas {TOWN} Laivu Depe, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Sevisas {STATION} Angare
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Servisas{STATION} Angare, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kopijuoti traukinį
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kopijuoti automobilį
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kopijuoti laivÄ…
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kopijuoti lÄ—ktuvÄ…
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Tai pagamins traukinio kopijÄ… su visais vagonais. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Tai pagamins automobilio kopijÄ…. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Tai pagamins laivo kopijÄ…. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Tai pagamins lÄ—ktuvo kopijÄ…. SpragtelÄ—jus laikant VALD (CTRL) nukopijuojami nurodymai
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tai pagamins traukinio kopiją su visais vagonais. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Tai pagamins automobilio kopiją. Spragtelkite šį mygtuką, o tada automobilį esantį garaže arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Tai pagamins laivo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį depe arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Tai pagamins lėktuvo kopiją. Spragtelkite šį mygtuką, o tada traukinį esantį angare arba už jo ribų. Spragtelėjus laikant VALD (CTRL) nukopijuojami nurodymai
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nauji Traukiniai
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nauji Elektriniai Traukiniai
@@ -3140,28 +3140,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Rodyti l
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Ar tikrai norite parduoti visas tr. priemones esan�ias šiame depe?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Netinkamas depo tipas
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Netinkamas depo tipas
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Parduoti visus traukinius Å¡iame depe
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Parduoti visus automobilius Å¡iame depe
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Parduoti visus laivus Å¡iame depe
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Parduoti visus lÄ—ktuvus Å¡iame angare
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Parduoti visus traukinius Å¡iame depe
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Parduoti visus automobilius Å¡iame depe
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Parduoti visus laivus Å¡iame depe
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Parduoti visus lÄ—ktuvus Å¡iame angare
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Gauti sąrašą visų traukinių turiun�ių nurodymuose šį depą
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Gauti sąrašą visų automobilių turiun�ių nurodymuose šį depą
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Gauti sąrašą visų laivų turiun�ių nurodymuose šį depą
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Gauti sąrašą visų lėktuvų turiun�ių nurodymuose šį angarą
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Gauti sąrašą visų traukinių turiun�ių nurodymuose šį depą
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Gauti sąrašą visų automobilių turiun�ių nurodymuose šį depą
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Gauti sąrašą visų laivų turiun�ių nurodymuose šį depą
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Gauti sąrašą visų lėktuvų turiun�ių nurodymuose šį angarą
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Pakeisti visus traukinius depe
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Pakeisti automobilius traukinius depe
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Pakeisti visus laivus depe
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Pakeisti visus lÄ—ktuvus angare
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Pakeisti visus traukinius depe
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Pakeisti automobilius traukinius depe
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Pakeisti visus laivus depe
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Pakeisti visus lÄ—ktuvus angare
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Keisti tr. priemones {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Pradeti tr. priemonių keitimą
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stabdyti tr. priemonių keitimą
-STR_NOT_REPLACING                                               :{BLACK}Nekeiciama
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nera pazymeta nei viena tr. priemone
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Nekeiciama
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nera pazymeta nei viena tr. priemone
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Pasirink tr. priemones tipa, kuriuo reikes keisti
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Pasirink tr. priemones tipa, kuria bus keiciamos pasirinktos tr. priemones
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Spustelk, jei nori sustabdyti siuo metu vykdoma keitimo procedura
@@ -3173,26 +3173,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Pakeitim
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Keicima: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Pereidinėti tarp garvežių ir vagonų pakeitimo langų
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Transporto priemonÄ— negalima
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Transporto priemonÄ— negalima
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Laivas negalimas
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Orlaivis negalimas
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Transporto priemonÄ— negalima
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Transporto priemonÄ— negalima
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Laivas negalimas
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Orlaivis negalimas
 
-STR_ENGINES                                                     :Varikliai
-STR_WAGONS                                                      :Vagonai
+STR_REPLACE_ENGINES                                             :Varikliai
+STR_REPLACE_WAGONS                                              :Vagonai
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Spragtelėkite norėdami sustabdyti visus traukinius esan�ius depe
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Spragtelėkite norėdami sustabdyti visus automobilius esan�ius depe
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Spragtelėkite norėdami sustabdyti visus laivus esan�ius depe
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Spragtelėkite norėdami sustabdyti visus lėktuvus esan�ius angare
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Spragtelėkite norėdami sustabdyti visus traukinius esan�ius depe
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Spragtelėkite norėdami sustabdyti visus automobilius esan�ius depe
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Spragtelėkite norėdami sustabdyti visus laivus esan�ius depe
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Spragtelėkite norėdami sustabdyti visus lėktuvus esan�ius angare
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Spragtelėkite norėdami paleisti visus traukinius esan�ius depe
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Spragtelėkite norėdami paleisti visus automobilius esan�ius depe
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Spragtelėkite norėdami paleisti visus laivus esan�ius depe
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Spragtelėkite norėdami paleisti visus lėktuvus esan�ius angare
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Spragtelėkite norėdami paleisti visus traukinius esan�ius depe
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Spragtelėkite norėdami paleisti visus automobilius esan�ius depe
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Spragtelėkite norėdami paleisti visus laivus esan�ius depe
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Spragtelėkite norėdami paleisti visus lėktuvus esan�ius angare
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Paspauskite noredami sustabdyti automobilius is saraso
-STR_MASS_START_LIST_TIP                                         :{BLACK}Paspauskite noredami paleisti automobilius is saraso
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Paspauskite noredami sustabdyti automobilius is saraso
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Paspauskite noredami paleisti automobilius is saraso
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Zenklu sarasas - {COMMA} Zenklai
@@ -3200,14 +3200,14 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Zenklu s
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Paprasti traukiniai
-STR_ELRAIL_VEHICLES                                             :Elektrifikuoti Traukiniai
-STR_MONORAIL_VEHICLES                                           :Vienbegiai traukiniai
-STR_MAGLEV_VEHICLES                                             :„Maglev“ traukiniai
+STR_REPLACE_RAIL_VEHICLES                                       :Paprasti traukiniai
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrifikuoti Traukiniai
+STR_REPLACE_MONORAIL_VEHICLES                                   :Vienbegiai traukiniai
+STR_REPLACE_MAGLEV_VEHICLES                                     :„Maglev“ traukiniai
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kaina: {GOLD}{CURRENCY}{BLACK} Svoris: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Greitis: {GOLD}{VELOCITY}{BLACK}   Galia: {GOLD}{POWER}
@@ -3233,67 +3233,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Sukurti
-STR_RANDOM                                                      :{BLACK}Atsitiktinai
-STR_RANDOM_HELP                                                 :{BLACK}Parenką naują atsitiktinę skai�ių seką naudojamą pasaulio kūrimui
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Pasaulio kūrimas
-STR_RANDOM_SEED                                                 :{BLACK}Atsitiktinė pradžia:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Paspauskite, jeigu norite įvesti atsitiktinę skai�ių seką naudojamą pasaulio kūrimui
-STR_LAND_GENERATOR                                              :{BLACK}Pasaulio kūrimas:
-STR_TREE_PLACER                                                 :{BLACK}Medžių algoritmas:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Zemelapio rotacija:
-STR_TERRAIN_TYPE                                                :{BLACK}VietovÄ—s tipas:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}JÅ«ros lygis:
-STR_SMOOTHNESS                                                  :{BLACK}Jautrumas:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Sniego linija:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Miestu kiekis:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Industriju kiekis:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Paaukštinti sniego liniją
-STR_SNOW_LINE_DOWN                                              :{BLACK}Pažeminti sniego liniją
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Pakeisti snieko linijos aukštį
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Keisti pradzios metus
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skales ispejimas
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Perdaryti pagrindini zemelapi per daug nerekomenduojama. Testi generavima?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Zemelapio vardas:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Dydis: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Sukurti
+STR_MAPGEN_RANDOM                                               :{BLACK}Atsitiktinai
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Parenką naują atsitiktinę skai�ių seką naudojamą pasaulio kūrimui
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Pasaulio kūrimas
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Atsitiktinė pradžia:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Paspauskite, jeigu norite įvesti atsitiktinę skai�ių seką naudojamą pasaulio kūrimui
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Pasaulio kūrimas:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Medžių algoritmas:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Zemelapio rotacija:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}VietovÄ—s tipas:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}JÅ«ros lygis:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Jautrumas:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Sniego linija:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Miestu kiekis:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Industriju kiekis:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Paaukštinti sniego liniją
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Pažeminti sniego liniją
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Pakeisti snieko linijos aukštį
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Keisti pradzios metus
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skales ispejimas
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Perdaryti pagrindini zemelapi per daug nerekomenduojama. Testi generavima?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Zemelapio vardas:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Dydis: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Pasaulis generuojamas...
 STR_GENERATION_ABORT                                            :{BLACK}Nutraukti
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Nutraukti pasaulio generavima
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ar jus tikrai norite nutraukti generavima?
-STR_PROGRESS                                                    :{WHITE}{NUM}% pabaigta
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Pasaulio generacija
-STR_TREE_GENERATION                                             :{BLACK}Medžių generacija
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Nejudinama generacija
-STR_CLEARING_TILES                                              :{BLACK}Daubų ir uolų generacija
-STR_SETTINGUP_GAME                                              :{BLACK}Sukurti zaidima
-STR_PREPARING_TILELOOP                                          :{BLACK}Paleidžiamas tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Ruošiamas žaidimas
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Sis veiksmas pakeite sunkumo lygi i specialu
-STR_SE_FLAT_WORLD                                               :{WHITE}Lygi zeme
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Sukurti lygią žemę
-STR_SE_RANDOM_LAND                                              :{WHITE}Atsitiktinis reljefas
-STR_SE_NEW_WORLD                                                :{BLACK}Sukurti nauja scenariju
-STR_SE_CAPTION                                                  :{WHITE}Scenarijaus tipas
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Pakeisk aukštį lygumos vienu zemyn
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Pakelti lygios zemes lygi vienu lygiu
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Keisti lygumos auksti
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Lygumos aukstis:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% pabaigta
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Pasaulio generacija
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Medžių generacija
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Nejudinama generacija
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Daubų ir uolų generacija
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Sukurti zaidima
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Paleidžiamas tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Ruošiamas žaidimas
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Sis veiksmas pakeite sunkumo lygi i specialu
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Lygi zeme
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Sukurti lygią žemę
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Atsitiktinis reljefas
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Sukurti nauja scenariju
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenarijaus tipas
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Pakeisk aukštį lygumos vienu zemyn
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Pakelti lygios zemes lygi vienu lygiu
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Keisti lygumos auksti
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Lygumos aukstis:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centruoti maza zemelapi i sita vieta
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Žemėlapio kraštai:
-STR_NORTHWEST                                                   :{BLACK}Å iaurÄ—s-vakarai
-STR_NORTHEAST                                                   :{BLACK}Å iaurÄ—s-rytai
-STR_SOUTHEAST                                                   :{BLACK}Pietry�iai
-STR_SOUTHWEST                                                   :{BLACK}Pietvakariai
-STR_BORDER_WATER                                                :{BLACK}Vanduo
-STR_BORDER_RANDOM                                               :{BLACK}Atsitiktinis
-STR_BORDER_RANDOMIZE                                            :{BLACK}Atsitiktinai
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Žemėlapio kraštai:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Å iaurÄ—s-vakarai
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Å iaurÄ—s-rytai
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Pietry�iai
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Pietvakariai
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vanduo
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Atsitiktinis
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Atsitiktinai
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Mažas
@@ -3318,15 +3318,15 @@ STR_MEASURE_AREA                                                :{BLACK}Sritis:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Atstumas: {NUM}{}Aukš�ių skirtumas: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Sritis: {NUM} x {NUM}{}Aukš�ių skirtumas: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Pervesti Kreditus: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Pervesti Kreditus: {LTBLUE}{CURRENCY}
 
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Permatomumo nustatymai
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Nustatyti permatomumą sto�ių ženklams. Ctrl+Click to lock.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Nustatyti permatomumą medžiams. Ctrl+Click to lock.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Nustatyti permatomumÄ… namams. Ctrl+Click to lock.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Nustatyti permatomumÄ… pramoniniams pastatams. Ctrl+Click to lock.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Nustatyti permatomumÄ… tiltams. Ctrl+Click to lock.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Nustatyti objektus nematomais vietoje permatomų
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Permatomumo nustatymai
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Nustatyti permatomumą sto�ių ženklams. Ctrl+Click to lock.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Nustatyti permatomumą medžiams. Ctrl+Click to lock.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Nustatyti permatomumÄ… namams. Ctrl+Click to lock.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Nustatyti permatomumÄ… pramoniniams pastatams. Ctrl+Click to lock.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Nustatyti permatomumÄ… tiltams. Ctrl+Click to lock.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Nustatyti objektus nematomais vietoje permatomų
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3336,7 +3336,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Visi traukiniai
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Visi automobiliai
 STR_GROUP_ALL_SHIPS                                             :Visi laivai
@@ -3345,24 +3345,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Nesugrupuoti tr
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nesugrupuoti automobiliai
 STR_GROUP_DEFAULT_SHIPS                                         :Nesugrupuoti laivai
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Nesugrupuoti lÄ—ktuvai
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Įkelti bendras transporto priemones
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :IÅ¡kelti visas transporto priemones
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Pervadinti grupÄ™
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Neįmanoma sukurti grupę...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Neįmanoma ištrinti šią grupę...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Neįmanoma pervadinti grupę...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Neįmanoma ištrinti visas tr. priemones iš šios grupės...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Neįmanoma įtraukti tr. priemonę į šią grupę...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Negalima pridėti bendrų transporto priemonių į grupę...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Neįmanoma sukurti grupę...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Neįmanoma ištrinti šią grupę...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Neįmanoma pervadinti grupę...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Neįmanoma ištrinti visas tr. priemones iš šios grupės...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Neįmanoma įtraukti tr. priemonę į šią grupę...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Negalima pridėti bendrų transporto priemonių į grupę...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupės - Spragtelk ant grupės jai priklausan�ių transporto priemonių peržiūrai
-STR_GROUP_CREATE_TIP                                            :{BLACK}Spragtelk, kad sukurti grupÄ™
-STR_GROUP_DELETE_TIP                                            :{BLACK}Pašalinti pasirinktą grupę
-STR_GROUP_RENAME_TIP                                            :{BLACK}Pervadinti pasirinktÄ… grupÄ™
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Paspauskite �ia, kad apsaugoti grupę nuo bendro auto-pakeitimo
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupės - Spragtelk ant grupės jai priklausan�ių transporto priemonių peržiūrai
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Spragtelk, kad sukurti grupÄ™
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Pašalinti pasirinktą grupę
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Pervadinti pasirinktÄ… grupÄ™
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Paspauskite �ia, kad apsaugoti grupę nuo bendro auto-pakeitimo
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3423,35 +3423,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Vardas turi būti unikalus
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Vardas turi būti unikalus
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Eiti prie kito ženklo
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Eiti prie ankstesnio ženklo
-STR_SIGN_OSKTITLE                                               :{BLACK}Įrašykite ženklo pavadinimą
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Eiti prie kito ženklo
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Eiti prie ankstesnio ženklo
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Įrašykite ženklo pavadinimą
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finansuoti
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Perspektyva
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Statyti
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Pasirink norimą industriją iš sąrašo
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finansuoti
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Perspektyva
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Statyti
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Pasirink norimą industriją iš sąrašo
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Pla�iau
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Platesnis veido pasirinkimas.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Platesnis veido pasirinkimas.
 STR_FACE_SIMPLE                                                 :{BLACK}Paprastas
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Paprastas veido pasirinkimas.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Paprastas veido pasirinkimas.
 STR_FACE_LOAD                                                   :{BLACK}Atverti
-STR_FACE_LOAD_TIP                                               :{BLACK}Atverti mÄ—gstamÄ… veidÄ…
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Atverti mÄ—gstamÄ… veidÄ…
 STR_FACE_LOAD_DONE                                              :{WHITE}Tavo mėgstamas veidas sėkmingai įkeltas iš OpenTTD config failo.
 STR_FACE_FACECODE                                               :{BLACK}Žaidėjo veido nr.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Tikrinti ir/arba nustatyti žaidėjo veido numerį
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Tikrinti ir/arba nustatyti žaidėjo veido numerį
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Tikrinti ir/arba nustatyti žaidėjo veido numerį
 STR_FACE_FACECODE_SET                                           :{WHITE}Naujas veido numeris sÄ—kmingai nustatytas.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Negalėjau nustatyti veido numerio - turi būti skai�ius tarp 0 ir 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}IÅ¡saugoti
-STR_FACE_SAVE_TIP                                               :{BLACK}IÅ¡saugoti mÄ—gstamÄ… veidÄ…
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}IÅ¡saugoti mÄ—gstamÄ… veidÄ…
 STR_FACE_SAVE_DONE                                              :{WHITE}Šis veidas bus išsaugotas kaip tavo mėgstamas OpenTTD config faile.
 STR_FACE_EUROPEAN                                               :{BLACK}Europietiškas
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Pasirinkti europietiškus veidus
@@ -3459,35 +3459,35 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikiet
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Pasirinkti afrikietiškus veidus
 STR_FACE_YES                                                    :Taip
 STR_FACE_NO                                                     :Ne
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Įjungti ūsus arba auskarą
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Įjungti ūsus arba auskarą
 STR_FACE_HAIR                                                   :Plaukai:
-STR_FACE_HAIR_TIP                                               :{BLACK}Keisti plaukus
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Keisti plaukus
 STR_FACE_EYEBROWS                                               :Antakiai:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Keisti antakius
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Keisti antakius
 STR_FACE_EYECOLOUR                                              :Akių spalva:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Keisti akių spalvą
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Keisti akių spalvą
 STR_FACE_GLASSES                                                :Akiniai:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Įjungti akinius
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Keisti akinius
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Įjungti akinius
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Keisti akinius
 STR_FACE_NOSE                                                   :Nosis:
-STR_FACE_NOSE_TIP                                               :{BLACK}Keisti nosį
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Keisti nosį
 STR_FACE_LIPS                                                   :LÅ«pos:
 STR_FACE_MOUSTACHE                                              :Ūsai:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Pakeisti lūpas arba ūsus
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Pakeisti lūpas arba ūsus
 STR_FACE_CHIN                                                   :Smakras:
-STR_FACE_CHIN_TIP                                               :{BLACK}Pakeisti smakrÄ…
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Pakeisti smakrÄ…
 STR_FACE_JACKET                                                 :Å varkas:
-STR_FACE_JACKET_TIP                                             :{BLACK}Pakeisti Å¡varkÄ…
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Pakeisti Å¡varkÄ…
 STR_FACE_COLLAR                                                 :ApykaklÄ—:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Pakeisti apykaklÄ™
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Pakeisti apykaklÄ™
 STR_FACE_TIE                                                    :Kaklaraištis:
 STR_FACE_EARRING                                                :Auskaras:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Pakeisti kaklaraištį arba auskarą
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Pakeisti kaklaraištį arba auskarą
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signalo Pasirinkimas
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Čia negalima konvertuoti signalų...
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalo Pasirinkimas
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Čia negalima konvertuoti signalų...
 ########
 
 ############ on screen keyboard
@@ -3499,34 +3499,34 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI Nustatymai
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Rodyti AI nustatymus
 STR_AI_DEBUG                                                    :{WHITE}DI Derinimas
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}AI vardas
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}AI vardas
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Perkrauti AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}IÅ¡braukti DI, perkrauti skritpÄ…, ir perkrauti DI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}DI derinimo langas yra pasiekiamas tik iš serverio
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}IÅ¡braukti DI, perkrauti skritpÄ…, ir perkrauti DI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}DI derinimo langas yra pasiekiamas tik iš serverio
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI Nustatymai
-STR_AI_CHANGE                                                   :{BLACK}Pasirinkti AI
-STR_AI_CONFIGURE                                                :{BLACK}Derinti
-STR_AI_CHANGE_TIP                                               :{BLACK}Įkelti kitą AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Suderinti DI nustatymus
-STR_AI_LIST_TIP                                                 :{BLACK}Visi DI bus įkelti į sekantį žaidimą
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Pasirinkti AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Derinti
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Įkelti kitą AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Suderinti DI nustatymus
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Visi DI bus įkelti į sekantį žaidimą
 STR_AI_LIST_CAPTION                                             :{WHITE}Galimi DI
-STR_AI_AILIST_TIP                                               :{BLACK}Paspauskite, kad pasirinkti DI
-STR_AI_ACCEPT                                                   :{BLACK}Priimti
-STR_AI_ACCEPT_TIP                                               :{BLACK}Pasirinkti pažymėtą DI
-STR_AI_CANCEL                                                   :{BLACK}Atšaukti
-STR_AI_CANCEL_TIP                                               :{BLACK}Nekeisti DI
-STR_AI_CLOSE                                                    :{BLACK}Uždaryti
-STR_AI_RESET                                                    :{BLACK}Atstatyti
-STR_AI_HUMAN_PLAYER                                             :Žaidėjas Žmogus
-STR_AI_RANDOM_AI                                                :Atsitiktinis DI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Paspauskite, kad pasirinkti DI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Priimti
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Pasirinkti pažymėtą DI
+STR_AI_LIST_CANCEL                                              :{BLACK}Atšaukti
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nekeisti DI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Uždaryti
+STR_AI_SETTINGS_RESET                                           :{BLACK}Atstatyti
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Žaidėjas Žmogus
+STR_AI_CONFIG_RANDOM_AI                                         :Atsitiktinis DI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parametrai
-STR_AI_AUTHOR                                                   :{BLACK}Autorius: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versija: {NUM}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autorius: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versija: {NUM}
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Triukšmo limitas mieste: {ORANGE}{COMMA}{BLACK}  daugiausia: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Sukeltas triukšmas: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Triukšmo limitas mieste: {ORANGE}{COMMA}{BLACK}  daugiausia: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Sukeltas triukšmas: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3539,20 +3539,20 @@ STR_CONTENT_TYPE_AI_LIBRARY                                     :DI biblioteka
 STR_CONTENT_TYPE_SCENARIO                                       :Scenarijus
 STR_CONTENT_TITLE                                               :{WHITE}Turinio atsisiuntimas
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipas
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Turinio tipas
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Turinio tipas
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Vardas
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Turinio vardas
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Turinio vardas
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Pažymėti viską
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Pažymėti visą turinį atsisiuntimui
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Pažymėti visą turinį atsisiuntimui
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Pažymėti atnaujinimus
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Pažymėti visą turinį, atnaujinimui skirtą turinį atsisiuntimui
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Pažymėti visą turinį, atnaujinimui skirtą turinį atsisiuntimui
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Nieko nežymėti
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Pažymėti visą turinį kaip neatsisiųstą
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Pažymėti visą turinį kaip neatsisiųstą
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Įveskite filtro eilutę
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Įveskite raktažodį filtruoti sąrašui dėl
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Įveskite raktažodį filtruoti sąrašui dėl
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtro pavadinimas:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Atsisiųsti
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Pradedama siųsti pažymėta turinį
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Pradedama siųsti pažymėta turinį
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Bendras siuntimo dydis: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}TURINIO INFORMACIJA
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Jūs nepasirinkote tai, kad atsisiųsti
@@ -3585,6 +3585,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nepavyko
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Patikrinti interneto turinį
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Patikrinti dėl naujų ir atnaujintą turinį atsisiuntimui
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Rasti ieškomą turinį tinkle
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Patikrinti trukstamą turinį  internete
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Rasti ieškomą turinį tinkle
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Patikrinti trukstamą turinį  internete
 ########
diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt
index 292857917..c5d0440ff 100644
--- a/src/lang/luxembourgish.txt
+++ b/src/lang/luxembourgish.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kaart -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spill Optiounen
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Meldung
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Matdeelung vun {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Opgepasst!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Opgepasst!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Kann dat net maachen....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kann dei Plaz net eidel maachen....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original Copyright {COPYRIGHT} 1995 Chris Sawyer, All Rechter virbehalen
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 D'OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}Eraus
-STR_YES                                                         :{BLACK}Jo
-STR_NO                                                          :{BLACK}Nee
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Sidd der slcher dass dir aus dem OpenTTD eraus wëllt , an op {STRING} zeréck?
+STR_QUIT_YES                                                    :{BLACK}Jo
+STR_QUIT_NO                                                     :{BLACK}Nee
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Sidd der slcher dass dir aus dem OpenTTD eraus wëllt , an op {STRING} zeréck?
 
 STR_JUST_NOTHING                                                :Näischt
 STR_COLOUR_DARK_BLUE                                            :Donkelblo
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Wüst
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Schnéi
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Meldung
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Standard
-STR_QUERY_CANCEL                                                :{BLACK}Ofbriechen
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Ëmbenennen
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Standard
+STR_BUTTON_CANCEL                                               :{BLACK}Ofbriechen
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Ëmbenennen
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Luedung
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informatioun
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapazitéiten
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Total Luedung
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total Luedplaz fir dësen Zuch:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Total Luedplaz fir dësen Zuch:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Neit Spill
 STR_INTRO_LOAD_GAME                                             :{BLACK}Spill lueden
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Multiplayer
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Szenarien Editor
 
-STR_MAPSIZE                                                     :{BLACK}Kaartgréisst:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kaartgréisst:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spilloptiounen
 
 STR_COMPANY_SOMEONE                                             :iergendeen{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Spill opginn
 STR_FILE_MENU_EXIT                                              :Eraus
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Sidd dir sécher dass dir dës Partie opginn wëllt?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Spill opginn
-STR_SORT_ORDER_TIP                                              :{BLACK}Richtung fir ze sortéieren (oofsteigend/opsteigend)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Argument fir ze sortéieren
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Filterkritère wielen
-STR_SORT_BY                                                     :{BLACK}Sortéier no
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Richtung fir ze sortéieren (oofsteigend/opsteigend)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Argument fir ze sortéieren
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Filterkritère wielen
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortéier no
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Bevölkerung
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :Betriebskäscht
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraaft/Betriebskäschten
 STR_SORT_BY_CARGO_CAPACITY                                      :Luedungskapazitéit
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Kéng Luedung
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Selectéier all d'Fabriken
-STR_SELECT_ALL_TYPES                                            :{BLACK}Wielt all Luedungstyp (ouni Luedung déi waart)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Lëscht vun allen Maschinen fir dësen Typ weisen.
-STR_MANAGE_LIST                                                 :{BLACK}Verwaltungslëscht
-STR_MANAGE_LIST_TIP                                             :{BLACK}Scheckt d'Instructiounen un all Gefierer an der Lëscht
-STR_REPLACE_VEHICLES                                            :Gefierer ersetzen
-STR_SEND_FOR_SERVICING                                          :An d'Revisioun schécken
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Verfügbar Zich
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Verfügbar Gefierer
-STR_AVAILABLE_SHIPS                                             :{BLACK}Verfügbar Schëffer
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Verfügbar Fligern
-
-STR_SEND_TRAIN_TO_DEPOT                                         :An den Depot schécken
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :An den Depot schécken
-STR_SEND_SHIP_TO_DEPOT                                          :An den Depot schécken
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :An den Hangar schécken
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Kéng Luedung
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Selectéier all d'Fabriken
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Wielt all Luedungstyp (ouni Luedung déi waart)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Lëscht vun allen Maschinen fir dësen Typ weisen.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Verwaltungslëscht
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Scheckt d'Instructiounen un all Gefierer an der Lëscht
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Gefierer ersetzen
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :An d'Revisioun schécken
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Verfügbar Zich
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Verfügbar Gefierer
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Verfügbar Schëffer
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Verfügbar Fligern
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :An den Depot schécken
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :An den Depot schécken
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :An den Depot schécken
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :An den Hangar schécken
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Optioune
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Den Service-Intervall kann net geännert ginn...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fënster zoumaachen
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Fënstertitel - hei zéien fir d'Fënster ze bewegen
-STR_STICKY_BUTTON                                               :{BLACK}Markéier dës Fënster als net zouzemaachen vun dem "All Fënsteren zoumaachen" Knäppchen
-STR_RESIZE_BUTTON                                               :{BLACK}Klicken an zéihen fir d'Fënstergréisst ze änneren
+STR_TOOLTIP_STICKY                                              :{BLACK}Markéier dës Fënster als net zouzemaachen vun dem "All Fënsteren zoumaachen" Knäppchen
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klicken an zéihen fir d'Fënstergréisst ze änneren
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klickt hei fir op d'Standard Späicher-/Luedeverzeeschnis ze goen
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Objekter op engem Stëck Land zerstéieren
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}En Eck vum Land erofsetzen
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}En Eck vum Land erophiewen
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}En Eck vum Land erofsetzen
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}En Eck vum Land erophiewen
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scrollbar - scrollt d'Lëscht erop/erof
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scrollbar - scrollt d'Lëscht no lénks/riets
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Weis d'Landkonturen op der Kaart
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Schalt d
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Profit dëst Joer: {CURRENCY} (lescht Joer: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} Joer ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} Joer ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} Joer ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} Joer ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Zuch
-STR_VEHICLE_ROAD_VEHICLE                                        :Stroossengefihr
-STR_VEHICLE_SHIP                                                :Schëff
-STR_VEHICLE_AIRCRAFT                                            :Fliger
+STR_REPLACE_VEHICLE_TRAIN                                       :Zuch
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Stroossengefihr
+STR_REPLACE_VEHICLE_SHIP                                        :Schëff
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fliger
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} gëtt aal
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} gëtt ganz aal
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} as ganz aal, an sollt schnellstens ersaat ginn
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Land Informatiounen
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Käschten fir ze raumen: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Käschten fir ze raumen: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Ankommes wann erleedegt: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Ankommes wann erleedegt: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Besëtzer: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Stroossenbesëtzer: {LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Schinnen
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokal Autoritéit: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Keng
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Numm
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1ten
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klick op
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klickt op d'Lidd fir et vum aktuellen Programm ze läschen (Benotzerdefinéiert 1 an 2 nëmmen)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Schalt den "shuffle" un/aus
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Weis Musékselektioneier-Fënster
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klick op den Service fir d'Usiicht op d'Industrie/Stad ze zentréieren
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klick op den Service fir d'Usiicht op d'Industrie/Stad ze zentréieren
 STR_INTRO_DIFFICULTY                                            :{BLACK}Schwieregkeet ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Läscht Meldung/Neiegkeet
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Verkleng
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generéier en Zoufallsland
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Setz d'Landschaft zréck
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Setz d'Landschaft zréck
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Huel all Grondstécker vun den Spiller ewesch
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Huel all Grondstécker vun den Spiller ewesch
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Sidd der sëcher dass der all Grondstécker vun den Spiller ewesch huelen wëllt?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landschaftserstellung
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Staderstellung
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...ze no
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...ze noo un enger aanerer Stadt
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...Plaz net gëeegent
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...ze vill Stied
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kann keng Stiedt bauen
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...et ass keng Plaz méi op der Kaart
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kann keng Stiedt bauen
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...et ass keng Plaz méi op der Kaart
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Stad méi grouss maachen
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Erweideren
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Stied bauen keng Stroossen. Dir kënnt den Bau iwwert Erweidert Astellungen->Economie->Stied anschalten
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Stied bauen keng Stroossen. Dir kënnt den Bau iwwert Erweidert Astellungen->Economie->Stied anschalten
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Zoufallsstad
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Bau d'Stad op enger zoufälleger Plaz
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kann {STRING} net hei bauen...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Fielsen
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Liichttuerm bauen
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Sender bauen
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Zone fir Wüst défineieren.{}CTRL unhaalen fir se ze leschen
-STR_CREATE_LAKE                                                 :{BLACK}Waasser definéieren.{}Mécht en Kanal. Mat CTRL gedréckt halen um Mieresspigel klicken, iwerflut d'Géigent
-STR_CREATE_RIVER                                                :{BLACK}Setzt Flëss
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Waasser definéieren.{}Mécht en Kanal. Mat CTRL gedréckt halen um Mieresspigel klicken, iwerflut d'Géigent
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Setzt Flëss
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Leschen
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Dës Stad ganz leschen
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Szenario späicheren
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Szenario lueden
-STR_MENU_LOAD_HEIGHTMAP                                         :Lued Héichtenkaart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Lued Héichtenkaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Eraus aus dem Editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Eraus
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Szenario
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Szenario spillen
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spillt Héichtenkaart
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Nei Partie starten, mat enger Héichtenkaart als Landschaft
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Sëcher dass der aus dësem Szenario raus wëllt ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Sëcher dass der aus dësem Szenario raus wëllt ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kann nëmmen an Stiedt mat opmannst 1200 Anwunner gebaut ginn
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Änner den Startdatum 1 Joer nohannen
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Änner den Startdatum 1 Joer no viir
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...dei z
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Kleng
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mëttel
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grouss
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Zoufall
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Zoufall
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stied wuessen méi schnell wéi Dierfer{}Ofhängeg vun den Astellungen, sinn se méi grouss am Ufank
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Wiel d'Stadgréisst
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Stadgréisst:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Stad Stroossenlayout
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Stroosenlayout fir dës Stad wielen
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Besser Stroossen
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 Gitter
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 Gitter
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Zoufall
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Stad Stroossenlayout
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Stroosenlayout fir dës Stad wielen
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Besser Stroossen
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 Gitter
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 Gitter
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Zoufall
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Lescht Meldung oder News
 STR_NEWS_MESSAGES_OFF                                           :Aus
 STR_NEWS_MESSAGES_SUMMARY                                       :Resumé
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot gespäichert als '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screenshotfehler!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kaaf Land fir zukünftëg Benotzung
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kaaf Land fir zukünftëg Benotzung
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOSPÄICHER
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SPÄICHERT D'SPILL  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Nach umgaangen ze späicheren. {} Weg. waarden bis daat faerdeg ass!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Nach umgaangen ze späicheren. {} Weg. waarden bis daat faerdeg ass!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Wielt 'Ezy Street Musék' Programm
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Wielt d'
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Vollbild
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Klickt dës Optioun un fir OpenTTD am Vollbild ze spillen
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fehler beim Vollbild
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fehler beim Vollbild
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Bildopléisung
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Wielt d'Bildopléisung
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wielt de
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fehlend/korrupt Datei{P "" en}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Méi Infos iwwert den Basis Grafikset
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Fehler beim Autospäicheren
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Fehler beim Autospäicheren
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Um Wee fir {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Um wee fir {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Keng Opträg
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Keng Opträg, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Um Wee fir {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Um wee fir {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Keng Opträg
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Keng Opträg, {VELOCITY}
 
 STR_PASSENGERS                                                  :Passagéier
 STR_BAGS                                                        :Säck
@@ -857,9 +857,9 @@ STR_CRATES                                                      :Këschten
 STR_RES_OTHER                                                   :Aaneres
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kann d'Optragslëscht net deelen...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kann d'Optragslëscht net kopéieren...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Enn vun der Optragslëscht - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kann d'Optragslëscht net deelen...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kann d'Optragslëscht net kopéieren...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Enn vun der Optragslëscht - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} kann den Wee fir weider ze fueren net fannen
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} as verluer.
@@ -1126,15 +1126,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-Gréi
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :ausgeschalt
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Astellung änneren
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Astellung änneren
 
-STR_TEMPERATE_LANDSCAPE                                         :Temperéiert Landschaft
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-Arktësch Landschaft
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-Tropësch Landschaft
-STR_TOYLAND_LANDSCAPE                                           :Spillland Landschaft
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Temperéiert Landschaft
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub-Arktësch Landschaft
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub-Tropësch Landschaft
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Spillland Landschaft
 
 STR_CHEATS                                                      :{WHITE}Cheats
-STR_CHEATS_TIP                                                  :{BLACK}Checkboxen weisen un dass dir den Cheat schon eng Kéier benotzt hutt
+STR_CHEATS_TOOLTIP                                              :{BLACK}Checkboxen weisen un dass dir den Cheat schon eng Kéier benotzt hutt
 STR_CHEATS_WARNING                                              :{BLACK}Warnung! Dir sidd um Wee är Géigner ze verroden. Sou eng Ongnod gëtt bis an all Éiwegkeet behalen.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Suen ëm {CURRENCY} erhéijen
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Als Firma spillen: {ORANGE}{COMMA}
@@ -1146,177 +1146,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Klima w
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Datum wiesselen: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Erlaabt änneren vun den Produktiounswerter: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Um Wee fir {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Um Wee fir {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Um Wee fir {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Um Wee fir {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Iwert {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Géi non-stop via{WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Iwert {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Géi non-stop via{WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Weepunkt {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Weepunkt {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Weepunkt
+STR_FORMAT_WAYPOINT_NAME                                        :Weepunkt {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Weepunkt {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Weepunkt
 
-STR_WAYPOINT                                                    :{WHITE}Weepunkt
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Wielt den Weepunktyp
+STR_WAYPOINT_CAPTION                                            :{WHITE}Weepunkt
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Wielt den Weepunktyp
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Weepunktnumm
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kann den Weepunktnumm net änneren...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kann den Weepunktnumm net änneren...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Konvertéiert d'Schinnen zum Weepunkt
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kann keen Zuchweepunkt héi bauen...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kann den Wee-Punkt hei net ofrappen...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kann keen Zuchweepunkt héi bauen...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kann den Wee-Punkt hei net ofrappen...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Schinnen am automateschen Modus bauen
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... et ass keen Duerf an dësem Szenario
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kaartenerstellung ofgebrach...{}...keng passend Stadplazen
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... et ass keen Duerf an dësem Szenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kaartenerstellung ofgebrach...{}...keng passend Stadplazen
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Vill zoufälleg Dierfer
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}D'Kaart zoufälleg mat Dierfer fëllen
-STR_MANY_RANDOM_INDUSTRIES                                      :Vill zoufälleg Industrien
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}D'Kaart mat villen zoufällegen Industrien fëllen
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kann keng Industrien bauen...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Vill zoufälleg Dierfer
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}D'Kaart zoufälleg mat Dierfer fëllen
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Vill zoufälleg Industrien
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}D'Kaart mat villen zoufällegen Industrien fëllen
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kann keng Industrien bauen...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Landschafts-Toolbar opman fir Land ze erhéigen/senken, Beem planzen, etc.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landschaftsbau
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Land planéiren
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Land planéiren
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Zoufälleg Beem
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Zoufälleg Beem planzen
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Zoufälleg Beem planzen
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kann hei keen Kanal bauen...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kann hei keen Kanal bauen...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Kanal bauen.
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kann keen Schlass hei setzen...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kann keen Schlass hei setzen...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Schlass setzen
-STR_LANDINFO_LOCK                                               :Schlass
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Schlass
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kann hei keen Floss platzéiren...
-STR_LANDINFO_RIVER                                              :Floss
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kann hei keen Floss platzéiren...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Floss
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...Boje ass am Gebrauch!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...Boje ass am Gebrauch!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinaten: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinaten: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kann den Deel vun der Gare net ofrappen...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kann Schinnentyp hei net convertéiren...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kann den Deel vun der Gare net ofrappen...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kann Schinnentyp hei net convertéiren...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertéiert den Typ vun Schinnen
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Lokomotiv heihinner zéien fir de ganzen Zuch ze läschen
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Lokomotiv heihinner zéien fir de ganzen Zuch ze läschen
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}D'Statioun per drag & drop bauen
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Wielt eng Statiounsklass fir ze weisen
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Wielt den Statiounstyp fir ze bauen
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Wielt eng Statiounsklass fir ze weisen
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Wielt den Statiounstyp fir ze bauen
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Spill schnell laafen loosen
 STR_MESSAGE_HISTORY                                             :{WHITE}Meldungshistorie
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Eng Lëscht vun den leschten Meldungen
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}All ausschalten
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}All unschalten
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Eng Lëscht vun den leschten Meldungen
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}All ausschalten
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}All unschalten
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrien
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportéiert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportéiert)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Fabrikennimm - klickt op en Numm fir d'Usiicht do drop ze zentréieren
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrien
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportéiert)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportéiert)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Fabrikennimm - klickt op en Numm fir d'Usiicht do drop ze zentréieren
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...ze Noo bei enger aanerer Fabrik
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...ze Noo bei enger aanerer Fabrik
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}D'Produktioun änneren
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multiplayer
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spillernumm:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Daat ass den Numm mat deem iersch dei aaner Spiller Identifizéieren kënnen
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Gidd ären Numm an
-STR_NETWORK_CONNECTION                                          :{BLACK}Connectioun:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Wielt zwëschent enger Internet Partie oder enger LAN Partie
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Server starten
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Eegenen Server starten
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Numm
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Numm vum Spill
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Sprooch, Serverversioun, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klickt op en Spill fir et ze selectéieren
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server deem der d'leschte Kéier bäigetrueden sidd:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klickt fir den Server ze wielen deen der d'leschte Kéier haat
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Server sichen
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Am Netzwierk no engem Server sichen
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Server bäisetzen
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Setzt en Server op d'Lëscht wou och no enger Partie gesicht gët
-STR_NETWORK_ENTER_IP                                            :{BLACK}d'Address vum Host unginn
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Spiller
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Spiller online / max Spiller{}Firmen online / max Firmen
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kaartegréisst
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kaartegréisst vum Spill{}Klicken fir dono ze sortéieren
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Momentanen Datum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Joer
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Unzuel vun Joer wou{}daat Spill leeft
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPILL INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Spiller:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Sprooch:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kaartgréisst:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversioun:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradress:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start Datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Momentanen Datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Passwuertgeschützt!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER VOLL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIOUNSËNNERSCHEED
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ËNNERSCHEEDLECH
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Spill bäitrieden
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Nei Multiplayerpartie starten
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spillnumm:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Den Numm deen an der Lëscht vun den Spiller ugewissen gëtt
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Gidd en Numm fir d'Spill un
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Passwuert setzen
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}En Passwuert fir d'Spill setzen, dass et net Public accessibel ass
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Kaart wielen:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Wéi eng Kaart wëllt der spillen?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (Werben)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} Spiller
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max Spiller:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Maximal Unzuel vun den Clients. Et muss net all Slot gefëllt sin.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Firm{P a en}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max Firmen:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}D'Unzuel vun den Firmen limitéieren
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} Zuschauer
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max Zuschauer:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}D'Unzuel vun den Zuschauer limitéiren
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Geschwaaten Sprooch:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aaner Leit gesin wéi eng Sprooch um Server geschwaat gëtt
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Spill starten
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Eng nei Partie iwwert d'Netzwierk starten
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Spill lueden
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Eng méi aal Multiplayerpartie lueden (als richtegen Spiller connectéieren)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spillernumm:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Daat ass den Numm mat deem iersch dei aaner Spiller Identifizéieren kënnen
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Gidd ären Numm an
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Connectioun:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Wielt zwëschent enger Internet Partie oder enger LAN Partie
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Server starten
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Eegenen Server starten
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Numm
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Numm vum Spill
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Sprooch, Serverversioun, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klickt op en Spill fir et ze selectéieren
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Server deem der d'leschte Kéier bäigetrueden sidd:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klickt fir den Server ze wielen deen der d'leschte Kéier haat
+
+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 och no enger Partie gesicht gët
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}d'Address vum Host unginn
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Spiller
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Spiller online / max Spiller{}Firmen online / max Firmen
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kaartegréisst
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kaartegréisst vum Spill{}Klicken fir dono ze sortéieren
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Momentanen Datum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Joer
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Unzuel vun Joer wou{}daat Spill leeft
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPILL INFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Spiller:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Sprooch:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tileset:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kaartgréisst:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Serverversioun:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serveradress:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start Datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Momentanen Datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Passwuertgeschützt!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER VOLL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIOUNSËNNERSCHEED
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF ËNNERSCHEEDLECH
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Spill bäitrieden
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Nei Multiplayerpartie starten
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spillnumm:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Den Numm deen an der Lëscht vun den Spiller ugewissen gëtt
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Gidd en Numm fir d'Spill un
+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_SELECT_MAP                             :{BLACK}Kaart wielen:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Wéi eng Kaart wëllt der spillen?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (Werben)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} Spiller
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max Spiller:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Maximal Unzuel vun den Clients. Et muss net all Slot gefëllt sin.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Firm{P a en}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max Firmen:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}D'Unzuel vun den Firmen limitéieren
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} Zuschauer
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max Zuschauer:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}D'Unzuel vun den Zuschauer limitéiren
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Geschwaaten Sprooch:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Aaner Leit gesin wéi eng Sprooch um Server geschwaat gëtt
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Spill starten
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Eng nei Partie iwwert d'Netzwierk starten
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Spill lueden
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Eng méi aal Multiplayerpartie lueden (als richtegen Spiller connectéieren)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Egal
@@ -1357,33 +1357,33 @@ STR_NETWORK_LANG_GREEK                                          :Grieschësch
 STR_NETWORK_LANG_LATVIAN                                        :Lettësch
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Multiplayer-Spill Empfang
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Multiplayer-Spill Empfang
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparéiert fir bäizetrieden:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Eng Lëscht vun den Firmen an dësem Spill. Du kanns enger bäitrieden oder eng nei opmaachen.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nei Firma
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Nei Firma erstellen
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Dem Spill nokucken
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}D'Spill als Zuschauer verfolgen
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Firma bäitrieden
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Déi Firma mat verwalten
-STR_NETWORK_REFRESH                                             :{BLACK}Server erneieren
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Serverinfo erneieren
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparéiert fir bäizetrieden:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Eng Lëscht vun den Firmen an dësem Spill. Du kanns enger bäitrieden oder eng nei opmaachen.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nei Firma
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Nei Firma erstellen
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Dem Spill nokucken
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}D'Spill als Zuschauer verfolgen
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Firma bäitrieden
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Déi Firma mat verwalten
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Server erneieren
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Serverinfo erneieren
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}FIRMENINFO
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}FIRMENINFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Firmennumm:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Grënnung:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Firmenwert:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Kontostand:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ankommes vum leschten Joër:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Firmennumm:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Grënnung:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Firmenwert:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Kontostand:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Ankommes vum leschten Joër:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Gefierer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Statiounen:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spiller:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Gefierer:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Statiounen:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spiller:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Connectioun...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Connectioun...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Connectéiert..
@@ -1399,49 +1399,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Ruffen d
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Spiller firun ierch
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} eroofgeluden
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Verbindung trennen
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Verbindung trennen
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Gidd den Betrag un deen der wëllt ginn
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server ass geschützt. Passwuert anginn
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma ass geschützt. Passwuert anginn
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Spillerlëscht
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spillerlëscht
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Nokucken
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nei Firma
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Keng Netzwierkgeräter font oder compiléiert ouni ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Konnt kéng Netzwierkspiller fannen
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Den Server huet net op d'Ufro geäntwert
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Konnt sech wéinst NewGRF ënnerscheed net connectéieren
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Netzwierksyncronisatiouns-Fehler
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Netzwierkverbindung verluer
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Konnt den Spillstand net lueden
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Konnt den Server net starten
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Konnt sëch net connectéieren
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Connectioun #{NUM} oofgelaaf
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} En Protokolfehler ass entstaanen an d'Connectioun ass getrennt ginn
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}D'Versioun vum Client stëmmt net mat där vum Server iwerëneen
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Falscht Passwuert
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Den Server ass voll
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Dir sidd vun dësem Server gebannt
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Dir sidd aus dem Spill gekickt ginn
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Cheaten ass op dësem Server net erlaabt
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Keng Netzwierkgeräter font oder compiléiert ouni ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Konnt kéng Netzwierkspiller fannen
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Den Server huet net op d'Ufro geäntwert
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Konnt sech wéinst NewGRF ënnerscheed net connectéieren
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Netzwierksyncronisatiouns-Fehler
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Netzwierkverbindung verluer
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Konnt den Spillstand net lueden
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Konnt den Server net starten
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Konnt sëch net connectéieren
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Connectioun #{NUM} oofgelaaf
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} En Protokolfehler ass entstaanen an d'Connectioun ass getrennt ginn
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}D'Versioun vum Client stëmmt net mat där vum Server iwerëneen
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Falscht Passwuert
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Den Server ass voll
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Dir sidd vun dësem Server gebannt
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Dir sidd aus dem Spill gekickt ginn
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Cheaten ass op dësem Server net erlaabt
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :generellen Fehler
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync Fehler
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :konnt d'Kaart net lueden
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :Connectioun verluer
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :Protokollfehler
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF ënnerscheedlech
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :net authoriséiert
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :komëschen Pak erhaalen
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :Falsch Versioun
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :Numm gët schon benotzt
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :falscht Passwuert
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :falsch Firmen-ID am "DoCommand"
-STR_NETWORK_ERR_CLIENT_KICKED                                   :vum Server gekickt
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :huet probéiert ze cheaten
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :Server voll
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :generellen Fehler
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desync Fehler
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :konnt d'Kaart net lueden
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :Connectioun verluer
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :Protokollfehler
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF ënnerscheedlech
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :net authoriséiert
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :komëschen Pak erhaalen
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :Falsch Versioun
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :Numm gët schon benotzt
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :falscht Passwuert
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :falsch Firmen-ID am "DoCommand"
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :vum Server gekickt
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :huet probéiert ze cheaten
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :Server voll
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1451,15 +1451,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spill gepaust (
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spill leeft erëm (Client ass connectéiert)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spill leeft erëm (Client konnt net connectéieren)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :verloossen
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} ass dem Spill baigetrueden
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} ass bei d'Firma #{2:NUM} gaangen
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} ass als Zuschauer do
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} huet eng nei Firma gegrënnt (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} huet d'Spill verloos ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} huet säin Numm op {STRING} gewiesselt
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} huet ärer Firma {2:CURRENCY} ginn
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Dir hudd dem {1:STRING} {2:CURRENCY} ginn
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :verloossen
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} ass dem Spill baigetrueden
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ass bei d'Firma #{2:NUM} gaangen
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ass als Zuschauer do
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} huet eng nei Firma gegrënnt (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} huet d'Spill verloos ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} huet säin Numm op {STRING} gewiesselt
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} huet ärer Firma {2:CURRENCY} ginn
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dir hudd dem {1:STRING} {2:CURRENCY} ginn
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_COMPANY                                        :[Team] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] Zu {STRING}: {WHITE}{STRING}
@@ -1469,8 +1469,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Private] Zu {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
 STR_NETWORK_CHAT_ALL                                            :[All] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Text fir Chat aginn
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Den Server huet d'Sessioun zougemaach
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Den Server get nei gestart...{}Weg. waarden...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Den Server huet d'Sessioun zougemaach
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Den Server get nei gestart...{}Weg. waarden...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Spiller
@@ -1484,19 +1484,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Der Firma soen
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privat Meldung
 
 
-STR_NETWORK_SEND                                                :{BLACK}Schécken
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Schécken
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kann d'Landschaft net vum PNG lueden...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...Datei net font.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...konnt den Bildtyp net convertéieren. 8 oder 24-bit PNG Bild benéidegt.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...eppes ass schief gaagnen. Sorry. (warscheinlech éng korrupt Datei)
+STR_ERROR_PNGMAP                                                :{WHITE}Kann d'Landschaft net vum PNG lueden...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...Datei net font.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...konnt den Bildtyp net convertéieren. 8 oder 24-bit PNG Bild benéidegt.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...eppes ass schief gaagnen. Sorry. (warscheinlech éng korrupt Datei)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kann d'Landschaft net aus der BMP lueden...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...konnt den Bildtyp net convertéieren.
+STR_ERROR_BMPMAP                                                :{WHITE}Kann d'Landschaft net aus der BMP lueden...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...konnt den Bildtyp net convertéieren.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Käschten: {CURRENCY}
@@ -1510,13 +1510,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Geschät
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kann d'Land hei net unhiewen...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kann d'Land hei net erofsetzen...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kann d'Land net ebenen...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Fielsen
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Knubbelegt Land
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Blankt Land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gras
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Felder
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Schnéibedeckt Land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Wüst
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Fielsen
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Knubbelegt Land
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Blankt Land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Felder
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Schnéibedeckt Land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Wüst
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Land ass an dei falsch Richtung geneigt
@@ -1524,11 +1524,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Onméigl
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Verdéiwung géif den Tunnel beschiedegen
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... schon op Mieresspigel
 STR_ERROR_TOO_HIGH                                              :{WHITE}... ze héich
-STR_ALREADY_LEVELLED                                            :{WHITE}... schon flaach
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... schon flaach
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Keng gëeegent Schinnen
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...schon gebaut
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}D'Schinnen mussen fir d'éischt ewesch
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}D'Strooss ass eng Richtung oder blockéiert
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}D'Strooss ass eng Richtung oder blockéiert
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Schinnenbau
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Élektrëschen Zuchbau
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Monorailbau
@@ -1552,41 +1552,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Zuchsign
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Zuchbréck bauen
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Zuchtunnel bauen
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Wiesselt zwëschen bauen/ofrappen vun Schinnen an Signaler
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Bréckenauswiel - Wielt äer Bréck aus
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Bréckenauswiel - Wielt äer Bréck aus
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Wielt d'Richtung vum Zuchdepot
-STR_RAILROAD_TRACK                                              :Schinnen
-STR_RAILROAD_TRAIN_DEPOT                                        :Schinnen Zuchdepot
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Schinnen
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Schinnen Zuchdepot
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...d'Plaz ass am Besëtz vun enger aanerer Firma
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Schinnen mat Blocksignaler
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Schinnen mat Pre-Signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Schinnen mat Ausgangssignaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Schinnen mat Kombosignaler
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Schinnen mat Weesignaler
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Schinnen mat Pfadsignaler an eng Richtung
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Schinnen mat Block- an Pre-Signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Schinnen mat Block- an Ausgangssignaler
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Schinnen mat Block- an Kombosignaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Schinnen mat Block- an Weesignaler
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Schinnen mat Block- an Weesignaler an eng Richtung
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Schinnen mat Pre- an Ausgangssignaler
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Schinnen mat Pre- an Kombosignaler
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Schinnen mat Pre- an Weesignaler
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Schinnen mat Pre- an Weesignaler an eng Richtung
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Schinnen mat Ausgangs- an Kombosignaler
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Schinnen mat Ausgangs- an Weesignaler
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Schinnen mat Ausgangs- an Weesignaler an eng Richtung
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Schinnen mat Kombo- an Weesignaler
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Schinnen mat Kombo- an Einbahn-Weesignaler an eng Richtung
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Schinnen mat Pfad- an Weesignaler an eng Richtung
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Musst d'Gare fir d'éischt ofrappen
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Eng separéiert Gare bauen
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}D'Gare verbannen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Schinnen mat Blocksignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Schinnen mat Pre-Signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Schinnen mat Ausgangssignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Schinnen mat Kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Schinnen mat Weesignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Schinnen mat Pfadsignaler an eng Richtung
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Schinnen mat Block- an Pre-Signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Schinnen mat Block- an Ausgangssignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Schinnen mat Block- an Kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Schinnen mat Block- an Weesignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Schinnen mat Block- an Weesignaler an eng Richtung
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Schinnen mat Pre- an Ausgangssignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Schinnen mat Pre- an Kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Schinnen mat Pre- an Weesignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Schinnen mat Pre- an Weesignaler an eng Richtung
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Schinnen mat Ausgangs- an Kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Schinnen mat Ausgangs- an Weesignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Schinnen mat Ausgangs- an Weesignaler an eng Richtung
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Schinnen mat Kombo- an Weesignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Schinnen mat Kombo- an Einbahn-Weesignaler an eng Richtung
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Schinnen mat Pfad- an Weesignaler an eng Richtung
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Musst d'Gare fir d'éischt ofrappen
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Eng separéiert Gare bauen
+STR_JOIN_STATION_CAPTION                                        :{BLACK}D'Gare verbannen
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Muss d'Strooss ewech huelen
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Stroossenarbeschten umgaangen
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Stroossenarbeschten umgaangen
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Stroossenbau
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Tramkonstruktioun
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Wielt d'Stroossenbréck
@@ -1622,14 +1622,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Tramtunn
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Strooss an eng Richtung aktivéieren/déaktivéieren
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Wieselt bauen/ofrappen vun Stroossenkonstruktiounen
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Wiesselt bauen/ofrappen vum Trambau
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Wielt Stroossendepot Richtung
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Tramdepot Richtung wielen
-STR_ROAD_DESCRIPTION_ROAD                                       :Strooss
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Strooss mat Luuchten
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Strooss mat Beem
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Stroossendepot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Zuch/Strooss Barrière
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tram
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Wielt Stroossendepot Richtung
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Tramdepot Richtung wielen
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Strooss
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Strooss mat Luuchten
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Strooss mat Beem
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Stroossendepot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Zuch/Strooss Barrière
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tram
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kann d'Busgare net ofrappen...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kann d'Camionsgare net ofrappen...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kann d'Tramstatioun net ofrappen...
@@ -1637,12 +1637,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kann d'W
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Stied
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Gebai muss fir d'éischt ofgerapt ginn
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Stad)
@@ -1655,9 +1655,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Zentréi
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Wiesselt den Stadnumm
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passagéier leschten Mount: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post leschten Mount: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Luedungen gebraucht fir Stadwuestum:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} gebraucht
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} leschten Mount geliwwert
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Luedungen gebraucht fir Stadwuestum:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} gebraucht
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} leschten Mount geliwwert
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Héichen Büroblock
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Büroblock
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Klengen Apartementsblock
@@ -1694,7 +1694,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subventioun geet un {STRING}!{}{}{STRING} Service vun {STATION} op {STATION} gët nächst Joer mat 300% bezuelt!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subventioun geet un {STRING}!{}{}{STRING} Service vun {STATION} op {STATION} gët nächst Joer mat 400% bezuelt!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} d'Gemeng erlabt keen weideren Fluchhafen an der Stad
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN}er Gemeng refüséiert den Bau fir den Flughafen wéinst Kaméidi
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN}er Gemeng refüséiert den Bau fir den Flughafen wéinst Kaméidi
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Hütten
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Haiser
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Apartementer
@@ -1730,7 +1730,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Trafficchaos an {TOWN}!{}{}Stroosenneibau deen vun {STRING} finanzéiert gin ass bréngt 6 Méint Misère fir d'Autosfuerer!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (gëtt gebaut)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (gëtt gebaut)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglu
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipien
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Téikaan-Haus
@@ -1743,17 +1743,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Schëld opstell
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Beem
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...schon Beem hei
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kann d'Beem hei net planzen...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...ze vill Schëlder
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kann d'Schëld hei net opriichten...
-STR_SIGN_DEFAULT                                                :Schëld
+STR_DEFAULT_SIGN_NAME                                           :Schëld
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Schëldtext änneren
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kann den Numm vum Schëld net änneren...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kann d'Schëld net läschen...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wielt den Baamtyp
-STR_TREE_NAME_TREES                                             :Beem
-STR_TREE_NAME_RAINFOREST                                        :Regenwald
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktus
+STR_LAI_TREE_NAME_TREES                                         :Beem
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regenwald
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktus
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Gare Selectioun
@@ -1773,7 +1773,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Musst d'
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Ze noo un engem aaneren Fluchhafen
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Musst den Fluchhafen fir d'éischt ofrappen
 
-STR_QUERY_RENAME_STATION_CAPTION                                :D'Gare ëmbenennen
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :D'Gare ëmbenennen
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kann d'Statioun net ëmbenennen...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Bewertungen
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Acceptéiert
@@ -1791,10 +1791,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Perfekt
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Weis all Zich déi des Statioun an hierem Zaitplang hun
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Weis all Stroossengefierter déi des Statioun an hierem Zaitplang hun
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Weis all Fliger den des Statioun an sengem Zaitplang huet
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Weis all Schëffer déi des Statioun an hierem Zaitplang hun
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Weis all Zich déi des Statioun an hierem Zaitplang hun
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Weis all Stroossengefierter déi des Statioun an hierem Zaitplang hun
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Weis all Fliger den des Statioun an sengem Zaitplang huet
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Weis all Schëffer déi des Statioun an hierem Zaitplang hun
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} acceptéiert {STRING} net méi
@@ -1827,47 +1827,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Den Numm
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Weis d'Lëscht vun den acceptéierten Wueren
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Statiounennimm - klick op den Numm fir d'Siicht drop ze zentréieren
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Wielt Gréisst/Typ vum Fluchhafen
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Gare
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Fligerhangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Fluchhafen
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Camionsgare
-STR_STATION_DESCRIPTION_BUS_STATION                             :Busgare
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Schëffshafen
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Gare
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Fligerhangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Fluchhafen
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Camionsgare
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Busgare
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Schëffshafen
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Weis d'Reechwäit vun dem Gebäi un
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Weis d'Reechwäit vun dem Gebäi net un
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Reechwäit
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Hafen
-STR_STATION_DESCRIPTION_BUOY                                    :Boje
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boje
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...Boje am Wee
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...Statioun ze ausgebreed
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...Net Uniform Statiounen ofgeschalt
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Haalt CTRL un fir méi wéi 1 Objet auszewielen
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...Net Uniform Statiounen ofgeschalt
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Haalt CTRL un fir méi wéi 1 Objet auszewielen
 
 STR_UNDEFINED                                                   :(ondefinéierten string)
-STR_STAT_CLASS_DFLT                                             :Standard Statioun
-STR_STAT_CLASS_WAYP                                             :Weepunkten
+STR_STATION_CLASS_DFLT                                          :Standard Statioun
+STR_STATION_CLASS_WAYP                                          :Weepunkten
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Schëffdepot Richtung
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...muss op Waasser gebaut ginn
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kann de Schëffdepot hei net bauen...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Wielt d'Schëffdepot Richtung
-STR_WATER_DESCRIPTION_WATER                                     :Waasser
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Küst oder Flossufer
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Schëffdepot
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aquadukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Waasser
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Küst oder Flossufer
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Schëffdepot
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aquadukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Kann net op d'Waasser bauen
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Musst den  Kanal fir d'éischt ofrappen
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Musst den  Kanal fir d'éischt ofrappen
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spill späicheren
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Spill lueden
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Späicheren
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Leschen
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Zuschauer, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Zuschauer, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} fräi
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kann net um Laafwierk liesen
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Fehler beim Späicheren{}{STRING}
@@ -1883,12 +1883,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lëscht
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Momentan gewielten Numm fir den Spillstand
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Lescht den momentan gewielten Spillstand
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Späichert dei aktuell Partie ënnert dem gewielten Numm
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generéiert en zoufällegt neit Spill
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Lued Héichtenkaart
-STR_SAVE_OSKTITLE                                               :{BLACK}Gidd en Numm an fir den Späicherstand
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generéiert en zoufällegt neit Spill
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Lued Héichtenkaart
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Gidd en Numm an fir den Späicherstand
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} am Wee
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} am Wee
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kuelenstollen
 STR_INDUSTRY_NAME_POWER_STATION                                 :Kraftwierk
@@ -1946,7 +1946,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Zentréiert d'Siicht op d'Industrie
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Nei {STRING} gëtt bei {TOWN} gebaut!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Nei {STRING} gëtt bei {TOWN} geplantzt!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Käschten: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Käschten: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kann deen Industrietyp hei net bauen...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...Bësch kann nëmmen iwert der Schnéilinn geplanzt ginn
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} gëtt glaich zougemaach!
@@ -1964,16 +1964,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Aaneren Tunnel am Wee
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnel géif ausserhalb der Kaart erauskommen
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnel géif ausserhalb der Kaart erauskommen
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Kann d'Land net fir dei aaner Säit vum Tunnel fräi leen
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Muss den Tunnel fir d'éischt ofrappen
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Musst d'Bréck fir d'éischt ofrapen
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kann nët op der selweschter Plaz unfänken an ophalen
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Bréckenenner net op der selwechter Héicht
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Bréckass ze déif fir dësen Terrain
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kann nët op der selweschter Plaz unfänken an ophalen
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Bréckenenner net op der selwechter Héicht
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Bréckass ze déif fir dësen Terrain
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start an Enn mussen op enger Linn sinn
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Plaz onpassend fir Tunnelentrée
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Stolen Hängebréck
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Stoldréier Bréck
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Fräidroend Stolbréck
@@ -1984,30 +1984,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Rouerstol Bréc
 STR_BRIDGE_TUBULAR_SILICON                                      :Rouer, Silikon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kann d'Bréck net hei bauen...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kann den Tunnel hei net  bauen...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Zuchtunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Stroossentunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Stolen Zuchhängebréck
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Stoldréier Zuchbréck
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Stolen fräidroend Zuchbréck
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Stolbeton Zuchhängebréck
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Holzen Zuchbréck
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betons Zuchbréck
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Stolen Hängebréck
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Stoldréier Bréck
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Fräidroend Stolbréck
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Stolbetons Hängebréck
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Holzen Bréck
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betons Bréck
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Rouerstol Zuchbréck
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Rouerstol Brèck
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Zuchtunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Stroossentunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Stolen Zuchhängebréck
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Stoldréier Zuchbréck
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Stolen fräidroend Zuchbréck
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Stolbeton Zuchhängebréck
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Holzen Zuchbréck
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betons Zuchbréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Stolen Hängebréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Stoldréier Bréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Fräidroend Stolbréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Stolbetons Hängebréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Holzen Bréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betons Bréck
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Rouerstol Zuchbréck
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Rouerstol Brèck
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objet am Wee
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Sender
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Liichttuerm
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Firmen Haaptgebai
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Sender
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Liichttuerm
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Firmen Haaptgebai
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...Firmen Haaptgebai am Wee
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Land am Firmenbesëtz
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Land am Firmenbesëtz
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Kann daat Land net kafen...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...schon am Besëtz!
 
@@ -2053,7 +2053,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Statio
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Schwieregkeetsgrad
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Späicheren
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Späicheren
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Einfach
@@ -2126,8 +2126,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Faarw Sch
 STR_LIVERY_CAPTION                                              :{WHITE}Neien Faarw Schéma
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Firmennumm
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Managernumm
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Firmennumm
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Numm vum Manager
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Firmennumm
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Numm vum Manager
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kann den Firmennumm net änneren...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kann den Numm vum Manager net änneren...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanzen {BLACK}{COMPANYNUM}
@@ -2151,11 +2151,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Grafik: Ankommen
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Grafik: Betriibsgewënn
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Kontostand
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Kredit
-STR_MAX_LOAN                                                    :{WHITE}Max Kredit:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Max Kredit:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Léinen {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Zeréckbezuelen {SKIP}{SKIP}{CURRENCY}
@@ -2164,7 +2164,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kann net
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...keen Kredit zeréckzebezuelen
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...et ginn {CURRENCY} gebraucht
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kann den Kredit net zeréckbezuelen...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kann keng Suen ginn déi vun der Bank geléint sinn...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kann keng Suen ginn déi vun der Bank geléint sinn...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Wielt en neit Gesiicht fir den Manager
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Ännert d'Firmengefierter Faarw
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Ännert den Numm vum Manager
@@ -2174,10 +2174,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Bezuelt
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Agefouert: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Gefierer:
-STR_TRAINS                                                      :{WHITE}{COMMA} Z{P uch ich}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} Stroossengefier{P t ter}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} Fliger
-STR_SHIPS                                                       :{WHITE}{COMMA} Schëff{P "" er}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} Z{P uch ich}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} Stroossengefier{P t ter}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} Fliger
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} Schëff{P "" er}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Keng
 STR_FACE_CAPTION                                                :{WHITE}Gesiichtsauswiel
 STR_FACE_MALE_BUTTON                                            :{BLACK}Männlech
@@ -2190,9 +2190,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Wielt we
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generéiert zoufällegt neit Gesiicht
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Legend
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Weist Legend vun der Grafik
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Weis detailléiert performance Astellungen
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Weis detailléiert performance Astellungen
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legend vun den Firmengrafiken
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klickt hei fir d'Firma an der Grafik an/aus zeschalten
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klickt hei fir d'Firma an der Grafik an/aus zeschalten
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Unitéiten vun Luedung geliwert
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Firmen Preformancebewertung (max bewertung=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmenwert
@@ -2226,23 +2226,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Tycoon
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Haaptgebai bauen
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Baut/Weist d'Firmenhaaptgebai
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Bau d'Firmenhaaptgebai op eng aaner Palatz.{}Käschten: 1% vun dem Firmenwert
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Bau d'Firmenhaaptgebai op eng aaner Palatz.{}Käschten: 1% vun dem Firmenwert
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kann d'Firmenhaptgebai net bauen...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Weist Haaptgebai
-STR_RELOCATE_HQ                                                 :{BLACK}Firmenhaaptgebai réckelen
-STR_COMPANY_JOIN                                                :{BLACK}Bäitrieden
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Bäitrieden an mat där Firma spillen
-STR_COMPANY_PASSWORD                                            :{BLACK}Passwuert
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Setzt en Passwuert fir nëmmen authoriséiert Benotzer spillen ze loosen.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Setzt d'Firmen-Passwuert
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Firmenhaaptgebai réckelen
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Bäitrieden
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Bäitrieden an mat där Firma spillen
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Passwuert
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Setzt en Passwuert fir nëmmen authoriséiert Benotzer spillen ze loosen.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Setzt d'Firmen-Passwuert
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Späicher d'Passwuert net
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Benotz daat neit Passwuert fir d'Firma
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Firmen-Passwuert
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standard Firmen-Passwuert
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Benotzt dëst Passwuert als Standard fir néi Firmen
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standard Firmen-Passwuert
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Benotzt dëst Passwuert als Standard fir néi Firmen
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Wirtschaftsréckgang!{}{}Finanzexperten rechnen mat schlëmmsten Abrëch!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Wirtschaftsflaut eriwer!{}{}Verbesserung am Handel mëcht zouversiichtlech!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Wiesselt grouss/kleng Fënstergréisst
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Wiesselt grouss/kleng Fënstergréisst
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmenwert: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kaaft 25%Undeel vun der Firma
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Verkaaft 25% Undeel vun der Firma
@@ -2252,7 +2252,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kann ken
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kann kéng 25% Undeel vun dëser Firma verkafen...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% am Besëtz vun {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} ass vun {STRING} iwerholl ginn!
-STR_PROTECTED                                                   :{WHITE}Dës Firma ass nach net aal genuch fir Undeeler ze handelen...
+STR_ERROR_PROTECTED                                             :{WHITE}Dës Firma ass nach net aal genuch fir Undeeler ze handelen...
 
 STR_LIVERY_DEFAULT                                              :Standard Tracht
 STR_LIVERY_STEAM                                                :Damplok
@@ -2278,14 +2278,14 @@ STR_LIVERY_LARGE_PLANE                                          :Groussen Fliger
 STR_LIVERY_PASSENGER_TRAM                                       :Passagéiertram
 STR_LIVERY_FREIGHT_TRAM                                         :Wuerentram
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Weist generell Faarwschemen
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Weist Zuch Faarwschemen
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Weist Stroossengefierer Faarwschemen
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Weist d'Schëff Faarwschemen
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Weist Fliger Faarwschemen
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Wielt d'Primärfaarw fir den ausgewieltenen Schema
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Wielt d'Sekundärfaarw fir den ausgewieltenen Schema
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Wielt en Faarwschema fir ze änneren, oder en puer Schemen mat CTRL+Klick. Klickt op d'Këscht fir d'Schemanotzung ze wieselen
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Weist generell Faarwschemen
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Weist Zuch Faarwschemen
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Weist Stroossengefierer Faarwschemen
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Weist d'Schëff Faarwschemen
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Weist Fliger Faarwschemen
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Wielt d'Primärfaarw fir den ausgewieltenen Schema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Wielt d'Sekundärfaarw fir den ausgewieltenen Schema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Wielt en Faarwschema fir ze änneren, oder en puer Schemen mat CTRL+Klick. Klickt op d'Këscht fir d'Schemanotzung ze wieselen
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Kessel (Damp)
@@ -2593,9 +2593,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Net entlueden
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Wiesselt d'Stoppen vun dem ungewielten Optrag
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Wiesselt Lueden vun dem ungewielten Optrag
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Wiesselt Entlueden vun dem ungewielten Optrag
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Setzt en erweiderten Optrag an
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Setzt en erweiderten Optrag an
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Géi bei den noosten Depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Géi bei den noosten Hangar
 STR_ORDER_NEAREST_DEPOT                                         :den noosten
@@ -2605,9 +2605,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Revisioun non-s
 STR_ORDER_TRAIN_DEPOT                                           :Zuchdepot
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Stroossengefierter-Depot
 STR_ORDER_SHIP_DEPOT                                            :Schëffdepot
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Géi ëmmer
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Revisioun falls néideg
@@ -2632,10 +2632,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :ass méi wéi
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :ass méi oder gläich wéi
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :as wouer(true)
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :as falsch(false)
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Sprang op Optrag {COMMA}
-STR_CONDITIONAL_NUM                                             :Sprang op Optrag {COMMA} wann {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Sprang op Optrag {COMMA} wann {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Sprang op Optrag {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Sprang op Optrag {COMMA} wann {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Sprang op Optrag {COMMA} wann {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Net ënnerwee
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Ënnerwee (ouni Fuerplang)
@@ -2658,18 +2658,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Zich kë
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Iwersprangen
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Leschen
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Géi op
-STR_REFIT                                                       :{BLACK}Ëmbauen
-STR_REFIT_TIP                                                   :{BLACK}Wielt wéi een Luedungstyp der wëllt. CTRL+Click fir den Ëmbau ze leschen
-STR_REFIT_ORDER                                                 :(Ëmbau op {STRING})
-STR_REFIT_STOP_ORDER                                            :(Ëmbau op {STRING} an stopen)
-STR_STOP_ORDER                                                  :(Stop)
-STR_TIMETABLE_VIEW                                              :{BLACK}Fuerplang
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Wiesselt op d'Fuerplangunzeig
-STR_ORDER_VIEW                                                  :{BLACK}Opträg
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Wiesselt op d'Opträgunzeig
+STR_ORDER_REFIT                                                 :{BLACK}Ëmbauen
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Wielt wéi een Luedungstyp der wëllt. CTRL+Click fir den Ëmbau ze leschen
+STR_ORDER_REFIT_ORDER                                           :(Ëmbau op {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Ëmbau op {STRING} an stopen)
+STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Fuerplang
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Wiesselt op d'Fuerplangunzeig
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Opträg
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Wiesselt op d'Opträgunzeig
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Opträg)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Enn vun den Opträg - -
-STR_SERVICE                                                     :{BLACK}Revisioun
+STR_ORDER_SERVICE                                               :{BLACK}Revisioun
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Gebaut: {LTBLUE}{NUM}{BLACK} Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Wert: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2689,7 +2689,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}Gefiert
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}en Gefiert dat dësen Optrag deelt kann net op déi Statioun goen
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kann d'Gefiert net réckelen...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}D'hënnescht Maschinn geet ëmmer der viischter no.
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kann den Wee an den Depot net fannen
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Revisiounsintervall: {LTBLUE}{COMMA}Deeg{BLACK}   Lescht Revisioun: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Revisiounsintervall: {LTBLUE}{COMMA}%{BLACK}  Lescht Revisioun: {LTBLUE}{DATE_LONG}
@@ -2709,10 +2709,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Zäitpla
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Änner Zäit déi ugewielten Uëder soll brauchen
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Lesch Zäit fir den gewielten Ueder
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Setzt den Verspéidungszieler zréck, sou dass d'Gefiert mat Zäit ukënnt
-STR_SERVICE_HINT                                                :{BLACK}Iwwersprang desen Ueder wann keng Revisioun néideg ass
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Käschten: {CURRENCY} Gewiicht: {WEIGHT_S}{}Geschwindegkeet: {VELOCITY}  Kraaft: {POWER}{}Betriibskäschten {CURRENCY}/joër{}Kapazitéit: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Käschten: {CURRENCY} Max. Geschwindegkeet: {VELOCITY}{}Kapazitéit: {CARGO}, {CARGO}{}Betriibskäschten {CURRENCY}/Joer
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Käschten: {CURRENCY} Max. Geschwindegkeet: {VELOCITY}{}Kapazitéit: {CARGO}{}Betriibskäschten: {CURRENCY}/Joer
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Iwwersprang desen Ueder wann keng Revisioun néideg ass
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Käschten: {CURRENCY} Gewiicht: {WEIGHT_S}{}Geschwindegkeet: {VELOCITY}  Kraaft: {POWER}{}Betriibskäschten {CURRENCY}/joër{}Kapazitéit: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Käschten: {CURRENCY} Max. Geschwindegkeet: {VELOCITY}{}Kapazitéit: {CARGO}, {CARGO}{}Betriibskäschten {CURRENCY}/Joer
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Käschten: {CURRENCY} Max. Geschwindegkeet: {VELOCITY}{}Kapazitéit: {CARGO}{}Betriibskäschten: {CURRENCY}/Joer
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Alter: {LTBLUE}{STRING}{BLACK}   Betriibskäschten: {LTBLUE}{CURRENCY}/Joer
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. Geschwindegkeet: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Gewiicht: {LTBLUE}{WEIGHT_S} {BLACK}Kraaft: {LTBLUE}{POWER}{BLACK} Max. Geschwindegkeet: {LTBLUE}{VELOCITY}
@@ -2731,27 +2731,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Accident!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Zuch Accident!{}{COMMA} stiewen an der Explosioun nom Accident
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kann d'Richtung vum Zuch net änneren...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kann keng Gefierer aus e puer Unitéiten emdréinen
-STR_CLEAR_TIME                                                  :{BLACK}Zäit läschen
-STR_RESET_LATENESS                                              :{BLACK}Verspeidungszieler zerécksetzen
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Weepunkt Numm änneren
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Zäit läschen
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Verspeidungszieler zerécksetzen
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Weepunkt Numm änneren
 
-STR_TRAIN_STOPPING                                              :{RED}Stopt
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stopt, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Onkompatibel Schinnen Typen
-STR_TRAIN_NO_POWER                                              :{RED}Keng Energie
-STR_TRAIN_START_NO_CATENARY                                     :Des Streck huet keng Uewerleitung, den Zuch kann net lassfueren.
-STR_TRAIN_STUCK                                                 :{ORANGE}Ward op en fraien Wee
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stopt
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stopt, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Onkompatibel Schinnen Typen
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Keng Energie
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Des Streck huet keng Uewerleitung, den Zuch kann net lassfueren.
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Ward op en fraien Wee
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nei {STRING} verfügbar!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nei {STRING} verfügbar!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kann keen zerstéiert Gefiert verkafen...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kann keen zerstéiert Gefiert oprüsten
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kann keen zerstéiert Gefiert verkafen...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kann keen zerstéiert Gefiert oprüsten
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kann dem Gefiert keen Zäitplang gin.
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Gefierter kënnen nëmmen op Statiounen halen.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Dëst Gefiert bleift net op dëser Statioun stoën.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kann dem Gefiert keen Zäitplang gin.
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Gefierter kënnen nëmmen op Statiounen halen.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Dëst Gefiert bleift net op dëser Statioun stoën.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Zäit wiesselen
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}D'Gefiert ass mat Zäit
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}D'Gefiert ass grad {STRING} ze spéit
@@ -2765,7 +2765,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fëll de
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...muss an engem Depot stoen
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kann den Depot net fannen
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forcéiert d'Gefiert fir ze dréien
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapazitéit: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapazitéit: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} Gefier{P t er}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2791,11 +2791,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plazéiert eng Boje, déi als Weepunkt kann benotzt ginn
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kann Boje net hei plazéieren...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Aquadukt bauen
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kann den Aquadukt héi net bauen...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kann den Aquadukt héi net bauen...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Refit)
 STR_REFIT_TITLE                                                 :{GOLD}Wielt den Luedungstyp:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nei Kapazitéit: {GOLD}{CARGO}{}{BLACK}Käschten fir ëmzebauen: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(ëmbaubar)
+STR_PURCHASE_INFO_REFITTABLE                                    :(ëmbaubar)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Fluchhäfen
@@ -2808,7 +2808,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Fluchhaf
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Biirger feieren . . .{}Éischten Fliger kënnt bei {STATION} un!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Fligeraccident!{}{COMMA} stiewen an der Explosioun bei {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Fligeraccident!{}Fliger haat keen Bensin méi, {COMMA} stiewen an Explosioun!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Zäitplang)
 
@@ -2821,13 +2821,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Kuelenstollen zesummenbroch hannerleist eng Spuer vun Verwüstung bei  {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Flut!{}Opmanst {COMMA} vermësst, wahrscheinlech doud noo grousser Flut!
 
-STR_BRIBE_FAILED                                                :{WHITE}Äer versichten Bestiechung ass
-STR_BRIBE_FAILED_2                                              :{WHITE}vun engem lokalen Fahnder entdeckt ginn
-STR_BUILD_DATE                                                  :{BLACK}Gebaut: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Äer versichten Bestiechung ass
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}vun engem lokalen Fahnder entdeckt ginn
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Gebaut: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Statiounsklass: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Statiounstyp: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Statiounsklass: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Statiounstyp: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detailéiert Leeschtungsbewertung
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detail
@@ -2847,28 +2847,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Suen:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Kredit:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Unzuel Gefierter; all Zorten zielen: Stroosengefierter, Zich, Schëffer an Fligeren
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Unzuel un Statiounsdeeler.All Deel vun enger Statioun (e.g. Gare,Busarret,Fluchhafen)gëtt gezielt,och wann déi als eng Statioun connectéiert sinn.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Profit vum Gefiert mam mansten Akommes (vun allen Gefierter déi méi wéi 2 Joer aal sin)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Betrag un Geld den am Mount mam mansten Profit gemet gouf an den leschten 12 Quartaler
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Betrag un Geld den am Mount mam héchsten Profit gemet gouf an den leschten 12 Quartaler
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unzuel un Typen Wueren déi déi 4 lescht Quartaler geliwwert goufen
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Unzuel un Typen Wueren déi lescht Quartal geliwwert goufen
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Betrag un Suen den des Firma op der Bank huet
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Betrag un Geld den dës Firma geléint huet
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total Punkte vun méiglechen Punkten
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Unzuel Gefierter; all Zorten zielen: Stroosengefierter, Zich, Schëffer an Fligeren
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Unzuel un Statiounsdeeler.All Deel vun enger Statioun (e.g. Gare,Busarret,Fluchhafen)gëtt gezielt,och wann déi als eng Statioun connectéiert sinn.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Profit vum Gefiert mam mansten Akommes (vun allen Gefierter déi méi wéi 2 Joer aal sin)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Betrag un Geld den am Mount mam mansten Profit gemet gouf an den leschten 12 Quartaler
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Betrag un Geld den am Mount mam héchsten Profit gemet gouf an den leschten 12 Quartaler
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unzuel un Typen Wueren déi déi 4 lescht Quartaler geliwwert goufen
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Unzuel un Typen Wueren déi lescht Quartal geliwwert goufen
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Betrag un Suen den des Firma op der Bank huet
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Betrag un Geld den dës Firma geléint huet
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total Punkte vun méiglechen Punkten
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Astellungen
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}NewGRF Astellungen uweisen
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF Astellungen
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Ännerungen unhuelen
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Palette wiesselen
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Wiessel Palette vun den selectéierten NewGRF.{} Maach dat wann d'Grafiken vun deser NewGRF rosa am Spill ausgesin
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Set parameters
-STR_NEWGRF_FILENAME                                             :{BLACK}Dateinumm: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palette: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Ännerungen unhuelen
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palette wiesselen
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Wiessel Palette vun den selectéierten NewGRF.{} Maach dat wann d'Grafiken vun deser NewGRF rosa am Spill ausgesin
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parameters
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Dateinumm: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palette: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du mëss Ännerungen an engem lafenden Spill; dëst kann OpenTTD crashen.{}Bassde sécher?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2891,34 +2891,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Probéiert eng
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} huet eng korrupt Sprite. All korrupt Sprites gin als Fragezeichen (?) duergestalt.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Huet e puer Action 8 Einträg
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Selectéierten Preset lueden
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Preset späichern
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Aktuell Lëscht als Preset späichern
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Presetnumm ugin
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Preset leschen
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Selectéierten Preset leschen
-STR_NEWGRF_ADD                                                  :{BLACK}Baifügen
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Eng nei NewGRF an d'Lëscht setzen
-STR_NEWGRF_REMOVE                                               :{BLACK}Wechhhuelen
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Selectéiert NewGRF aus der Lëscht huelen
-STR_NEWGRF_MOVEUP                                               :{BLACK}Rop
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Setzt d'NewGRF an der Lëscht erop
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Rof
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Setzt d'NewGRF an der Lëscht erof
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Eng Lëscht vun NewGRF Dateien déi installéiert sin. Klick eng Datei fir seng Parameter ze änneren.
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parameter: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF Parameter agin
-STR_NEWGRF_NO_INFO                                              :{BLACK}Keng Info verfügbar
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Selectéierten Preset lueden
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Preset späichern
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Aktuell Lëscht als Preset späichern
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Presetnumm ugin
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Preset leschen
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Selectéierten Preset leschen
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Baifügen
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Eng nei NewGRF an d'Lëscht setzen
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Wechhhuelen
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Selectéiert NewGRF aus der Lëscht huelen
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Rop
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Setzt d'NewGRF an der Lëscht erop
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Rof
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Setzt d'NewGRF an der Lëscht erof
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Eng Lëscht vun NewGRF Dateien déi installéiert sin. Klick eng Datei fir seng Parameter ze änneren.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parameter: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF Parameter agin
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Keng Info verfügbar
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Verfügbar NewGRF files
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Zur der Selectioun baifügen
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Selectionéiert NewGRF an der Config baisetzen
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Dateien nei scannen
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Update d'Lëscht vun verfügbaren NewGRF Dateien.
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Selectionéiert NewGRF an der Config baisetzen
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Dateien nei scannen
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Update d'Lëscht vun verfügbaren NewGRF Dateien.
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kann Datei net bäisetzen: Duplikat GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Datei net fonnt.
-STR_NEWGRF_DISABLED                                             :{RED}Ausgeschalt
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Datei net fonnt.
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Ausgeschalt
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Passend Datei net fonnt (kompatibel GRF gelued)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibel GRF(s) gelueden fir fehlend Dateien
@@ -2934,7 +2934,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Cargo/refit Informatioun fir '{1:ENGINE}' ass anescht wéi an der Kaflëscht no der Constructioun. Dëst kann en autoerneirung/-ersetzen Fehler oprufen.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' huet eng Endlosschläif am Production callback verursaacht.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spill gouf an enger Versioun ouni Tram support gesaved. All Tram gouf wechgeholl.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spill gouf an enger Versioun ouni Tram support gesaved. All Tram gouf wechgeholl.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Egen Währung
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Wiesselkuer: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2945,16 +2945,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Zum Eur
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Zum Euro wiesselen: {ORANGE}nie
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Prouf: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Änner Währungsparameter
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Setz den Betrag Suen den fir 1 Pond (£) gebraucht get erof
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Setz den Betrag Suen den fir 1 Pond (£) gebraucht get erop
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Setzt den Wiesselcours fir äer Währung fir 1 Pond (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Setz den Separateur fir äer Währung
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Setz den Prefix fir äer Währung
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Setz den Suffix fir äer Währung
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Wiessel éischter op den Euro
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Wiessel méi spéit op den Euro
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Wielt d'Joer wou op den Euro gewiesselt gëtt
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pond (£) an äerer Währung
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Setz den Betrag Suen den fir 1 Pond (£) gebraucht get erof
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Setz den Betrag Suen den fir 1 Pond (£) gebraucht get erop
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Setzt den Wiesselcours fir äer Währung fir 1 Pond (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Setz den Separateur fir äer Währung
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Setz den Prefix fir äer Währung
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Setz den Suffix fir äer Währung
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Wiessel éischter op den Euro
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Wiessel méi spéit op den Euro
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Wielt d'Joer wou op den Euro gewiesselt gëtt
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pond (£) an äerer Währung
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2973,8 +2973,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Schëff{P "" er}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Fliger
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Gedeelten Ueder vun {COMMA} Gefier{P t er}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Weis all Gefierer déi dësen Plang deelen
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Gedeelten Ueder vun {COMMA} Gefier{P t er}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Weis all Gefierer déi dësen Plang deelen
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} waart am Depot
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} waart am Depot
@@ -3081,39 +3081,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Stroosse
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Schëffslager ëmbauen fir aaner Luedungen ze transportéieren
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Fliger ëmbauen fir aaner Wueren ze transportéieren
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Um Wee fir {TOWN} Stroossendepot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Um Wee fir {TOWN} Stroossendepot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Um Wee fir {TOWN} Schëffdepot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Um Wee fir {TOWN} Schëffdepot, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Um Wee fir {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Um Wee fir {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Revisioun am {TOWN} Zuchdepot
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Revisioun am {TOWN} Zuchdepot, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Revisioun am {TOWN} Stroossendepot
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Revisioun am {TOWN} Stroossendepot, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Revisioun am {TOWN} Schëffdepot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Revisioun am {TOWN} Schëffdepot, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Revisioun am {STATION} Hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Revisioun am {STATION} Hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Zuch klonen
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Gefiert klonen
-STR_CLONE_SHIP                                                  :{BLACK}Schëff klonen
-STR_CLONE_AIRCRAFT                                              :{BLACK}Fliger klonen
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dëst baut eng Kopie vum Schëff. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dëst baut eng Kopie vum Fliger. CTRL+Klick kopéiert och d'Opträg
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen.  Klickt op dësen Knäppchen an dann op en Zuch am Depot oder baussen.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dsst baut eng Kopie vum Schëff. Klickt op dësen Knäppchen an dann op en Schëff am Depot oder baussen.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dëst baut eng Kopie vun engem Fliger. Klickt op dësen Knäppchen, an dann op en Fliger am Hangar oder baussen.
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Ënnerwee fir {TOWN} Zuchdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Um Wee fir {TOWN} Stroossendepot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Um Wee fir {TOWN} Stroossendepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Um Wee fir {TOWN} Schëffdepot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Um Wee fir {TOWN} Schëffdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Um Wee fir {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Um Wee fir {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Revisioun am {TOWN} Zuchdepot
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Revisioun am {TOWN} Zuchdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Revisioun am {TOWN} Stroossendepot
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Revisioun am {TOWN} Stroossendepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Revisioun am {TOWN} Schëffdepot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Revisioun am {TOWN} Schëffdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Revisioun am {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Revisioun am {STATION} Hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Zuch klonen
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Gefiert klonen
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Schëff klonen
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Fliger klonen
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen. CTRL+Klick kopéiert och d'Opträg
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Dëst baut eng Kopie vum Schëff. CTRL+Klick kopéiert och d'Opträg
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Dëst baut eng Kopie vum Fliger. CTRL+Klick kopéiert och d'Opträg
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Dëst baut eng Kopie vun engem Zuch mat all den Wagonen.  Klickt op dësen Knäppchen an dann op en Zuch am Depot oder baussen.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Baut eng Kopie vum Stroossengefiert. CTRL+Klick kopéiert och d'Opträg
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Dsst baut eng Kopie vum Schëff. Klickt op dësen Knäppchen an dann op en Schëff am Depot oder baussen.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Dëst baut eng Kopie vun engem Fliger. Klickt op dësen Knäppchen, an dann op en Fliger am Hangar oder baussen.
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nei Zich
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nei Elektrozich
@@ -3183,28 +3183,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Zentréi
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Dier verkaft grad all Gefierer am Depot. Sidder sécher ?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Falschen Depot-Typ
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Falschen Depot-Typ
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}All Zich am Depot verkafen
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}All Gefiert am Depot verkafen
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}All Schëff am Depot verkafen
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}All Fliger am Hangar verkafen
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}All Zich am Depot verkafen
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}All Gefiert am Depot verkafen
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}All Schëff am Depot verkafen
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}All Fliger am Hangar verkafen
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Lëscht mat all Zich an dësem Depot
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Lëscht mat all Gefierer an dësem Depot
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Lëscht mat all Schëffer an dësem Depot
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Lëscht mat all Fliger am Hangar op dësem Fluchhafen
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Lëscht mat all Zich an dësem Depot
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Lëscht mat all Gefierer an dësem Depot
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Lëscht mat all Schëffer an dësem Depot
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Lëscht mat all Fliger am Hangar op dësem Fluchhafen
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}All Zich am Depot automatesch ersetzen
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}All Gefierer am Depot automatesch ersetzen
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}All Schëffer am Depot automatesch ersetzen
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}All Fliger am Hangar automatesch ersetzen
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}All Zich am Depot automatesch ersetzen
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}All Gefierer am Depot automatesch ersetzen
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}All Schëffer am Depot automatesch ersetzen
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}All Fliger am Hangar automatesch ersetzen
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Remplacéier{STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Start Gefierterremplacement
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stop Gefierterremplacement
-STR_NOT_REPLACING                                               :{BLACK}Net remplacéiert:
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Keen gefier gewielt
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Net remplacéiert:
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Keen gefier gewielt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Wielt den Maschinentyp fir ze remplacéiren
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Wielt den neien Typ den benotzt soll gin am Plaz vun der lénks gewielter Maschin
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Drécken fir Remplacement ze stoppen
@@ -3216,26 +3216,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Mecht da
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Remplacéiren: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Wiessel tëscht Maschin- an Wagonremplac. Fënster
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Gefiert net verfügbar
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Stroossengefiert net verfügbar
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Schëff net verfügbar
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Fliger net verfügbar
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Gefiert net verfügbar
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Stroossengefiert net verfügbar
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Schëff net verfügbar
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Fliger net verfügbar
 
-STR_ENGINES                                                     :Motoren
-STR_WAGONS                                                      :Wagonen
+STR_REPLACE_ENGINES                                             :Motoren
+STR_REPLACE_WAGONS                                              :Wagonen
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klickt fir all Zicham Depot ze stoppen
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klickt fir all Gefierer am Depot ze stoppen
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klickt fir all Schëffer am Depot ze stoppen
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klickt fir all Fliger am Hangar ze stoppen
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klickt fir all Zicham Depot ze stoppen
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klickt fir all Gefierer am Depot ze stoppen
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klickt fir all Schëffer am Depot ze stoppen
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klickt fir all Fliger am Hangar ze stoppen
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klickt fir all Zich am Depot ze starten
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klick fir all Gefierer am Depot ze starten
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klickt fir all Schëff am Depot ze starten
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klickt fir all Fliger am Hangar ze starten
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klickt fir all Zich am Depot ze starten
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klick fir all Gefierer am Depot ze starten
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klickt fir all Schëff am Depot ze starten
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klickt fir all Fliger am Hangar ze starten
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klickt fir all Gefierer an der Lëscht ze stoppen
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klickt fir all Gefirer an der Lëscht ze starten
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klickt fir all Gefierer an der Lëscht ze stoppen
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klickt fir all Gefirer an der Lëscht ze starten
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Schëlderlëscht - {COMMA} Schëld{P "" er}
@@ -3243,14 +3243,14 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Schëlde
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Schinnengefierter
-STR_ELRAIL_VEHICLES                                             :Elektresch Schinnen Gefierer
-STR_MONORAIL_VEHICLES                                           :Monorail Gefierer
-STR_MAGLEV_VEHICLES                                             :Magnéitbunn Gefierer
+STR_REPLACE_RAIL_VEHICLES                                       :Schinnengefierter
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektresch Schinnen Gefierer
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorail Gefierer
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magnéitbunn Gefierer
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Käschten: {GOLD}{CURRENCY}{BLACK} Gewiicht: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Geschw.: {GOLD}{VELOCITY}{BLACK} Kraaft: {GOLD}{POWER}
@@ -3277,70 +3277,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generéiren
-STR_RANDOM                                                      :{BLACK}Duerchenen würfeln
-STR_RANDOM_HELP                                                 :{BLACK}Zoufallszuel änneren fir den Terrain-Generator
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Welt Generatioun
-STR_RANDOM_SEED                                                 :{BLACK}Zoufalls-Zuel:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klick fir eng Zoufalls-Zuel anzegin
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Gidd eng zoufälleg Zuel an
-STR_LAND_GENERATOR                                              :{BLACK}Landgenerator:
-STR_TREE_PLACER                                                 :{BLACK}Baam Algorithmus:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Héichtekaart rotatioun:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrain Typ:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Mieresspigel:
-STR_SMOOTHNESS                                                  :{BLACK}Mëllt:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Weis d'Schnéilinnhéicht
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Unz. Dierfer:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Unz. Industrien:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Beweg Schnéilinnhéicht rop
-STR_SNOW_LINE_DOWN                                              :{BLACK}Beweg Schnéilinnhéicht rof
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ännert d'Schnéilinnhéicht
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Änner d'Startjoer
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Scaléirungswarnung
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Quellenkaart zevill an der Gréisst änneren ass net ugeroden. Weiderman ?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Héichtekaart Numm:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Gréisst: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generéiren
+STR_MAPGEN_RANDOM                                               :{BLACK}Duerchenen würfeln
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Zoufallszuel änneren fir den Terrain-Generator
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Welt Generatioun
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Zoufalls-Zuel:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klick fir eng Zoufalls-Zuel anzegin
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Gidd eng zoufälleg Zuel an
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landgenerator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Baam Algorithmus:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Héichtekaart rotatioun:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrain Typ:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Mieresspigel:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Mëllt:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Weis d'Schnéilinnhéicht
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Unz. Dierfer:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Unz. Industrien:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Beweg Schnéilinnhéicht rop
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Beweg Schnéilinnhéicht rof
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ännert d'Schnéilinnhéicht
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Änner d'Startjoer
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Scaléirungswarnung
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Quellenkaart zevill an der Gréisst änneren ass net ugeroden. Weiderman ?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Héichtekaart Numm:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Gréisst: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Weltgeneratioun...
 STR_GENERATION_ABORT                                            :{BLACK}Ofbriechen
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Welt Generatioun ofbriechen
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Wëllt dir wierklech d'Generatioun ofbriechen?
-STR_PROGRESS                                                    :{WHITE}{NUM}% komplett
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Welt Generatioun
-STR_TREE_GENERATION                                             :{BLACK}Baam Generatioun
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Unbewegbar Generatioun
-STR_CLEARING_TILES                                              :{BLACK}Generatioun vun knubblegen an stengegen Areal
-STR_SETTINGUP_GAME                                              :{BLACK}Spill gëtt opgestallt
-STR_PREPARING_TILELOOP                                          :{BLACK}Running tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Preparéiren Spill
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE} Des Aktioun setzt d'Schwieregkeet op "eegen"
-STR_SE_FLAT_WORLD                                               :{WHITE}Flaachland
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generéier en flaacht Land
-STR_SE_RANDOM_LAND                                              :{WHITE}Zoufallsland
-STR_SE_NEW_WORLD                                                :{BLACK}Neien Szenario man
-STR_SE_CAPTION                                                  :{WHITE}Szenarientyp
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Héicht vum flaachen land 1 rofsetzen
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Héicht vum flaachen land 1 ropsetzen
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Héicht vum flaachen Land änneren
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Héicht vum flaachen Land:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% komplett
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Welt Generatioun
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Baam Generatioun
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Unbewegbar Generatioun
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generatioun vun knubblegen an stengegen Areal
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Spill gëtt opgestallt
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Running tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparéiren Spill
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE} Des Aktioun setzt d'Schwieregkeet op "eegen"
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Flaachland
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generéier en flaacht Land
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Zoufallsland
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Neien Szenario man
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Szenarientyp
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Héicht vum flaachen land 1 rofsetzen
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Héicht vum flaachen land 1 ropsetzen
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Héicht vum flaachen Land änneren
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Héicht vum flaachen Land:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Zentréiert d'kleng Kaart op déi aktuell Positioun
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kartenenner:
-STR_NORTHWEST                                                   :{BLACK}Nordwest
-STR_NORTHEAST                                                   :{BLACK}Nordost
-STR_SOUTHEAST                                                   :{BLACK}Südost
-STR_SOUTHWEST                                                   :{BLACK}Südwest
-STR_BORDER_FREEFORM                                             :{BLACK}Fräiform
-STR_BORDER_WATER                                                :{BLACK}Waasser
-STR_BORDER_RANDOM                                               :{BLACK}Zoufälleg
-STR_BORDER_RANDOMIZE                                            :{BLACK}Zoufall
-STR_BORDER_MANUAL                                               :{BLACK}Handbuch
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kartenenner:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordwest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordost
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Südost
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Südwest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Fräiform
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Waasser
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Zoufälleg
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Zoufall
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Handbuch
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Kleng
@@ -3365,21 +3365,21 @@ STR_MEASURE_AREA                                                :{BLACK}Areal: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Längt: {NUM}{}Héichtenënnerscheed: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Areal: {NUM} x {NUM}{}Héichtenënnerscheed: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer Suen: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...d'Strooss ass am Besëtz vun der Stad
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...Strooss geet an dei falsch Richtung
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Transparenzoptiounen
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Wiesselt d'Transparenz fir d'Statiounsschëlder. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Wiesselt d'Transparenz fir d'Beem. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Wiesselt d'Transparenz fir d'Haiser. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Wiesselt d'Transparenz fir d'Industrien. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Wiesselt d'Transparenz fir d'Firmengebaier. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Wiesselt d'Transparenz fir d'Brécken. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Wiesselt d'Transparenz fir d'Gebaier wei d'Liichttiirm oder Transmitter. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Wiesselt d'Transparenz fir d'Iwerleitung. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Wiesselt d'Transparenz fir d'Luedungsindikatoren. Ctrl+Klick fir festzesetzen.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Setzt d'Objeten op onsichtbar amplaz transparent
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer Suen: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...d'Strooss ass am Besëtz vun der Stad
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...Strooss geet an dei falsch Richtung
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparenzoptiounen
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Wiesselt d'Transparenz fir d'Statiounsschëlder. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Wiesselt d'Transparenz fir d'Beem. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Wiesselt d'Transparenz fir d'Haiser. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Wiesselt d'Transparenz fir d'Industrien. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Wiesselt d'Transparenz fir d'Firmengebaier. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Wiesselt d'Transparenz fir d'Brécken. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Wiesselt d'Transparenz fir d'Gebaier wei d'Liichttiirm oder Transmitter. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Wiesselt d'Transparenz fir d'Iwerleitung. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Wiesselt d'Transparenz fir d'Luedungsindikatoren. Ctrl+Klick fir festzesetzen.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Setzt d'Objeten op onsichtbar amplaz transparent
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3389,7 +3389,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :All Zich
 STR_GROUP_ALL_ROAD_VEHICLES                                     :All Stroossengefierer
 STR_GROUP_ALL_SHIPS                                             :All Schëffer
@@ -3398,24 +3398,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ongruppéiert Z
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ongruppéiert Stroossengefierer
 STR_GROUP_DEFAULT_SHIPS                                         :Ongruppéiert Schëffer
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ongruppéiert Fligeren
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Gedeelten Gefierer bäisetzen
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :All Gefierer wechhuelen
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Eng Grupp ëmbenennen
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kann d'Grupp net erstellen...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kann d'Grupp net läschen...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kann d'Grupp net ëmbenennen...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kann net all d'Gefierer aus der Grupp läschen...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kann d'Gefiert net bei d'Grupp bäisetzen...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kann dei gedeelten Gefierer net bei d'Grupp bäisetzen...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kann d'Grupp net erstellen...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kann d'Grupp net läschen...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kann d'Grupp net ëmbenennen...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kann net all d'Gefierer aus der Grupp läschen...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kann d'Gefiert net bei d'Grupp bäisetzen...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kann dei gedeelten Gefierer net bei d'Grupp bäisetzen...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Gruppen - klickt op eng Grupp fir d'Gefierer aus där Grupp ze gesinn
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klickt fir eng Grupp ze maachen
-STR_GROUP_DELETE_TIP                                            :{BLACK}Déi ungewielten Grupp läschen
-STR_GROUP_RENAME_TIP                                            :{BLACK}Déi ungewielten Grupp ëmbenennen
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klickt fir déi Grupp vum globalen "Autoersetzen" auszeschléissen
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruppen - klickt op eng Grupp fir d'Gefierer aus där Grupp ze gesinn
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klickt fir eng Grupp ze maachen
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Déi ungewielten Grupp läschen
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Déi ungewielten Grupp ëmbenennen
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klickt fir déi Grupp vum globalen "Autoersetzen" auszeschléissen
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3476,35 +3476,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Numm muss eenzegartëg sinn
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Numm muss eenzegartëg sinn
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Géi bei d'nächst Schëld
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Géi bei d'Schëld firdrun
-STR_SIGN_OSKTITLE                                               :{BLACK}Gidd en Numm fir d'Schëld an
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Géi bei d'nächst Schëld
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Géi bei d'Schëld firdrun
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Gidd en Numm fir d'Schëld an
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Grënnen
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Biergbau
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bauen
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Wielt déi gewënschten Industrie op der Lëscht aus
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Grënnen
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Biergbau
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bauen
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Wielt déi gewënschten Industrie op der Lëscht aus
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Erweidert
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Erweidert Gesiichtsauswiel.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Erweidert Gesiichtsauswiel.
 STR_FACE_SIMPLE                                                 :{BLACK}Einfach
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Einfach Gesiichtsauswiel
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Einfach Gesiichtsauswiel
 STR_FACE_LOAD                                                   :{BLACK}Lueden
-STR_FACE_LOAD_TIP                                               :{BLACK}Favoriséiert Gesiicht lueden
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Favoriséiert Gesiicht lueden
 STR_FACE_LOAD_DONE                                              :{WHITE}Äert favoriséiert Gesiicht ass aus der OpenTTD configuratiouns Datei gelueden ginn.
 STR_FACE_FACECODE                                               :{BLACK}Gesiicht no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Kuckt an wielt d'Gesiichtsnummer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Kuckt an wielt d'Gesiichtsnummer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Kuckt an wielt d'Gesiichtsnummer
 STR_FACE_FACECODE_SET                                           :{WHITE}Néi Gesiichtsnummer ass angestallt ginn.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Konnt d'Gesiichtsnummer net setzen - muss en numereschen Wert zwëschent 0 an 4,294,967,295 sinn!
 STR_FACE_SAVE                                                   :{BLACK}Späicheren
-STR_FACE_SAVE_TIP                                               :{BLACK}Späichert favoriséiert Gesiicht
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Späichert favoriséiert Gesiicht
 STR_FACE_SAVE_DONE                                              :{WHITE}Dëst Gesiicht gët als Favoriséiert an der OpenTTD Configuratiounsdatei gespäichert.
 STR_FACE_EUROPEAN                                               :{BLACK}Europäesch
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Wielt europäesch Gesiichter
@@ -3512,51 +3512,51 @@ STR_FACE_AFRICAN                                                :{BLACK}AfrikanÃ
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Wielt afrikanësch Gesiichter
 STR_FACE_YES                                                    :Jo
 STR_FACE_NO                                                     :Nee
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Schalt Schnautz oder Ouerréng an
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Schalt Schnautz oder Ouerréng an
 STR_FACE_HAIR                                                   :Hoër:
-STR_FACE_HAIR_TIP                                               :{BLACK}Hoër änneren
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Hoër änneren
 STR_FACE_EYEBROWS                                               :Aaenbraaen:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Aaenbraaen Ouerréng
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Aaenbraaen Ouerréng
 STR_FACE_EYECOLOUR                                              :Aaenfaarw:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Aaenfaarw Ouerréng
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Aaenfaarw Ouerréng
 STR_FACE_GLASSES                                                :Brëll:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Brëll anschalten
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Brëll änneren
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Brëll anschalten
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Brëll änneren
 STR_FACE_NOSE                                                   :Nues:
-STR_FACE_NOSE_TIP                                               :{BLACK}Nues änneren
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Nues änneren
 STR_FACE_LIPS                                                   :Lëpsen:
 STR_FACE_MOUSTACHE                                              :Schnautz:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Lëpsen oder Schnautz änneren
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Lëpsen oder Schnautz änneren
 STR_FACE_CHIN                                                   :Kënn:
-STR_FACE_CHIN_TIP                                               :{BLACK}Kënn änneren
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Kënn änneren
 STR_FACE_JACKET                                                 :Mantel:
-STR_FACE_JACKET_TIP                                             :{BLACK}Mantel änneren
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Mantel änneren
 STR_FACE_COLLAR                                                 :Halsband:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Halsband änneren
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Halsband änneren
 STR_FACE_TIE                                                    :Krawatt:
 STR_FACE_EARRING                                                :Ouerréng:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Krawatt oder Ouerréng änneren
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Krawatt oder Ouerréng änneren
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signalauswiel
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kann d'Signal hei net convertéieren...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Block Signal (semaphore){} Dëst ass em Basis-Signal, wat engem Zuch zur selwechter Zait erlabt an engem Block ze sin.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Agangs-Signal (semaphore){}Gréng soulaang een oder méi gréng Ausgangs-Signaler op nächsten Streckenabschnitt sin. Anescht ass et roud.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Ausgangs-Signal (semaphore){}Verhält sech wéi en Block-Signal mee get gebraucht fir déi korrekt Faarw ob Agangs- an Combo-Pre-Signaler ze setzen.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combo-Signal (semaphore){}En Combo-Signal agéiert wéi en Agangs- an wéi en Ausgangs-Signal. Dëst erlaabt engem vill "Beem" vun Pre-Signaler
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Wee-Signal (semaphore){}E Wee-Signal erlabt méi wéi engem Zuch an en Block ze fueren zur selweschter Zäit,  wann den Zuch en Wee op en sécheren Stop-Punkt kann reservéiren. Standard Wee-Signaler kenne vun béiden Säiten duerchfuer gin.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Einbahn-Wee-Signal (semaphore){}E Wee-Signal erlabt méi wéi engem Zuch an en Block ze fueren zur selweschter Zäit,  wann den Zuch en Wee op en sécheren Stop-Punkt kann reservéiren. Einbahn-Wee-Signaler kennen net den falschen Wee duerchfuer gin.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Block Signal (electric){}Dëst ass en Basis-Signal, mat dem een een Zuch an engem selwechten Block zur selwechter Zäit erlaabt
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Agangs-Signal (electric){}Gréng soulaang een oder méi gréng Ausgangssignaler vum nächsten Streckenabschnitt kommen. Anescht ass et roud.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Ausgangs-Signal (electric){}Verhält sech wéi en Block-Signal mee get gebraucht fir déi korrekt Faarw vun den Agangs- an Combo Pre-Signaler ze setzen.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combo-Signal (electric){}D'Combo-Signal ass einfach en An- an Ausgangssignal. Dëst erlaabt grouss "Beem" Presignaler ze bauen.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Wee-Signal (electric){}E Wee-Signal erlabt méi wéi engem Zuch an en Block eranzefueren, wann den Zuch en Wee op en Stop-Punkt reservéiren kann. Standard Wee-Signaler kennen vun béiden Säiten duerchfuer gin.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Einbahn-Wee-Signal (electric){}En Einbahn-Signal erlaabt méi wéi een Zuch zur selwechter Zäit an engem Block ze sin, wann den Zuch en Wee op en sécheren Stop-Punkt reservéiren kann. Einbahn-Signaler kennen net vun der falscher Säit duerchfuer gin.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signal konvertéiren{}Wann selectéiert, gëtt en geklickten Signal an dat gewielten Signal konvertéiert, Ctrl+Klick wiesselt tëscht den Varianten
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Signaldensitéit
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Setzt Signaldensitéit rof
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Setzt Signaldensitéit rop
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalauswiel
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kann d'Signal hei net convertéieren...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Block Signal (semaphore){} Dëst ass em Basis-Signal, wat engem Zuch zur selwechter Zait erlabt an engem Block ze sin.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Agangs-Signal (semaphore){}Gréng soulaang een oder méi gréng Ausgangs-Signaler op nächsten Streckenabschnitt sin. Anescht ass et roud.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Ausgangs-Signal (semaphore){}Verhält sech wéi en Block-Signal mee get gebraucht fir déi korrekt Faarw ob Agangs- an Combo-Pre-Signaler ze setzen.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combo-Signal (semaphore){}En Combo-Signal agéiert wéi en Agangs- an wéi en Ausgangs-Signal. Dëst erlaabt engem vill "Beem" vun Pre-Signaler
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Wee-Signal (semaphore){}E Wee-Signal erlabt méi wéi engem Zuch an en Block ze fueren zur selweschter Zäit,  wann den Zuch en Wee op en sécheren Stop-Punkt kann reservéiren. Standard Wee-Signaler kenne vun béiden Säiten duerchfuer gin.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Einbahn-Wee-Signal (semaphore){}E Wee-Signal erlabt méi wéi engem Zuch an en Block ze fueren zur selweschter Zäit,  wann den Zuch en Wee op en sécheren Stop-Punkt kann reservéiren. Einbahn-Wee-Signaler kennen net den falschen Wee duerchfuer gin.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Block Signal (electric){}Dëst ass en Basis-Signal, mat dem een een Zuch an engem selwechten Block zur selwechter Zäit erlaabt
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Agangs-Signal (electric){}Gréng soulaang een oder méi gréng Ausgangssignaler vum nächsten Streckenabschnitt kommen. Anescht ass et roud.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Ausgangs-Signal (electric){}Verhält sech wéi en Block-Signal mee get gebraucht fir déi korrekt Faarw vun den Agangs- an Combo Pre-Signaler ze setzen.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combo-Signal (electric){}D'Combo-Signal ass einfach en An- an Ausgangssignal. Dëst erlaabt grouss "Beem" Presignaler ze bauen.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Wee-Signal (electric){}E Wee-Signal erlabt méi wéi engem Zuch an en Block eranzefueren, wann den Zuch en Wee op en Stop-Punkt reservéiren kann. Standard Wee-Signaler kennen vun béiden Säiten duerchfuer gin.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Einbahn-Wee-Signal (electric){}En Einbahn-Signal erlaabt méi wéi een Zuch zur selwechter Zäit an engem Block ze sin, wann den Zuch en Wee op en sécheren Stop-Punkt reservéiren kann. Einbahn-Signaler kennen net vun der falscher Säit duerchfuer gin.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signal konvertéiren{}Wann selectéiert, gëtt en geklickten Signal an dat gewielten Signal konvertéiert, Ctrl+Klick wiesselt tëscht den Varianten
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Signaldensitéit
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Setzt Signaldensitéit rof
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Setzt Signaldensitéit rop
 ########
 
 ############ on screen keyboard
@@ -3568,36 +3568,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}KI Astellungen
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}KI Astellungen uweisen
 STR_AI_DEBUG                                                    :{WHITE}KI Debug
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Numm vun der KI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Numm vun der KI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}KI nei lueden
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}KI stoppen, Skript nei lueden, KI nei starten
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}KI Debugfënster ass nëmmen fir Serveren verfügbar
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}KI stoppen, Skript nei lueden, KI nei starten
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}KI Debugfënster ass nëmmen fir Serveren verfügbar
 STR_AI_CONFIG_CAPTION                                           :{WHITE}KI Konfiguratioun
-STR_AI_CHANGE                                                   :{BLACK}Selectionéiert KI
-STR_AI_CONFIGURE                                                :{BLACK}Konfiguréieren
-STR_AI_CHANGE_TIP                                               :{BLACK}Lued eng aner KI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}All Parameter vun der KI konfiguréieren
-STR_AI_LIST_TIP                                                 :{BLACK}All KI'en dei am nächsten Spill gelueden ginn
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Selectionéiert KI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfiguréieren
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Lued eng aner KI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}All Parameter vun der KI konfiguréieren
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}All KI'en dei am nächsten Spill gelueden ginn
 STR_AI_LIST_CAPTION                                             :{WHITE}Verfügbar KI'en
-STR_AI_AILIST_TIP                                               :{BLACK}Klickt fir eng KI ze selectéieren
-STR_AI_ACCEPT                                                   :{BLACK}Acceptéiert
-STR_AI_ACCEPT_TIP                                               :{BLACK}Selectéiert ungewielte KI
-STR_AI_CANCEL                                                   :{BLACK}Ofbriechen
-STR_AI_CANCEL_TIP                                               :{BLACK}KI net wiesselen
-STR_AI_CLOSE                                                    :{BLACK}Zoumaachen
-STR_AI_RESET                                                    :{BLACK}Reset
-STR_AI_HUMAN_PLAYER                                             :Mënschlechen Spiller
-STR_AI_RANDOM_AI                                                :Zoufälleg KI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klickt fir eng KI ze selectéieren
+STR_AI_LIST_ACCEPT                                              :{BLACK}Acceptéiert
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selectéiert ungewielte KI
+STR_AI_LIST_CANCEL                                              :{BLACK}Ofbriechen
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}KI net wiesselen
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zoumaachen
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Mënschlechen Spiller
+STR_AI_CONFIG_RANDOM_AI                                         :Zoufälleg KI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}KI Astellungen
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versioun: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Eng KI ass ofgestierzt. W.e.g mellt des dem KI Autor mat engem Screenshot vun der KI Debugfënster
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versioun: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Eng KI ass ofgestierzt. W.e.g mellt des dem KI Autor mat engem Screenshot vun der KI Debugfënster
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Kaméidislimit an der Stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Kaméidi: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Kaméidislimit an der Stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Kaméidi: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3611,21 +3611,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Szenario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Héischtenkaart
 STR_CONTENT_TITLE                                               :{WHITE}Downloaden Inhalt
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Typ
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Typ vum Inhalt
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Typ vum Inhalt
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Numm
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Numm vum Inhalt
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klick op eng Linn fir Detailer{}Klick Checkbox fir et downzeloaden
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Numm vum Inhalt
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klick op eng Linn fir Detailer{}Klick Checkbox fir et downzeloaden
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Wiel alles
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Wiell all Inhalt fir den Download
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Wiell all Inhalt fir den Download
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Wiel Upgrades
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Markéier all Inhalt,den en Upgrade fir existéirenden Inhalt ass, als Download
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Markéier all Inhalt,den en Upgrade fir existéirenden Inhalt ass, als Download
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Alles ofwielen
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Alles markéiren fir net downzeloaden
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Alles markéiren fir net downzeloaden
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Filter string
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Wuert fir d'Lëscht ze filtern
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Wuert fir d'Lëscht ze filtern
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag-/Nummfilter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Download
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Start den Download vum ausgewielten Inhalt
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Start den Download vum ausgewielten Inhalt
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total Downloadgréisst: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Du hues dëst net fir den Download gewielt
@@ -3658,6 +3658,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Konnt de
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Check Online Inhalt
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check op neien Inhalt kann downgeload gin
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Fann Inhalt den feelt online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Check op den Inahlt den feelt online kann fonnt gin
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Fann Inhalt den feelt online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Check op den Inahlt den feelt online kann fonnt gin
 ########
diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt
index 8360dafc7..1d0a7fc7d 100644
--- a/src/lang/norwegian_bokmal.txt
+++ b/src/lang/norwegian_bokmal.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kart - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spillinnstillinger
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Melding
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Melding fra {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Advarsel!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Kan ikke gjøre dette...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kan ikke rydde dette området...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Opprinnelig opphavsbeskyttet {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheter reservert
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-teamet
 
 STR_QUIT_CAPTION                                                :{WHITE}Avslutt
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nei
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Er du sikker på at du vil avslutte og gå tilbake til {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nei
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Er du sikker på at du vil avslutte og gå tilbake til {STRING}?
 
 STR_JUST_NOTHING                                                :Ingenting
 STR_COLOUR_DARK_BLUE                                            :Mørkeblå
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Ørken
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Snø
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Melding
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Forhåndsstilt
-STR_QUERY_CANCEL                                                :{BLACK}Avbryt
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Gi nytt navn
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Forhåndsstilt
+STR_BUTTON_CANCEL                                               :{BLACK}Avbryt
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Gi nytt navn
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Last
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informasjon
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapasitet
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Total last
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total kapasitet på dette toget:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Total kapasitet på dette toget:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nytt spill
 STR_INTRO_LOAD_GAME                                             :{BLACK}Last inn spill
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Flerspiller
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scenario Editor
 
-STR_MAPSIZE                                                     :{BLACK}Kartstørrelse:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kartstørrelse:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spillinnstillinger
 
 STR_COMPANY_SOMEONE                                             :noen{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Avslutt gjelden
 STR_FILE_MENU_EXIT                                              :Avslutt OpenTTD
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Er du sikker på du vil avslutte dette spillet ?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Avslutt spill
-STR_SORT_ORDER_TIP                                              :{BLACK}Velg sorteringsrekkefølge (synkende/stigende)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Velg sorteringskriterier
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Velg filtreringskriterier
-STR_SORT_BY                                                     :{BLACK}Sorter etter
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Velg sorteringsrekkefølge (synkende/stigende)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Velg sorteringskriterier
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Velg filtreringskriterier
+STR_BUTTON_SORT_BY                                              :{BLACK}Sorter etter
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Folketall
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :Driftskostnad
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraft/Driftskostnad
 STR_SORT_BY_CARGO_CAPACITY                                      :Lastkapasitet
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Ingen last venter
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Velg alle anlegg
-STR_SELECT_ALL_TYPES                                            :{BLACK}Velg alle lasttyper (inkludert last som ikke venter)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se en liste over tilgjengelige maskindesigner for dette kjøretøyet.
-STR_MANAGE_LIST                                                 :{BLACK}Behandl liste
-STR_MANAGE_LIST_TIP                                             :{BLACK}Send instruksjoner til alle kjøretøyer i denne listen
-STR_REPLACE_VEHICLES                                            :Bytt ut kjøretøy
-STR_SEND_FOR_SERVICING                                          :Send til vedlikehold
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgjengelige tog
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgjengelige kjøretøy
-STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgjengelige skip
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgjengelige luftfartøy
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Send til depoet
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til depoet
-STR_SEND_SHIP_TO_DEPOT                                          :Send til depoet
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Ingen last venter
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Velg alle anlegg
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Velg alle lasttyper (inkludert last som ikke venter)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Se en liste over tilgjengelige maskindesigner for dette kjøretøyet.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Behandl liste
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instruksjoner til alle kjøretøyer i denne listen
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Bytt ut kjøretøy
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send til vedlikehold
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Tilgjengelige tog
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Tilgjengelige kjøretøy
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Tilgjengelige skip
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Tilgjengelige luftfartøy
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Send til depoet
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Send til depoet
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Send til depoet
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Send til hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Innstill
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan ikke endre serviceintervall...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Lukk vindu
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Vindustittel - dra her for å flytte vindu
-STR_STICKY_BUTTON                                               :{BLACK}Beskytt dette vinduet mot 'Lukk alle vinduer'-knappen
-STR_RESIZE_BUTTON                                               :{BLACK}Klikk og dra for å endre størrelsen på vinduet
+STR_TOOLTIP_STICKY                                              :{BLACK}Beskytt dette vinduet mot 'Lukk alle vinduer'-knappen
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klikk og dra for å endre størrelsen på vinduet
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klikk her for å komme til standardmappen for lagring og lasting
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Riv bygninger o.l.
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Senk et hjørne av et landstykke
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Hev et hjørne av et landstykke
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Senk et hjørne av et landstykke
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Hev et hjørne av et landstykke
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scroll bar - scroller listen opp/ned
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullefelt - ruller listen til venstre/høyre
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Vis landkonturer på kartet
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Skru av/
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Fortjeneste i år: {CURRENCY} (sist år: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} år{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} år{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} år{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} år{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Tog
-STR_VEHICLE_ROAD_VEHICLE                                        :Kjøretøy
-STR_VEHICLE_SHIP                                                :Skip
-STR_VEHICLE_AIRCRAFT                                            :Fly
+STR_REPLACE_VEHICLE_TRAIN                                       :Tog
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Kjøretøy
+STR_REPLACE_VEHICLE_SHIP                                        :Skip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fly
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} begynner å bli gammel
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} begynner å bli veldig gammel
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} begynner å bli veldig gammel, og bør byttes ut snarest
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informasjon om felt
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Fjerningskostnad: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Fjerningskostnad: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Utbytte når fjernet: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Utbytte når fjernet: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eier: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Vei eier: {LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Jernbane
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokal myndighet: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Navn
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klikk pÃ
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klikk på et musikkspor for å fjerne det fra nåværende program (Gjelder bare egendefinert 1 og 2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Skru tilfeldig program av/på
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Vis musikkspormeny
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Trykk for å sentere bildet rundt industri/by
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Trykk for å sentere bildet rundt industri/by
 STR_INTRO_DIFFICULTY                                            :{BLACK}Vanskelighetsgrad ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Siste melding/nyhet
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Mink stÃ
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generer tilfeldig landskap
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Tilbakestill landskap
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Tilbakestill landskap
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Fjern all eiendom som er eid av spilleren(e) fra kartet
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Fjern all eiendom som er eid av spilleren(e) fra kartet
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Er du sikker på at du vil fjerne all eiendommen som er eid av spilleren(e)?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landskapsgenerering
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Bygenerering
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...for n
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...for nært en annen by
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...feltet er uegnet
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...for mange byer
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan ikke bygge byer
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...der er ikke mer plass på kartet
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan ikke bygge byer
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...der er ikke mer plass på kartet
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Øk bystørrelse
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Utvid
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Byen kommer ikke til å bygge veier. Du kan slå på bygging av veier via Avanserte innstillinger->Økonomi->Byer.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Byen kommer ikke til å bygge veier. Du kan slå på bygging av veier via Avanserte innstillinger->Økonomi->Byer.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Lag tilfeldig by
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Grunnlegg by et tilfeldig sted
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan ikke bygge {STRING} her...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Plasser
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Plasser fyrtårn
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Plasser radiosender
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definer ørkenområde.{}Trykk og hold inne CTRL for å fjerne den
-STR_CREATE_LAKE                                                 :{BLACK}Definer vannområde.{}Lag en kanal, unntatt hvis CTRL holdes nede på havnivå, hvorpå området rundt vil fylles istedenfor
-STR_CREATE_RIVER                                                :{BLACK}Plasser elver.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definer vannområde.{}Lag en kanal, unntatt hvis CTRL holdes nede på havnivå, hvorpå området rundt vil fylles istedenfor
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Plasser elver.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Slett
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Slett denne byen fullstendig
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Lagre scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Last inn scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Last høydekart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Last høydekart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Avslutt redigeringsprogram
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Avslutt
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Lagre sc
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Spill scenario
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spill høydekart
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Start et nytt spill, bruk et høydekart som landskap
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Er du sikker på du vil forlate dette scenariet?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Er du sikker på du vil forlate dette scenariet?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kan kun bygges i byer med mer enn 1200 innbyggere
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Flytt startdatoen tilbake ett år
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Flytt startdatoen frem ett år
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...broen
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Liten
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Middels
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Stor
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Tilfeldig
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Tilfeldig
 STR_FOUND_TOWN_CITY                                             :{BLACK}By
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Store byer vokser raskere enn vanlige byer{}Avhengig av valgte innstillinger er de større når de blir grunnlagt
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Velg bystørrelse
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Bystørrelse:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Byers veiløsning
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Velg veiløsning for denne byen
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bedre veier
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 rutenett
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 rutenett
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Tilfeldig
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Byers veiløsning
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Velg veiløsning for denne byen
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bedre veier
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 rutenett
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 rutenett
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Tilfeldig
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Vis siste melding eller nyhetsrapport
 STR_NEWS_MESSAGES_OFF                                           :Av
 STR_NEWS_MESSAGES_SUMMARY                                       :Sammendrag
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Skjermdumpen ble lagret som '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Skjermdump mislyktes!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kjøp land for fremtidig bruk
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kjøp land for fremtidig bruk
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOLAGRING
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  LAGRER SPILL  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Lagring pågår enda,{}vennligst vent til det er ferdig!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Lagring pågår enda,{}vennligst vent til det er ferdig!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Velg 'Ezy style music'-program
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Velg spr
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullskjerm
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Trykk på denne knappen for å spille OpenTTD i fullskjermmodus
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fullskjerm modus mislykkes
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fullskjerm modus mislykkes
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjermoppløsning
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Velg skjermoppløsningen som skal brukes
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Velg gra
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} manglende/korrupt fil{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Tilleggsinformasjon om grafikksettet
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autolagring feilet
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autolagring feilet
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}PÃ¥ vei til {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}PÃ¥ vei til {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Ingen ordre
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Ingen ordre, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}PÃ¥ vei til {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}PÃ¥ vei til {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Ingen ordre
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Ingen ordre, {VELOCITY}
 
 STR_PASSENGERS                                                  :passasjerer
 STR_BAGS                                                        :sekker
@@ -857,9 +857,9 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :annet
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan ikke dele ordreliste...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikke kopiere ordreliste...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slutt på delte ordre - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kan ikke dele ordreliste...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kan ikke kopiere ordreliste...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Slutt på delte ordre - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} kan ikke finne en rute å fortsette på.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} har kjørt seg vill
@@ -1128,15 +1128,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-stør
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :slått av
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Endre innstillingsverdi
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Endre innstillingsverdi
 
-STR_TEMPERATE_LANDSCAPE                                         :Temperert landskap
-STR_SUB_ARCTIC_LANDSCAPE                                        :subarktisk landskap
-STR_SUB_TROPICAL_LANDSCAPE                                      :subtropisk landskap
-STR_TOYLAND_LANDSCAPE                                           :Lekeland landskap
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Temperert landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :subarktisk landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :subtropisk landskap
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Lekeland landskap
 
 STR_CHEATS                                                      :{WHITE}Juksekoder
-STR_CHEATS_TIP                                                  :{BLACK}Avkrysningsbokser indikerer at du har brukt denne juksekoden tidligere.
+STR_CHEATS_TOOLTIP                                              :{BLACK}Avkrysningsbokser indikerer at du har brukt denne juksekoden tidligere.
 STR_CHEATS_WARNING                                              :{BLACK}Advarsel! Vær klar over at du er i ferd med å bedra dine motstandere og at straffen for slike handlinger er evig tid i skjærsilden.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Øk pengebeholdningen med {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spiller som firma: {ORANGE}{COMMA}
@@ -1148,179 +1148,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Endre k
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Endre dato: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tillat endring av produksjonsmengder: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Har kurs mot {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Har kurs mot {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Har kurs mot {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Har kurs mot {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Kjør via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Kjør non-stop via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Kjør via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Kjør non-stop via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Kontrollpunkt
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Kontrollpunkt # {COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Bøye
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Bøye #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Kontrollpunkt
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Kontrollpunkt
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Kontrollpunkt # {COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Bøye
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bøye #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrollpunkt
 
-STR_WAYPOINT                                                    :{WHITE}Kontrollpunkt
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Velg type kontrollpunkt
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrollpunkt
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Velg type kontrollpunkt
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Endre navn på kontrollpunkt...
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan ikke endre navnet til kontrollpunktet...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan ikke endre navnet til kontrollpunktet...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Gjør om jernbane til kontrollpunkt
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kan ikke bygge kontrollpunkt for tog her...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan ikke fjerne kontrollpunktet...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan ikke bygge kontrollpunkt for tog her...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan ikke fjerne kontrollpunktet...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Bygg jernbane ved hjelp av autobanemodusen
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...det er ingen byer i dette scenarioet
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kartgenerering avbrutt...{}...ingen brukbare steder å plassere byene
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...det er ingen byer i dette scenarioet
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kartgenerering avbrutt...{}...ingen brukbare steder å plassere byene
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mange tilfeldige byer
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Dekk kartet med tilfeldig plasserte byer
-STR_MANY_RANDOM_INDUSTRIES                                      :Mange tilfeldige industrier
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Dekk kartet med tilfeldig plasserte industrier
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kan ikke generere industrier...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Mange tilfeldige byer
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Dekk kartet med tilfeldig plasserte byer
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Mange tilfeldige industrier
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Dekk kartet med tilfeldig plasserte industrier
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan ikke generere industrier...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Åpne verktøylinjen for å heve/senke land, plante trær, osv.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landskapsarbeid
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Jevn ut land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Jevn ut land
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Trær av tilfeldig type
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plasser trær av tilfeldig type
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plasser trær av tilfeldig type
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kan ikke bygge kanaler her...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kan ikke bygge kanaler her...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Bygg kanaler.
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikke bygge sluser her...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kan ikke bygge sluser her...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Bygg sluser
-STR_LANDINFO_LOCK                                               :Sluse
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sluse
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kan ikke plassere elver her...
-STR_LANDINFO_RIVER                                              :Elv
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kan ikke plassere elver her...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Elv
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...bøyen er i bruk!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...bøyen er i bruk!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ikke fjerne del av stasjonen...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan ikke konvertere jernbanetype her...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan ikke fjerne del av stasjonen...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan ikke konvertere jernbanetype her...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Gjør om/oppgrader jernbanetypen
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Dra lokomotivet hit for å selge hele toget.
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Dra lokomotivet hit for å selge hele toget.
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Dra og slipp
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bygg stasjon med dra og slipp
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Velg en stasjonstypen å vise
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Velg stasjonen du vil bygge
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Velg en stasjonstypen å vise
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Velg stasjonen du vil bygge
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Spol fremover
 STR_MESSAGE_HISTORY                                             :{WHITE}Meldingshistorikk
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En liste over de siste nyhetsmeldingene
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Deaktiver alle
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Aktiver alle
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}En liste over de siste nyhetsmeldingene
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Deaktiver alle
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Aktiver alle
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportert)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industri navn - klikk på navn for å sentrere sikt over industri
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrier
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportert)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportert)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industri navn - klikk på navn for å sentrere sikt over industri
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for nært en annen industri
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...for nært en annen industri
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Flerspiller
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spillernavn:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Dette er navnet andre spillere vil identifisere deg med
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Skriv ditt navn
-STR_NETWORK_CONNECTION                                          :{BLACK}Forbindelse:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Velg mellom å spille på internett eller i lokalt nettverk (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Start tjener
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start en egen tjener
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Navn
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Navn på spillet
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Språk, tjenerversjon, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klikk på et spill i listen for å velge det
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Serveren du ble med forrige gang:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klikk for å velge serveren du spilte på forrige gang
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Finn tjenere
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Søk på nettverket etter en server
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Legg til tjener
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Legger til en tjener som vil bli sjekket for aktive spill.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv inn IP-adressen til serveren
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter på nett / maks. antall klienter{}Firmaer på nett / maks. antall firmaer
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kart størrelse
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kart størrelsen av spillet{}Klikk til å sortere ved område
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dato
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Gjeldende dato
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Ã…r
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nummer av år {}spillet er pågående
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPILLOVERSIKT
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Språk: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Brikkesett: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstørrelse: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tjenerversjon: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Tjeneradresse: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Startdato: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nettverksdato: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Passordbeskyttet!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}TJENEREN ER FRAKOBLET
-STR_NETWORK_SERVER_FULL                                         :{SILVER}TJENEREN ER FULL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}DU HAR EN ANNEN VERSJON ENN TJENEREN
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF MATCHER IKKE
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Bli med i spill
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start et nytt flerspillerspill
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spillnavn:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Spillnavnet er det som vises til andre spillere i listen over spill
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Skriv et navn for nettverks spillet
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Sett passord
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Beskytt ditt spill med et passord hvis du ikke vil at hvem som helst skal bli med på det
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Velg et kart:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Hvilket kart vil du spille på?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internett
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internett
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internett (annonser)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" er}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maksimalt antall tillatte klienter
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Velg maksimalt antall klienter. Ikke alle plassene trenger å bli tatt
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma{P "" er}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks. antall firmaer:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begrens tjeneren til et bestemt antall firmaer
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskuer{P "" e}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks antall tilskuere
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begrens tjeneren til et bestemt antall tilskuere
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Språk de snakker på tjeneren:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Andre spillere skal kunne vite hvilket språk man snakker på denne tjeneren.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Start spill
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Start et nytt nettverksspill på et tilfeldig kart, eller scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Last spill
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Fortsett et tidligere lagret flerspiller spill (pass på å koble til som den korrekte spilleren)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Flerspiller
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Skriv ditt navn
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Forbindelse:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Velg mellom å spille på internett eller i lokalt nettverk (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start tjener
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start en egen tjener
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Navn
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Navn på spillet
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Språk, tjenerversjon, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klikk på et spill i listen for å velge det
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Serveren du ble med forrige gang:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klikk for å velge serveren du spilte på forrige gang
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Finn tjenere
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Søk på nettverket etter en server
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Legg til tjener
+STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Legger til en tjener som vil bli sjekket for aktive spill.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Skriv inn IP-adressen til serveren
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klienter
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klienter på nett / maks. antall klienter{}Firmaer på nett / maks. antall firmaer
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kart størrelse
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kart størrelsen av spillet{}Klikk til å sortere ved område
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dato
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Gjeldende dato
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Ã…r
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Nummer av år {}spillet er pågående
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPILLOVERSIKT
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Språk: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Brikkesett: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kartstørrelse: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Tjenerversjon: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Tjeneradresse: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Startdato: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Nettverksdato: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Passordbeskyttet!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}TJENEREN ER FRAKOBLET
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}TJENEREN ER FULL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}DU HAR EN ANNEN VERSJON ENN TJENEREN
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF MATCHER IKKE
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Bli med i spill
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start et nytt flerspillerspill
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spillnavn:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Spillnavnet er det som vises til andre spillere i listen over spill
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Skriv et navn for nettverks spillet
+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_SELECT_MAP                             :{BLACK}Velg et kart:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Hvilket kart vil du spille på?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internett
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internett
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internett (annonser)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" er}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maksimalt antall tillatte klienter
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Velg maksimalt antall klienter. Ikke alle plassene trenger å bli tatt
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma{P "" er}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maks. antall firmaer:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Begrens tjeneren til et bestemt antall firmaer
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskuer{P "" e}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maks antall tilskuere
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Begrens tjeneren til et bestemt antall tilskuere
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Språk de snakker på tjeneren:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Andre spillere skal kunne vite hvilket språk man snakker på denne tjeneren.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start spill
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Start et nytt nettverksspill på et tilfeldig kart, eller scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Last spill
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Fortsett et tidligere lagret flerspiller spill (pass på å koble til som den korrekte spilleren)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Hvilket som helst
@@ -1361,33 +1361,33 @@ STR_NETWORK_LANG_GREEK                                          :Gresk
 STR_NETWORK_LANG_LATVIAN                                        :Latvisk
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Flerspiller lobby
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Flerspiller lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Prøver å koble til: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En liste over firma i spillet. Du kan enten bli med i et eller starte et nytt.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nytt firma
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Start et nytt firma
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Se på spill
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Vær tilskuer til spillet
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Bli med i firmaet
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Hjelp til med å styre dette firmaet
-STR_NETWORK_REFRESH                                             :{BLACK}Oppdater tjener
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Oppdater tjenerinfo
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Prøver å koble til: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}En liste over firma i spillet. Du kan enten bli med i et eller starte et nytt.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nytt firma
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Start et nytt firma
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Se på spill
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Vær tilskuer til spillet
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Bli med i firmaet
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hjelp til med å styre dette firmaet
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Oppdater tjener
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Oppdater tjenerinfo
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}FIRMAOVERSIKT
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}FIRMAOVERSIKT
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Firmanavn: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Innviet: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Firmaverdi: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanse nå: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inntekt i fjor: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Nettverksytelse: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Firmanavn: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Innviet: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Firmaverdi: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balanse nå: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Inntekt i fjor: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Nettverksytelse: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Kjøretøy: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasjoner: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spillere: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Kjøretøy: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stasjoner: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spillere: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Kobler til...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Kobler til...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Kobler til..
@@ -1403,49 +1403,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Henter f
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} foran oss
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} lastet ned
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Koble fra
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Koble fra
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv inn hvor mye penger du øsnker å gi
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tjeneren er beskyttet. Skriv inn passord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskyttet. Skriv inn passord
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste over klienter
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste over klienter
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Vær tilskuer
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt firma
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Ingen nettverksadaptere funnet eller kompilert uten ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kunne ikke finne noen nettverksspill
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Tjeneren svarte ikke på forespørselen
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kunne ikke koble til på grunn av ulike versjoner på en NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Synkronisering av nettverksspill feilet.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Mistet tilkobling til nettverksspill
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunne ikke laste lagret spill
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kunne ikke starte tjeneren
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kunne ikke opprette forbindelse
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Tilkobling #{NUM} ble tidsavbrutt
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Forbindelsen ble brutt på grunn av en protokollfeil
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Klientversjonen er ikke den samme som tjenerversjonen
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Feil passord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Tjeneren er full
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Du er bannlyst fra denne tjeneren
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Du ble kastet ut av spillet
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Juksing er ikke tillatt på denne tjeneren
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Ingen nettverksadaptere funnet eller kompilert uten ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Kunne ikke finne noen nettverksspill
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Tjeneren svarte ikke på forespørselen
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Kunne ikke koble til på grunn av ulike versjoner på en NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Synkronisering av nettverksspill feilet.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Mistet tilkobling til nettverksspill
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Kunne ikke laste lagret spill
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Kunne ikke starte tjeneren
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Kunne ikke opprette forbindelse
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Tilkobling #{NUM} ble tidsavbrutt
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Forbindelsen ble brutt på grunn av en protokollfeil
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Klientversjonen er ikke den samme som tjenerversjonen
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Feil passord
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Tjeneren er full
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Du er bannlyst fra denne tjeneren
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Du ble kastet ut av spillet
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Juksing er ikke tillatt på denne tjeneren
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :generell feil
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniseringsfeil
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kunne ikke åpne kartet
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :forbindelsen ble brutt
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollfeil
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF stemmer ikke
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikke autorisert
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottok merkelig pakke
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :feil versjon
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :navnet er allerede i bruk
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :feil firma-id i DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :kastet ut av tjeneren
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :prøvde å jukse
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serveren er full
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :generell feil
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :synkroniseringsfeil
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :kunne ikke åpne kartet
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :forbindelsen ble brutt
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokollfeil
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF stemmer ikke
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ikke autorisert
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :mottok merkelig pakke
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :feil versjon
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :navnet er allerede i bruk
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :feil passord
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :feil firma-id i DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :kastet ut av tjeneren
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :prøvde å jukse
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serveren er full
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1455,15 +1455,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spill satt på
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spill gjennopptatt (klient koblet til)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spill gjenopptatt (klient kunne ikke koble seg til)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :forlater
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} har blitt med i spillet
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} har blitt med i bedrift nr. {2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} har blitt med som tilskuer
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} har startet et nytt firma (nr. {2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} har forlatt spillet ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} har forandret sitt navn til {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gav {2:CURRENCY} til ditt firma
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Du gav {2:CURRENCY} til {1:STRING}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :forlater
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} har blitt med i spillet
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} har blitt med i bedrift nr. {2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} har blitt med som tilskuer
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} har startet et nytt firma (nr. {2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} har forlatt spillet ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} har forandret sitt navn til {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gav {2:CURRENCY} til ditt firma
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Du gav {2:CURRENCY} til {1:STRING}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Lag] :
 STR_NETWORK_CHAT_COMPANY                                        :[Lag] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Lag] Til {STRING}: {WHITE}{STRING}
@@ -1473,8 +1473,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privat] Til {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Alle] :
 STR_NETWORK_CHAT_ALL                                            :[Alle] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Skriv inn text for netverk samtale
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Tjeneren avsluttet spillet
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Tjeneren starter på nytt...{}Vennligst vent...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Tjeneren avsluttet spillet
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Tjeneren starter på nytt...{}Vennligst vent...
 
 STR_NETWORK_SERVER                                              :Tjener
 STR_NETWORK_CLIENT                                              :Klient
@@ -1488,19 +1488,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Snakk til firma
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privat beskjed
 
 
-STR_NETWORK_SEND                                                :{BLACK}Send
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Send
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kunne ikke laste landskapet fra PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fant ingen fil.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kunne ikke konvertere bildetypen. Et 8- eller 24-bits bilde trengs.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...noe gikk akkurat galt. Beklager. (Sannsynligvis en ødelagt fil.)
+STR_ERROR_PNGMAP                                                :{WHITE}Kunne ikke laste landskapet fra PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fant ingen fil.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...kunne ikke konvertere bildetypen. Et 8- eller 24-bits bilde trengs.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...noe gikk akkurat galt. Beklager. (Sannsynligvis en ødelagt fil.)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kunne ikke laste landskapet fra BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan ikke konvertere bildetype.
+STR_ERROR_BMPMAP                                                :{WHITE}Kunne ikke laste landskapet fra BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...kan ikke konvertere bildetype.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Kostnad: {CURRENCY}
@@ -1514,13 +1514,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Anslått
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan ikke heve land her...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kan ikke senke land her...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan ikke jevne ut land her...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Steiner
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Ulendt terreng
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Bart land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gress
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Jorder
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snødekket land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Ørken
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Steiner
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Ulendt terreng
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bart land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gress
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Jorder
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snødekket land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Landet heller i feil retning
@@ -1528,11 +1528,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Umulig k
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Utgraving ville skadet tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Allerede på havnivå
 STR_ERROR_TOO_HIGH                                              :{WHITE}For høyt
-STR_ALREADY_LEVELLED                                            :{WHITE}... allerede flatt
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... allerede flatt
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Upassende jernbanespor
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...allerede bygget
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Må fjerne jernbanespor først
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Vei er enveis eller blokkert
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Vei er enveis eller blokkert
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Bygg jernbane
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrisk jernbane-konstruksjon
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Bygg Monorail
@@ -1556,41 +1556,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Bygg sig
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bygg jernbanebro
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bygg jernbanetunnel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Velg mellom bygging og fjerning for jernbanespor og signallykter
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brovalg - trykk på broen du vil ha for å bygge den.
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brovalg - trykk på broen du vil ha for å bygge den.
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Velg togstallens retning
-STR_RAILROAD_TRACK                                              :Jernbanespor
-STR_RAILROAD_TRAIN_DEPOT                                        :Togstall
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbanespor
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Togstall
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...felt eies av et annet firma
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbanespor med blokk-signaler
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Jernbanespor med inngangs-signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbanespor med utgangs-signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbanespor med kombosignaler
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Jernbane skinner med avanserte signaler
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Jernbane skinner med enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Jernbane med normale og inngangs-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Jernbane med normale og utgangs-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Jernbanespor med normale og kombo-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Jernbanespor med normale og avanserte signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Jernbanespor med normal og enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Togbane med pre- og utgangs-signaler
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Jernbanespor med pre- og kombosignaler
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Jernbanespor med inngangs- og avanserte signaler
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Jernbanespor med inngangs- og enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Jernbanespor med utgangs- og kombosignaler
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Jernbanespor med utgangs- og avanserte signaler
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Jernbanespor med utgangs- og enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Jernbanespor med kombo- og avanserte signaler
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Jernbanespor med kombo- og enveis avanserte signaler
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Jernbanespor med avanserte og enveis avanserte signaler
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Må fjerne togbanestasjon først
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Bygg separat stasjon
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Slå sammen stasjonene
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbanespor med blokk-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Jernbanespor med inngangs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Jernbanespor med utgangs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Jernbanespor med kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Jernbane skinner med avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Jernbane skinner med enveis avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Jernbane med normale og inngangs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Jernbane med normale og utgangs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Jernbanespor med normale og kombo-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Jernbanespor med normale og avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Jernbanespor med normal og enveis avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Togbane med pre- og utgangs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Jernbanespor med pre- og kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Jernbanespor med inngangs- og avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Jernbanespor med inngangs- og enveis avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Jernbanespor med utgangs- og kombosignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Jernbanespor med utgangs- og avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Jernbanespor med utgangs- og enveis avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Jernbanespor med kombo- og avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Jernbanespor med kombo- og enveis avanserte signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Jernbanespor med avanserte og enveis avanserte signaler
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Må fjerne togbanestasjon først
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Bygg separat stasjon
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Slå sammen stasjonene
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Må fjerne vei først
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Veiarbeid i gang
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Veiarbeid i gang
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Bygg vei
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Trikkekonstruksjon
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Velg brotype
@@ -1626,14 +1626,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Bygg tun
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktiver/deaktiver énveiskjørte veier
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Velg mellom bygging/fjerning for veibygging
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Velg mellom bygging/fjerning for trikkesporkonstruksjon
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Velg garasjens retning
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Velg trikkestallens retning
-STR_ROAD_DESCRIPTION_ROAD                                       :Vei
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Vei med gatelykter
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Aveny
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garasje
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Jernbaneovergang
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Trikkeskinner
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Velg garasjens retning
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Velg trikkestallens retning
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Vei
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Vei med gatelykter
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Aveny
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garasje
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Jernbaneovergang
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Trikkeskinner
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan ikke fjerne busstasjonen...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan ikke fjerne godsstasjonen...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan ikke fjerne trikkestasjon for passasjerer...
@@ -1641,12 +1641,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kan ikke
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Byer
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Bygningen må rives først
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (By)
@@ -1659,9 +1659,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Sentrer
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Bytt navn på byen
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passasjerer forrige måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post forrige måned: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Godsbehov for byekspansjon:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} påkrevd
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} levert sist måned
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Godsbehov for byekspansjon:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} påkrevd
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} levert sist måned
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høyhus
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kontorblokk
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Leilighetsblokk
@@ -1698,7 +1698,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subsidie gitt til {STRING}!{}{}Frakt av {STRING} fra {STATION} til {STATION} vil gi trippel betaling i løpet i et år fra nå!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subsidie gitt til {STRING}!{}{}Transport av {STRING} fra {STATION} til {STATION} vil gi fire ganger så mye inntekt i løpet av et år!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN}s bystyre tillater ikke flere flyplasser i denne byen
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN}s bystyre nekter deg å anlegge en flyplass her pga. støynivået
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN}s bystyre nekter deg å anlegge en flyplass her pga. støynivået
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Hytter
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Hus
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Leiligheter
@@ -1734,7 +1734,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Traffkkaos i {TOWN}!{}{}Ombygging av veien, finasiert av {STRING}, fører med seg seks måneders veiproblemer.
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (under bygging)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (under bygging)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indianertelt
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tekjelehus
@@ -1747,17 +1747,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Plasser skilt
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Trær
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...det er allerede et tre her
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan ikke plante trær her...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...for mange skilt
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan ikke plassere skilt her...
-STR_SIGN_DEFAULT                                                :Skilt
+STR_DEFAULT_SIGN_NAME                                           :Skilt
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Endre teksten på skiltet
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan ikke endre teksten på skiltet...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan ikke slette skilt...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Velg typen tre som skal plantes
-STR_TREE_NAME_TREES                                             :Trær
-STR_TREE_NAME_RAINFOREST                                        :Regnskog
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusplanter
+STR_LAI_TREE_NAME_TREES                                         :Trær
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regnskog
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusplanter
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Velg jernbanestasjontype
@@ -1777,7 +1777,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}MÃ¥ rive
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}For nær en annen flyplass
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Må rive eksisterende flyplass først
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Endre navnet til stasjon/lasteterminal
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Endre navnet til stasjon/lasteterminal
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan ikke endre stasjonens navn...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Vurderinger
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aksepterer
@@ -1795,10 +1795,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Fremragende
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Finn alle togene som har denne stasjonen på timeplanen
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Finn alle kjøretøyene som har denne stasjonen på timeplanen
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Finn alle flyene som har denne stasjonen på timeplanen
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Finn alle skipene som har denne stasjonen på timeplanen
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Finn alle togene som har denne stasjonen på timeplanen
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Finn alle kjøretøyene som har denne stasjonen på timeplanen
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Finn alle flyene som har denne stasjonen på timeplanen
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Finn alle skipene som har denne stasjonen på timeplanen
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}{NBSP}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} godtar ikke lenger {STRING}
@@ -1834,47 +1834,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Endre st
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Vis liste over godtatte varer
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stasjonsnavn - Trykk på navnet for å sentrere bildet på stasjonen
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Velg størrelse/type flyplass
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Jernbanestasjon
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Flyplass
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Lasteterminal
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bussterminal
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Havn
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Jernbanestasjon
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Flyplass
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lasteterminal
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bussterminal
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Havn
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Vis dekningsområdet til den foreslåtte plasseringen
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Ikke vis dekningsområdet til den foreslåtte plasseringen
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Dekningsområde
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Havn
-STR_STATION_DESCRIPTION_BUOY                                    :Bøye
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bøye
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bøyen er i veien
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stasjonen er spredd for mye
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...uensartede stasjoner deaktivert
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hold nede CTRL for å velge mer enn en ting
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...uensartede stasjoner deaktivert
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hold nede CTRL for å velge mer enn en ting
 
 STR_UNDEFINED                                                   :(udefinert streng)
-STR_STAT_CLASS_DFLT                                             :Standard stasjon
-STR_STAT_CLASS_WAYP                                             :Lokalstasjoner
+STR_STATION_CLASS_DFLT                                          :Standard stasjon
+STR_STATION_CLASS_WAYP                                          :Lokalstasjoner
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Skipdepotets retning
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...må bygges i sjøen
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kan ikke bygge skipsdepot her...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Velg skipsdepotets retning
-STR_WATER_DESCRIPTION_WATER                                     :Vann
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kyst eller elvebredd
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Skipsdepot
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvedukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vann
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kyst eller elvebredd
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Skipsdepot
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvedukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Kan ikke bygge på vann
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Må fjerne kanal først
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Må fjerne kanal først
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Lagre spill
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Last inn spill
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Lagre
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Slett
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Tilskuer, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Tilskuer, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} ledig
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan ikke lese fra disk
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Lagring av spillet mislyktes{}{STRING}
@@ -1890,12 +1890,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Liste ov
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Gjeldende navn for valgt lagret spill
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Slett valgte lagring
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Lagre gjeldende spill ved å bruke navnet som er valgt
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Lag et tilfeldig spill
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Last høydekart
-STR_SAVE_OSKTITLE                                               :{BLACK}Skriv inn et navn for dette lagret-spill
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Lag et tilfeldig spill
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Last høydekart
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Skriv inn et navn for dette lagret-spill
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} er i veien
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} er i veien
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kullgruve
 STR_INDUSTRY_NAME_POWER_STATION                                 :Kraftstasjon
@@ -1953,7 +1953,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Sentrer bildet på industriområdet
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Ny {STRING} under bygging i nærheten av {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Ny {STRING} plantes i nærheten av {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Koster: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Koster: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan ikke bygge denne typen industri her...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...skog kan bare plantes over snøgrensen
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} legger ned!
@@ -1971,16 +1971,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Annen tunnel i veien
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnelen ville munne ut utenfor kartkanten
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnelen ville munne ut utenfor kartkanten
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Kan ikke grave ut land til den andre tunnelutgangen
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Må rive tunnel først
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Må rive bro først
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kan ikke starte og slutte på samme felt
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Broender er ikke på samme nivå
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Broen er for lav for terrenget
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan ikke starte og slutte på samme felt
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Broender er ikke på samme nivå
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Broen er for lav for terrenget
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start og slutt må være på linje
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Feltet er upassende for tunnelinngang
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hengebro, stål
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Bjelker, stål
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Frittbærende, stål
@@ -1991,30 +1991,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Rørformet, stÃ
 STR_BRIDGE_TUBULAR_SILICON                                      :Rørformet, silikon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kan ikke bygge bro her...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan ikke bygge tunnel her...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Jernbanetunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Veitunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Hengebro av stål (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Bjelkebro av stål (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Frittbærende bro av stål (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Hengebro av armert betong (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Trebro (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betongbro (jernbane)
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Hengebro av stål (vei)
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Bjelkebro av stål (vei)
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Frittbærende bro av stål (vei)
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Hengebro av armert betong (vei)
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Trebro (vei)
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betongbro (vei)
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Rørformet bro (jernbane)
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Rørformet bro (vei)
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Jernbanetunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Veitunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Hengebro av stål (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Bjelkebro av stål (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Frittbærende bro av stål (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Hengebro av armert betong (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Trebro (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betongbro (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Hengebro av stål (vei)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Bjelkebro av stål (vei)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Frittbærende bro av stål (vei)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Hengebro av armert betong (vei)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Trebro (vei)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betongbro (vei)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Rørformet bro (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Rørformet bro (vei)
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objekt er i veien
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Radiosender
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fyrtårn
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Hovedkontor til firma
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Radiosender
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fyrtårn
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Hovedkontor til firma
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...hovedkontor til firma er i veien
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Feltet eies av et firma
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Feltet eies av et firma
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Kan ikke kjøpe dette feltet...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...du eier det allerede!
 
@@ -2062,7 +2062,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stasjo
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Vanskelighetsgrad
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Lagre
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Lagre
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lett
@@ -2135,8 +2135,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Firmafarg
 STR_LIVERY_CAPTION                                              :{WHITE}Ny firmafarge
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Firmanavn
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Sjefens navn
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Firmanavn
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Sjefens navn
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Firmanavn
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Sjefens navn
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan ikke endre firmanavn...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kan ikke bytte navn på sjefen...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY}s regnskap{BLACK}{COMPANYNUM}
@@ -2160,11 +2160,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totalt:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Inntektsgraf
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Overskuddsgraf
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Saldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}LÃ¥n
-STR_MAX_LOAN                                                    :{WHITE}Maks lån: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maks lån: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}LÃ¥ne mer ({SKIP}{SKIP}{CURRENCY})
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Betale tilbake ({SKIP}{SKIP}{CURRENCY})
@@ -2173,7 +2173,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan ikke
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...lånet er allerede betalt tilbake
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...du trenger {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan ikke betale tilbake lån...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan ikke gi bort penger som er lånt fra banken...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan ikke gi bort penger som er lånt fra banken...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Velg nytt utsende på sjefen
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Endre firmafarge
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Endre sjefens navn
@@ -2183,10 +2183,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Betal ti
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Sjef)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Grunnlagt: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Kjøretøy:
-STR_TRAINS                                                      :{WHITE}{COMMA} tog{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} kjøretøy{P "" s}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} fly
-STR_SHIPS                                                       :{WHITE}{COMMA} skip{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tog{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} kjøretøy{P "" s}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} fly
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} skip{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ingen
 STR_FACE_CAPTION                                                :{WHITE}Velg utseende
 STR_FACE_MALE_BUTTON                                            :{BLACK}Mann
@@ -2199,9 +2199,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Velg kvi
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Lag et tilfeldig ansikt
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Nøkkel
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Vis oversikt over grafvalg
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Vis detaljerte ytelsesmålinger
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Vis detaljerte ytelsesmålinger
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Vis oversikt over firmagrafvalg
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Trykk her for å vise/skjule et firma
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Trykk her for å vise/skjule et firma
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Antall varer levert
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Prestasjonsvudering av firma (maks poeng=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmaverdi
@@ -2235,23 +2235,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Finansfyrste
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bygg hovedkontor
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bygg firmaets hovedkontor/se firmaets hovedkontor
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Gjenoppbygg spelskapets hovedkvarter en annen plass for 1{NBSP}% av selskapsverdien
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Gjenoppbygg spelskapets hovedkvarter en annen plass for 1{NBSP}% av selskapsverdien
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan ikke bygge hovedkontor...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Se hovedkontor
-STR_RELOCATE_HQ                                                 :{BLACK}Omplasser hovedkvarter
-STR_COMPANY_JOIN                                                :{BLACK}Bli med
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Bli med og spill som denne bedriften
-STR_COMPANY_PASSWORD                                            :{BLACK}Passord
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Beskytt firmaet ditt med et passord for å forhindre uautoriserte brukere fra å bli med.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Velg firmapassord
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Omplasser hovedkvarter
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Bli med
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Bli med og spill som denne bedriften
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Passord
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Beskytt firmaet ditt med et passord for å forhindre uautoriserte brukere fra å bli med.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Velg firmapassord
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ikke lagre passordet
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gi firmaet nytt passord
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Firmapassord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standard firmapassord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Bruk dette passordet som standard for nye firmaer
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standard firmapassord
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Bruk dette passordet som standard for nye firmaer
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Verdenskrise!{}{}Økonomer frykter det verste. Nedgangstider i møte.
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Verdenskrise over!{}{}Opptur i markedet gir industrien selvsikkerheten tilbake.
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Bytte mellom stor/liten vindustørrelse
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Bytte mellom stor/liten vindustørrelse
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmaverdi: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kjøp 25{NBSP}% av aksjene i firmaet
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Selg 25{NBSP}% av aksjene du eier
@@ -2261,7 +2261,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan ikke
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan ikke selge 25{NBSP}% av aksjene...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}{NBSP}% eies av {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} har blitt kjøpt opp av {STRING}!
-STR_PROTECTED                                                   :{WHITE}Dette selskapet selger ikke aksjer enda...
+STR_ERROR_PROTECTED                                             :{WHITE}Dette selskapet selger ikke aksjer enda...
 
 STR_LIVERY_DEFAULT                                              :Standardovertakelse
 STR_LIVERY_STEAM                                                :Damplokomotiv
@@ -2287,14 +2287,14 @@ STR_LIVERY_LARGE_PLANE                                          :Stort fly
 STR_LIVERY_PASSENGER_TRAM                                       :Passasjertrikk
 STR_LIVERY_FREIGHT_TRAM                                         :Frakttrikk
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Vis generelle fargetemaer
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Vis togfargetemaer
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Vis bilfargetemaer
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Vis skipsfargetemaer
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Vis flyfarger
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Velg en primærfarge for valgte tema
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Velg sekundærfarge for valgte tema
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Velg fargetemaet du ønsker å endre, eller flere fargetemaer med CTRL-klikk. Klikk på boksen for å vise bruken av fargetemaene
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Vis generelle fargetemaer
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Vis togfargetemaer
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Vis bilfargetemaer
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Vis skipsfargetemaer
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Vis flyfarger
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Velg en primærfarge for valgte tema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Velg sekundærfarge for valgte tema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Velg fargetemaet du ønsker å endre, eller flere fargetemaer med CTRL-klikk. Klikk på boksen for å vise bruken av fargetemaene
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (damp)
@@ -2602,9 +2602,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ingen avlast Ã
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Bytt stopp oppførselen på merket ordre
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Bytt lastings oppførselen på merket ordre
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Bytt avlastings oppførselen på merket ordre
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Put inn en avansert ordre
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Put inn en avansert ordre
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Gå til nærmeste depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Gå til nærmeste hangar
 STR_ORDER_NEAREST_DEPOT                                         :det nærmeste
@@ -2614,9 +2614,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Vedlikehold ute
 STR_ORDER_TRAIN_DEPOT                                           :Togstall
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Garasje
 STR_ORDER_SHIP_DEPOT                                            :Skipdepot
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Alltid gå
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service vis trengs
@@ -2641,10 +2641,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :er mere enn
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :er mere eller lik
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er sant
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er usant
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Hopp til ordre {COMMA}
-STR_CONDITIONAL_NUM                                             :Hopp til ordre {COMMA} når {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Hopp til ordre {COMMA} når {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Hopp til ordre {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Hopp til ordre {COMMA} når {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Hopp til ordre {COMMA} når {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Ingen reise
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Reise (uten tidstabell)
@@ -2667,18 +2667,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Tog kan
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hopp over
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Slett
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Kjør til
-STR_REFIT                                                       :{BLACK}Bygg om
-STR_REFIT_TIP                                                   :{BLACK}Velg hvilken varetype som skal fraktes. CTRL-klikk for å fjerne ordren om ombygning.
-STR_REFIT_ORDER                                                 :(Bygg om til {STRING})
-STR_REFIT_STOP_ORDER                                            :(Ombygg til {STRING} å stopp)
-STR_STOP_ORDER                                                  :(Stopp)
-STR_TIMETABLE_VIEW                                              :{BLACK}Tidstabell
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Bytt til tidstabellvisning
-STR_ORDER_VIEW                                                  :{BLACK}Ordre
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Bytt til ordre oversikt
+STR_ORDER_REFIT                                                 :{BLACK}Bygg om
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Velg hvilken varetype som skal fraktes. CTRL-klikk for å fjerne ordren om ombygning.
+STR_ORDER_REFIT_ORDER                                           :(Bygg om til {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Ombygg til {STRING} å stopp)
+STR_ORDER_STOP_ORDER                                            :(Stopp)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Tidstabell
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Bytt til tidstabellvisning
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordre
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Bytt til ordre oversikt
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordre)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slutt på ordre - -
-STR_SERVICE                                                     :{BLACK}Vedlikehold
+STR_ORDER_SERVICE                                               :{BLACK}Vedlikehold
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygget: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2698,7 +2698,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}kjøretÃ
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}et kjøretøy som deler denne orderen kan ikke gå til den stasjonen
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan ikke flytte kjøretøy...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Bakmaskinen vil alltid følge det fremste motstykket
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan ikke finne en togstall i nærheten
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Vedlikeholdsintervall: {LTBLUE}{COMMA}{NBSP}dager{BLACK}   Forrige vedlikehold: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Vedlikeholdsintervall: {LTBLUE}{COMMA}{NBSP}%{BLACK}   Forrige vedlikehold: {LTBLUE}{DATE_LONG}
@@ -2718,10 +2718,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tidstabe
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Endre varigheten for valgte ordre
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Fjern varigheten for valgte ordre
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nullstill senhetstelleren slik at kjøretøyet ankommer i tide
-STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren med mindre vedlikehold trengs.
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koster: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftkostnader: {CURRENCY}/Ã¥r{}Kapasitet: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Kostnad: {CURRENCY} Max. Hastighet: {VELOCITY}{}Kapasitet: {CARGO}, {CARGO}{}Løpende kostnader: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Kostnad: {CURRENCY} Maksfart: {VELOCITY}{}Kapasitet: {CARGO}{}Driftskostnader: {CURRENCY}/yr
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Hopp over ordren med mindre vedlikehold trengs.
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Koster: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftkostnader: {CURRENCY}/Ã¥r{}Kapasitet: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kostnad: {CURRENCY} Max. Hastighet: {VELOCITY}{}Kapasitet: {CARGO}, {CARGO}{}Løpende kostnader: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kostnad: {CURRENCY} Maksfart: {VELOCITY}{}Kapasitet: {CARGO}{}Driftskostnader: {CURRENCY}/yr
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Alder: {LTBLUE}{STRING}{BLACK}   Driftskostnader: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Maksfart: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vekt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maksfart: {LTBLUE}{VELOCITY}
@@ -2741,28 +2741,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikke snu toget...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan ikke snu kjøreretningen til kjøretøy...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikke snu kjøretøy som består av flere deler
-STR_CLEAR_TIME                                                  :{BLACK}Nullstill tid
-STR_RESET_LATENESS                                              :{BLACK}Nullstill senhetsteller
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Endre kontrollpunkt navn
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Endre navnet på bøyen
-
-STR_TRAIN_STOPPING                                              :{RED}Stopper
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stopper, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Inkompatible jernbanetyper
-STR_TRAIN_NO_POWER                                              :{RED}Ingen strøm
-STR_TRAIN_START_NO_CATENARY                                     :Dette sporet mangler et kjede, så toget kan ikke starte
-STR_TRAIN_STUCK                                                 :{ORANGE}Venter på ledig rute
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nullstill tid
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nullstill senhetsteller
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Endre kontrollpunkt navn
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Endre navnet på bøyen
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stopper
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stopper, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Inkompatible jernbanetyper
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ingen strøm
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Dette sporet mangler et kjede, så toget kan ikke starte
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Venter på ledig rute
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Ny {STRING} nå tilgjengelig!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Ny {STRING} NÃ¥ tilgjengelig!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kan ikke selge ødelagt kjøretøy...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kan ikke ombygge ødelagt kjøretøy...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kan ikke selge ødelagt kjøretøy...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kan ikke ombygge ødelagt kjøretøy...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kan ikke gi kjøretøy tidstabell...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Kjøretøy kan bare vente på stasjoner.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Dette kjøretøyet stopper ikke på denne stasjonen.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan ikke gi kjøretøy tidstabell...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Kjøretøy kan bare vente på stasjoner.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Dette kjøretøyet stopper ikke på denne stasjonen.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Skift Tid
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Dette kjøretøyet går på tid
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Dette kjøretøyet er {STRING} for sent ute
@@ -2776,7 +2776,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fyll ut
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...må være stoppet i en garasje
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikke finne en garasje i nærheten
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Bytt kjøreretning
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapasitet: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapasitet: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kjøretøy{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2803,11 +2803,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plasser bøye, kan brukes til å danne kontrollpunkter
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikke plassere bøye her...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bygg akveduk
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Can't build aqueduct here...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Can't build aqueduct here...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (bygg om)
 STR_REFIT_TITLE                                                 :{GOLD}Velg varetype:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapasitet: {GOLD}{CARGO}{}{BLACK}Kostnad for ombygging: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(ombyggbart)
+STR_PURCHASE_INFO_REFITTABLE                                    :(ombyggbart)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flyplasser
@@ -2820,7 +2820,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg fly
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Innbyggerne jubler . . .{}Første fly ankommer {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Flykrasj!{}{COMMA} dør ved {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Flystyrt!{}Fly gikk tom for drivstoff, {COMMA} døde i eksplosjon!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tidstabell)
 
@@ -2833,13 +2833,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Gruvegangkollaps fører til store ødeleggelser i nærheten av {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Flyter over!{}Minst {COMMA} antatt fortapt{P "" e} eller død{P "" s} etter dødlig flom!
 
-STR_BRIBE_FAILED                                                :{WHITE}Ditt forsøk på bestikkelse har blitt
-STR_BRIBE_FAILED_2                                              :{WHITE}oppdaget av en regional inspektør
-STR_BUILD_DATE                                                  :{BLACK}Bygget: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Ditt forsøk på bestikkelse har blitt
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}oppdaget av en regional inspektør
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Bygget: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stasjon klasse: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stasjon type: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}Ny grafikk: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stasjon klasse: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stasjon type: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}Ny grafikk: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detaljert prestasjonsnivå
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalj
@@ -2859,28 +2859,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Penger:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}LÃ¥n:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totalt:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Antall kjøretøy. Dette inkluderer vei kjøretøy, tog, skip og flymaskiner.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antall stasjonsdeler. Hver del av en stasjon (eks. tog stasjon, buss stop, flyplass) er talt, selv om de er tilkoblet til en stasjon.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Profitten av kjøretøyene med lavest inntekt (kjøretøy eldre enn 2 år)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Penger tjent i måneden med lavest gevinst av de 12 siste kvartalene
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Penger tjent i måneden med høyest gevinst i de siste 12 kvartalene
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Enheter med frakt levert i de siste fire kvartalene.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Typer av frakt levert i de siste fire kvartalene.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Hvor mye penger dette firmaet har i banken
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Størrelsen på firmaets lån
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Totale poeng av mulige poeng
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Antall kjøretøy. Dette inkluderer vei kjøretøy, tog, skip og flymaskiner.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Antall stasjonsdeler. Hver del av en stasjon (eks. tog stasjon, buss stop, flyplass) er talt, selv om de er tilkoblet til en stasjon.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Profitten av kjøretøyene med lavest inntekt (kjøretøy eldre enn 2 år)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Penger tjent i måneden med lavest gevinst av de 12 siste kvartalene
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Penger tjent i måneden med høyest gevinst i de siste 12 kvartalene
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Enheter med frakt levert i de siste fire kvartalene.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Typer av frakt levert i de siste fire kvartalene.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Hvor mye penger dette firmaet har i banken
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Størrelsen på firmaets lån
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Totale poeng av mulige poeng
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Instillinger
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Vis NewGRF instillinger
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Innstillinger for NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Bruk forandringene
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Vis/skjul palette
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Skjul/vis paletten av valgte ny grafikk.{}Gjør dette når graffikken fra denne nye grafikken ser rosa i spillet
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Sett parametre
-STR_NEWGRF_FILENAME                                             :{BLACK}Filnavn: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palett: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Bruk forandringene
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Vis/skjul palette
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Skjul/vis paletten av valgte ny grafikk.{}Gjør dette når graffikken fra denne nye grafikken ser rosa i spillet
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Sett parametre
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Filnavn: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palett: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er i ferd med å gjøre forandringer i et kjørende spill; Dette kan krasje OpenTTD.{}Er du helt sikker på at du vil gjøre dette?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2903,34 +2903,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøk å bruk
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneholder en ødelagt grafikk. All ødelagt grafikk vil bli vist som røde spørsmålstegn (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneholder flere "Action 8" oppføringer
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Last den valgte fastsette på forhånd
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Lagre fastsette på forhånd
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Lagre den nåværende listen som en fastsette på forhånd
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Skriv inn navn for fastsette på forhånd
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Slett fastsette på forhånd
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Slett den nåværende valgte fastsette på forhånd
-STR_NEWGRF_ADD                                                  :{BLACK}Legg til
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Legg en ny NewGRF-fil til listen
-STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjern den valgte NewGRF filen fra listen
-STR_NEWGRF_MOVEUP                                               :{BLACK}Flytt opp
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flytt den valgte NewGRF-filen oppover listen
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flytt ned
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flytt den valgte NewGRF-filen nedover listen
-STR_NEWGRF_FILE_TIP                                             :{BLACK}En liste over NewGRF-filene som er installert. Klikk på en fil for å forandre parameterene
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametere: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Skriv NewGRF parameterene
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen informasjon tilgjengelig
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Last den valgte fastsette på forhånd
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Lagre fastsette på forhånd
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Lagre den nåværende listen som en fastsette på forhånd
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Skriv inn navn for fastsette på forhånd
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Slett fastsette på forhånd
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Slett den nåværende valgte fastsette på forhånd
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Legg til
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Legg en ny NewGRF-fil til listen
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Fjern
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Fjern den valgte NewGRF filen fra listen
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Flytt opp
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Flytt den valgte NewGRF-filen oppover listen
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Flytt ned
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flytt den valgte NewGRF-filen nedover listen
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}En liste over NewGRF-filene som er installert. Klikk på en fil for å forandre parameterene
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametere: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Skriv NewGRF parameterene
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ingen informasjon tilgjengelig
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tilgjengelige NewGRF-filer
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Legg til i seleksjonen
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Legg den valgte NewGRF filen til i konfigurasjonen din
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Søk på nytt
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Oppdater listen over tilgjengelige NewGRF filer
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Legg den valgte NewGRF filen til i konfigurasjonen din
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Søk på nytt
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Oppdater listen over tilgjengelige NewGRF filer
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan ikke legge til fil: GRF ID finnes allerede
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ingen passende fil funnet
-STR_NEWGRF_DISABLED                                             :{RED}Deaktivert
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ingen passende fil funnet
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Deaktivert
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Tilsvarende fil ikke funnet (kompatibel GRF lastet)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibel GRF lastet for manglende filer
@@ -2946,7 +2946,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Gods-/ombygningsinformasjon for '{1:ENGINE}' er forskjellig fra kjøpelisten etter konstruksjonen. Dette kan resultere i at autofornying ikke fungerer på riktig måte.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' forårsaket en uendelig loop i produksjonstilbakekallet.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spillet ble lagret i versjon uten trikk støtte. Alle trikker har blitt fjernet.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spillet ble lagret i versjon uten trikk støtte. Alle trikker har blitt fjernet.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Egendefinert valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2957,16 +2957,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Bytt ti
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Bytt til euro: {ORANGE}aldri
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Forhåndsvis: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Bytt egendefinert valuta parameter
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Reduser valutaen av din kurs for ett pund (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Øk valutaen av din kurs for ett pund (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Still inn valutaen av din kurs for ett pund (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Velg desimalskilletegn for valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Velg prefiks for valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Velg suffiks for valuta
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Bytt til Euro tidligere
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Bytt til Euro senere
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Velg året det skal byttes til Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 pund (£) i din valuta
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Reduser valutaen av din kurs for ett pund (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Øk valutaen av din kurs for ett pund (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Still inn valutaen av din kurs for ett pund (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Velg desimalskilletegn for valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Velg prefiks for valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Velg suffiks for valuta
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Bytt til Euro tidligere
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Bytt til Euro senere
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Velg året det skal byttes til Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 pund (£) i din valuta
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2985,8 +2985,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} skip
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} fly
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delte ordre av {COMMA} kjøretøy
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle kjøretøy med samme ruteplan som denne
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Delte ordre av {COMMA} kjøretøy
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Vis alle kjøretøy med samme ruteplan som denne
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} venter i togstallen
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} venter i garasjen
@@ -3093,39 +3093,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bygg om
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Bygg om et konteinerskip til å ta en annen type last
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Bygg om et fly til å ta en annen type last
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Er på vei til {TOWN} togstall
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Er på vei til {TOWN} togstall, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Er på vei til {TOWN} garasje
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Er på vei til {TOWN} garasje, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Er på vei til {TOWN} skipsdepot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Er på vei mot {TOWN} skipsdepot, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Er på vei til {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Er på vei til {STATION} hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Vedlikehold ved {TOWN} togstall
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Vedlikehold ved {TOWN} togstall, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Vedlikehold ved {TOWN} garasje
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Vedlikehold ved {TOWN} garasje, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Vedlikehold ved {TOWN} skipsdepot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Vedlikehold ved {TOWN} skipsdepot, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Vedlikehold ved {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Vedlikehold ved {STATION} hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon kjøretøy
-STR_CLONE_SHIP                                                  :{BLACK}Klon skip
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil skape en kopi av et lokomotiv inkludert alle vognene. CTRL-klikk vil sørge for delte ordrer
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil skape en kopi av et kjøretøy. CTRL-klikk vil sørge for delte ordrer
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil skape en kopi av et skip. CTRL-klikk vil sørge for delte ordrer
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil skape en kopi av et fly. CTRL-klikk vil sørge for delte ordrer
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil skape en kopi av et lokomotiv inkludert alle vognene. Trykk denne knappen og så på et hvilket som helst annet tog. CTRL-klikk vil sørge for delte ordrer
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil skape en kopi av et kjøretøy. Klikk denne knappen og deretter på et hvilket som helst annet kjøretøy. CTRL-klikk vil sørge for delte ordrer
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil skape en kopi av et skip. Trykk på denne knappen og så på et hvilket som helst annet skip. CTRL-klikk vil sørge for delte ordrer
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil skape en kopi av et fly. Trykk denne knappen og så på et hvilket som helst annet fly. CTRL-klikk vil sørge for delte ordrer
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Er på vei til {TOWN} togstall
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Er på vei til {TOWN} togstall, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Er på vei til {TOWN} garasje
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Er på vei til {TOWN} garasje, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Er på vei til {TOWN} skipsdepot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Er på vei mot {TOWN} skipsdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Er på vei til {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Er på vei til {STATION} hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Vedlikehold ved {TOWN} togstall
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Vedlikehold ved {TOWN} togstall, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Vedlikehold ved {TOWN} garasje
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Vedlikehold ved {TOWN} garasje, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Vedlikehold ved {TOWN} skipsdepot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Vedlikehold ved {TOWN} skipsdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Vedlikehold ved {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Vedlikehold ved {STATION} hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klon tog
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klon kjøretøy
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klon skip
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klon fly
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Dette vil skape en kopi av et lokomotiv inkludert alle vognene. CTRL-klikk vil sørge for delte ordrer
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Dette vil skape en kopi av et kjøretøy. CTRL-klikk vil sørge for delte ordrer
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Dette vil skape en kopi av et skip. CTRL-klikk vil sørge for delte ordrer
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Dette vil skape en kopi av et fly. CTRL-klikk vil sørge for delte ordrer
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Dette vil skape en kopi av et lokomotiv inkludert alle vognene. Trykk denne knappen og så på et hvilket som helst annet tog. CTRL-klikk vil sørge for delte ordrer
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Dette vil skape en kopi av et kjøretøy. Klikk denne knappen og deretter på et hvilket som helst annet kjøretøy. CTRL-klikk vil sørge for delte ordrer
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Dette vil skape en kopi av et skip. Trykk på denne knappen og så på et hvilket som helst annet skip. CTRL-klikk vil sørge for delte ordrer
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Dette vil skape en kopi av et fly. Trykk denne knappen og så på et hvilket som helst annet fly. CTRL-klikk vil sørge for delte ordrer
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye tog/vogner for jernbane
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nytt elektrisk tog
@@ -3195,28 +3195,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vis hvor
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Du er nå i ferd med å selge alle kjøretøyene i depoet. Er du sikker på at du vil dette?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Gal stalltype
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Gal stalltype
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Selg alle tog i depodet
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Selg alle kjøretøy i garasjen
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Selg alle skip i depotet
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Selg alle fly i hangaren
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Selg alle tog i depodet
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Selg alle kjøretøy i garasjen
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Selg alle skip i depotet
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Selg alle fly i hangaren
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}FÃ¥ en liste over alle tog med dette depotet i sine ordre
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Få en liste over alle kjøretøy med denne garasjen i sine ordre
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}FÃ¥ en liste over alle skip med dette depotet i sine ordre
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}FÃ¥ en liste over alle fly med denne hangaren i sine ordre
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}FÃ¥ en liste over alle tog med dette depotet i sine ordre
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Få en liste over alle kjøretøy med denne garasjen i sine ordre
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}FÃ¥ en liste over alle skip med dette depotet i sine ordre
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}FÃ¥ en liste over alle fly med denne hangaren i sine ordre
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autoerstatt alle tog i depotet
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autoerstatt all kjøretøy i hangaren
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autoerstatt all skip i depotet
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autoerstatt alle fly i hangaren
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autoerstatt alle tog i depotet
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autoerstatt all kjøretøy i hangaren
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autoerstatt all skip i depotet
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autoerstatt alle fly i hangaren
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Erstatte {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Begynn med å bytte ut kjøretøy
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Slutt med å bytte ut kjøretøy
-STR_NOT_REPLACING                                               :{BLACK}Byttes ikke ut
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ingen kjøretøy valgt
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Byttes ikke ut
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ingen kjøretøy valgt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Velg lokomotivtype å bytte ut
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Velg den nye lokomotivtypen du vil skal ta over for den du har valgt til venstre
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klikk denne knappen hvis du ikke vil bytte ut lokomotivet som er valgt på venstresiden
@@ -3228,26 +3228,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}La den a
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Erstatter: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skift mellom tog- og vognvinduet
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kjøretøyet er ikke tilgjengelig
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kjøretøyet er ikke tilgjengelig
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skipet er ikke tilgjengelig
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Flyfartøyet er ikke tilgjengelig
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Kjøretøyet er ikke tilgjengelig
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Kjøretøyet er ikke tilgjengelig
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Skipet er ikke tilgjengelig
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Flyfartøyet er ikke tilgjengelig
 
-STR_ENGINES                                                     :Motorer
-STR_WAGONS                                                      :Vogner
+STR_REPLACE_ENGINES                                             :Motorer
+STR_REPLACE_WAGONS                                              :Vogner
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klikk for å stoppe alle togene i depodet
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klikk for å stoppe alle kjøretøyene i garasjen
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klikk for å stoppe alle skipene i depodet
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klikk for å stoppe alle flyene i hangaren
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klikk for å stoppe alle togene i depodet
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klikk for å stoppe alle kjøretøyene i garasjen
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klikk for å stoppe alle skipene i depodet
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klikk for å stoppe alle flyene i hangaren
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klikk for å starte alle togene i depodet
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klikk for å starte kjøretøyet inne i garasjen
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klikk for å starte alle skipene i depodet
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klikk for å starte alle flyene i hangaren
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klikk for å starte alle togene i depodet
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klikk for å starte kjøretøyet inne i garasjen
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klikk for å starte alle skipene i depodet
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klikk for å starte alle flyene i hangaren
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klikk for å stoppe alle kjøretøyene i listen
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klikk for å starte alle kjøretøyene i listen
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klikk for å stoppe alle kjøretøyene i listen
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klikk for å starte alle kjøretøyene i listen
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} skilt
@@ -3256,14 +3256,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Ordre gj
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Jernbanelokomotiv
-STR_ELRAIL_VEHICLES                                             :Elektriske tog
-STR_MONORAIL_VEHICLES                                           :Monoraillokomotiv
-STR_MAGLEV_VEHICLES                                             :Maglevlokomotiv
+STR_REPLACE_RAIL_VEHICLES                                       :Jernbanelokomotiv
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektriske tog
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monoraillokomotiv
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglevlokomotiv
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vekt: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK} Effekt: {GOLD}{POWER}
@@ -3290,70 +3290,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generer
-STR_RANDOM                                                      :{BLACK}Tilfeldiggjør
-STR_RANDOM_HELP                                                 :{BLACK}Endre tilfeldig-nummer som brukes for terreng-generering
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generer en verden
-STR_RANDOM_SEED                                                 :{BLACK}Tilfeldig nummer:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Trykk her for å taste inn et tilfeldig nummer
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Skriv inn en tilfeldig sender
-STR_LAND_GENERATOR                                              :{BLACK}Landskapsgenerator
-STR_TREE_PLACER                                                 :{BLACK}Trealgoritme:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Høydekartrotering:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrengtype
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Havflate:
-STR_SMOOTHNESS                                                  :{BLACK}Glatthet:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Høyde på snøgrensen:
-STR_DATE                                                        :{BLACK}Dato:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Antall byer:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Antall industrier:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Flytt høyden på snøgrensen ett hakk opp
-STR_SNOW_LINE_DOWN                                              :{BLACK}Flytt høyden på snøgrensen ett hakk ned
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Skift høyden på snøgrensen
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Endre startår
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skalaadvarsel
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Å endre kildemapstørrelsen for mye er ikke anbefalt. Fortsette generering?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Høydekartnavn:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Størrelse: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generer
+STR_MAPGEN_RANDOM                                               :{BLACK}Tilfeldiggjør
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Endre tilfeldig-nummer som brukes for terreng-generering
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generer en verden
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Tilfeldig nummer:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Trykk her for å taste inn et tilfeldig nummer
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Skriv inn en tilfeldig sender
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landskapsgenerator
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Trealgoritme:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Høydekartrotering:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrengtype
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Havflate:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Glatthet:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Høyde på snøgrensen:
+STR_MAPGEN_DATE                                                 :{BLACK}Dato:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Antall byer:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Antall industrier:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Flytt høyden på snøgrensen ett hakk opp
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Flytt høyden på snøgrensen ett hakk ned
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Skift høyden på snøgrensen
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Endre startår
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalaadvarsel
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Å endre kildemapstørrelsen for mye er ikke anbefalt. Fortsette generering?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Høydekartnavn:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Størrelse: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Genererer verden...
 STR_GENERATION_ABORT                                            :{BLACK}Avbryt
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Avbryt verdensgenerering
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Vil du virkelig avbryte verdensgenereringen?
-STR_PROGRESS                                                    :{WHITE}{NUM}{NBSP}% ferdig
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generer en verden
-STR_TREE_GENERATION                                             :{BLACK}Tregenerering
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Ikke-flyttbar generering
-STR_CLEARING_TILES                                              :{BLACK}Generering av ulendt og steinete område
-STR_SETTINGUP_GAME                                              :{BLACK}Klargjør spillet
-STR_PREPARING_TILELOOP                                          :{BLACK}Kjører tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Gjør klart spillet
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Denne handlingen endret vanskelighetsgraden til egendefinert
-STR_SE_FLAT_WORLD                                               :{WHITE}Flatt land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generer et flatt landskap
-STR_SE_RANDOM_LAND                                              :{WHITE}Tilfeldig landskap
-STR_SE_NEW_WORLD                                                :{BLACK}Generer et nytt scenario
-STR_SE_CAPTION                                                  :{WHITE}Scenariotype
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Flytt landhøyden ett nivå ned
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Flytt høyden på flagg land ett nivå opp
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Endre høyden på flatt land
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Høyde av flatt land:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}{NBSP}% ferdig
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generer en verden
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Tregenerering
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Ikke-flyttbar generering
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generering av ulendt og steinete område
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Klargjør spillet
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Kjører tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Gjør klart spillet
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Denne handlingen endret vanskelighetsgraden til egendefinert
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Flatt land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generer et flatt landskap
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Tilfeldig landskap
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Generer et nytt scenario
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenariotype
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Flytt landhøyden ett nivå ned
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Flytt høyden på flagg land ett nivå opp
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Endre høyden på flatt land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Høyde av flatt land:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Midstill oversiktskartet på den gjeldende posisjonen
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kartkanter:
-STR_NORTHWEST                                                   :{BLACK}Nordvest
-STR_NORTHEAST                                                   :{BLACK}Nordøst
-STR_SOUTHEAST                                                   :{BLACK}Sørøst
-STR_SOUTHWEST                                                   :{BLACK}Sørvest
-STR_BORDER_FREEFORM                                             :{BLACK}Friform
-STR_BORDER_WATER                                                :{BLACK}Sjø
-STR_BORDER_RANDOM                                               :{BLACK}Tilfeldig
-STR_BORDER_RANDOMIZE                                            :{BLACK}Tilfeldig
-STR_BORDER_MANUAL                                               :{BLACK}Manuell
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kartkanter:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordvest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordøst
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sørøst
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sørvest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Friform
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Sjø
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Tilfeldig
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Tilfeldig
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuell
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Liten
@@ -3378,21 +3378,21 @@ STR_MEASURE_AREA                                                :{BLACK}Område:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengde: {NUM}{}Høydeforskjell: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Område: {NUM} x {NUM}{}Høydeforskjell: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Overfør kreditt: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...denne veien er eid av en by
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...veien vender mot feil retning
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Instillinger for gjennomsiktighet
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Gjennomsiktighet for stasjonskilt. CTRL+klikk for å låse fast.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Gjennomsiktighet for trær. CTRL+klikk for å låse.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Gjennomsiktighet for hus. CTRL+klikk for å låse.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Gjennomsiktighet for industrier. CTRL+klikk for å låse.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Gjennomsiktighet for stasjoner, depoter og kontrollpunkt. CTRL+klikk for å låse fast.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Gjennomsiktighet for broer. CTRL+klikk for å låse.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Gjennomsiktighet for fyrtårn og antenner. CTRL+klikk for å låse.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Gjennomsiktighet for detaljer. CTRL+klikk for å låse.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Gjennomsiktighet for lasteindikatorer. CTRL+klikk for å låse.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Sett objekter usynlig istede for gjennomsiktig
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Overfør kreditt: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...denne veien er eid av en by
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...veien vender mot feil retning
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Instillinger for gjennomsiktighet
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Gjennomsiktighet for stasjonskilt. CTRL+klikk for å låse fast.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Gjennomsiktighet for trær. CTRL+klikk for å låse.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Gjennomsiktighet for hus. CTRL+klikk for å låse.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Gjennomsiktighet for industrier. CTRL+klikk for å låse.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Gjennomsiktighet for stasjoner, depoter og kontrollpunkt. CTRL+klikk for å låse fast.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Gjennomsiktighet for broer. CTRL+klikk for å låse.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Gjennomsiktighet for fyrtårn og antenner. CTRL+klikk for å låse.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Gjennomsiktighet for detaljer. CTRL+klikk for å låse.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Gjennomsiktighet for lasteindikatorer. CTRL+klikk for å låse.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Sett objekter usynlig istede for gjennomsiktig
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}{NBSP}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}{NBSP}%{UPARROW}
@@ -3402,7 +3402,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}{NBSP}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alle tog
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alle kjøretøyer
 STR_GROUP_ALL_SHIPS                                             :Alle båter
@@ -3411,24 +3411,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ugrupperte tog
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ugrupperte biler
 STR_GROUP_DEFAULT_SHIPS                                         :Ugrupperte skip
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ugrupperte fly
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Legg til delte kjøretøy
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Fjern alle kjøretøy
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Gi nytt navn på gruppen
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kan ikke opprette gruppe...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kan ikke slette denne gruppen...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kan ikke gi nytt navn på denne gruppen...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kan ikke fjerne alle kjøretøy fra denne gruppen...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kan ikke legge til kjøretøy i denne grupppen...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kan ikke legge til delte kjøretøyer i gruppa...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kan ikke opprette gruppe...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kan ikke slette denne gruppen...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kan ikke gi nytt navn på denne gruppen...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kan ikke fjerne alle kjøretøy fra denne gruppen...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kan ikke legge til kjøretøy i denne grupppen...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kan ikke legge til delte kjøretøyer i gruppa...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupper - Klikk en gruppe for å se alle kjøretøy i gruppen
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klikk for å opprette en gruppe
-STR_GROUP_DELETE_TIP                                            :{BLACK}Fjern den valgte gruppen
-STR_GROUP_RENAME_TIP                                            :{BLACK}Gi nytt navn på den valgte gruppen
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikk for å beskytte denne gruppa fra global autoerstatting
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupper - Klikk en gruppe for å se alle kjøretøy i gruppen
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikk for å opprette en gruppe
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Fjern den valgte gruppen
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Gi nytt navn på den valgte gruppen
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikk for å beskytte denne gruppa fra global autoerstatting
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3489,35 +3489,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Navn må være unikt
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Navn må være unikt
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}GÃ¥ til neste signal
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}GÃ¥ til forrige signal
-STR_SIGN_OSKTITLE                                               :{BLACK}Skriv inn et navn for skiltet
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}GÃ¥ til neste signal
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}GÃ¥ til forrige signal
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Skriv inn et navn for skiltet
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fond
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospekt
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bygg
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Velg passende industri fra listen
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fond
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospekt
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bygg
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Velg passende industri fra listen
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avansert
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Avansert ansiktsvalg
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Avansert ansiktsvalg
 STR_FACE_SIMPLE                                                 :{BLACK}Enkelt
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Enkelt ansiktsvalg.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Enkelt ansiktsvalg.
 STR_FACE_LOAD                                                   :{BLACK}Last
-STR_FACE_LOAD_TIP                                               :{BLACK}Last favorittansikt
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Last favorittansikt
 STR_FACE_LOAD_DONE                                              :{WHITE}Ditt favorittansikt har blitt lastet fra OpenTTDs konfigurasjonsfil.
 STR_FACE_FACECODE                                               :{BLACK}Ansiktsnummer
-STR_FACE_FACECODE_TIP                                           :{BLACK}Vis og/eller endre ansiktsnummer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Vis og/eller endre ansiktsnummer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Vis og/eller endre ansiktsnummer
 STR_FACE_FACECODE_SET                                           :{WHITE}Ny ansiktsnummerkode har blitt fastsatt.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kunne ikke endre ansiktsnummer - må være numerisk mellom 0 og 4 294 967 295!
 STR_FACE_SAVE                                                   :{BLACK}Lagre
-STR_FACE_SAVE_TIP                                               :{BLACK}Lagre favorittansikt
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Lagre favorittansikt
 STR_FACE_SAVE_DONE                                              :{WHITE}Dette ansiktet vil bli lagret som din favoritt i OpenTTDs konfigurasjonsfil.
 STR_FACE_EUROPEAN                                               :{BLACK}Europeisk
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Velg europeiske ansikter
@@ -3525,51 +3525,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikans
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Velg afrikanske ansikter
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nei
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Slå på bart eller ørering
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Slå på bart eller ørering
 STR_FACE_HAIR                                                   :HÃ¥r:
-STR_FACE_HAIR_TIP                                               :{BLACK}Endre hår
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Endre hår
 STR_FACE_EYEBROWS                                               :Øyenbryn:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Endre øyenbryn
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Endre øyenbryn
 STR_FACE_EYECOLOUR                                              :Øyefarge:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Endre øyefarge
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Endre øyefarge
 STR_FACE_GLASSES                                                :Briller:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Slå på briller
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Endre briller
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Slå på briller
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Endre briller
 STR_FACE_NOSE                                                   :Nese:
-STR_FACE_NOSE_TIP                                               :{BLACK}Endre nese
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Endre nese
 STR_FACE_LIPS                                                   :Lepper:
 STR_FACE_MOUSTACHE                                              :Bart:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Endre lepper eller bart
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Endre lepper eller bart
 STR_FACE_CHIN                                                   :Hake:
-STR_FACE_CHIN_TIP                                               :{BLACK}Endre hake
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Endre hake
 STR_FACE_JACKET                                                 :Jakke:
-STR_FACE_JACKET_TIP                                             :{BLACK}Endre jakke
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Endre jakke
 STR_FACE_COLLAR                                                 :Krage:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Endre krage
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Endre krage
 STR_FACE_TIE                                                    :Slips:
 STR_FACE_EARRING                                                :Ørering:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Endre slips eller ørering
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Endre slips eller ørering
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signalvalg
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan ikke konvertere signaler her...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Vanlig signal{}Dette er den enkleste typen av signaler som tillater kun ett tog å kjøre om gangen.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Grønt så lenge det er mer enn ett grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Utgangs-signal (semafor){}Oppfører seg på samme måte som et vanlig signal ville gjort, men er nødvendig for å riktig farge på inngangs- og kombosignaler.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinasjonssignal (semafor){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge «trær» av presignaler.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Avansert signal (semafor){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Avanserte signaler kan passeres fra baksiden.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Enveis avansert signal (semafor){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Enveis avanserte signaler kan ikke passeres fra baksiden.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Vanlig signal (elektrisk){}Dette er den enkleste typen av signaler som tillater kun ett tog å kjøre om gangen.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Inngangssignal (elektrisk){}Grønt så lenge det er mer enn et grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Utgangs-signal (elektrisk){}Oppfører seg på samme måte som et vanlig signal ville gjort, men er nødvendig for å riktig farge på inngangs- og kombosignaler.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinasjonssignal (elektrisk){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge «trær» av presignaler.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Avansert signal (elektrisk){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Avanserte signaler kan passeres fra baksiden.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Enveis avansert signal (elektrisk){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Enveis avanserte signaler kan ikke passeres fra baksiden.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Konverter signal{}Konverterer signaler til den valgte signaltypen; CTRL-klikk vil endre eksisterende variant.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Signaltetthet ved dra-og-slipp
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Senk signaltetthet ved dra-og-slipp
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Øk signaltetthet ved dra-og-slipp
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalvalg
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan ikke konvertere signaler her...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Vanlig signal{}Dette er den enkleste typen av signaler som tillater kun ett tog å kjøre om gangen.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Grønt så lenge det er mer enn ett grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Utgangs-signal (semafor){}Oppfører seg på samme måte som et vanlig signal ville gjort, men er nødvendig for å riktig farge på inngangs- og kombosignaler.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinasjonssignal (semafor){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge «trær» av presignaler.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Avansert signal (semafor){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Avanserte signaler kan passeres fra baksiden.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Enveis avansert signal (semafor){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Enveis avanserte signaler kan ikke passeres fra baksiden.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Vanlig signal (elektrisk){}Dette er den enkleste typen av signaler som tillater kun ett tog å kjøre om gangen.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Inngangssignal (elektrisk){}Grønt så lenge det er mer enn et grønt utgangssignal fra etterfølgende sporseksjon. Ellers rødt.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Utgangs-signal (elektrisk){}Oppfører seg på samme måte som et vanlig signal ville gjort, men er nødvendig for å riktig farge på inngangs- og kombosignaler.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinasjonssignal (elektrisk){}Kombinasjonssignalet fungerer både som inn- og utgangssignal. Dette gjør at du kan bygge «trær» av presignaler.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Avansert signal (elektrisk){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Avanserte signaler kan passeres fra baksiden.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Enveis avansert signal (elektrisk){}Et avansert signal tillater mer enn ett tog å kjøre samtidig, dersom toget kan reservere en trygg rute til et stopp . Enveis avanserte signaler kan ikke passeres fra baksiden.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konverter signal{}Konverterer signaler til den valgte signaltypen; CTRL-klikk vil endre eksisterende variant.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Signaltetthet ved dra-og-slipp
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Senk signaltetthet ved dra-og-slipp
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Øk signaltetthet ved dra-og-slipp
 ########
 
 ############ on screen keyboard
@@ -3581,37 +3581,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI instillinger
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Vis AI instillinger
 STR_AI_DEBUG                                                    :{WHITE}AI feilsøking
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Navnet til AIen
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Navnet til AIen
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Last inn AI på nytt
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Slå av AI, last skript på nytt, og start AI på nytt
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI feilsøkingsvidu er kun tilgjengelig for serveren
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Slå av AI, last skript på nytt, og start AI på nytt
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI feilsøkingsvidu er kun tilgjengelig for serveren
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI konfigurasjon
-STR_AI_CHANGE                                                   :{BLACK}Velg AI
-STR_AI_CONFIGURE                                                :{BLACK}Konfigurer
-STR_AI_CHANGE_TIP                                               :{BLACK}Last enda en AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfigurer AI-parameterene
-STR_AI_LIST_TIP                                                 :{BLACK}Alle AIer som blir lastet i neste spill
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Velg AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurer
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Last enda en AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigurer AI-parameterene
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alle AIer som blir lastet i neste spill
 STR_AI_LIST_CAPTION                                             :{WHITE}Tilgjengelige AIer
-STR_AI_AILIST_TIP                                               :{BLACK}Klikk for å velge en AI
-STR_AI_ACCEPT                                                   :{BLACK}Godta
-STR_AI_ACCEPT_TIP                                               :{BLACK}Velg merket AI
-STR_AI_CANCEL                                                   :{BLACK}Avbryt
-STR_AI_CANCEL_TIP                                               :{BLACK}Ikke endre AI
-STR_AI_CLOSE                                                    :{BLACK}Lukk
-STR_AI_RESET                                                    :{BLACK}Tilbakestill
-STR_AI_HUMAN_PLAYER                                             :Menneskelig spiller
-STR_AI_RANDOM_AI                                                :Tilfeldig AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikk for å velge en AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Godta
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Velg merket AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Avbryt
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ikke endre AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Lukk
+STR_AI_SETTINGS_RESET                                           :{BLACK}Tilbakestill
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Menneskelig spiller
+STR_AI_CONFIG_RANDOM_AI                                         :Tilfeldig AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI-parametere
-STR_AI_AUTHOR                                                   :{BLACK}Forfatter: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versjon {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}En av AIene krasjet. Vennligst rapporter dette til forfatteren av AIen med en skjermdump av AI-feilsøkingsvinduet.
-STR_AI_NO_AI_FOUND                                              :Ingen brukbare AI ble funnet.{}Denne AIen er en plassholder og vil ikke gjøre noe.{}Du kan laste ned flere AIer ved hjelp av 'Online Content' systemet.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Forfatter: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versjon {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En av AIene krasjet. Vennligst rapporter dette til forfatteren av AIen med en skjermdump av AI-feilsøkingsvinduet.
+STR_ERROR_AI_NO_AI_FOUND                                        :Ingen brukbare AI ble funnet.{}Denne AIen er en plassholder og vil ikke gjøre noe.{}Du kan laste ned flere AIer ved hjelp av 'Online Content' systemet.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Lyd grense i by: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Lyd generert: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Lyd grense i by: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Lyd generert: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3625,21 +3625,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Høydekart
 STR_CONTENT_TITLE                                               :{WHITE}Last ned innhold
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type innhold
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Type innhold
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Navn
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Navn
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klikk på en linje for å se detaljene{}Klikk på avmerkningsboksen for å merke den til nedlastning
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Navn
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klikk på en linje for å se detaljene{}Klikk på avmerkningsboksen for å merke den til nedlastning
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Velg alt
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Merk alt innhold til å bli lastet ned
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Merk alt innhold til å bli lastet ned
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Velg oppgraderinger
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Merk alt innhold som en en oppgradering av eksisterende innhold
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Merk alt innhold som en en oppgradering av eksisterende innhold
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Velg bort alt
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Merk alt innhold som ikke skal lastes ned
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Merk alt innhold som ikke skal lastes ned
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Skriv inn filterstreng
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Skriv inn et søkeord for å filtrere listen med
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Skriv inn et søkeord for å filtrere listen med
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Merke-/navnefilter:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Last ned
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Start nedlastningen av det merkede innholdet
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Start nedlastningen av det merkede innholdet
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total størrelse: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INNHOLDSINFORMASJON
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Du har ikke valgt at dette skal lastes ned
@@ -3672,6 +3672,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kunne ik
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Se etter innhold på nettet
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Se etter nytt eller oppdatert innhold å laste ned
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Finn manglende innhold på nettet
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Sjekk om manglende innhold kan bli funnet på nettet
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Finn manglende innhold på nettet
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Sjekk om manglende innhold kan bli funnet på nettet
 ########
diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt
index 0c754aadf..381b96395 100644
--- a/src/lang/norwegian_nynorsk.txt
+++ b/src/lang/norwegian_nynorsk.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Kart - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Spelinnstillingar
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Melding
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Melding frå {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Ã…tvaring!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Ã…tvaring!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Kan ikkje gjere dette...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kan ikkje rydde dette området...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Opphaveleg opphavsbeskytta av {COPYRIGHT} 1995 Chris Sawyer, Alle rettigheiter reservert
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-teamet
 
 STR_QUIT_CAPTION                                                :{WHITE}Avslutt
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nei
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå attende til {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nei
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Er du sikker på at du vil avslutte OpenTTD og gå attende til {STRING}?
 
 STR_JUST_NOTHING                                                :Ingenting
 STR_COLOUR_DARK_BLUE                                            :Mørkeblå
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Ørken
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Snø
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Melding
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Standard
-STR_QUERY_CANCEL                                                :{BLACK}Avbryt
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Gje nytt namn
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Standard
+STR_BUTTON_CANCEL                                               :{BLACK}Avbryt
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Gje nytt namn
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Last
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informasjon
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapasitet
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Total last
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Total kapasitet for dette toget:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Total kapasitet for dette toget:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nytt spel
 STR_INTRO_LOAD_GAME                                             :{BLACK}Last inn spel
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Fleirspelar
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Scenario-redigerar
 
-STR_MAPSIZE                                                     :{BLACK}Kartstorleik:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kartstorleik:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Spelinnstillingar
 
 STR_COMPANY_SOMEONE                                             :nokon{SKIP}{SKIP}
@@ -309,9 +309,9 @@ STR_FILE_MENU_QUIT_GAME                                         :Avslutt noveran
 STR_FILE_MENU_EXIT                                              :Avslutt OpenTTD
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Er du sikker på at du vil avslutte spelet?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Avslutt spel
-STR_SORT_ORDER_TIP                                              :{BLACK}Vel sorteringsrekkefølgje (søkkande/stigande)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Vel sorteringskriterie
-STR_SORT_BY                                                     :{BLACK}Sorter etter
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Vel sorteringsrekkefølgje (søkkande/stigande)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Vel sorteringskriterie
+STR_BUTTON_SORT_BY                                              :{BLACK}Sorter etter
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Innbyggjartal
@@ -341,24 +341,24 @@ STR_SORT_BY_RUNNING_COST                                        :Driftskostnad
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Kraft/Driftskostnad
 STR_SORT_BY_CARGO_CAPACITY                                      :Lastekapasitet
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Inga last ventar
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Vel alle anlegga
-STR_SELECT_ALL_TYPES                                            :{BLACK}Vel alle lasttypar (inkludert last som ikkje ventar)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Sjå ei liste over mogelege maskindesign for dette køyretøyet.
-STR_MANAGE_LIST                                                 :{BLACK}Behandle liste
-STR_MANAGE_LIST_TIP                                             :{BLACK}Send instruksjonar til alle køyretøy i denne lista
-STR_REPLACE_VEHICLES                                            :Bytt ut køyretøy
-STR_SEND_FOR_SERVICING                                          :Send til vedlikehald
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tilgjengelege tog
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tilgjengelege køyretøy
-STR_AVAILABLE_SHIPS                                             :{BLACK}Tilgjengelege skip
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tilgjengelege fly
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Send til depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Send til depot
-STR_SEND_SHIP_TO_DEPOT                                          :Send til depot
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Send til hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Inga last ventar
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Vel alle anlegga
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Vel alle lasttypar (inkludert last som ikkje ventar)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Sjå ei liste over mogelege maskindesign for dette køyretøyet.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Behandle liste
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Send instruksjonar til alle køyretøy i denne lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Bytt ut køyretøy
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Send til vedlikehald
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Tilgjengelege tog
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Tilgjengelege køyretøy
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Tilgjengelege skip
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Tilgjengelege fly
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Send til depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Send til depot
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Send til depot
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Send til hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -388,12 +388,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Instilli
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan ikkje endre serviceintervall...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Lukk vindauge
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Tittel på vindauget - dra for å flytte vindauget
-STR_STICKY_BUTTON                                               :{BLACK}Beskytt dette vindauget mot 'Lukk alle vindauge'-knappen
-STR_RESIZE_BUTTON                                               :{BLACK}Klikk og dra for å endre storleiken på vindauget
+STR_TOOLTIP_STICKY                                              :{BLACK}Beskytt dette vindauget mot 'Lukk alle vindauge'-knappen
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klikk og dra for å endre storleiken på vindauget
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klikk her for å kome til standardmappa for lagring og lasting
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Riv bygningar o.l.
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Senk eit hjørne av eit landstykke
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Hev eit hjørne av eit landstykke
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Senk eit hjørne av eit landstykke
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Hev eit hjørne av eit landstykke
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullefelt - blar lista opp/ned
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullefelt - blar lista til venstre/høgre
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Vis landkonturar på kartet
@@ -406,21 +406,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Skru av/
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Forteneste i år: {CURRENCY} (førre år: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} år ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} år ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} år ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} år ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :To
-STR_VEHICLE_ROAD_VEHICLE                                        :Køyretøy
-STR_VEHICLE_SHIP                                                :Skip
-STR_VEHICLE_AIRCRAFT                                            :Fly
+STR_REPLACE_VEHICLE_TRAIN                                       :To
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Køyretøy
+STR_REPLACE_VEHICLE_SHIP                                        :Skip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fly
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} er gammal
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} er veldig gammal
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} er veldig gammal, og må bytast ut snarast
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informasjon om felt
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Pris for å fjerne: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Pris for å fjerne: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Salsinntekt når den er nullstilt: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Salsinntekt når den er nullstilt: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigar: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Veg eigar: {LTBLUE}{STRING}
@@ -429,7 +429,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Jernbane
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokale styresmaktar: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namn
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -541,7 +541,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klikk pÃ
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klikk på eit musikkspor for å fjerne det frå gjeldande program (Gjeld berre eigendefinert 1 og 2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Skru tilfeldig program av/på
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Vis musikkspormeny
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Trykk for å sentrere biletet rundt industri/by
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Trykk for å sentrere biletet rundt industri/by
 STR_INTRO_DIFFICULTY                                            :{BLACK}Vanskegrad ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Siste melding/nyhende
@@ -590,7 +590,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Mink sto
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generer tilfeldig landskap
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Nullstill landskap
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Nullstill landskap
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Fjern all eigedom som er ått av spelar frå kartet
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Fjern all eigedom som er ått av spelar frå kartet
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Er du sikker på at du vil fjerne all eigedom som er ått av spelar?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Landskapsgenerering
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Bygenerering
@@ -604,11 +604,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...for n
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...for nær ein annan by
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...feltet er ikkje høveleg
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...for mange byar
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan ikkje byggje byar
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...det er ikkje meir plass på kartet
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan ikkje byggje byar
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...det er ikkje meir plass på kartet
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Auk bystorleik
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Utvid
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Byen byggjer ikkje vegar. Du kan tillata veg-bygging i Avanserte innstillingar -> Økonomi -> Byar.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Byen byggjer ikkje vegar. Du kan tillata veg-bygging i Avanserte innstillingar -> Økonomi -> Byar.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Lag tilfeldig by
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Bygg by ein tilfeldig stad
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan ikkje byggja {STRING} her...
@@ -622,13 +622,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Plasser
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Plasser fyrtårn
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Plasser radiosendar
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definer ørkenområde.{}Trykk og held inne CTRL for å fjerne det
-STR_CREATE_LAKE                                                 :{BLACK}Definer vassområde.{}Lag ein kanal. Viss CTRL er halde nede ved havnivå, vil vatnet i staden fløyme over omgivnadene
-STR_CREATE_RIVER                                                :{BLACK}Plasser elver.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definer vassområde.{}Lag ein kanal. Viss CTRL er halde nede ved havnivå, vil vatnet i staden fløyme over omgivnadene
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Plasser elver.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Slett
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Slett byen heilt
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Lagre scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Last inn scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Last inn høgdekart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Last inn høgdekart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Avslutt redigeringsprogram
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Avslutt
@@ -638,7 +638,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Lagre sc
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Spel scenario
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Spel høgdekart
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Start eit nytt spel, bruk eit høgdekart som landskap
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Er du sikker på at du vil avslutte scenariet?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Er du sikker på at du vil avslutte scenariet?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kan berre byggjast i byar med meir enn 1200 innbyggjarar
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Flytt startdatoen attende eit år
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Flytt startdatoen fram eit år
@@ -646,21 +646,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...endan
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Liten
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Middels
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Stor
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Vilkårleg
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Vilkårleg
 STR_FOUND_TOWN_CITY                                             :{BLACK}By
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Store byar veks raskare enn små byar{}Instillingane avgjer om dei er større når dei vert grunnlagt
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vel storleik på by
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Bystorleik:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}By-veglayout:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Vel veg-layout nytta for denne byen
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Orginal
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Betre vegar
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 rutenett
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 rutenett
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Vilkårleg
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}By-veglayout:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Vel veg-layout nytta for denne byen
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orginal
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Betre vegar
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 rutenett
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 rutenett
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Vilkårleg
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Vis siste melding eller nyhende
 STR_NEWS_MESSAGES_OFF                                           :Av
 STR_NEWS_MESSAGES_SUMMARY                                       :Samandrag
@@ -760,10 +760,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Skjermdumpen vart lagra som '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Skjermdump gjekk gale!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kjøp land for framtidig bruk
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kjøp land for framtidig bruk
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOLAGRING
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  LAGRAR SPEL  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Lagring foregår framleis,{}ver venleg å vente til det er ferdig!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Lagring foregår framleis,{}ver venleg å vente til det er ferdig!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Vel 'Ezy Street style music'-program
 
 ############ start of townname region
@@ -826,7 +826,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vel sprÃ
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Fullskjerm
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kryss av i denne boksen for å spele OpenTTD i fullskjermmodus
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fullskjermvising feila
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fullskjermvising feila
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skjermoppløysing
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vel skjermoppløysinga som skal nyttast
@@ -837,12 +837,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Vel kva
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Basis-grafikksett
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Vel basis-grafikksett som skal nyttast
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autolagring gjekk gale
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autolagring gjekk gale
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}PÃ¥ veg til {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}PÃ¥ veg til {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Ingen ordre
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Ingen ordre, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}PÃ¥ veg til {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}PÃ¥ veg til {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Ingen ordre
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Ingen ordre, {VELOCITY}
 
 STR_PASSENGERS                                                  :passasjerar
 STR_BAGS                                                        :sekkar
@@ -853,9 +853,9 @@ STR_CRATES                                                      :kasser
 STR_RES_OTHER                                                   :anna
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan ikkje dele ordreliste...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan ikkje kopiere ordreliste...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slutt på delte ordrar - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kan ikkje dele ordreliste...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kan ikkje kopiere ordreliste...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Slutt på delte ordrar - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} kan ikke finna ein veg å fortsette på
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} har køyrt seg vill.
@@ -1119,15 +1119,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-storl
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :slått av
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Endre innstillingsverdi
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Endre innstillingsverdi
 
-STR_TEMPERATE_LANDSCAPE                                         :Temperert landskap
-STR_SUB_ARCTIC_LANDSCAPE                                        :subarktisk landskap
-STR_SUB_TROPICAL_LANDSCAPE                                      :subtropisk landskap
-STR_TOYLAND_LANDSCAPE                                           :"Leikeland"-landskap
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Temperert landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :subarktisk landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :subtropisk landskap
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :"Leikeland"-landskap
 
 STR_CHEATS                                                      :{WHITE}Juks
-STR_CHEATS_TIP                                                  :{BLACK}Avkrysningsbokser fortel at du har nytta denne juksekoden tidlegare
+STR_CHEATS_TOOLTIP                                              :{BLACK}Avkrysningsbokser fortel at du har nytta denne juksekoden tidlegare
 STR_CHEATS_WARNING                                              :{BLACK}Åtvaring! Du skal vete at du er i ferd med å gjera motspelarane ein stor urett. Gud tilgjev, men det er ikkje sikkert at venene dine gjer det same.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Auk lommeboka di med {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Speler som firma: {ORANGE}{COMMA}
@@ -1139,177 +1139,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Byt kli
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Byt dato: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Tillat endring av produksjonsmengder: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Har kurs mot {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Har kurs mot {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Har kurs mot {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Har kurs mot {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Køyr via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Køyr utan stopp via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Køyr via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Køyr utan stopp via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN} kontrollpunkt
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} kontrollpunkt nr. {COMMA}
-STR_LANDINFO_WAYPOINT                                           :Kontrollpunkt
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} kontrollpunkt
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} kontrollpunkt nr. {COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrollpunkt
 
-STR_WAYPOINT                                                    :{WHITE}Kontrollpunkt
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vel kontrollpunkttype
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrollpunkt
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vel kontrollpunkttype
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Endre namn på kontrollpunkt
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan ikkje endre namnet til kontrollpunktet...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan ikkje endre namnet til kontrollpunktet...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Gjer om jernbane til kontrollpunkt
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kan ikkje byggje kontrollpunkt for tog her...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan ikkje fjerne kontrollpunktet...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan ikkje byggje kontrollpunkt for tog her...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan ikkje fjerne kontrollpunktet...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Bygg jernbane ved hjelp av autobanemodusen
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...det er ingen byar i dette scenarioet
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kart-generering avbrutt...{}...ingen passande by-plasseringar
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...det er ingen byar i dette scenarioet
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kart-generering avbrutt...{}...ingen passande by-plasseringar
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mange tilfeldige byar
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Dekk kartet med tilfeldig plasserte byar
-STR_MANY_RANDOM_INDUSTRIES                                      :Mange tilfeldige industriar
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Dekk kartet med tilfeldig plasserte industriar
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kan ikkje lage industriar...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Mange tilfeldige byar
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Dekk kartet med tilfeldig plasserte byar
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Mange tilfeldige industriar
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Dekk kartet med tilfeldig plasserte industriar
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan ikkje lage industriar...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Åpne verktøylinja for å heve/senke land, plante tre, osv.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landskaping
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Utjamn land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Utjamn land
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Tre av tilfeldig type
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Plasser tre av tilfeldig type
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plasser tre av tilfeldig type
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kan ikkje byggje kanalar her...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kan ikkje byggje kanalar her...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Lag kanalar
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan ikkje byggje sluser her...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kan ikkje byggje sluser her...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Bygg sluser
-STR_LANDINFO_LOCK                                               :Sluse
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sluse
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kan ikkje plassere elver her...
-STR_LANDINFO_RIVER                                              :Elv
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kan ikkje plassere elver her...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Elv
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...bøye er i bruk!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...bøye er i bruk!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinatar: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinatar: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ikkje fjerne del av stasjonen...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan ikkje konvertere jernbanetype her...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan ikkje fjerne del av stasjonen...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan ikkje konvertere jernbanetype her...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Gjer om/oppgrader jernbanetypen
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Dra lokomotivet hit for å selje heile toget
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Dra lokomotivet hit for å selje heile toget
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Dra og slipp
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bygg stasjon med dra og slipp
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Vel den stasjonstypen som skal visast
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vel stasjonen du vil byggje
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vel den stasjonstypen som skal visast
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vel stasjonen du vil byggje
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Snøgg tid
 STR_MESSAGE_HISTORY                                             :{WHITE}Tidlegare meldingar
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Ei liste over siste nyhende
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Deaktiver alle
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Aktiver alle
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Ei liste over siste nyhende
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Deaktiver alle
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Aktiver alle
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industriar
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA} % transportert)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA} %/{COMMA} % transportert)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinamn - klikk på namnet for å sentrera visingsbildet på industrien
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industriar
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA} % transportert)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA} %/{COMMA} % transportert)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industrinamn - klikk på namnet for å sentrera visingsbildet på industrien
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...for nær ein annan industri
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...for nær ein annan industri
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Endre produksjon
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Fleirspelar
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spelarnamn:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Dette er namnet andre spelarar vil identifisere deg med
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Sett inn namnet ditt
-STR_NETWORK_CONNECTION                                          :{BLACK}Samband:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Vel mellom å spele på internett eller i lokalt nettverk (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Start tenar
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start ein eigen tenar
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Namn
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Namn på spelet
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Språk, tenarversjon, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klikk på eit spel i lista for å velje det
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Tenaren du brukte sist gong:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klikk for å velje tenaren du brukte sist gong
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Finn tenar
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Søk på nettverket etter ein tenar
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Legg til tenar
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Legg til ein tenar i lista over tenarar som alltid vil verte sjekka for aktive spel.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Skriv inn IP-adressa til tenaren
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientar
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientar på nett / maks. antal klientar{}Firma på nett / maks. antal firma
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kartstørrelse
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Spelets kartstorleik{}Klikk for å sortere etter område
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dato
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuell dato
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Ã…r
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Antal år{}spelet har pågått
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPELOVERSIKT
-STR_NETWORK_CLIENTS                                             :{SILVER}Klientar:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Språk:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Brikkesett:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorleik:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tenarversjon:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adressa til tenaren:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Starta:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Noverande dato:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Passordbeskytta!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}TENAREN ER KOBLA AV
-STR_NETWORK_SERVER_FULL                                         :{SILVER}TENAREN ER FULL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}DU HAR EIN ANNAN VERSJON ENN TENAREN
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF PASSAR IKKJE
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Bli med på spel
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start eit nytt fleirspelarspel
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spelnamn:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Spelnamnet vil verte vist til andre spelarar i fleirspelarmenyen
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Gje eit namn til nettverksspelet
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Set passord
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Beskytt spelet ditt med passord så ikkje kven som helst kan verte med på det
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Vel eit kart:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Kva kart vil du spele?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internett
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internett
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internett (annonser)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maksimalt antal tillatne klientar
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Vel maksimalt antal klientar. Alle plassane treng ikkje å verte tekne
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maks. antal firma:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begrens tenaren til eit visst antal firma
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskodar{P "" ar}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maks antal tilskodarar
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begrens tenaren til eit visst antal tilskodarar
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Språk som vert tala på tenaren:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Andre spelarar skal vete kva språk ein talar på denne tenaren
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Start spel
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Start eit nytt nettverksspel frå ein tilfeldig bane, eller eit scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Last spel
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Gjenoppta eit tidlegare lagra fleirspelarspel (ver sikker på at du koblar deg til som den rette spelaren)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Fleirspelar
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Sett inn namnet ditt
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Samband:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Vel mellom å spele på internett eller i lokalt nettverk (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Start tenar
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Start ein eigen tenar
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Namn
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Namn på spelet
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Språk, tenarversjon, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klikk på eit spel i lista for å velje det
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Tenaren du brukte sist gong:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klikk for å velje tenaren du brukte sist gong
+
+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_ENTER_IP                                :{BLACK}Skriv inn IP-adressa til tenaren
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klientar
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klientar på nett / maks. antal klientar{}Firma på nett / maks. antal firma
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kartstørrelse
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Spelets kartstorleik{}Klikk for å sortere etter område
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dato
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Aktuell dato
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Ã…r
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Antal år{}spelet har pågått
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPELOVERSIKT
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klientar:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Språk:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Brikkesett:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kartstorleik:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Tenarversjon:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adressa til tenaren:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Starta:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Noverande dato:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Passordbeskytta!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}TENAREN ER KOBLA AV
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}TENAREN ER FULL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}DU HAR EIN ANNAN VERSJON ENN TENAREN
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF PASSAR IKKJE
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Bli med på spel
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start eit nytt fleirspelarspel
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spelnamn:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Spelnamnet vil verte vist til andre spelarar i fleirspelarmenyen
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Gje eit namn til nettverksspelet
+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_SELECT_MAP                             :{BLACK}Vel eit kart:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Kva kart vil du spele?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internett
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internett
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internett (annonser)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maksimalt antal tillatne klientar
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Vel maksimalt antal klientar. Alle plassane treng ikkje å verte tekne
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firma
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maks. antal firma:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Begrens tenaren til eit visst antal firma
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} tilskodar{P "" ar}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maks antal tilskodarar
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Begrens tenaren til eit visst antal tilskodarar
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Språk som vert tala på tenaren:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Andre spelarar skal vete kva språk ein talar på denne tenaren
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start spel
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Start eit nytt nettverksspel frå ein tilfeldig bane, eller eit scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Last spel
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Gjenoppta eit tidlegare lagra fleirspelarspel (ver sikker på at du koblar deg til som den rette spelaren)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Kva som helst
@@ -1350,33 +1350,33 @@ STR_NETWORK_LANG_GREEK                                          :Gresk
 STR_NETWORK_LANG_LATVIAN                                        :Latvisk
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Fleirspelarspel-lobby
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Fleirspelarspel-lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Freistar å verte med:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Ei liste over firma i spelet. Du kan anten verte med i eit eller starte eit nytt.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nytt firma
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Skip eit nytt firma
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Sjå på spel
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Ver tilskodar til spelet
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Ver med i firmaet
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Hjelp å styre dette firmaet
-STR_NETWORK_REFRESH                                             :{BLACK}Oppdater tenar
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Oppdater tenarinfo
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Freistar å verte med:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Ei liste over firma i spelet. Du kan anten verte med i eit eller starte eit nytt.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nytt firma
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Skip eit nytt firma
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Sjå på spel
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Ver tilskodar til spelet
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Ver med i firmaet
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hjelp å styre dette firmaet
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Oppdater tenar
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Oppdater tenarinfo
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}FIRMAOVERSIKT
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}FIRMAOVERSIKT
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Firmanamn:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Skipa:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Firmaverdi:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Noverande saldo:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Inntekt i fjor:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Nettverksyting:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Firmanamn:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Skipa:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Firmaverdi:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Noverande saldo:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Inntekt i fjor:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Nettverksyting:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Køyretøy:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasjonar:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spelarar:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Køyretøy:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stasjonar:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spelarar:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Kobler til...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Kobler til...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Kobler til..
@@ -1392,49 +1392,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hentar f
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" ar} føre oss
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} lasta ned så langt
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Koble frå
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Koble frå
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Slå inn det beløpet du vil gi
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Tenaren er beskytta. Skriv inn passord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firmaet er beskytta.  Skriv inn eit passord
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Liste over klientar
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Liste over klientar
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Vær tilskodar
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt firma
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Finn inkje nettverksadapter eller kompilert utan ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Kunne ikkje finne noko nettverksspel
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Tenaren svarte ikkje på spørringa
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Kunne ikkje koble til grunna NewGRF-filer som ikkje passar saman
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Synkronisering i nettverksspelet feila
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Mista tilkoblinga til nettverksspelet
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Kunne ikkje laste spel som var lagra på tenaren
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Klarte ikkje å starte tenaren
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Klarte ikkje å opprette samband.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Tilkobling nr. {NUM} vart tidsavbrote
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Det skjedde ein protokoll-feil, så sambandet er brote
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Klientversjonen er ikkje den same som tenarversjonen
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Feil passord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Tenaren er full
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Du er bannlyst frå denne tenaren
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Du vart sparka ut frå spelet
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Juksing er forbode på denne tenaren
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Finn inkje nettverksadapter eller kompilert utan ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Kunne ikkje finne noko nettverksspel
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Tenaren svarte ikkje på spørringa
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Kunne ikkje koble til grunna NewGRF-filer som ikkje passar saman
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Synkronisering i nettverksspelet feila
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Mista tilkoblinga til nettverksspelet
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Kunne ikkje laste spel som var lagra på tenaren
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Klarte ikkje å starte tenaren
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Klarte ikkje å opprette samband.
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Tilkobling nr. {NUM} vart tidsavbrote
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Det skjedde ein protokoll-feil, så sambandet er brote
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Klientversjonen er ikkje den same som tenarversjonen
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Feil passord
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Tenaren er full
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Du er bannlyst frå denne tenaren
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Du vart sparka ut frå spelet
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Juksing er forbode på denne tenaren
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :generell feil
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniseringsfeil
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :klarte ikkje å opne kartet
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :sambandet vart brote
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollfeil
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF-filer passar ikkje saman
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :ikkje autorisert
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottok merkeleg pakke
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :feil versjon
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :namnet er brukt av nokon andre
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :feil passord for til spelet
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :feil bedrifts-id i DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :sparka ut av tenaren
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :freista å jukse
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :tenaren er full
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :generell feil
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :synkroniseringsfeil
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :klarte ikkje å opne kartet
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :sambandet vart brote
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokollfeil
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF-filer passar ikkje saman
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :ikkje autorisert
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :mottok merkeleg pakke
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :feil versjon
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :namnet er brukt av nokon andre
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :feil passord for til spelet
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :feil bedrifts-id i DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :sparka ut av tenaren
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :freista å jukse
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :tenaren er full
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1444,15 +1444,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spel sett på p
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spel gjenoppteke (klient tilkobla)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spel gjenoppteke (klient kunne ikkje kobla seg til)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :forlet
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} har blitt med i spelet
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} har slutta seg til firma #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} har slutta seg til sjåarane
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} har starta eit nytt firma (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} har forlatt spelet ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} har endra namnet sitt til {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gav firmaet ditt {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Du gav {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :forlet
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} har blitt med i spelet
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} har slutta seg til firma #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} har slutta seg til sjåarane
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} har starta eit nytt firma (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} har forlatt spelet ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} har endra namnet sitt til {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gav firmaet ditt {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Du gav {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Lag] :
 STR_NETWORK_CHAT_COMPANY                                        :[Lag] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Lag] Til {STRING}: {WHITE}{STRING}
@@ -1462,8 +1462,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privat] Til {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Alle] :
 STR_NETWORK_CHAT_ALL                                            :[Alle] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Skriv tekst for nettverkssamtale
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Tenaren avslutta spelet
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Tenaren startar om att...Vær venleg og vent
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Tenaren avslutta spelet
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Tenaren startar om att...Vær venleg og vent
 
 STR_NETWORK_SERVER                                              :Tenar
 STR_NETWORK_CLIENT                                              :Klient
@@ -1477,19 +1477,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Snakk til firma
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privat melding
 
 
-STR_NETWORK_SEND                                                :{BLACK}Send
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Send
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kan ikkje laste landskapet frå PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fann inga fil.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kunne ikkje konvertere biletetypen. Eit 8- eller 24-bits bilete trengst.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...noko gjekk akkurat gale. Orsak. (Truleg ei øydelagt fil.)
+STR_ERROR_PNGMAP                                                :{WHITE}Kan ikkje laste landskapet frå PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fann inga fil.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...kunne ikkje konvertere biletetypen. Eit 8- eller 24-bits bilete trengst.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...noko gjekk akkurat gale. Orsak. (Truleg ei øydelagt fil.)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kan ikkje laste landskap frå BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kan ikkje konvertere biletetype.
+STR_ERROR_BMPMAP                                                :{WHITE}Kan ikkje laste landskap frå BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...kan ikkje konvertere biletetype.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Kostnad: {CURRENCY}
@@ -1503,13 +1503,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Berekna
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan ikkje heve land her...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kan ikkje senke land her...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan ikkje jemne ut land her...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Steinar
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Ulendt terreng
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Bart land
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gras
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Jorde
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snødekt land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Ørken
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Steinar
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Ulendt terreng
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Bart land
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gras
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Jorde
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snødekt land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Ørken
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Landet hallar feil veg
@@ -1517,11 +1517,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Umogeleg
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Utgraving vil skade tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Allereie på havnivå
 STR_ERROR_TOO_HIGH                                              :{WHITE}For høgt
-STR_ALREADY_LEVELLED                                            :{WHITE}... allereie flatt
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... allereie flatt
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Upassande jernbanespor
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...allereie bygd
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Må fjerne jernbanespor først
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Vegen er einvegs eller blokkert
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Vegen er einvegs eller blokkert
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Bygg jernbane
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrisk jernbane-konstruksjon
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Bygg Monorail
@@ -1545,41 +1545,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Bygg sig
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bygg jernbanebru
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bygg jernbanetunnel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Vel mellom bygging/fjerning for jernbanespor og signallykter
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Bruval - trykk på brua du vil ha for å byggje ho
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Bruval - trykk på brua du vil ha for å byggje ho
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Vel togstallens retning
-STR_RAILROAD_TRACK                                              :Jernbanespor
-STR_RAILROAD_TRAIN_DEPOT                                        :Togstall
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Jernbanespor
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Togstall
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...feltet er ått av eit anna firma
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Jernbanespor med normale signal
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Jernbanespor med for-signal
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Jernbanespor med ut-signal
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Jernbane med kombinasjonssignal
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Togspor med vegsignal
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Togspor med envegs vegsignal
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Jernbanespor med normale- og pre-signal
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Jernbanespor med normale- og exit-spor
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Jernbane med vanlege og kombinasjonssignal
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Togspor med blokkerings- og vegsignal
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Togspor med blokkerings- og envegs vegsignal
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Jernbanespor med pre- og exit-signal
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Jernbane med pre- og kombinasjonssignal
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Togspor med inngangs- og vegsignal
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Togspor med inngangs- og envegs vegsignal
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Jernbane med utgangs- og kombinasjonssignal
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Togspor med utgangs- og vegsignal
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Togspor med utgangs- og einvegs vegsignal
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Togspor med kobinasjons- og vegsignal
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Togspor med kombinasjons- og einvegs vegsignal
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Togspor med vegsignal og einvegs vegsignal
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Må fjerne togstasjon først
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Bygg ein seperat stasjon
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Spleisa stasjonen
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Jernbanespor med normale signal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Jernbanespor med for-signal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Jernbanespor med ut-signal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Jernbane med kombinasjonssignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Togspor med vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Togspor med envegs vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Jernbanespor med normale- og pre-signal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Jernbanespor med normale- og exit-spor
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Jernbane med vanlege og kombinasjonssignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Togspor med blokkerings- og vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Togspor med blokkerings- og envegs vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Jernbanespor med pre- og exit-signal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Jernbane med pre- og kombinasjonssignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Togspor med inngangs- og vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Togspor med inngangs- og envegs vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Jernbane med utgangs- og kombinasjonssignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Togspor med utgangs- og vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Togspor med utgangs- og einvegs vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Togspor med kobinasjons- og vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Togspor med kombinasjons- og einvegs vegsignal
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Togspor med vegsignal og einvegs vegsignal
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Må fjerne togstasjon først
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Bygg ein seperat stasjon
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Spleisa stasjonen
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Må fjerne veg først
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vegarbeid pågår
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vegarbeid pågår
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Bygg veg
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Trikkekonstruksjon
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Vel type bru
@@ -1615,14 +1615,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Bygg tun
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Aktiver / Deaktiver envegskøyrde vegar
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Vel mellom bygging/fjerning for vegbygging
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Byt mellom bygge / fjerne for trikk
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Vel retninga på garasjen
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Vel retning for trikkedepot
-STR_ROAD_DESCRIPTION_ROAD                                       :Veg
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Veg med gatelykter
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Aveny
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garasje
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Jernbaneovergang
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Sporvei
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vel retninga på garasjen
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vel retning for trikkedepot
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Veg
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Veg med gatelykter
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Aveny
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garasje
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Jernbaneovergang
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Sporvei
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan ikkje fjerne busstasjon
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan ikkje fjerne lastebilstasjon
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan ikkje fjerne trikkestasjon...
@@ -1630,12 +1630,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kan ikkj
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Byar
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Bygningen må rivst først
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (By)
@@ -1648,9 +1648,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Sentrer
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Bytt namn på byen
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passasjerar førre månad: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post førre månad: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Frakt naudsynt for folketalsauke:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} naudsynt
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} levert forrige månad
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Frakt naudsynt for folketalsauke:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} naudsynt
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} levert forrige månad
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Høghus
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kontorblokk
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Leilegheitsblokk
@@ -1687,7 +1687,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subsidie gjeve til {STRING}!{}{}Transport av {STRING} frå {STATION} til {STATION} vil gje trippel inntekt i eit år!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subsidie gjeve til {STRING}!{}{}Transport av {STRING} frå {STATION} til {STATION} vil gje firedobbel inntekt i eit år!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Bystyret i {TOWN} tillèt ikkje fleire flyplassar i denne byen
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} lokal myndigheit nektar tillatelse til flyplass pga støybekymringar
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokal myndigheit nektar tillatelse til flyplass pga støybekymringar
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Hytter
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Hus
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Leilegheiter
@@ -1723,7 +1723,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Trafikkaos i {TOWN}!{}{}Ombygging av vegen, finansiert av {STRING}, vil gje vegproblem i 6 månader.
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (under bygging)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (under bygging)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Indianertelt
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tekjelehus
@@ -1736,17 +1736,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Plasser skilt
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Tre
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...det er allereie eit tre her
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan ikkje plante tre her...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...for mange skilt
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan ikkje plassere skilt her...
-STR_SIGN_DEFAULT                                                :Skilt
+STR_DEFAULT_SIGN_NAME                                           :Skilt
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Endre teksta på skiltet
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan ikkje endre teksta på skiltet...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan ikkje sletta skilt...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vel typen tre som skal plantast
-STR_TREE_NAME_TREES                                             :Tre
-STR_TREE_NAME_RAINFOREST                                        :Regnskog
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusplanter
+STR_LAI_TREE_NAME_TREES                                         :Tre
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regnskog
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusplanter
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Vel jernbanestasjontype
@@ -1766,7 +1766,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}MÃ¥ rive
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}For nær ein annan flyplass
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Må rive eksisterande flyplass først
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Endre namnet på stasjon/lasteterminal
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Endre namnet på stasjon/lasteterminal
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan ikkje endre namnet på stasjonen...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Vurderingar
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aksepterer
@@ -1784,10 +1784,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Framifrå
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Vis alle tog som har denne stasjonen på timeplanen sin
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Vis alle køyretøy som har denne stasjonen på timeplanen sin
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Vis alle fly som har denne stasjonen på timeplanen sin
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Vis alle skip som har denne stasjonen på timeplanen sin
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Vis alle tog som har denne stasjonen på timeplanen sin
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Vis alle køyretøy som har denne stasjonen på timeplanen sin
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Vis alle fly som har denne stasjonen på timeplanen sin
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Vis alle skip som har denne stasjonen på timeplanen sin
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} godtek ikkje lenger {STRING}
@@ -1820,47 +1820,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Endre na
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Vis liste over godtekne varer
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stasjonsnamn - Trykk på namnet for å sentrere biletet på stasjonen
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vel storleik og flyplasstype
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Jernbanestasjon
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Flyplass
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Lasteterminal
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bussterminal
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Hamn
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Jernbanestasjon
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Flyplass
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lasteterminal
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bussterminal
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Hamn
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Vis dekningsområdet til den foreslåtte plasseringa
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Ikkje vis dekningsområdet til den foreslåtte plasseringa
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Dekningsområde
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Hamn
-STR_STATION_DESCRIPTION_BUOY                                    :Bøye
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bøye
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bøya er i vegen
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stasjonen er spreidd for mykje
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ikkje-einsarta stasjonar er deaktiverte
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Hald nede CTRL for å velje meir enn éin ting
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...ikkje-einsarta stasjonar er deaktiverte
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Hald nede CTRL for å velje meir enn éin ting
 
 STR_UNDEFINED                                                   :(udefinert streng)
-STR_STAT_CLASS_DFLT                                             :Standard stasjon
-STR_STAT_CLASS_WAYP                                             :Lokalstasjonar
+STR_STATION_CLASS_DFLT                                          :Standard stasjon
+STR_STATION_CLASS_WAYP                                          :Lokalstasjonar
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Retning på skipdepotet
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...må byggjast på sjøen
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kan ikkje byggje skipsdepot her...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Vel retning påskipsdepotet
-STR_WATER_DESCRIPTION_WATER                                     :Vatn
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kyst eller elvebreidd
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Skipsdepot
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvedukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vatn
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kyst eller elvebreidd
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Skipsdepot
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvedukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Kan ikkje byggje på vatn
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Må fjerna kanal først
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Må fjerna kanal først
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Lagre spel
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Last inn spel
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Lagre
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Slett
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Tilskuar, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Tilskuar, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} ledig
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan ikkje lese frå disk
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Lagring av spelet mislukkast{}{STRING}
@@ -1876,12 +1876,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Liste ov
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Gjeldande namn for vald lagra spel
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Slett valde lagra spel
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Lagre gjeldande spel ved å bruke det valde namnet
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Lag eit tilfeldig spel
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Last høgdekart
-STR_SAVE_OSKTITLE                                               :{BLACK}Gje eit namn til til lagringa av spelet
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Lag eit tilfeldig spel
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Last høgdekart
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Gje eit namn til til lagringa av spelet
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} er i vegen
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} er i vegen
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kolgruve
 STR_INDUSTRY_NAME_POWER_STATION                                 :Kraftstasjon
@@ -1939,7 +1939,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Sentrer biletet på industriområdet
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Ny {STRING} byggjast i nærleiken av {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Ny {STRING} plantast i nærleiken av {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kostnad: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kostnad: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan ikkje byggje denne typen industri her...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...skog kan berre plantast over snøgrensa
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} legg ned verksemda straks!
@@ -1957,16 +1957,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Annan tunnel i vegen
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunnelen vil enda utanfor kartet
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunnelen vil enda utanfor kartet
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Kan ikkje grave ut land til den andre tunnelutgangen
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Må rive tunnel først
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Må rive bru først
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kan ikkje starte og slutte på same felt
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Bruhovud er ikkje på same nivå
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Brua er for låg for terrenget
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan ikkje starte og slutte på same felt
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Bruhovud er ikkje på same nivå
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Brua er for låg for terrenget
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start og slutt må vere på linje
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Feltet er uhøveleg for tunnelinngang
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hengjebru, stål
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Bjelkar, stål
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Frittberande, stål
@@ -1977,30 +1977,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Røyrforma, stÃ
 STR_BRIDGE_TUBULAR_SILICON                                      :Røyrforma, silikon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kan ikkje byggje bru her...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan ikkje byggje tunnel her...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Jernbanetunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Vegtunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Hengjebru av stål (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Bjelkebru av stål (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Frittberande bru av stål (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Hengjebru av armert betong (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Trebru (jernbane)
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betongbru (jernbane)
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Hengjebru av stål (veg)
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Bjelkebru av stål (veg)
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Frittbærende bru av stål (veg)
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Hengjebru av armert betong (veg)
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Trebru (veg)
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betongbru (veg)
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Røyrforma bru (jernbane)
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Røyrforma bru (veg)
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Jernbanetunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Vegtunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Hengjebru av stål (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Bjelkebru av stål (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Frittberande bru av stål (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Hengjebru av armert betong (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Trebru (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betongbru (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Hengjebru av stål (veg)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Bjelkebru av stål (veg)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Frittbærende bru av stål (veg)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Hengjebru av armert betong (veg)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Trebru (veg)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betongbru (veg)
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Røyrforma bru (jernbane)
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Røyrforma bru (veg)
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objekt er i vegen
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Radiosendar
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fyrtårn
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Hovudkontor til firma
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Radiosendar
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fyrtårn
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Hovudkontor til firma
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...hovudkontor til firma er i vegen
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Feltet eigast av eit firma
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Feltet eigast av eit firma
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Kan ikkje kjøpe dette feltet...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...du eig det alt!
 
@@ -2046,7 +2046,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stasjo
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Vanskegrad
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Lagre
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Lagre
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lett
@@ -2119,8 +2119,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Firmafarg
 STR_LIVERY_CAPTION                                              :{WHITE}Ny firmafarge
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Firmanamn
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Namnet til sjefen
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Firmanamn
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Namnet til sjefen
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Firmanamn
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Namnet til sjefen
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan ikkje endre firmanamn...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kan ikkje byte namn på sjefen...
 STR_FINANCES_CAPTION                                            :{WHITE}Rekneskapen til {COMPANY} {BLACK}{COMPANYNUM}
@@ -2144,11 +2144,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totalt:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf over inntekter
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf over overskot
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Saldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}LÃ¥n
-STR_MAX_LOAN                                                    :{WHITE}Maks lån:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maks lån:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}LÃ¥n meir ({SKIP}{SKIP}{CURRENCY})
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Betal attende ({SKIP}{SKIP}{CURRENCY})
@@ -2157,7 +2157,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan ikkj
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...lånet er allereie betalt attende
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...du treng {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan ikkje betale lånet attende...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan ikkje gje vekk pengar som er lånt frå banken...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan ikkje gje vekk pengar som er lånt frå banken...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Gje sjefen ei andletslyfting
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Endre firmafarge
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Endre namnet til sjefen
@@ -2167,10 +2167,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Betal at
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Sjef)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Grunnlagt: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Køyretøy:
-STR_TRAINS                                                      :{WHITE}{COMMA} tog
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} køyretøy
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} fly
-STR_SHIPS                                                       :{WHITE}{COMMA} skip
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tog
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} køyretøy
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} fly
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} skip
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ingen
 STR_FACE_CAPTION                                                :{WHITE}Vel utsjånad
 STR_FACE_MALE_BUTTON                                            :{BLACK}Mann
@@ -2184,7 +2184,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Lag eit
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Nøkkel
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Vis oversikt over grafval
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Vis oversikt over firmagrafval
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Trykk her for å vise/skjule eit firma
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Trykk her for å vise/skjule eit firma
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Antal leverte varer
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Prestasjonsvurdering av firma (maks poeng=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Firmaverdi
@@ -2218,23 +2218,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :President
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Finansfyrste
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bygg hovudkontor
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bygg firmaet sitt hovudkontor/sjå firmaet sitt hovudkontor
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Gjenoppbygg selskapets hovudkvarter ein annan stad for 1 % av verdien til firmaet
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Gjenoppbygg selskapets hovudkvarter ein annan stad for 1 % av verdien til firmaet
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan ikkje byggje hovudkontor...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Sjå hovudkontor
-STR_RELOCATE_HQ                                                 :{BLACK}Omplasser hovudkvarter
-STR_COMPANY_JOIN                                                :{BLACK}Knytt til
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Knytt til og spel som dette firmaet
-STR_COMPANY_PASSWORD                                            :{BLACK}Passord
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Passordbeskytt firmaet ditt slik at ikkje alle og einkvar kan verte med. Bruk '*' for å tømme passord.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Vel firmapassord
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Omplasser hovudkvarter
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Knytt til
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Knytt til og spel som dette firmaet
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Passord
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Passordbeskytt firmaet ditt slik at ikkje alle og einkvar kan verte med. Bruk '*' for å tømme passord.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Vel firmapassord
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK} Ikkje lagre passordet
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Gje firmaet nytt passord
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Firmapassord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standard passord for firma
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Bruk passordet fra dette firmaet som standard for nye firma
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standard passord for firma
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Bruk passordet fra dette firmaet som standard for nye firma
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Verdskrise!{}{}Økonomar fryktar det verste. Nedgangstider i kjømda.
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Verdskrise over!{}{}Opptur i marknaden gjer industrien sjølvkjensla attende.
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Byt mellom stor/liten storleik på vindauga
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Byt mellom stor/liten storleik på vindauga
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Firmaverdi: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kjøp 25 % av aksjane i firmaet
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sel 25 % av aksjane du eig
@@ -2244,7 +2244,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan ikkj
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan ikkje selje 25 % av aksjane...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA} % eigast av {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} har vorte kjøpt opp av {STRING}!
-STR_PROTECTED                                                   :{WHITE}Dette selskapet sel ikkje aksjer enno...
+STR_ERROR_PROTECTED                                             :{WHITE}Dette selskapet sel ikkje aksjer enno...
 
 STR_LIVERY_DEFAULT                                              :Standardovertaking
 STR_LIVERY_STEAM                                                :Damplokomotiv
@@ -2270,14 +2270,14 @@ STR_LIVERY_LARGE_PLANE                                          :Stort fly
 STR_LIVERY_PASSENGER_TRAM                                       :Passasjertrikk
 STR_LIVERY_FREIGHT_TRAM                                         :Frakttrikk
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Vis generelle fargetema
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Vis togfargetema
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Vis bilfargetema
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Vis skipsfargetema
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Vis flyfargar
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Vel ein primærfarge for valde tema
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Vel sekundærfarge for valde tema
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Vel eit fargetema å endre, eller fleire fargetema med CTRL-klikk. Klikk på boksen for å vise bruken av fargetema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Vis generelle fargetema
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Vis togfargetema
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Vis bilfargetema
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Vis skipsfargetema
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Vis flyfargar
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Vel ein primærfarge for valde tema
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Vel sekundærfarge for valde tema
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Vel eit fargetema å endre, eller fleire fargetema med CTRL-klikk. Klikk på boksen for å vise bruken av fargetema
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (damp)
@@ -2582,9 +2582,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ikkje last av,
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Endre stopp-oppførselen til den merkte rekkefølgja
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Endre opplastings-oppførselen til den merkte rekkjefølgja
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Endre avlastings-oppførselen til den merkte rekkjefølgja
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Set inn ei avansert rekkjefølgje
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Set inn ei avansert rekkjefølgje
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Køyr til næraste depot
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Fly til næraste hangar
 STR_ORDER_NEAREST_DEPOT                                         :næraste
@@ -2594,9 +2594,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Service utan st
 STR_ORDER_TRAIN_DEPOT                                           :Togstall
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Garasje
 STR_ORDER_SHIP_DEPOT                                            :Skipsdokk
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Reis alltid
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service om naudsynt
@@ -2621,10 +2621,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :er meir enn
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :er meir eller lik
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :er rett
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :er feil
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Hopp til rekkjefølgje {COMMA}
-STR_CONDITIONAL_NUM                                             :Hopp til rekkjefølgje {COMMA} når {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Hopp til rekkjefølgje {COMMA} når {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Hopp til rekkjefølgje {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Hopp til rekkjefølgje {COMMA} når {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Hopp til rekkjefølgje {COMMA} når {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Ingen reise
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Reis (ikke på rutetabell)
@@ -2647,18 +2647,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Tog kan
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hopp over
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Slett
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Køyr til
-STR_REFIT                                                       :{BLACK}Bygg om
-STR_REFIT_TIP                                                   :{BLACK}Vel varetypen det skal skiftast til. CTRL-klikk for å fjerne ombyggingsinstruksjonar
-STR_REFIT_ORDER                                                 :(Bygg om til {STRING})
-STR_REFIT_STOP_ORDER                                            :(Tilpass {STRING} og stopp)
-STR_STOP_ORDER                                                  :(Stopp)
-STR_TIMETABLE_VIEW                                              :{BLACK}Rutetabell
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Bytt til rutetabellvinauge
-STR_ORDER_VIEW                                                  :{BLACK}Ordrer
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Bytt til ordrevising
+STR_ORDER_REFIT                                                 :{BLACK}Bygg om
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vel varetypen det skal skiftast til. CTRL-klikk for å fjerne ombyggingsinstruksjonar
+STR_ORDER_REFIT_ORDER                                           :(Bygg om til {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Tilpass {STRING} og stopp)
+STR_ORDER_STOP_ORDER                                            :(Stopp)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Rutetabell
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Bytt til rutetabellvinauge
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordrer
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Bytt til ordrevising
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordre)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slutt på ordre - -
-STR_SERVICE                                                     :{BLACK}Vedlikehald
+STR_ORDER_SERVICE                                               :{BLACK}Vedlikehald
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Bygd: {LTBLUE}{NUM}{BLACK} Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Verdi: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2678,7 +2678,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}kjøretÃ
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}eit kjøretøy som delar denne påbodet kan ikkje gå til den stasjonen
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan ikkje flytte køyretøy...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Bakmaskinen vil alltid følgje det fremste motstykket
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan ikkje finne ein togstall i nærleiken
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Vedlikehaldsintervall: {LTBLUE}{COMMA}dagar{BLACK}   Førre vedlikehald: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Vedlikehaldsintervall: {LTBLUE}{COMMA} %{BLACK}   Førre vedlikehald: {LTBLUE}{DATE_LONG}
@@ -2698,8 +2698,8 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rutetabe
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Bytt tida den merka ordra skal bruke
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Fjern tida den merka ordra skal bruke
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Still attende teljaren for forseining, slik at køyretøyet vert presis
-STR_SERVICE_HINT                                                :{BLACK}Hopp over ordren dersom ikkje vedlikehald trengst
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kostnad: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftskostnader: {CURRENCY}/Ã¥r{}Kapasitet: {CARGO}
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Hopp over ordren dersom ikkje vedlikehald trengst
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kostnad: {CURRENCY} Vekt: {WEIGHT_S}{}Fart: {VELOCITY}  Kraft: {POWER}{}Driftskostnader: {CURRENCY}/Ã¥r{}Kapasitet: {CARGO}
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Stoppa
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Kan ikkje tvinge tog til å køyre på raudt lys ved fare...
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Krasja!
@@ -2707,27 +2707,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Krasja!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Togkrasj!{}{COMMA} døyr i kollisjonen
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan ikkje snu toget...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan ikkje snu køyretøy som er samansette av fleire delar
-STR_CLEAR_TIME                                                  :{BLACK}Fjern Tid
-STR_RESET_LATENESS                                              :{BLACK}Still attende teljaren for forseining
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Endre namnet på waypoint
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Fjern Tid
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Still attende teljaren for forseining
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Endre namnet på waypoint
 
-STR_TRAIN_STOPPING                                              :{RED}Stoppar
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stoppar, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Jernbanetypane passar ikkje saman
-STR_TRAIN_NO_POWER                                              :{RED}Ingen straum
-STR_TRAIN_START_NO_CATENARY                                     :Dette sporet manglar eit kjede, så toget kan ikkje starte
-STR_TRAIN_STUCK                                                 :{ORANGE}Ventar på klart spor
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stoppar
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stoppar, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Jernbanetypane passar ikkje saman
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ingen straum
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Dette sporet manglar eit kjede, så toget kan ikkje starte
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Ventar på klart spor
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Ny {STRING}type er tilgjengeleg!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Ny {STRING}type er tilgjengeleg!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kan ikkje selge øydelagd køyretøy
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kan ikkje tilpasse øydelagt køyretøy...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kan ikkje selge øydelagd køyretøy
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kan ikkje tilpasse øydelagt køyretøy...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kan ikkje lage rutetabell for køyretøyet
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Køyretøy kan berre venta på stasjonar
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Dette køyretøyet stoppar ikkje på denne stasjonen
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan ikkje lage rutetabell for køyretøyet
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Køyretøy kan berre venta på stasjonar
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Dette køyretøyet stoppar ikkje på denne stasjonen
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Bytt Tid
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Dette køyretøyet er presis
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Dette køyretøyet er {STRING} for seint
@@ -2741,7 +2741,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fyll tim
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...må verte stoppa i ein garasje
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan ikkje finne ein garasje i nærleiken
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Bytt køyreretning
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapasitet: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapasitet: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} kjøretøy{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2767,11 +2767,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Plasser bøye, kan brukast til å lage kontrollpunkt
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikkje plassere bøye her...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Bygg kanal
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan ikkje bygge kanal her...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan ikkje bygge kanal her...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (bygg om)
 STR_REFIT_TITLE                                                 :{GOLD}Vel varetype:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapasitet: {GOLD}{CARGO}{}{BLACK}Ombyggingskostnader: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(ombyggbart)
+STR_PURCHASE_INFO_REFITTABLE                                    :(ombyggbart)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Flyplassar
@@ -2784,7 +2784,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Bygg fly
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Innbyggjarane jublar . . .{}Første fly kjem til {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Flykrasj!{}{COMMA} døyr ved {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Flystyrt!{}Fly gjekk tom for drivstoff, {COMMA} døydde i eksplosjon!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rutetabell)
 
@@ -2797,13 +2797,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Kollaps i ein gruvegoag gjer store øydeleggingar i nærleiken av {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Flyt over!{}Minst {COMMA} truleg sakna eller daud{P "" e} etter skrekkeleg flaum!
 
-STR_BRIBE_FAILED                                                :{WHITE}Freistinga di på bestikking
-STR_BRIBE_FAILED_2                                              :{WHITE}er oppdaga av ein regional inspektør.
-STR_BUILD_DATE                                                  :{BLACK}Byggd: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Freistinga di på bestikking
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}er oppdaga av ein regional inspektør.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Byggd: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stasjonsklasse: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stasjontype: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stasjonsklasse: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stasjontype: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detaljert prestasjonsnivå
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detalj
@@ -2823,28 +2823,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Pengar:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}LÃ¥n:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totalt:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Antal køyretøy. Dette inkluderer vegkøyretøy, tog, skip og fly
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antal stasjonsdelar. Kvar del av ein stasjon (f.eks. togstasjon, busstopp, flyplass) vert telt, sjølv om dei er kobla til som éin stasjon
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Vinst frå køyretøya med lægst inntekt (av alle køyretøy eldre enn 2 år)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Pengar tente i månaden med lægst gevinst dei 12 siste kvartala
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Pengar tente i månaden med høgast gevinst dei siste 12 kvartala
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Antal leverte einingar dei siste fire kvartala
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tal på frakttypar, levert dei siste fire kvartala
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Kor mykje pengar dette firmaet har i banken
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Storleiken på låna til firmaet
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total poengsum av moglege poeng
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Antal køyretøy. Dette inkluderer vegkøyretøy, tog, skip og fly
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Antal stasjonsdelar. Kvar del av ein stasjon (f.eks. togstasjon, busstopp, flyplass) vert telt, sjølv om dei er kobla til som éin stasjon
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Vinst frå køyretøya med lægst inntekt (av alle køyretøy eldre enn 2 år)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Pengar tente i månaden med lægst gevinst dei 12 siste kvartala
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Pengar tente i månaden med høgast gevinst dei siste 12 kvartala
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Antal leverte einingar dei siste fire kvartala
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tal på frakttypar, levert dei siste fire kvartala
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Kor mykje pengar dette firmaet har i banken
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Storleiken på låna til firmaet
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total poengsum av moglege poeng
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-innstillingar
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Syn NewGRF instillingar
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Innstillingar for ny grafikk
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Bruk forandringane
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Vis palett
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Vis paletten til den valde NewGRF.{}Gjer dette når grafikken frå denne NewGRF ser rosa ut i spelet
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Set parametrar
-STR_NEWGRF_FILENAME                                             :{BLACK}Filnamn: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palett: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Bruk forandringane
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Vis palett
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Vis paletten til den valde NewGRF.{}Gjer dette når grafikken frå denne NewGRF ser rosa ut i spelet
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Set parametrar
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Filnamn: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palett: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du er i ferd med å gjere forandringar i eit spel som er i gang.  Det kan få OpenTTD til å krasje.  Er du heilt sikker på at du vil gjere dette?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2867,34 +2867,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøk på å
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} inneheld ein øydelagt grafikk. All øydelagt grafikk vil bli vist som raude spørsmålsteikn (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Inneheld fleire "Action 8" oppføringar.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Last det valde oppsettet
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Lagre oppsettet
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Lagre den noverande lista som oppsett
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Skriv inn namnet på oppsettet
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Slett oppsett
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Slett det valde oppsettet
-STR_NEWGRF_ADD                                                  :{BLACK}Legg til
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Legg ei ny NewGRF-fil til lista
-STR_NEWGRF_REMOVE                                               :{BLACK}Fjern
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Fjern den valde NewGRF-fila frå lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Flytt opp
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flytt den valde NewGRF-fila oppover lista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flytt ned
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flytt den valde NewGRF-fila nedover lista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Ei liste over NewGRF-filene som er installert. Klikk på ei fil for å endre parametrane
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametrar: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Skriv NewGRF-parametrar
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen informasjon tilgjengeleg
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Last det valde oppsettet
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Lagre oppsettet
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Lagre den noverande lista som oppsett
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Skriv inn namnet på oppsettet
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Slett oppsett
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Slett det valde oppsettet
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Legg til
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Legg ei ny NewGRF-fil til lista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Fjern
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Fjern den valde NewGRF-fila frå lista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Flytt opp
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Flytt den valde NewGRF-fila oppover lista
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Flytt ned
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flytt den valde NewGRF-fila nedover lista
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Ei liste over NewGRF-filene som er installert. Klikk på ei fil for å endre parametrane
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametrar: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Skriv NewGRF-parametrar
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ingen informasjon tilgjengeleg
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tilgjengelege NewGRF-filer
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Legg til i utvalet
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Legg til den valde NewGRF-fila  i konfigurasjonen din
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Søk om att
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Oppdater lista over tilgjengelege NewGRF-filer
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Legg til den valde NewGRF-fila  i konfigurasjonen din
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Søk om att
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Oppdater lista over tilgjengelege NewGRF-filer
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan ikkje leggje til fil: to eller fleire GRF ID-er
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ingen passande filer funne
-STR_NEWGRF_DISABLED                                             :{RED}Deaktivert
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ingen passande filer funne
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Deaktivert
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Kunne ikkje finne ein passande fil (lasta inn ein kompatibel GRF-fil)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Ein eller fleire kompatible GRF-filar har vorte lasta inn i plassen for manglande filar
@@ -2909,7 +2909,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Tog '{VE
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' gir gal informasjon.
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Last/istandsettings-informasjon for '{1:ENGINE}' er forskjellig frå kjøpslista etter konstruksjon. Dette kan føra til at autofornying/erstatning ikkje tilpasser riktig.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spelet har blitt lagra i ein versjon utan støtte for trikk. Alle trikkar har blitt fjerna.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spelet har blitt lagra i ein versjon utan støtte for trikk. Alle trikkar har blitt fjerna.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vanleg valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Valutakurs: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2938,8 +2938,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} skip
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} fly
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delte ordre av {COMMA} køyretøy
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Vis alle køyretøy som har same ruteplan
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Delte ordre av {COMMA} køyretøy
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Vis alle køyretøy som har same ruteplan
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} ventar i depoet
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} ventar i depoet
@@ -3046,39 +3046,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Bygg om
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Bygg om et konteinarskip til å ta ein annan type last
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Bygg om eit fly til å ta ein annan type last
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Er på veg til {TOWN} togstall
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Er på veg til {TOWN} togstall, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Er på veg til {TOWN} garasje
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Er på veg til {TOWN} garasje, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Er på veg til {TOWN} skipsdepot
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Er på veg mot {TOWN} skipsdepot, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Er på veg til {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Er på veg til {STATION} hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Vedlikehald ved {TOWN} togstall
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Vedlikehald ved {TOWN} togstall, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Vedlikehald ved {TOWN} garasje
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Vedlikehald ved {TOWN} garasje, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Vedlikehald ved {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Vedlikehald ved {STATION} hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klon tog
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klon eit køyretøy
-STR_CLONE_SHIP                                                  :{BLACK}Klon skip
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klon fly
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. CTRL-klikk deler ordrane
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Dette vil lage ein kopi av eit kjøretøy. CTRL-klikk deler ordrane
-STR_CLONE_SHIP_INFO                                             :{BLACK}Dette vil laga ein kopi av eit skip. CTRL-klikk deler ordrane
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Dette vil lage ein kopi av eit fly. CTRL-klikk deler ordrane
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. Trykk på denne knappen og etter det på eit anna tog. CTRL-klikk deler ordrane
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Dette vil lage ein kopi av eit køyretøy. Klikk denne knappen og etter det på eit anna køyretøy. CTRL-klikk deler ordrane
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Dette vil laga ein kopi av eit skip. Trykk på denne knappen og etter det på eit anna skip. CTRL-klikk deler ordrane
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Dette vil lage ein kopi av eit fly. Trykk denne knappen og etter det på eit anna fly. CTRL-klikk deler ordrane
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Er på veg til {TOWN} togstall
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Er på veg til {TOWN} togstall, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Er på veg til {TOWN} garasje
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Er på veg til {TOWN} garasje, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Er på veg til {TOWN} skipsdepot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Er på veg mot {TOWN} skipsdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Er på veg til {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Er på veg til {STATION} hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Vedlikehald ved {TOWN} togstall
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Vedlikehald ved {TOWN} togstall, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Vedlikehald ved {TOWN} garasje
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Vedlikehald ved {TOWN} garasje, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Vedlikehald ved {TOWN} skipsdepot, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Vedlikehald ved {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Vedlikehald ved {STATION} hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klon tog
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klon eit køyretøy
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klon skip
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klon fly
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. CTRL-klikk deler ordrane
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Dette vil lage ein kopi av eit kjøretøy. CTRL-klikk deler ordrane
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Dette vil laga ein kopi av eit skip. CTRL-klikk deler ordrane
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Dette vil lage ein kopi av eit fly. CTRL-klikk deler ordrane
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Dette vil lage ein kopi av eit lokomotiv inkludert alle vognene. Trykk på denne knappen og etter det på eit anna tog. CTRL-klikk deler ordrane
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Dette vil lage ein kopi av eit køyretøy. Klikk denne knappen og etter det på eit anna køyretøy. CTRL-klikk deler ordrane
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Dette vil laga ein kopi av eit skip. Trykk på denne knappen og etter det på eit anna skip. CTRL-klikk deler ordrane
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Dette vil lage ein kopi av eit fly. Trykk denne knappen og etter det på eit anna fly. CTRL-klikk deler ordrane
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nye tog/vogner for jernbane
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nytt elektrisk tog
@@ -3148,28 +3148,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vis kvar
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Du er i ferd med å selje alle køyretøya i depotet. Er du sikker?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Gal type depot
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Gal type depot
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sel alle toga i togstallen
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Sel alle køyretøya i garasjen
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sel alle skipa i depotet
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sel alle flya i hangaren
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Sel alle toga i togstallen
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Sel alle køyretøya i garasjen
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Sel alle skipa i depotet
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Sel alle flya i hangaren
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Vis ei liste over alle toga som har denne togstallen i ordrane sine.
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Vis ei liste over alle køyretøya som har denne garasjen i ordrane sine.
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Vis ei liste over alle skipa som har dette depotet i ordrane sine.
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Vis ei liste over alle flya som har denne hangaren i ordrane sine.
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Vis ei liste over alle toga som har denne togstallen i ordrane sine.
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Vis ei liste over alle køyretøya som har denne garasjen i ordrane sine.
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Vis ei liste over alle skipa som har dette depotet i ordrane sine.
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Vis ei liste over alle flya som har denne hangaren i ordrane sine.
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autoerstatt alle toga i togstallen
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autoerstatt all køyretøya i garasjen
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autoerstatt alle skipa i depotet
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autoerstatt alle flya i hangaren
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autoerstatt alle toga i togstallen
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autoerstatt all køyretøya i garasjen
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autoerstatt alle skipa i depotet
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autoerstatt alle flya i hangaren
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Erstatt {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Byrje utskiftinga av køyretøy
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Stopp utskiftinga av køyretøy
-STR_NOT_REPLACING                                               :{BLACK}Bytast ikkje ut
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ingen lokomotiv er valde
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Bytast ikkje ut
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ingen lokomotiv er valde
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vel lokomotivtype å byte ut
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vel den nye typen lokomotiv du vil at skal ta over for den du har vald til venstre
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Klikk denne knappen for å avbryte utskiftinga av lokomotivet du har vald på venstresida
@@ -3181,26 +3181,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Lat den
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Erstatter: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skift mellom tog- og vognvindauget
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Køyretøyet er ikkje tilgjengeleg
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Køyretøyet er ikkje tilgjengeleg
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Skipet er ikkje tilgjengeleg
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Flyet er ikkje tilgjengeleg
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Køyretøyet er ikkje tilgjengeleg
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Køyretøyet er ikkje tilgjengeleg
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Skipet er ikkje tilgjengeleg
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Flyet er ikkje tilgjengeleg
 
-STR_ENGINES                                                     :Motorar
-STR_WAGONS                                                      :Vogner
+STR_REPLACE_ENGINES                                             :Motorar
+STR_REPLACE_WAGONS                                              :Vogner
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klikk for å stoppe alle toga i togstallen
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klikk for å stoppe alle køyretøya i garasjen
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klikk for å stoppe alle skipa i depotet
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klikk for å stoppe alle flya i hangaren
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klikk for å stoppe alle toga i togstallen
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klikk for å stoppe alle køyretøya i garasjen
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klikk for å stoppe alle skipa i depotet
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klikk for å stoppe alle flya i hangaren
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klikk for å starte alle toga i togstallen
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klikk for å starte køyretøya inne i garasjen
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klikk for å starte alle skipa i depotet
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klikk for å starte alle flya i hangaren
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klikk for å starte alle toga i togstallen
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klikk for å starte køyretøya inne i garasjen
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klikk for å starte alle skipa i depotet
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klikk for å starte alle flya i hangaren
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klikk for å stoppe alle køyretøya i listen
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klikk for å starte alle køyretøya på lista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klikk for å stoppe alle køyretøya i listen
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klikk for å starte alle køyretøya på lista
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skiltliste - {COMMA} skilt
@@ -3209,14 +3209,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Stoppa o
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Jernbanelokomotiv
-STR_ELRAIL_VEHICLES                                             :Elektriske tog
-STR_MONORAIL_VEHICLES                                           :Monoraillokomotiv
-STR_MAGLEV_VEHICLES                                             :Maglevlokomotiv
+STR_REPLACE_RAIL_VEHICLES                                       :Jernbanelokomotiv
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektriske tog
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monoraillokomotiv
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglevlokomotiv
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vekt: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Fart: {GOLD}{VELOCITY}{BLACK}   Effekt: {GOLD}{POWER}
@@ -3242,70 +3242,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generer
-STR_RANDOM                                                      :{BLACK}Gjer tilfeldig
-STR_RANDOM_HELP                                                 :{BLACK}Endre tilfeldig nummer som nyttast for terreng-generering
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generer ei verd
-STR_RANDOM_SEED                                                 :{BLACK}Tilfeldig nummer:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Trykk her for å taste inn eit tilfeldig nummer
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Skriv inn tilfeldig seed
-STR_LAND_GENERATOR                                              :{BLACK}Landskapsgenerator:
-STR_TREE_PLACER                                                 :{BLACK}Trealgoritme:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotering av høgdekart:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrengtype
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Havflate:
-STR_SMOOTHNESS                                                  :{BLACK}Glattleik:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Høgd på snøgrensa:
-STR_DATE                                                        :{BLACK}Dato:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Antal byar:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Antal industriar:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Flytt høgda på snøgrensa eitt hakk opp
-STR_SNOW_LINE_DOWN                                              :{BLACK}Flytt høgda på snøgrensa eitt hakk ned
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Skift høgda på snøgrensa
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Endre startår
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skalaåtvaring
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Å endre storleiken på kjeldekartet for mykje er ikkje anbefalt. Vil du halde fram med genereringa?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Høgdekartnamn:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Storleik: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generer
+STR_MAPGEN_RANDOM                                               :{BLACK}Gjer tilfeldig
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Endre tilfeldig nummer som nyttast for terreng-generering
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generer ei verd
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Tilfeldig nummer:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Trykk her for å taste inn eit tilfeldig nummer
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Skriv inn tilfeldig seed
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landskapsgenerator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Trealgoritme:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotering av høgdekart:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrengtype
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Havflate:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Glattleik:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Høgd på snøgrensa:
+STR_MAPGEN_DATE                                                 :{BLACK}Dato:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Antal byar:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Antal industriar:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Flytt høgda på snøgrensa eitt hakk opp
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Flytt høgda på snøgrensa eitt hakk ned
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Skift høgda på snøgrensa
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Endre startår
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skalaåtvaring
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Å endre storleiken på kjeldekartet for mykje er ikkje anbefalt. Vil du halde fram med genereringa?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Høgdekartnamn:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Storleik: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Genererer verd...
 STR_GENERATION_ABORT                                            :{BLACK}Avbryt
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Avbryt verdsgenerering
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Vil du verkeleg avbryte verdsgenereringa?
-STR_PROGRESS                                                    :{WHITE}{NUM} % ferdig
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generer ei verd
-STR_TREE_GENERATION                                             :{BLACK}Tregenerering
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Ikkje-flyttbar generering
-STR_CLEARING_TILES                                              :{BLACK}Generering av ulendt og steinete område
-STR_SETTINGUP_GAME                                              :{BLACK}Klargjer spelet
-STR_PREPARING_TILELOOP                                          :{BLACK}Kjører tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Gjer klart spelet
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Denne handlinga endra vanskegraden til eigendefinert
-STR_SE_FLAT_WORLD                                               :{WHITE}Flatt land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Lag eit flatt landskap
-STR_SE_RANDOM_LAND                                              :{WHITE}Tilfeldig landskap
-STR_SE_NEW_WORLD                                                :{BLACK}Lag eit nytt scenario
-STR_SE_CAPTION                                                  :{WHITE}Scenariotype
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Flytt landhøgda eitt nivå ned
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Flytt landhøgda eitt nivå opp
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Endre høgda på flatt land
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Høgde på flatt land:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM} % ferdig
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generer ei verd
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Tregenerering
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Ikkje-flyttbar generering
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generering av ulendt og steinete område
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Klargjer spelet
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Kjører tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Gjer klart spelet
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Denne handlinga endra vanskegraden til eigendefinert
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Flatt land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Lag eit flatt landskap
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Tilfeldig landskap
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Lag eit nytt scenario
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenariotype
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Flytt landhøgda eitt nivå ned
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Flytt landhøgda eitt nivå opp
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Endre høgda på flatt land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Høgde på flatt land:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Still oversiktskartet midt på på den gjeldande posisjonen
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kartkantar
-STR_NORTHWEST                                                   :{BLACK}Nordvest
-STR_NORTHEAST                                                   :{BLACK}Nordaust
-STR_SOUTHEAST                                                   :{BLACK}Søraust
-STR_SOUTHWEST                                                   :{BLACK}Sørvest
-STR_BORDER_FREEFORM                                             :{BLACK}Fri-form
-STR_BORDER_WATER                                                :{BLACK}Vatn
-STR_BORDER_RANDOM                                               :{BLACK}Vilkårleg
-STR_BORDER_RANDOMIZE                                            :{BLACK}Vilkårleg
-STR_BORDER_MANUAL                                               :{BLACK}Manuell
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kartkantar
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordvest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordaust
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Søraust
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sørvest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Fri-form
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vatn
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Vilkårleg
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Vilkårleg
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuell
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Liten
@@ -3330,21 +3330,21 @@ STR_MEASURE_AREA                                                :{BLACK}Område:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Lengd: {NUM}{}Høgdeskilnad: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Område: {NUM} x {NUM}{}Høgdeskilnad: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Overfør kreditt: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...denne vegen eigast av ein by
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vegen peiker feil veg
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Gjennomsynsval
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Byt gjennomsyn for stasjonssktilt
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Byt gjennomsyn for tre
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Byt gjennomsyn for hus
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Byt gjennomsyn for industriar
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Byt gjennomsyn for bygningar som kan byggast, til dømes depot og vegmerker
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Byt gjennomsyn for bruer
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Byt gjennomsyn for bygningar som fyrtårn og antenner, kanskje i framtida for fine effekter
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Vel transparent-instillingar for kjede. CTRL+klikk for å låsa.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Bytt gjennomsyn for lasteindikatorar
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gjer usynlege istanden for transparent
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Overfør kreditt: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...denne vegen eigast av ein by
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...vegen peiker feil veg
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Gjennomsynsval
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Byt gjennomsyn for stasjonssktilt
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Byt gjennomsyn for tre
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Byt gjennomsyn for hus
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Byt gjennomsyn for industriar
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Byt gjennomsyn for bygningar som kan byggast, til dømes depot og vegmerker
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Byt gjennomsyn for bruer
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Byt gjennomsyn for bygningar som fyrtårn og antenner, kanskje i framtida for fine effekter
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Vel transparent-instillingar for kjede. CTRL+klikk for å låsa.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Bytt gjennomsyn for lasteindikatorar
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Gjer usynlege istanden for transparent
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3354,7 +3354,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alle tog
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alle køyretøty
 STR_GROUP_ALL_SHIPS                                             :Alle skip
@@ -3363,24 +3363,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Tog utan gruppe
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :køyretøy utan gruppe
 STR_GROUP_DEFAULT_SHIPS                                         :Skip utan gruppe
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Fly utan gruppe
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Legg til delte køyretøy
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Fjern alle køyretøy
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Gje nytt namn til ei gruppe
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kan ikkje lage gruppe...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kan ikkje slette denne gruppa...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kan ikkje gje gruppa nytt namn...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kan ikkje fjerne alle køyretøy fra denne gruppa...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kan ikkje legge dette køyretøyet til denne gruppa...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kan ikkje legge til gruppe for delte køyretøy...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kan ikkje lage gruppe...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kan ikkje slette denne gruppa...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kan ikkje gje gruppa nytt namn...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kan ikkje fjerne alle køyretøy fra denne gruppa...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kan ikkje legge dette køyretøyet til denne gruppa...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kan ikkje legge til gruppe for delte køyretøy...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupper - Klikk på ei gruppe for å få ei liste over alle køyretøya i den
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klikk for å lage ei gruppe
-STR_GROUP_DELETE_TIP                                            :{BLACK}Slett den valde gruppa
-STR_GROUP_RENAME_TIP                                            :{BLACK}Gje den valde gruppa nytt namn
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikk for å beskytte denne gruppa frå å global automatisk erstatning
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupper - Klikk på ei gruppe for å få ei liste over alle køyretøya i den
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikk for å lage ei gruppe
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Slett den valde gruppa
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Gje den valde gruppa nytt namn
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikk for å beskytte denne gruppa frå å global automatisk erstatning
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3441,35 +3441,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Namnet må vera unikt
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Namnet må vera unikt
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}GÃ¥ til neste skilt
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Gå til førre skilt
-STR_SIGN_OSKTITLE                                               :{BLACK}Skriv inn eit namn for skiltet
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}GÃ¥ til neste skilt
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Gå til førre skilt
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Skriv inn eit namn for skiltet
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finansier
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospekt
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bygg
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Vel den rette industritypen frå lista
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finansier
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospekt
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bygg
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Vel den rette industritypen frå lista
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Avansert
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Avansert val av andlet
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Avansert val av andlet
 STR_FACE_SIMPLE                                                 :{BLACK}Enkel
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Enkelt val av andlet
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Enkelt val av andlet
 STR_FACE_LOAD                                                   :{BLACK}Last
-STR_FACE_LOAD_TIP                                               :{BLACK}Last favoritandlet
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Last favoritandlet
 STR_FACE_LOAD_DONE                                              :{WHITE}Favorittandletet ditt har blitt lasta frå OpenTTD config fila
 STR_FACE_FACECODE                                               :{BLACK}Spelarandlet nummer.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Sjå og/eller set spelar andletsnummer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Sjå og/eller set spelar andletsnummer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Sjå og/eller set spelars andletsnummer
 STR_FACE_FACECODE_SET                                           :{WHITE}Ny kode for andletsnummer er satt
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kunne ikke setja spelars andletsnummer - må vera mellom  0 og 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Lagre
-STR_FACE_SAVE_TIP                                               :{BLACK}Lagre favoritandlete
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Lagre favoritandlete
 STR_FACE_SAVE_DONE                                              :{WHITE} Dette andletet vil verte lagra som favoriten din i OpenTTD config fila
 STR_FACE_EUROPEAN                                               :{BLACK}Europeisk
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Velg europeiske andlet
@@ -3477,51 +3477,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikans
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Velg afrikanske andlet
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nei
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Bart eller øyrering
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Bart eller øyrering
 STR_FACE_HAIR                                                   :HÃ¥r:
-STR_FACE_HAIR_TIP                                               :{BLACK} Bytt hår
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK} Bytt hår
 STR_FACE_EYEBROWS                                               :Augebryn:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Bytt augebryn
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Bytt augebryn
 STR_FACE_EYECOLOUR                                              :Augefarge:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Bytt augefarge:
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Bytt augefarge:
 STR_FACE_GLASSES                                                :Briller:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Bruk briller
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Bytt briller
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Bruk briller
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Bytt briller
 STR_FACE_NOSE                                                   :Nase:
-STR_FACE_NOSE_TIP                                               :{BLACK}Bytt nase
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Bytt nase
 STR_FACE_LIPS                                                   :Lepper:
 STR_FACE_MOUSTACHE                                              :Bart:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Bytt lepper eller bart
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Bytt lepper eller bart
 STR_FACE_CHIN                                                   :Hake:
-STR_FACE_CHIN_TIP                                               :{BLACK}Bytt hake
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Bytt hake
 STR_FACE_JACKET                                                 :Jakke:
-STR_FACE_JACKET_TIP                                             :{BLACK}Bytt jakke
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Bytt jakke
 STR_FACE_COLLAR                                                 :Krage:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Bytt krage
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Bytt krage
 STR_FACE_TIE                                                    :Slips:
 STR_FACE_EARRING                                                :Øyrering:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Bytt slips eller øyrering
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Bytt slips eller øyrering
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Signal Selection
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan ikkje endre signal her
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standard Signal (semaphore){}Signals are necessary to keep trains from crashing on railway networks with more than one train.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Entry-Signal (semaphore){}Grønt så lenge det er eit eller fleir grøne ut-signal i den følgande seksjonen. Ellers syner det raudt.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Ut-Signal (semaphore){}Virker på samme måte som normale signal, men er naudsynte for å få rett farge på inn og combo pre-signal.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Combo-Signal (semaphore){}Combo signal fungerer som både inn og ut signal. Det gjer deg moglegheit til å bygge store "tre" av presignal.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Vegsignal(semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Standard vegsignal kan passeraste frå baksida.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Einvegs vegsignal (semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Einvegs vegsignal kan ikkje passerast frå baksida.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standard Signal (elektrisk){}Signals er naudsynte for at tog ikkje skal kollidere når det er meir en ett på linja.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}In-Signal (elektrisk){}Grøn så lenge det er eit eller fleir grønne ut signal fra den følgande seksjonen. Ellers synar det raudt.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Ut-Signal (elektrisk){}Verker på samme måte som vanlege signal, men er naudsynt for å gje rett farge på in og combo pre-signal
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Combo-Signal (elektrisk){}Verker som både inn og ut signaler og gjer det moglegheit til å lage store "tre" av presignal
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Vegsignal (elektrisk){}(semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Standard vegsignal kan passerast frå baksida.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Einvegs vegsignal (elektrisk){}(semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Einvegs vegsignal kan ikkje passerast frå baksida.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Signal Konvertering{}Klikk på eit signal for å endra det til valde type, CTRL-klikk  skifter mellom forskjellige variantar.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Tettleik for dra og slepp signalbygging
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Minsk tettleik for dra og slepp signalbygging
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Auk tettleik for dra og slepp signalbygging
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signal Selection
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan ikkje endre signal her
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standard Signal (semaphore){}Signals are necessary to keep trains from crashing on railway networks with more than one train.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Entry-Signal (semaphore){}Grønt så lenge det er eit eller fleir grøne ut-signal i den følgande seksjonen. Ellers syner det raudt.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Ut-Signal (semaphore){}Virker på samme måte som normale signal, men er naudsynte for å få rett farge på inn og combo pre-signal.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Combo-Signal (semaphore){}Combo signal fungerer som både inn og ut signal. Det gjer deg moglegheit til å bygge store "tre" av presignal.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Vegsignal(semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Standard vegsignal kan passeraste frå baksida.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Einvegs vegsignal (semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Einvegs vegsignal kan ikkje passerast frå baksida.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standard Signal (elektrisk){}Signals er naudsynte for at tog ikkje skal kollidere når det er meir en ett på linja.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}In-Signal (elektrisk){}Grøn så lenge det er eit eller fleir grønne ut signal fra den følgande seksjonen. Ellers synar det raudt.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Ut-Signal (elektrisk){}Verker på samme måte som vanlege signal, men er naudsynt for å gje rett farge på in og combo pre-signal
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Combo-Signal (elektrisk){}Verker som både inn og ut signaler og gjer det moglegheit til å lage store "tre" av presignal
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Vegsignal (elektrisk){}(semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Standard vegsignal kan passerast frå baksida.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Einvegs vegsignal (elektrisk){}(semaphore){}Eit vegsignal tillet meir enn eitt tog å entre signalblokka på same tid, om toget kan reservere ei rute til ein trygg plass å stoppe på. Einvegs vegsignal kan ikkje passerast frå baksida.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Signal Konvertering{}Klikk på eit signal for å endra det til valde type, CTRL-klikk  skifter mellom forskjellige variantar.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Tettleik for dra og slepp signalbygging
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Minsk tettleik for dra og slepp signalbygging
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Auk tettleik for dra og slepp signalbygging
 ########
 
 ############ on screen keyboard
@@ -3533,35 +3533,35 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI konfigurasjonar
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Syn AI instillingar
 STR_AI_DEBUG                                                    :{WHITE}AI feilsøking
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Namnet til datamaskinspelaren
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Namnet til datamaskinspelaren
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Last datamaskinspelaren på ny
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Drep datamaskinspelaren, last skriptet på ny og starte om datamaskinspelaren
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI-feilsøkingvindauget er kun tilgjengeleg for serveren
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Drep datamaskinspelaren, last skriptet på ny og starte om datamaskinspelaren
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI-feilsøkingvindauget er kun tilgjengeleg for serveren
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI konfigurasjonar
-STR_AI_CHANGE                                                   :{BLACK}Vel AI
-STR_AI_CONFIGURE                                                :{BLACK}Konfigurere
-STR_AI_CHANGE_TIP                                               :{BLACK}Last endå ein AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfigurer AI-parametrane
-STR_AI_LIST_TIP                                                 :{BLACK}Alle AI som vil bli lasta i neste spel
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Vel AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurere
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Last endå ein AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigurer AI-parametrane
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alle AI som vil bli lasta i neste spel
 STR_AI_LIST_CAPTION                                             :{WHITE}Tilgjengelege AI
-STR_AI_AILIST_TIP                                               :{BLACK}Klikk for å velje ein AI
-STR_AI_ACCEPT                                                   :{BLACK}Godta
-STR_AI_ACCEPT_TIP                                               :{BLACK}Merk utheva AI
-STR_AI_CANCEL                                                   :{BLACK}Avbryt
-STR_AI_CANCEL_TIP                                               :{BLACK}Ikkje endre AI
-STR_AI_CLOSE                                                    :{BLACK}Lukk
-STR_AI_RESET                                                    :{BLACK}Tilbakestill
-STR_AI_HUMAN_PLAYER                                             :Menneskeleg spelar
-STR_AI_RANDOM_AI                                                :Vilkårleg AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikk for å velje ein AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Godta
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Merk utheva AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Avbryt
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ikkje endre AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Lukk
+STR_AI_SETTINGS_RESET                                           :{BLACK}Tilbakestill
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Menneskeleg spelar
+STR_AI_CONFIG_RANDOM_AI                                         :Vilkårleg AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI Parametrar
-STR_AI_AUTHOR                                                   :{BLACK}Forfattar: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versjon: {NUM}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Ein AI har krasja. Venleg rapporter dette til produsenten av AIen med eit skjermbilete av "AI Debug"-vindauget.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Forfattar: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versjon: {NUM}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ein AI har krasja. Venleg rapporter dette til produsenten av AIen med eit skjermbilete av "AI Debug"-vindauget.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Grense for lydnivå i byen: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Lyd generert: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Grense for lydnivå i byen: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Lyd generert: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3575,21 +3575,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Høgdekart
 STR_CONTENT_TITLE                                               :{WHITE}Last ned innhald
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Type innhald
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Type innhald
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Namn
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Namnet til innhaldet
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klikk på ei line for å sjå detaljane{}Klikk på avkryssingsboksen for å merka den for nedlasting
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Namnet til innhaldet
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klikk på ei line for å sjå detaljane{}Klikk på avkryssingsboksen for å merka den for nedlasting
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Vel alle
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Merk alt innhald som skal lastast ned
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Merk alt innhald som skal lastast ned
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Vel oppdateringar
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Merk alt innhald som er ei oppgradering av eksisterande, og skal lastast ned
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Merk alt innhald som er ei oppgradering av eksisterande, og skal lastast ned
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Vel ingenting
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Merk alt innhald som ikkje skal lastast ned
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Merk alt innhald som ikkje skal lastast ned
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Skriv inn filter-streng
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Skriv eit nøkkelord for filtrering av lista
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Skriv eit nøkkelord for filtrering av lista
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Merke-/namn-filter
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Last ned
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Last ned valt innhald
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Last ned valt innhald
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total størrelse: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INNHALDSINFORMASJON
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Du har ikkje valt at dette skal lastast ned
@@ -3622,6 +3622,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kunne ik
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Sjå etter innhald på nett
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Sjå etter nytt eller oppdatert innhald som kan lastas ned
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Finn manglande innhald på nettet
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Sjekk om det manglande innhaldet kan bli funne på nettet
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Finn manglande innhald på nettet
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Sjekk om det manglande innhaldet kan bli funne på nettet
 ########
diff --git a/src/lang/polish.txt b/src/lang/polish.txt
index 3de81c69f..1175023d1 100644
--- a/src/lang/polish.txt
+++ b/src/lang/polish.txt
@@ -531,7 +531,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mapa - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Opcje Gry
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Wiadomość
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Wiadomość od {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Uwaga!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Uwaga!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Nie można tego zrobić...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Nie można wyczyścić terenu...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Prawa Autorskie {COPYRIGHT} 1995 Chris Sawyer, Wszelkie prawa zastrzeżone
@@ -539,9 +539,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Zespół OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Wyjście
-STR_YES                                                         :{BLACK}Tak
-STR_NO                                                          :{BLACK}Nie
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Jesteś pewien, że chcesz zakończyć tę grę i wrócić do {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Tak
+STR_QUIT_NO                                                     :{BLACK}Nie
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Jesteś pewien, że chcesz zakończyć tę grę i wrócić do {STRING}?
 
 STR_JUST_NOTHING                                                :Nic
 STR_COLOUR_DARK_BLUE                                            :Ciemnoniebieski
@@ -603,11 +603,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Pustynia
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Åšnieg
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Wiadomość
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Domyslna
-STR_QUERY_CANCEL                                                :{BLACK}Anuluj
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Zmień nazwę
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Domyslna
+STR_BUTTON_CANCEL                                               :{BLACK}Anuluj
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Zmień nazwę
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -624,16 +624,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}�adunek
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informacja
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Pojemność
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Całkowity ładunek
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Calkowita pojemność tego pociągu:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Calkowita pojemność tego pociągu:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nowa Gra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Wczytaj GrÄ™
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Gra Wieloosobowa
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Edytor Scenariuszy
 
-STR_MAPSIZE                                                     :{BLACK}Rozmiar Mapy:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Rozmiar Mapy:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Opcje Gry
 
 STR_COMPANY_SOMEONE                                             :ktoÅ›{SKIP}{SKIP}
@@ -682,10 +682,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Opuść grę
 STR_FILE_MENU_EXIT                                              :Wyjście
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Jesteś pewien że chcesz skończyć grę?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Wyjście
-STR_SORT_ORDER_TIP                                              :{BLACK}Wybierz porzÄ…dek sortowania (malejÄ…co/rosnÄ…co)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Wybierz kryterium sortowania
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Wybierz kryteria filtrowania
-STR_SORT_BY                                                     :{BLACK}Sortuj wg
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Wybierz porzÄ…dek sortowania (malejÄ…co/rosnÄ…co)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Wybierz kryterium sortowania
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Wybierz kryteria filtrowania
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortuj wg
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populacja
@@ -715,24 +715,24 @@ STR_SORT_BY_RUNNING_COST                                        :Koszty użytkow
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Moc/Koszty użytkowania
 STR_SORT_BY_CARGO_CAPACITY                                      :Pojemność
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Nie ma żadnego czekającego ładunku
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Zaznacz wszystkie typy stacji
-STR_SELECT_ALL_TYPES                                            :{BLACK}Zaznacz wszystkie typy Å‚adunku (oraz brak czekajÄ…cego Å‚adunku)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Zobacz listę dostępnych projektów silników dla tego typu pojazdów.
-STR_MANAGE_LIST                                                 :{BLACK}ZarzÄ…dzaj listÄ…
-STR_MANAGE_LIST_TIP                                             :{BLACK}Wyślij instrukcje wszystkim pojazdom na tej liĹ›cie
-STR_REPLACE_VEHICLES                                            :ZastÄ…p pojazdy
-STR_SEND_FOR_SERVICING                                          :Wyślij do Serwisu
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostępne lokomotywy
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostępne pojazdy
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostępne statki
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostępny samolot
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Wyślij do Zajezdni
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Wyślij do Zajezdni
-STR_SEND_SHIP_TO_DEPOT                                          :Wyślij do Stoczni
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Wyślij do Hangaru
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nie ma żadnego czekającego ładunku
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Zaznacz wszystkie typy stacji
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Zaznacz wszystkie typy Å‚adunku (oraz brak czekajÄ…cego Å‚adunku)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Zobacz listę dostępnych projektów silników dla tego typu pojazdów.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}ZarzÄ…dzaj listÄ…
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Wyślij instrukcje wszystkim pojazdom na tej liĹ›cie
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :ZastÄ…p pojazdy
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Wyślij do Serwisu
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Dostępne lokomotywy
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Dostępne pojazdy
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Dostępne statki
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Dostępny samolot
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Wyślij do Zajezdni
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Wyślij do Zajezdni
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Wyślij do Stoczni
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Wyślij do Hangaru
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -762,12 +762,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcje
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nie można zmienić okresu między serwisowaniem...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zamknięcie okna
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Tytuł okna - przeciągnij aby przesunąć okno
-STR_STICKY_BUTTON                                               :{BLACK}Zaznacza to okno jako niezamykane dla funkcji 'Zamknij wszystkie okna'
-STR_RESIZE_BUTTON                                               :{BLACK}Kliknij i przeciągnij by zmienić rozmiar okna
+STR_TOOLTIP_STICKY                                              :{BLACK}Zaznacza to okno jako niezamykane dla funkcji 'Zamknij wszystkie okna'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Kliknij i przeciągnij by zmienić rozmiar okna
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kliknij tutaj aby przejść do domyślnego katalogu
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Niszczenie budynków itp. w danym kwadracie terenu
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Obniżenie narożnika terenu
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Podwyższenie narożnika terenu
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Obniżenie narożnika terenu
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Podwyższenie narożnika terenu
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Suwak - przesuwa listę w górę i w dół
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Pasek przewijania - przewija listÄ™ prawo/lewo
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Pokaż zarysy lądu na mapie
@@ -780,21 +780,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Pokaż n
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Zysk w tym roku: {CURRENCY} (ostatni rok: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} {P rok lata lat} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} {P rok lata lat} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} {P rok lata lat} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} {P rok lata lat} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :PociÄ…g
-STR_VEHICLE_ROAD_VEHICLE                                        :Samochód
-STR_VEHICLE_SHIP                                                :Statek
-STR_VEHICLE_AIRCRAFT                                            :Samolot
+STR_REPLACE_VEHICLE_TRAIN                                       :PociÄ…g
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Samochód
+STR_REPLACE_VEHICLE_SHIP                                        :Statek
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Samolot
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} starzeje siÄ™
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} bardzo siÄ™ starzeje
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} bardzo siÄ™ starzeje i potrzebuje natychmiastowej wymiany
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informacja o terenie
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Koszt czyszczenia: {LTBLUE}N/D
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Koszt czyszczenia: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Zysk gdy czyszczone: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Zysk gdy czyszczone: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Brak
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Właściciel: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Wlasciciel drogi: {LTBLUE}{STRING}
@@ -803,7 +803,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Wlascici
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokalne władze: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Brak
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nazwa
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1szy
@@ -915,7 +915,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klik na
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kliknij na ścieżce muzycznej aby usunąć ją z wybranego programu (Wlasny1 lub Wlasny2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Przełącz losowe odtwarzanie wł./wył.
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Pokaż okno wyboru ścieżek
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik na usłudze żeby wyśrodkować widok na Fabrykę/Miasto
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik na usłudze żeby wyśrodkować widok na Fabrykę/Miasto
 STR_INTRO_DIFFICULTY                                            :{BLACK}Trudność ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Ostatnia wiadomość/ogłoszenie
@@ -964,7 +964,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Zmniejsz
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Tworzenie przypadkowego lÄ…du
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Resetuj krajobraz
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Resetuj krajobraz
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Usuń całą własność graczy z mapy
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Usuń całą własność graczy z mapy
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Jesteś pewien że chcesz usunąć całą własność graczy?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Tworzenie krajobrazu
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Tworzenie miast
@@ -978,11 +978,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...zbyt
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...zbyt blisko innego miasta
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...niewłaściwa parcela
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...zbyt wiele miast
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nie można wybudować żadnego miasta
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nie ma więcej miejsca na mapie
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nie można wybudować żadnego miasta
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...nie ma więcej miejsca na mapie
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Zwiększ rozmiar miasta
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Rozszerz
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE} Miasto nie będzie budować dróg. Możesz zezwolić na budowę dróg poprzez Zaawansowane Ustawienia->Ekonomia->Miasta.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE} Miasto nie będzie budować dróg. Możesz zezwolić na budowę dróg poprzez Zaawansowane Ustawienia->Ekonomia->Miasta.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Losowe miasto
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Budowa miasta w losowym miejscu
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Nie można tutaj wybudować: {STRING}...
@@ -996,13 +996,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Umieść
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Umieść latarnię morską
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Umieść nadajnik
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definiuj obszar pustyni.{}Wciśnij i trzymaj CTRL by usunąć
-STR_CREATE_LAKE                                                 :{BLACK}Stwórz akwen wodny.{}Tworzy kanał, chyba że przyrzymany jest CTRL na poziomie morza, wtedy pobliski teren zostanie zatopiony
-STR_CREATE_RIVER                                                :{BLACK}Umieszczanie rzek.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Stwórz akwen wodny.{}Tworzy kanał, chyba że przyrzymany jest CTRL na poziomie morza, wtedy pobliski teren zostanie zatopiony
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Umieszczanie rzek.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Skasuj
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Skasuj to miasto
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Zapisz scenariusz
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Wczytaj scenariusz
-STR_MENU_LOAD_HEIGHTMAP                                         :Wczytaj mapę wysokości
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Wczytaj mapę wysokości
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Wyjdź z edytora
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Wyjście
@@ -1012,7 +1012,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Zapisz s
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Zagraj Scenariusz
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Zagraj z mapy wysokości
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Rozpocznij nowa grę używając mapy wysokości jako krajobrazu
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Jesteś pewien że chcesz opuścić scenariusz?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Jesteś pewien że chcesz opuścić scenariusz?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...można zbudować jedynie w miastach o populacji przynajmniej 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Zmień datę początkową do tyłu o 1 rok
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Zmień datę początkawą do przodu o 1 rok
@@ -1020,21 +1020,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...końc
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Male
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Åšrednie
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Duże
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Losowo
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Losowo
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropolia
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Duże miasta rozwijają się szybciej o małych miast{}W zależności od ustawień, są większe przy zakładaniu
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Wybierz wielkość miasta
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Wielkość miasta:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW} Układ dróg miasta
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Wybierz układ dróg dla tego miasta
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Oryginalnie
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Lepsze drogi
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Siatka 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Siatka 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Losowo
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW} Układ dróg miasta
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Wybierz układ dróg dla tego miasta
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Oryginalnie
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Lepsze drogi
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Siatka 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Siatka 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Losowo
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Pokaż ostatnią wiadomość lub ogłoszenie
 STR_NEWS_MESSAGES_OFF                                           :Wyłączone
 STR_NEWS_MESSAGES_SUMMARY                                       :Sumaryczne
@@ -1134,10 +1134,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Zrzut ekranu zapisany na dysk z powodzeniem {STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}BÅ‚Ä…d zrzutu ekranu!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Nabyj teren do przyszłego użycia
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Nabyj teren do przyszłego użycia
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOZAPIS
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ZAPISYWANIE GRY  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Zapisywanie trwa,{}proszę zaczekać do zakończenia!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Zapisywanie trwa,{}proszę zaczekać do zakończenia!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Wybierz program 'Ezy Street'
 
 ############ start of townname region
@@ -1200,7 +1200,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Wybierz
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Pełny ekran
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaznacz to jeśli chcesz grać w OpenTTD w trybie pełnoekranowym
-STR_FULLSCREEN_FAILED                                           :{WHITE}Uruchomienie trybu pelnoekranowego nie powiodlo sie
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Uruchomienie trybu pelnoekranowego nie powiodlo sie
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozdzielczość ekranu
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Wybierz rozdzielczość ekranu
@@ -1211,12 +1211,12 @@ STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP                      :{BLACK}Wybierz
 STR_GAME_OPTIONS_BASE_GRF                                       :{BLACK}Główny zestaw grafik
 STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Wybierz główny zestaw grafik do użycia
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}BÅ‚Ä…d autozapisu
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}BÅ‚Ä…d autozapisu
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Zmierza do {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Zmierza do {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Bez poleceń
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Bez poleceń, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Zmierza do {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Zmierza do {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Bez poleceń
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Bez poleceń, {VELOCITY}
 
 STR_PASSENGERS                                                  :pasażerów
 STR_BAGS                                                        :worki
@@ -1233,9 +1233,9 @@ STR_CRATES                                                      :skrzyń
 STR_RES_OTHER                                                   :inna
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nie można współdzielić poleceń...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nie można skopiować listy poleceń...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Koniec współdzielonych poleceń - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nie można współdzielić poleceń...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nie można skopiować listy poleceń...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Koniec współdzielonych poleceń - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} nie potrafi znaleźć trasy, aby kontynuować.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} zgubił się.
@@ -1501,15 +1501,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Rozmiar
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :niedostępne
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Zmiana wartości
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Zmiana wartości
 
-STR_TEMPERATE_LANDSCAPE                                         :Krajobraz umiarkowany
-STR_SUB_ARCTIC_LANDSCAPE                                        :Krajobraz arktyczny
-STR_SUB_TROPICAL_LANDSCAPE                                      :Krajobraz tropikalny
-STR_TOYLAND_LANDSCAPE                                           :Krajobraz zabawkowy
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Krajobraz umiarkowany
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Krajobraz arktyczny
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Krajobraz tropikalny
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Krajobraz zabawkowy
 
 STR_CHEATS                                                      :{WHITE}Oszukiwanie
-STR_CHEATS_TIP                                                  :{BLACK}Pole wyboru wskazuje, czy użyłeś już wcześniej tego oszustwa
+STR_CHEATS_TOOLTIP                                              :{BLACK}Pole wyboru wskazuje, czy użyłeś już wcześniej tego oszustwa
 STR_CHEATS_WARNING                                              :{BLACK}Ostrzeżenie! Właśnie chcesz zdradzić swoich współzawodników. Miej na uwadze, że taka hańba będzie pamiętana na wieki!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Zwiększ ilość pieniędzy o {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Grasz jako firma: {ORANGE}{COMMA}
@@ -1521,177 +1521,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Zmień
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Zmień datę: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Pozwól modyfikować wielkość produkcji przedsiębiorstw: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Zmierza do {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Zmierza do {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Zmierza do {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Zmierza do {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Idź przez {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Idź bez zatrzymywania przez {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Idź przez {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Idź bez zatrzymywania przez {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Pkt. kontrolny {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Pkt. kontrolny  {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Pkt. kontrolny
+STR_FORMAT_WAYPOINT_NAME                                        :Pkt. kontrolny {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Pkt. kontrolny  {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Pkt. kontrolny
 
-STR_WAYPOINT                                                    :{WHITE}Pkt kontrolny
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Wybierz typ pkt kontrolnego
+STR_WAYPOINT_CAPTION                                            :{WHITE}Pkt kontrolny
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Wybierz typ pkt kontrolnego
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Edytuj nazwÄ™ pkt. kontrolnego
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nie można zmienić nazwy punktu orientacyjnego...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nie można zmienić nazwy punktu orientacyjnego...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Zmiana torów na pkt. kontrolny
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nie można budować tutaj punktu orientacyjnego...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nie można usunąć stąd kolejowego punktu orientacyjnego...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Nie można budować tutaj punktu orientacyjnego...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Nie można usunąć stąd kolejowego punktu orientacyjnego...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Budowa torów za pomocą trybu Autotory
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...nie ma żadnego miasta w scenariuszu
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generowanie mapy anulowane...{}...brak odpowiednich miesjc dla miast
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...nie ma żadnego miasta w scenariuszu
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generowanie mapy anulowane...{}...brak odpowiednich miesjc dla miast
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Wiele losowych miast
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Pokryj mapę losowo położonymi miastami
-STR_MANY_RANDOM_INDUSTRIES                                      :Wiele losowych
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Pokryj mapę losowo położonymi przedsiębiorstwami
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nie można stworzyć przedsiębiorstw...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Wiele losowych miast
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Pokryj mapę losowo położonymi miastami
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Wiele losowych
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Pokryj mapę losowo położonymi przedsiębiorstwami
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nie można stworzyć przedsiębiorstw...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Zmiana terenu, podwyższanie/obniżanie lądu, sadzenie drzew, itp.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Krajobraz
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Wyrównaj teren
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Wyrównaj teren
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Drzewa rożnych rodzajów
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Sadzenie drzew rożnych rodzajów
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Sadzenie drzew rożnych rodzajów
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Nie można budować tutaj kanału...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Nie można budować tutaj kanału...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Buduj kanały.
-STR_LANDINFO_CANAL                                              :Kanał
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanał
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Nie można budować tutaj śluzy...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Nie można budować tutaj śluzy...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Buduj śluzy
-STR_LANDINFO_LOCK                                               :Åšluza
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Åšluza
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}NIe mozna tutaj umieścić rzeki...
-STR_LANDINFO_RIVER                                              :Rzeka
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}NIe mozna tutaj umieścić rzeki...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rzeka
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...boja w użyciu!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...boja w użyciu!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Współrzędne: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Współrzędne: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nie można usunąć części stacji...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Nie można zmienić typu torów w tym miejscu...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nie można usunąć części stacji...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Nie można zmienić typu torów w tym miejscu...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Zamiana typu torów
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Przeciągnij tutaj lokomotywę by sprzedać cały pociąg
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Przeciągnij tutaj lokomotywę by sprzedać cały pociąg
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Przeciągnij i upuść
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Budowj stację używając "przeciągnij i upuść"
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Wybierz rodzaj stacji do pokazania
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Wybierz typ stacji do zbudowania
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Wybierz rodzaj stacji do pokazania
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Wybierz typ stacji do zbudowania
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Szybkie przemijanie czasu w grze
 STR_MESSAGE_HISTORY                                             :{WHITE}Poprzednie wiadomości
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Lista ostatnich wiadomości
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Wyłącz wszystko
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}WÅ‚Ä…cz wszystko
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Lista ostatnich wiadomości
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Wyłącz wszystko
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}WÅ‚Ä…cz wszystko
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Przemysł
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} (przetransportowano {COMMA}%)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} (przetransportowano {COMMA}%/{COMMA}%)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nazwy zakladow - kliknij na nazwie by wysrodkowac na nim widok
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Przemysł
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} (przetransportowano {COMMA}%)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} (przetransportowano {COMMA}%/{COMMA}%)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nazwy zakladow - kliknij na nazwie by wysrodkowac na nim widok
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...zbyt blisko innego przedsiębiorstwa
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...zbyt blisko innego przedsiębiorstwa
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmiana produkcji
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Gra Wieloosobowa
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nazwa gracza:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}To jest nazwa pod którą będą Cię widzieć inni gracze
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Wprowadz swoje imie
-STR_NETWORK_CONNECTION                                          :{BLACK}Połączenie:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Wybierz między grą w internecie a grą w sieci lokalnej
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Uruchom serwer
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Uruchom własny serwer
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nazwa
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nazwa gry
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Język, wersja serwera, itp.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Kliknij na grze z listy by ją wybrać
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Serwer do ktorego ostatnio sie polaczyles:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Kliknij by wybrac serwer na ktorym grales ostatnim razem
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Szukanie serwera
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Przeszukuje siec w poszukiwaniu serwera
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Dodaj serwer
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Dodaj serwer do listy, która będzie przeszukiwana w poszukiwaniu uruchomionych gier.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Wpisz adres IP serwera
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klientów
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientów podłączonych / maks.{}Firm podłączonych / maks.
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Rozmiar mapy
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Rozmiar mapy{}Kliknij by sortowac po powierzchni
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Bieżąca data
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Lata
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Ilosc lat{}trwania gry
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O GRZE
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienci:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Język:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Krajobraz:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Rozmiar mapy:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Wersja serwera:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adres serwera:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data uruchomienia:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Bieżąca data:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Chronione hasłem!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERWER WY�ĄCZONY
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERWER PE�NY
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}NIEZGODNA WERSJA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NIEZGODNE NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Przyłącz się do gry
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Rozpocznij nowa grÄ™
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nazwa gry:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Nazwa gry będzie wyświetlana u innych graczy w menu gry wieloosobowej
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Wpisz nazwÄ™ dla gry sieciowej
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Ustaw hasło
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Zabezpiecz grę hasłem jeśli nie chcesz, by była publicznie dostępna
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Wybierz mapÄ™:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Na której mapie chcesz grac?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (publiczny)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" ów ów}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Dopuszczalna ilość klientów:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Ustaw maksymalną liczbę klientów. Nie wszystkie pola muszą być wypełnione.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firm{P a y ""}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maksymalna ilość firm:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Ogranicz serwer do określonej ilości firm
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} widz{P "" ów ów}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maksymalna ilość widzów:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ogranicz serwer do określonej ilości widzów
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Używany język:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Inni gracze będą poinformowani jaki język jest używany na serwerze
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Rozpocznij grÄ™
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Uruchom nowÄ… grÄ™ sieciowÄ… z losowÄ… mapÄ… lub scenariuszem
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Wczytaj GrÄ™
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Przywróć wcześniej zapisaną grę wieloosobową (upewnij się, że połączyłeś się jako odpowiedni gracz)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Gra Wieloosobowa
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Wprowadz swoje imie
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Połączenie:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Wybierz między grą w internecie a grą w sieci lokalnej
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Uruchom serwer
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Uruchom własny serwer
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nazwa
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nazwa gry
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Język, wersja serwera, itp.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Kliknij na grze z listy by ją wybrać
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Serwer do ktorego ostatnio sie polaczyles:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Kliknij by wybrac serwer na ktorym grales ostatnim razem
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Szukanie serwera
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Przeszukuje siec 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_ENTER_IP                                :{BLACK}Wpisz adres IP serwera
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klientów
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klientów podłączonych / maks.{}Firm podłączonych / maks.
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Rozmiar mapy
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Rozmiar mapy{}Kliknij by sortowac po powierzchni
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Bieżąca data
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Lata
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Ilosc lat{}trwania gry
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO O GRZE
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klienci:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Język:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Krajobraz:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Rozmiar mapy:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Wersja serwera:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adres serwera:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data uruchomienia:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Bieżąca data:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Chronione hasłem!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERWER WY�ĄCZONY
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERWER PE�NY
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}NIEZGODNA WERSJA
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NIEZGODNE NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Przyłącz się do gry
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Rozpocznij nowa grÄ™
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nazwa gry:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nazwa gry będzie wyświetlana u innych graczy w menu gry wieloosobowej
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Wpisz nazwÄ™ dla gry sieciowej
+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_SELECT_MAP                             :{BLACK}Wybierz mapÄ™:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Na której mapie chcesz grac?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (publiczny)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" ów ów}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Dopuszczalna ilość klientów:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Ustaw maksymalną liczbę klientów. Nie wszystkie pola muszą być wypełnione.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} firm{P a y ""}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maksymalna ilość firm:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Ogranicz serwer do określonej ilości firm
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} widz{P "" ów ów}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maksymalna ilość widzów:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Ogranicz serwer do określonej ilości widzów
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Używany język:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Inni gracze będą poinformowani jaki język jest używany na serwerze
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Rozpocznij grÄ™
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Uruchom nowÄ… grÄ™ sieciowÄ… z losowÄ… mapÄ… lub scenariuszem
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Wczytaj GrÄ™
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Przywróć wcześniej zapisaną grę wieloosobową (upewnij się, że połączyłeś się jako odpowiedni gracz)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Dowolny
@@ -1732,33 +1732,33 @@ STR_NETWORK_LANG_GREEK                                          :Grecki
 STR_NETWORK_LANG_LATVIAN                                        :�otewski
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Lobby gry wieloosobowej
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Lobby gry wieloosobowej
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Przygotowanie do połączenia:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista wszystkich firm w grze. Możesz przyłączyć się do jednej z nich lub założyć nowa
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nowa firma
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Rozpoczęcie działalności nowej firmy
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Gra obserwowana
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}OglÄ…daj grÄ™ jako widz
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Połącz z firmą
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Pomóż zarządzać tą firmą
-STR_NETWORK_REFRESH                                             :{BLACK}Odśwież serwer
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Odśwież informacje o serwerze
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Przygotowanie do połączenia:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Lista wszystkich firm w grze. Możesz przyłączyć się do jednej z nich lub założyć nowa
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nowa firma
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Rozpoczęcie działalności nowej firmy
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Gra obserwowana
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}OglÄ…daj grÄ™ jako widz
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Połącz z firmą
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Pomóż zarządzać tą firmą
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Odśwież serwer
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Odśwież informacje o serwerze
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO O FIRMIE
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO O FIRMIE
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nazwa firmy:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguracja:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Wartość firmy:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Bieżący bilans:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Przychód w ostatnim roku:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Wydajność:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nazwa firmy:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguracja:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Wartość firmy:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Bieżący bilans:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Przychód w ostatnim roku:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Wydajność:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Pojazdy:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stacje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Gracze:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Pojazdy:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stacje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Gracze:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}�ączenie...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}�ączenie...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) �ączenie..
@@ -1774,49 +1774,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Uzyskiwa
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" ów ów} chce się przyłączyć
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} dotÄ…d pobranych
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Rozłącz
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Rozłącz
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Wprowadź ilość pieniędzy, które chcesz przekazać
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Serwer jest chroniony. Wprowadź hasło
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Firma jest chroniona. Wprowadź hasło
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista klientów
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista klientów
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Obserwuj
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nowe przedsiębiorstwo
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Brak interface'u sieciowego lub skompilowano bez opcji ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Nie można znaleźć żadnej gry w sieci
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Serwer nie odpowiada
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}  Nie można było połączyć z powodu niezgodności NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} BÅ‚Ä…d synchronizacji gry sieciowej.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Połączenie utracone w grze sieciowej.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Nie można wczytać zapisanej gry z serwera.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nie można uruchomić serwera
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nie można połączyć
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Przekroczony limit czasu dla połączenia #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Błąd protokołu, połączenie zostało przerwane.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Wersja gry nie zgadza siÄ™ z wersjÄ… gry na serwerze
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Złe hasło
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Serwer jest pełny
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Masz zabroniony dostęp do tego serwera
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Zostałeś wyrzucony z serwera
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} UÅ‚atwienia sÄ… niedozwolone na tym serwerze
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Brak interface'u sieciowego lub skompilowano bez opcji ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Nie można znaleźć żadnej gry w sieci
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Serwer nie odpowiada
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}  Nie można było połączyć z powodu niezgodności NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} BÅ‚Ä…d synchronizacji gry sieciowej.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Połączenie utracone w grze sieciowej.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Nie można wczytać zapisanej gry z serwera.
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Nie można uruchomić serwera
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Nie można połączyć
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Przekroczony limit czasu dla połączenia #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Błąd protokołu, połączenie zostało przerwane.
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Wersja gry nie zgadza siÄ™ z wersjÄ… gry na serwerze
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Złe hasło
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Serwer jest pełny
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Masz zabroniony dostęp do tego serwera
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Zostałeś wyrzucony z serwera
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} UÅ‚atwienia sÄ… niedozwolone na tym serwerze
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :błąd ogólny
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :błąd synchronizacji
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nie można załadować mapy
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :połączenie utracone
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :błąd protokołu
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Niezgodność NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nie autoryzowane
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :odebrany nieznany pakiet
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :zła wersja
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nazwa już w użyciu
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :złe hasło gry
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :zla nazwa firmy w DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :wyrzucony przez serwer
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :probował użyć ułatwień
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :serwer jest pełny
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :błąd ogólny
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :błąd synchronizacji
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :nie można załadować mapy
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :połączenie utracone
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :błąd protokołu
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Niezgodność NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nie autoryzowane
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :odebrany nieznany pakiet
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :zła wersja
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nazwa już w użyciu
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :złe hasło gry
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :zla nazwa firmy w DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :wyrzucony przez serwer
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :probował użyć ułatwień
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serwer jest pełny
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1826,15 +1826,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Gra zatrzymana
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Gra wznowiona (klient połączony)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Gra wznowiona (nieudane połączenie klienta)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :opuszczanie
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} dołączył do gry.
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} dołączył do firmy #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} dołączył do obserwatorów
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} założył nową firmę (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} opuścił grę ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} zmienił/zmieniła swoje imię na {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} dał/dała twojemu przedsiębiorstwu {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Dałeś {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :opuszczanie
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} dołączył do gry.
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} dołączył do firmy #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} dołączył do obserwatorów
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} założył nową firmę (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} opuścił grę ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} zmienił/zmieniła swoje imię na {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} dał/dała twojemu przedsiębiorstwu {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dałeś {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Zespół] :
 STR_NETWORK_CHAT_COMPANY                                        :[Zespół] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Zespół] do {STRING}: {WHITE}{STRING}
@@ -1844,8 +1844,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Prywatna] do {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Wszyscy] :
 STR_NETWORK_CHAT_ALL                                            :[Wszyscy] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Wpisz tekst do chat'u
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Serwer zamknÄ…Å‚ sesjÄ™
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Restart serwera...{}Proszę czekać...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Serwer zamknÄ…Å‚ sesjÄ™
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Restart serwera...{}Proszę czekać...
 
 STR_NETWORK_SERVER                                              :Serwer
 STR_NETWORK_CLIENT                                              :Klient
@@ -1859,19 +1859,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Mów do firmy
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Prywatna wiadomość
 
 
-STR_NETWORK_SEND                                                :{BLACK}Wyślij
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Wyślij
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nie można wczytać krajobrazu z PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...nie znaleziono pliku.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nie można konwertować typu obrazu. Wymagany 8- lub 24-bitowy PNG.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...coś poszło nie tak. Przepraszam. (prawdopodobnie zepsuty plik)
+STR_ERROR_PNGMAP                                                :{WHITE}Nie można wczytać krajobrazu z PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...nie znaleziono pliku.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nie można konwertować typu obrazu. Wymagany 8- lub 24-bitowy PNG.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...coś poszło nie tak. Przepraszam. (prawdopodobnie zepsuty plik)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Nie można wczytać krajobrazu z BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nie można konwertować typu obrazu.
+STR_ERROR_BMPMAP                                                :{WHITE}Nie można wczytać krajobrazu z BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nie można konwertować typu obrazu.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Koszt: {CURRENCY}
@@ -1885,13 +1885,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Szacowan
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Nie można tutaj podnieść lądu...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Nie można tutaj obniżyć lądu...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Nie mozna wyrownac tutaj terenu
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Skały
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Wyboisty teren
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Odkryty teren
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Trawa
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Pola
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Zaśnieżony teren
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Pustynia
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Skały
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Wyboisty teren
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Odkryty teren
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Trawa
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Pola
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Zaśnieżony teren
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Pustynia
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Teren pochylony w złym kierunku
@@ -1899,11 +1899,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Niemożl
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Wykop zniszczyłby tunel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Już na poziome morza
 STR_ERROR_TOO_HIGH                                              :{WHITE}Zbyt wysoko
-STR_ALREADY_LEVELLED                                            :{WHITE}... juz wyrównany
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... juz wyrównany
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nieodpowiednie tory
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...już zbudowano
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Należy najpierw usunąć tory
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Droga jest jednokierunkowa lub zablokowana
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Droga jest jednokierunkowa lub zablokowana
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Konstrukcja torowiska
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Konstrukcja elektryfikowanego torowiska
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Konstrukcja torowiska jednoszynowego
@@ -1927,41 +1927,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Budowa s
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Budowa mostu kolejowego
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Budowa tunelu kolejowego
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Przełącz buduj/usuń dla torów i semaforów
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Wybór mostu - kliknij na wybranym moście, aby go zbudować
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Wybór mostu - kliknij na wybranym moście, aby go zbudować
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Wybierz ukierunkowanie zajezdni kolejowej
-STR_RAILROAD_TRACK                                              :Tory kolejowe
-STR_RAILROAD_TRAIN_DEPOT                                        :Zajezdnia kolejowa
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Tory kolejowe
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Zajezdnia kolejowa
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...teren jest własnością innej firmy
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Tory kolejowe ze zwykłą sygnalizacją
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Tory kolejowe z pre-sygnałami
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Tory kolejowe z exit-sygnałami
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Tory kolejowe z combo-sygnałami
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Tor kolejowy z sygnalizacjÄ…
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Tor kolejowy z sygnalizacjÄ… jednokierunkowÄ…
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Tory kolejowe z normalnymi i pre-sygnałami
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Tory kolejowe z normalnymi i exit-sygnałami
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Tory kolejowe z normalnymi i combo-sygnałami
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Tory kolejowe z sygnalizatorami blokowania i jazdy
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Tor kolejowy z blokadą i jednokierunkowymi sygnałami
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Tory kolejowe z pre- i exit-sygnałami
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Tory kolejowe z pre i combo-sygnałami
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Tor kolejowy z sygnalizatorami wejścia i trasy
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Tor kolejowy z sygnalizatorami wejścia i jednokierunkowymi trasy
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Tory kolejowe z exit i combo-sygnałami
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Tor kolejowy z sygnałami wyjścia- i trasy
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Tor kolejowy z sygnałami wyjścia- i trasy jednokierunkowej
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Tor kolejowy z sygnałami mieszanymi- i trasy
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Tor kolejowy z sygnałami mieszanymi- i trasy jednokierunkowej
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Tor kolejowy z sygnałami trasy i trasy jednokierunkowej
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Należy najpierw usunąć stację kolejową
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Zbuduj oddzielnÄ… stacjÄ™
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Połącz stację
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Tory kolejowe ze zwykłą sygnalizacją
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Tory kolejowe z pre-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Tory kolejowe z exit-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Tory kolejowe z combo-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Tor kolejowy z sygnalizacjÄ…
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Tor kolejowy z sygnalizacjÄ… jednokierunkowÄ…
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Tory kolejowe z normalnymi i pre-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Tory kolejowe z normalnymi i exit-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Tory kolejowe z normalnymi i combo-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Tory kolejowe z sygnalizatorami blokowania i jazdy
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Tor kolejowy z blokadą i jednokierunkowymi sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Tory kolejowe z pre- i exit-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Tory kolejowe z pre i combo-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Tor kolejowy z sygnalizatorami wejścia i trasy
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Tor kolejowy z sygnalizatorami wejścia i jednokierunkowymi trasy
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Tory kolejowe z exit i combo-sygnałami
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Tor kolejowy z sygnałami wyjścia- i trasy
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Tor kolejowy z sygnałami wyjścia- i trasy jednokierunkowej
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Tor kolejowy z sygnałami mieszanymi- i trasy
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Tor kolejowy z sygnałami mieszanymi- i trasy jednokierunkowej
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Tor kolejowy z sygnałami trasy i trasy jednokierunkowej
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Należy najpierw usunąć stację kolejową
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Zbuduj oddzielnÄ… stacjÄ™
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Połącz stację
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Należy najpierw usunąć drogę
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}TrwajÄ… roboty drogowe
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}TrwajÄ… roboty drogowe
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Tworzenie dróg
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Budowa torowiska tramwajowego
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Wybierz most drogowy
@@ -1997,14 +1997,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Zbuduj t
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Włącz/Wyłącz drogi jednokierunkowe
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Przełącz buduj/usuń dla konstrukcji dróg
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Przełącz buduj/usuń dla konstrukcji torowiska tramwajowego
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Wybierz umiejscowienie zajezdni samochodowej
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Wybierz ukierunkowanie zajezdni tramwajowej
-STR_ROAD_DESCRIPTION_ROAD                                       :Droga
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Droga z oświetleniem ulicznym
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Droga z drzewami
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Zajezdnia samochodowa
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Przejazd kolejowy
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Szyny tramwajowe
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Wybierz umiejscowienie zajezdni samochodowej
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Wybierz ukierunkowanie zajezdni tramwajowej
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Droga
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Droga z oświetleniem ulicznym
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Droga z drzewami
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Zajezdnia samochodowa
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Przejazd kolejowy
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Szyny tramwajowe
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nie można usunąć przystanku...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nie można usunąć stacji załadunkowej...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nie można usunąć przystanku tramwajowego...
@@ -2012,12 +2012,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nie moż
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Miasta
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Należy najpierw zburzyć budynek
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (City)
@@ -2030,9 +2030,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centruj
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Zmień nazwę miasta
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Pasażerów w zeszłym miesiącu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Poczta w zeszłym miesiącu: {ORANGE}{COMMA}{BLACK}  maks: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Towar potrzebny do rozwoju miasta:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{BLACK}Wymaganych {SETX 20}{ORANGE}{STRING}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} dowiezionych w zeszłym miesiącu
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Towar potrzebny do rozwoju miasta:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{BLACK}Wymaganych {SETX 20}{ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} dowiezionych w zeszłym miesiącu
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Wysoki biurowiec
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Biurowiec
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Mały blok mieszkalny
@@ -2069,7 +2069,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Przyznano subsydia dla {STRING}!{}{}Przewóz {STRING.d} z {STATION} do {STATION} będzie opłacany potrójnie przez następny rok!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Przyznano subsydia dla {STRING}!{}{}Przewóz {STRING.d} z {STATION} do {STATION} będzie opłacany poczwórnie przez następny rok!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Lokalne władze {TOWN} nie pozwalają na budowę kolejnego lotniska w tym mieście
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} lokalne władzę odmawiają zgody na lotnisko ze względu na poziom hałasu
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokalne władzę odmawiają zgody na lotnisko ze względu na poziom hałasu
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Domki
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Domy
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Mieszkania
@@ -2105,7 +2105,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Chaos na drogach w {TOWN}!{}{}Program przebudowy dróg ufundowany przez {STRING} przynosi 6 miesięcy męki dla kierowców!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (w budowie)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (w budowie)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igloo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Dom-Czajniczek
@@ -2118,17 +2118,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Umieść napis
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drzewa
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...drzewo już tu jest
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Nie można posadzić drzewa...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...zbyt wiele napisów
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Nie można umieścić napisu...
-STR_SIGN_DEFAULT                                                :Napis
+STR_DEFAULT_SIGN_NAME                                           :Napis
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Edycja tekstu napisu
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nie możesz zmienić nazwy napisu...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nie można usunąć znaku...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Wybierz typ drzew do sadzenia
-STR_TREE_NAME_TREES                                             :Drzewa
-STR_TREE_NAME_RAINFOREST                                        :Las deszczowy
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusy
+STR_LAI_TREE_NAME_TREES                                         :Drzewa
+STR_LAI_TREE_NAME_RAINFOREST                                    :Las deszczowy
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusy
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Wybór stacji
@@ -2148,7 +2148,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Należy
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Zbyt blisko innego lotniska
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Należy najpierw usunąć lotnisko
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Zmień nazwę stacji
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Zmień nazwę stacji
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nie można zmienić nazwy.
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Oceny
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Akceptuje
@@ -2166,10 +2166,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Niezrównane
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Pokazuje wszystkie pociągi, które mają tę stację w swoim rozkładzie
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Pokazuje wszystkie samochody, ktore majÄ… tÄ™ stacjÄ™ w swoim rozkladzie
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Pokazuje wszystkie samoloty, ktore majÄ… tÄ™ stacjÄ™ w swoim rozkladzie
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Pokazuje wszystkie statki, ktore majÄ… tÄ™ stacjÄ™ w swoim rozkladzie
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Pokazuje wszystkie pociągi, które mają tę stację w swoim rozkładzie
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Pokazuje wszystkie samochody, ktore majÄ… tÄ™ stacjÄ™ w swoim rozkladzie
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Pokazuje wszystkie samoloty, ktore majÄ… tÄ™ stacjÄ™ w swoim rozkladzie
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Pokazuje wszystkie statki, ktore majÄ… tÄ™ stacjÄ™ w swoim rozkladzie
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} już nie akceptuje {STRING.d}
@@ -2202,47 +2202,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Zmień n
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Pokaż listę akceptowanych ładunków
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nazwa stacji - kliknij na nazwie aby wycentrować główny widok na stacji
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Wybierz wielkość/typ lotniska
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Stacja kolejowa
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lotnisko
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Stacja załadunku ciężarówek
-STR_STATION_DESCRIPTION_BUS_STATION                             :Przystanek
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Port
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Stacja kolejowa
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lotnisko
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Stacja załadunku ciężarówek
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Przystanek
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Port
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Podświetl zasięg projektowanej stacji
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nie podświetlaj zasięgu projektowanej stacji
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Podświetlaj zasięg
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Port
-STR_STATION_DESCRIPTION_BUOY                                    :Boja
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boja
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boja na drodze
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stacja zbyt rozległa
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...niejednorodne  są niedostępne
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Przytrzymaj CTRL aby zaznaczyć więcej niż jedną opcję
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...niejednorodne  są niedostępne
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Przytrzymaj CTRL aby zaznaczyć więcej niż jedną opcję
 
 STR_UNDEFINED                                                   :(nieokreślony tekst)
-STR_STAT_CLASS_DFLT                                             :Typowa stacja
-STR_STAT_CLASS_WAYP                                             :Pkt. kontrolne
+STR_STATION_CLASS_DFLT                                          :Typowa stacja
+STR_STATION_CLASS_WAYP                                          :Pkt. kontrolne
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Ukierunkowanie stoczni
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...musi być wybudowane na wodzie
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nie można tutaj wybudować stoczni...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}wybierz ukierunkowanie stoczni
-STR_WATER_DESCRIPTION_WATER                                     :Woda
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Wybrzeże lub brzeg rzeki
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Stocznia
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akwedukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Woda
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Wybrzeże lub brzeg rzeki
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Stocznia
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akwedukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Nie można wybudować na wodzie
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Należy najpierw usunąć kanał
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Należy najpierw usunąć kanał
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Zapisz grÄ™
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Wczytaj grÄ™
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Zapisz
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Usuń
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Obserwator, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Obserwator, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} wolnego miejsca
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Nie można odczytać napędu
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Nie można zapisać gry{}{STRING}
@@ -2258,12 +2258,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista na
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Obecnie zaznaczona nazwa dla zapisanej gry
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Skasuj zaznaczonÄ… zapisanÄ… grÄ™
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Zapisz bieżącą grę używając wybranej nazwy
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Tworzenie losowej nowej gry
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Wczytaj mapę wysokości
-STR_SAVE_OSKTITLE                                               :{BLACK}Wprowadz nazwe pod jaka zapisac gre
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Tworzenie losowej nowej gry
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Wczytaj mapę wysokości
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Wprowadz nazwe pod jaka zapisac gre
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} na drodze
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} na drodze
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Kopalnia Węgla
 STR_INDUSTRY_NAME_COAL_MINE.d                                   :{G=f}kopalni węgla
@@ -2357,7 +2357,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centruj główny widok na przedsiębiorstwie
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Rozpoczęto budowę nowe{G go j go} {STRING.d} blisko {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Now{G y a e} {STRING} został{G 0 "" a o} posadzon{G 0 y a e} blisko {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Koszt: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Koszt: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Nie można tutaj wybudować tego przedsiębiorstwa...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...las może być posadzony tylko powyżej linii śniegu
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} ogłasza bliskie zamkniecie!
@@ -2375,16 +2375,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Inny tunel na drodze
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Koniec tunelu poza mapÄ…
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Koniec tunelu poza mapÄ…
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nie można wydrążyć drugiego końca tunelu
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Należy najpierw usunąć tunel
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Należy najpierw usunąć most
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Nie można zaczynać i kończyć w tym samym miejscu
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Początki mostu nie są na tej samej wysokości
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Most jest za nisko dla tego terenu
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Nie można zaczynać i kończyć w tym samym miejscu
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Początki mostu nie są na tej samej wysokości
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most jest za nisko dla tego terenu
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Początek i koniec muszą być w jednej linii
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Nieodpowiednie miejsce na wejście tunelu
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Podwieszany, stalowy
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Dźwigarowy, stalowy
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Wspornikowy, stalowy
@@ -2395,30 +2395,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cylindryczny, s
 STR_BRIDGE_TUBULAR_SILICON                                      :Cylindryczny, krzemowy
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Nie można tutaj wybudować mostu...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Nie można tutaj wybudować tunelu...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Tunel kolejowy
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunel samochodowy
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Podwieszany most kolejowy ze stali
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Dźwigarowy most kolejowy ze stali
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Stalowy wspornikowy most kolejowy
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Podwieszany most kolejowy wzmocniony betonem
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Drewniany most kolejowy
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Most kolejowy z betonu
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Podwieszany most drogowy ze stali
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Dźwigarowy most drogowy ze stali
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Wspornikowy most drogowy ze stali
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Podwieszany most drogowy wzmocniony betonem
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Drewniany most drogowy
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonowy most drogowy
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Cylindryczny most kolejowy
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Cylindryczny most drogowy
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Tunel kolejowy
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunel samochodowy
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Podwieszany most kolejowy ze stali
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Dźwigarowy most kolejowy ze stali
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Stalowy wspornikowy most kolejowy
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Podwieszany most kolejowy wzmocniony betonem
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Drewniany most kolejowy
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Most kolejowy z betonu
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Podwieszany most drogowy ze stali
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Dźwigarowy most drogowy ze stali
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Wspornikowy most drogowy ze stali
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Podwieszany most drogowy wzmocniony betonem
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Drewniany most drogowy
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonowy most drogowy
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Cylindryczny most kolejowy
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Cylindryczny most drogowy
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Obiekt na drodze
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Nadajnik
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Latarnia
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Siedziba firmy
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Nadajnik
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Latarnia
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Siedziba firmy
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...siedziba firmy na drodze
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Teren w posiadaniu firmy
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Teren w posiadaniu firmy
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Nie możesz nabyć tego terenu...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...to już jest Twoje!
 
@@ -2464,7 +2464,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stacja
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Poziom Trudności
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Zapisz
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Zapisz
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}�atwy
@@ -2537,8 +2537,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Schemat k
 STR_LIVERY_CAPTION                                              :{WHITE}Nowy schemat kolorów
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Nazwa Firmy
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Prezes
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nazwa firmy
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nazwisko prezesa
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nazwa firmy
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nazwisko prezesa
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Nie można zmienić nazwy firmy...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Nie można zmienić nazwiska prezesa...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanse {BLACK}{COMPANYNUM}
@@ -2562,11 +2562,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}�ącznie:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Wykres przychodów
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Wykres obrotów
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Bilans bankowy
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Pożyczka
-STR_MAX_LOAN                                                    :{WHITE}Maks. pożyczka:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maks. pożyczka:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pożyczka {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Zwrot {SKIP}{SKIP}{CURRENCY}
@@ -2575,7 +2575,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nie moż
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...pożyczka już jest spłacona
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} wymagane
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nie można zwrócić pożyczki...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nie możesz wydać pieniędzy, które są pożyczone z banku...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Nie możesz wydać pieniędzy, które są pożyczone z banku...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Wybierz nowa twarz prezesa
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Zmień kolor pojazdów firmy
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Zmień imię prezesa
@@ -2585,10 +2585,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Zwróć
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Prezes)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inauguracja: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Pojazdy:
-STR_TRAINS                                                      :{WHITE}{COMMA} pociąg{P "" i ów}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} pojazd{P "" y ów}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} samolot{P "" y ów}
-STR_SHIPS                                                       :{WHITE}{COMMA} stat{P ek ki ków}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} pociąg{P "" i ów}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} pojazd{P "" y ów}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} samolot{P "" y ów}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} stat{P ek ki ków}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Brak
 STR_FACE_CAPTION                                                :{WHITE}Wybór twarzy
 STR_FACE_MALE_BUTTON                                            :{BLACK}Mężczyzna
@@ -2602,7 +2602,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Stwórz
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Legenda
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Pokaż legendę na wykresie
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legenda do wykresów firm
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Kliknij tutaj aby wł./wył. wyświetlanie danych firmy na wykresie
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Kliknij tutaj aby wł./wył. wyświetlanie danych firmy na wykresie
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Dostarczonych jednostek Å‚adunku
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Ocena działalności firmy (max. ocena=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Wartości firm
@@ -2636,23 +2636,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Prezes
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Magnat
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Budowa Siedziby
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Buduj siedzibę główną / zobacz siedzibę główną
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Zbuduj siedzibę główna w innym miejscu za cenę 1% wartości firmy
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Zbuduj siedzibę główna w innym miejscu za cenę 1% wartości firmy
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nie można zbudować siedziby firmy...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Zobacz SG
-STR_RELOCATE_HQ                                                 :{BLACK}PrzenieÅ› SG
-STR_COMPANY_JOIN                                                :{BLACK}Dołącz
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Dołącz i graj jako ta firma
-STR_COMPANY_PASSWORD                                            :{BLACK}Hasło
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Ochrona hasłem Twojej firmy zapobiega nieautoryzowanemu przyłączeniu się
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Ustaw hasło firmy
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}PrzenieÅ› SG
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Dołącz
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Dołącz i graj jako ta firma
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Hasło
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Ochrona hasłem Twojej firmy zapobiega nieautoryzowanemu przyłączeniu się
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Ustaw hasło firmy
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Nie zapisuj podanego hasła
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Nadaj firmie nowe hasło
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Hasło firmy
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Hasło domyślne
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Użyj tego hasła jako domyślnego dla nowych firm
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Hasło domyślne
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Użyj tego hasła jako domyślnego dla nowych firm
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Åšwiatowa recesja!{}{}Eksperci finansowi obawiajÄ… siÄ™ najgorszego z powodu kryzysu!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Koniec recesji!{}{}Polepszenie się transakcji handlowych daje pewność przedsiębiorstwom dzięki umacniającej się ekonomii!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Przełącz duży/mały rozmiar okna
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Przełącz duży/mały rozmiar okna
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Wartość firmy: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kup 25% udziałów w firmie
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sprzedaj 25% udziałów w firmie
@@ -2662,7 +2662,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Nie moż
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}nie można sprzedać 25% udziałów tej firmy...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% w posiadaniu przez {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} zostało przejęte przez {STRING}!
-STR_PROTECTED                                                   :{WHITE}Ta firma jeszcze nie sprzedaje akcji...
+STR_ERROR_PROTECTED                                             :{WHITE}Ta firma jeszcze nie sprzedaje akcji...
 
 STR_LIVERY_DEFAULT                                              :Standardowy wyglÄ…d
 STR_LIVERY_STEAM                                                :Parowóz
@@ -2688,14 +2688,14 @@ STR_LIVERY_LARGE_PLANE                                          :Duży samolot
 STR_LIVERY_PASSENGER_TRAM                                       :Tramwaj pasażerski
 STR_LIVERY_FREIGHT_TRAM                                         :Tramwaj towarowy
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Pokaż ogólne schematy koloru
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Pokaż schematy koloru pociągów
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Pokaż schematy koloru samochodów
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Pokaż schematy koloru statków
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Pokaż schematy koloru samolotów
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Wybierz pierwszy kolor dla wybranego schematu
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Wybierz drugi kolor dla wybranego schematu
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Wybierz schemat kolorów do zmiany, albo wiele schematów z CTRL+klik. Kliknij na okienku aby wł./wył. używanie schematu.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Pokaż ogólne schematy koloru
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Pokaż schematy koloru pociągów
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Pokaż schematy koloru samochodów
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Pokaż schematy koloru statków
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Pokaż schematy koloru samolotów
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Wybierz pierwszy kolor dla wybranego schematu
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Wybierz drugi kolor dla wybranego schematu
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Wybierz schemat kolorów do zmiany, albo wiele schematów z CTRL+klik. Kliknij na okienku aby wł./wył. używanie schematu.
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Parowóz)
@@ -3009,9 +3009,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Nie rozladowuj
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Zmień zachowanie hamowania podświetlonych rozkazów
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Zmień zachowanie załadunku podświetlonego rozkazu
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}}Zmień zachowanie wyładunku podświetlonego rozkazu
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Dodaj zaawansowany rozkaz
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Dodaj zaawansowany rozkaz
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Jedz do najblizszej zajezdni
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Lec do najblizszego hangaru
 STR_ORDER_NEAREST_DEPOT                                         :najbliższy
@@ -3021,9 +3021,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Obsluga non-sto
 STR_ORDER_TRAIN_DEPOT                                           :Zajezdni kolejowej
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Zajezdni samochodowej
 STR_ORDER_SHIP_DEPOT                                            :Doku
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangaru
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangaru
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Zawsze do
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Obsluga jesli wymagana
@@ -3048,10 +3048,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :większy niż
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :większy lub równy
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :prawda
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :fałsz
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Skocz do rozkazu {COMMA}
-STR_CONDITIONAL_NUM                                             :Skocz do rozkazu {COMMA} kiedy {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Skocz do rozkazu {COMMA} kiedy {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Skocz do rozkazu {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Skocz do rozkazu {COMMA} kiedy {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Skocz do rozkazu {COMMA} kiedy {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nie podróżuje
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Przejazd (bez ustalonego czasu)
@@ -3074,18 +3074,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}PociÄ…g
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Pomiń
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Usuń
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Idź do
-STR_REFIT                                                       :{BLACK}Przeksztalc
-STR_REFIT_TIP                                                   :{BLACK}Wybierz typ ladunku do przeksztalcenia. Klikniecie z CTRL usuwa zmiane
-STR_REFIT_ORDER                                                 :(Przeksztalc na {STRING})
-STR_REFIT_STOP_ORDER                                            :(Remontuj w {STRING} i zatrzymaj)
-STR_STOP_ORDER                                                  :(Stop)
-STR_TIMETABLE_VIEW                                              :{BLACK}Rozkład
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Otwórz widok rozkładu jazdy
-STR_ORDER_VIEW                                                  :{BLACK}Rozkazy
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Przełącz w oknie rozkazów
+STR_ORDER_REFIT                                                 :{BLACK}Przeksztalc
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Wybierz typ ladunku do przeksztalcenia. Klikniecie z CTRL usuwa zmiane
+STR_ORDER_REFIT_ORDER                                           :(Przeksztalc na {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Remontuj w {STRING} i zatrzymaj)
+STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Rozkład
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Otwórz widok rozkładu jazdy
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Rozkazy
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Przełącz w oknie rozkazów
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Polecenia)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Koniec poleceń - -
-STR_SERVICE                                                     :{BLACK}Serwis
+STR_ORDER_SERVICE                                               :{BLACK}Serwis
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Budowa: {LTBLUE}{NUM}{BLACK} Wartość: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Wartość: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3105,7 +3105,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}pojazd n
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}pojazd dzielący ten rozkaz nie może jechać do tej stacji
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nie można ruszyć pojazdem...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Tylna lokomotywa zawsze porusza siÄ™ razem z przedniÄ…
-STR_CARGO_N_A                                                   :N/D{SKIP}
+STR_QUANTITY_N_A                                                :N/D{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nie można znaleźć drogi do zajezdni.
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Okres między serwisowaniem: {LTBLUE}{COMMA}dni{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Okres między serwisowaniem: {LTBLUE}{COMMA}%{BLACK}   Ostatni serwis: {LTBLUE}{DATE_LONG}
@@ -3125,10 +3125,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Rozkład
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Zmień ilość czasu którą zaznaczone zadanie powinno zająć
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Usuń ilość czasu przeznaczoną na zaznaczone zadanie
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Wyzeruj licznik spóźnienia, aby pojazd podróżował zgodnie z rozkładem jazdy
-STR_SERVICE_HINT                                                :{BLACK}Pomiń to polecenie jesli serwis nie jest wymagany
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Koszt: {CURRENCY} Waga: {WEIGHT_S}{}Prędkość: {VELOCITY}  Moc: {POWER}{}Utrzymanie: {CURRENCY}/rok{}Pojemność: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Kosztuje: {CURRENCY} Maksymalna prędkość: {VELOCITY}{}Pojemność: {CARGO}, {CARGO}{}Koszt używania: {CURRENCY}/rok
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Koszt: {CURRENCY} Prędkość maksymalna: {VELOCITY}{}�adowność: {CARGO}{}Koszt utrzymania: {CURRENCY}/rok
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Pomiń to polecenie jesli serwis nie jest wymagany
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Koszt: {CURRENCY} Waga: {WEIGHT_S}{}Prędkość: {VELOCITY}  Moc: {POWER}{}Utrzymanie: {CURRENCY}/rok{}Pojemność: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kosztuje: {CURRENCY} Maksymalna prędkość: {VELOCITY}{}Pojemność: {CARGO}, {CARGO}{}Koszt używania: {CURRENCY}/rok
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Koszt: {CURRENCY} Prędkość maksymalna: {VELOCITY}{}�adowność: {CARGO}{}Koszt utrzymania: {CURRENCY}/rok
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Wiek: {LTBLUE}{STRING}{BLACK}   Koszt używania: {LTBLUE}{CURRENCY}/rok
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Maksymalna prędkość: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Waga: {LTBLUE}{WEIGHT_S} {BLACK}Moc: {LTBLUE}{POWER}{BLACK} Maksymalna prędkość: {LTBLUE}{VELOCITY}
@@ -3148,27 +3148,27 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nie można odwrócić kierunku jazdy pociągu...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Nie można zawrócić pociągu...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nie można obracać pociągów z podwójnymi lokomotywami
-STR_CLEAR_TIME                                                  :{BLACK}Usuń czas
-STR_RESET_LATENESS                                              :{BLACK}Wyzeruj spóźnienia
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Zmień nazwę punktu orientacyjnego
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Usuń czas
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Wyzeruj spóźnienia
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Zmień nazwę punktu orientacyjnego
 
-STR_TRAIN_STOPPING                                              :{RED}Hamowanie
-STR_TRAIN_STOPPING_VEL                                          :{RED}Hamowanie, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Niezgodne typy torów
-STR_TRAIN_NO_POWER                                              :{RED}Brak zasilania
-STR_TRAIN_START_NO_CATENARY                                     :Ta trasa nie jest zelektryfikowana, wiec pociÄ…g nie wystartuje
-STR_TRAIN_STUCK                                                 :{ORANGE}Czeka na wolnÄ… drogÄ™
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Hamowanie
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Hamowanie, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Niezgodne typy torów
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Brak zasilania
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Ta trasa nie jest zelektryfikowana, wiec pociÄ…g nie wystartuje
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Czeka na wolnÄ… drogÄ™
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Dostępn{G y a e} now{G y a e} {STRING}!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Dostępn{G y a e} now{G y a e} {STRING} - {ENGINE}!
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Nie można sprzedać zniszczonego pojazdu...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nie można umieścić ponownie zniszczonego pojazdu...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Nie można sprzedać zniszczonego pojazdu...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nie można umieścić ponownie zniszczonego pojazdu...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Nie można wyznaczyć rozkładu jazdy pojazdu...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Pojazdy mogą czekać tylko na stacjach.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Ten pojazd nie zatrzymuje siÄ™ na tej stacji.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Nie można wyznaczyć rozkładu jazdy pojazdu...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Pojazdy mogą czekać tylko na stacjach.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Ten pojazd nie zatrzymuje siÄ™ na tej stacji.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Zmień czas
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Ten pojazd podróżuje teraz zgodnie z rozkładem jazdy
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Ten pojazd jest teraz spóźniony o {STRING}
@@ -3182,7 +3182,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Wypełni
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...musi być zatrzymany w zajezdni samochodowej
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nie można znaleźć zajezdni
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Zmuś pojazd do zawrócenia
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Pojemność: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Pojemność: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} pojazd{P "" y ów}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3209,11 +3209,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Ustaw boję, która może być użyta jako punkt kontrolny
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Nie można tutaj ustawić boi...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Zbuduj akwedukt
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Nie można zbudować tutaj akweduktu...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Nie można zbudować tutaj akweduktu...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Przebudowa)
 STR_REFIT_TITLE                                                 :{GOLD}Wybierz typ Å‚adunku do przewozu:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nowa pojemność: {GOLD}{CARGO}{}{BLACK}Koszt przebudowy: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(przebudowalny)
+STR_PURCHASE_INFO_REFITTABLE                                    :(przebudowalny)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Lotniska
@@ -3226,7 +3226,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Budowa l
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Mieszkańcy świętują . . .{}Pierwszy samolot przyleciał na {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Katastrofa lotnicza!{}{COMMA} ofiar{P a y ""} na {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Wypadek lotniczy!{}Samolot rozbił się z powodu braku paliwa, zginęł{P 0 a y o} {COMMA} os{P oba oby ób}!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Rozkład jazdy)
 
@@ -3239,13 +3239,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Tąpnięcie przy kopalni pozostawiło pas zniszczenia blisko {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Powódź!{}Przynajmniej {COMMA} zaginęło lub utonęło w czasie powodzi!
 
-STR_BRIBE_FAILED                                                :{WHITE}Twoja próba wręczenia łapówki została
-STR_BRIBE_FAILED_2                                              :{WHITE}wykryta przez lokalnych śledczych.
-STR_BUILD_DATE                                                  :{BLACK}Zbudowano: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Twoja próba wręczenia łapówki została
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}wykryta przez lokalnych śledczych.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Zbudowano: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Klasa stacji: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Typ stacji: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Klasa stacji: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Typ stacji: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Szczegóły oceny działalności
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Szczegóły
@@ -3265,28 +3265,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}PieniÄ…d
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Pożyczka:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}�ącznie:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Liczba pojazdów. Ujęte są pociągi, samochody, statki i samoloty.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Liczba stacji. Wliczany jest każdy element stacji (np. dworzec, przystanek, lotnisko), nawet jeśli są połączone w jedną stację
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Minimalny zysk spośród wszystkich pojazdów, które mają conajmniej 2 lata.
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Ilość pieniędzy zarobiona w miesiącu z najmniejszym zyskiem w ostatnich 12 kwartałach
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Ilość pieniędzy zarobiona w miesiącu z największym zyskiem w ostatnich 12 kwartałach
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Ilość ładunku przewiezionego w poprzednich 4 kwartałach
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Ilość rożnych typów ładunku przewiezionych w ostatnim kwartale
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Ilość pieniędzy w ręku
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Wielkość pożyczki wziętej przez firmę
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Suma przyznanych punktów
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Liczba pojazdów. Ujęte są pociągi, samochody, statki i samoloty.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Liczba stacji. Wliczany jest każdy element stacji (np. dworzec, przystanek, lotnisko), nawet jeśli są połączone w jedną stację
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Minimalny zysk spośród wszystkich pojazdów, które mają conajmniej 2 lata.
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Ilość pieniędzy zarobiona w miesiącu z najmniejszym zyskiem w ostatnich 12 kwartałach
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Ilość pieniędzy zarobiona w miesiącu z największym zyskiem w ostatnich 12 kwartałach
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Ilość ładunku przewiezionego w poprzednich 4 kwartałach
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Ilość rożnych typów ładunku przewiezionych w ostatnim kwartale
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Ilość pieniędzy w ręku
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Wielkość pożyczki wziętej przez firmę
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Suma przyznanych punktów
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Ustawienia NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Wyświetl ustawienia NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Ustawienia NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Zastosuj zmiany
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Zmień paletę
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Zmień paletę kolorów wybranego NewGRF.{}Zrób to gdy grafika tego NewGRF jest różowa
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Ustaw parametry
-STR_NEWGRF_FILENAME                                             :{BLACK}Nazwa pliku: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}suma MD5: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Zastosuj zmiany
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Zmień paletę
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Zmień paletę kolorów wybranego NewGRF.{}Zrób to gdy grafika tego NewGRF jest różowa
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Ustaw parametry
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nazwa pliku: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}suma MD5: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Zamierzasz wprowadzić zmiany do gry w toku; to może zawiesić OpenTTD.{}Czy jesteś całkowicie pewien?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3309,34 +3309,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Attempt to use
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} zawiera uszkodzoną teksturę. Wszystkie uszkodzone tekstury będą pokazane jako czerwony znak zapytania (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Zawiera wiele wpisów Action 8
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Załaduj wskazany stan ustawień
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Zapisz stan ustawień
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Zapisz obecną listę jako stan ustawień
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Nadaj nazwę dla stanu ustawień
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Usuń stan ustawień
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Usuń obecnie wskazany stan ustawień
-STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodaj plik NewGRF do listy
-STR_NEWGRF_REMOVE                                               :{BLACK}Usuń
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Usuń zaznaczony plik NewGRF z listy
-STR_NEWGRF_MOVEUP                                               :{BLACK}Do góry
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Przesuń zaznaczony plik NewGRF w górę listy
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Na dół
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Przesuń zaznaczony plik NewGRF na dół listy
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Lista zainstalowanych plików NewGRF. Kliknij na pliku aby zmienić jego parametry
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametry: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Wprowadź parametry NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}Brak dostępnych informacji
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Załaduj wskazany stan ustawień
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Zapisz stan ustawień
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Zapisz obecną listę jako stan ustawień
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Nadaj nazwę dla stanu ustawień
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Usuń stan ustawień
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Usuń obecnie wskazany stan ustawień
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Dodaj
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Dodaj plik NewGRF do listy
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Usuń
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Usuń zaznaczony plik NewGRF z listy
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Do góry
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Przesuń zaznaczony plik NewGRF w górę listy
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Na dół
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Przesuń zaznaczony plik NewGRF na dół listy
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista zainstalowanych plików NewGRF. Kliknij na pliku aby zmienić jego parametry
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametry: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Wprowadź parametry NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Brak dostępnych informacji
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostępne pliki NewGRF
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Dodaj do listy
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Dodaj zaznaczony plik NewGRF do Twojego ustawienia
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Przeskanuj pliki
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Odśwież listę dostępnych plików NewGRF
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Dodaj zaznaczony plik NewGRF do Twojego ustawienia
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Przeskanuj pliki
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Odśwież listę dostępnych plików NewGRF
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nie można dodać pliku: taki sam GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Nie znaleziono pasujÄ…cego pliku
-STR_NEWGRF_DISABLED                                             :{RED}Niedostępny
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Nie znaleziono pasujÄ…cego pliku
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Niedostępny
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Nie znaleziono pasujÄ…cego pliku (wczytano kompatybilny GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Wczytano kompatybilne GRF dla brakujących plików
@@ -3350,7 +3350,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}PociÄ…g
 
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '{0:STRING}' dostarcza niepoprawnych danych.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Gra została zapisana w wersji nie obsługującej tramwajów. Wszystkie tramwaje zostały usunięte.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Gra została zapisana w wersji nie obsługującej tramwajów. Wszystkie tramwaje zostały usunięte.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}WÅ‚asna waluta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Współczynnik wymiany: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3361,16 +3361,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}PrzejÅ›
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Przejście na Euro: {ORANGE}nigdy
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}PodglÄ…d: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zmień parametr własnej waluty
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Zmniejsz kurs wymiany za jednego Funta (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Zwiększ kurs wymiany za jednego Funta (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Ustal kurs wymiany za jednego Funta (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Ustaw znak oddzielajÄ…cy w twojej walucie
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Ustaw przedrostek dla swojej waluty
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Ustaw symbol dla twojej waluty
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Przełącz na Euro wcześniej
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Przełącz na Euro później
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Ustaw rok przełączenia na Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Funtów (£) w twojej walucie
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zmniejsz kurs wymiany za jednego Funta (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zwiększ kurs wymiany za jednego Funta (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Ustal kurs wymiany za jednego Funta (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Ustaw znak oddzielajÄ…cy w twojej walucie
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Ustaw przedrostek dla swojej waluty
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Ustaw symbol dla twojej waluty
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Przełącz na Euro wcześniej
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Przełącz na Euro później
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Ustaw rok przełączenia na Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Funtów (£) w twojej walucie
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3389,8 +3389,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Stat{P ek ki ów}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Samolot
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Wspoldzielone polecenia {COMMA} pojazd{P u ow ow}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Pokaż wszystkie pojazdy współdzielące te polecenia
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Wspoldzielone polecenia {COMMA} pojazd{P u ow ow}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Pokaż wszystkie pojazdy współdzielące te polecenia
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} czeka w zajezdni
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} czeka w zajezdni
@@ -3497,39 +3497,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Przebudo
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Przebudowa statku do przewozu innego typu Å‚adunku
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Przebudowa samolotu do przewozu innego typu Å‚adunku
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Zmierza do zajezdni w {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Zmierza do zajezdni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Zmierza do zajezdni sam. w {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Zmierza do zajezdni sam. w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Zmierza do stoczni w {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Zmierza do stoczni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Zmierza do hangaru w {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Zmierza do hangaru w {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Serwisuj w Stoczni w {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Serwisuj w Stoczni w {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Serwisuj w Hangarze na {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Serwisuj w Hangarze na {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klonuj pociÄ…g
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonuj pojazd
-STR_CLONE_SHIP                                                  :{BLACK}Klonuj statek
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonuj samolot
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Spowoduje wybudowanie kopii pociągu wraz ze wszystkimi wagonami. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Spowoduje zbudowanie kopii pojazdu. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_SHIP_INFO                                             :{BLACK}Spowoduje wybudowanie kopii statku. Control+klik spowoduje współdzielenie poleceń
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Spowoduje wybudowanie kopii samolotu. Control+klik spowoduje współdzielenie poleceń
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Spowoduje wybudowanie kopii pociągu wraz z wszystkimi wagonami. Kliknij na przycisk a następnie na pociąg wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Spowoduje zbudowanie kopii pojazdu. Kliknij na przycisk a następnie na pojazd wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Spowoduje wybudowanie kopii statku. Kliknij na przycisk a następnie na statek wewnątrz lub na zewnątrz stoczni. Control+klik spowoduje współdzielenie poleceń
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Spowoduje wybudowanie kopii samolotu. Kliknij na przycisk a następnie na samolot wewnątrz lub na zewnątrz hangaru. Control+klik spowoduje współdzielenie poleceń
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Zmierza do zajezdni w {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Zmierza do zajezdni w {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Zmierza do zajezdni sam. w {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Zmierza do zajezdni sam. w {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Zmierza do stoczni w {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Zmierza do stoczni w {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Zmierza do hangaru w {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Zmierza do hangaru w {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Serwisuj w Zajezdni w {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Serwisuj w Zajezdni w {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Serwisuj w Stoczni w {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Serwisuj w Stoczni w {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Serwisuj w Hangarze na {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Serwisuj w Hangarze na {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klonuj pociÄ…g
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonuj pojazd
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonuj statek
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonuj samolot
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Spowoduje wybudowanie kopii pociągu wraz ze wszystkimi wagonami. CTRL+klik spowoduje współdzielenie poleceń
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Spowoduje zbudowanie kopii pojazdu. CTRL+klik spowoduje współdzielenie poleceń
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Spowoduje wybudowanie kopii statku. Control+klik spowoduje współdzielenie poleceń
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Spowoduje wybudowanie kopii samolotu. Control+klik spowoduje współdzielenie poleceń
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Spowoduje wybudowanie kopii pociągu wraz z wszystkimi wagonami. Kliknij na przycisk a następnie na pociąg wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Spowoduje zbudowanie kopii pojazdu. Kliknij na przycisk a następnie na pojazd wewnątrz lub na zewnątrz zajezdni. CTRL+klik spowoduje współdzielenie poleceń
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Spowoduje wybudowanie kopii statku. Kliknij na przycisk a następnie na statek wewnątrz lub na zewnątrz stoczni. Control+klik spowoduje współdzielenie poleceń
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Spowoduje wybudowanie kopii samolotu. Kliknij na przycisk a następnie na samolot wewnątrz lub na zewnątrz hangaru. Control+klik spowoduje współdzielenie poleceń
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nowe pociÄ…gi
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nowe elektryczne pojazdy szynowe
@@ -3599,28 +3599,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centruj
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Sprzedasz wszystkie pojazdy z zajezdni. JesteÅ› pewien?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :ZÅ‚y typ zajezdni
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :ZÅ‚y typ zajezdni
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sprzedaj wszystkie pociÄ…gi z zajezdni
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Sprzedaj wszystkie samochody z zajezdni
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sprzedaj wszystkie statki ze stoczni
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sprzedaj wszystkie samoloty z hangaru
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Sprzedaj wszystkie pociÄ…gi z zajezdni
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Sprzedaj wszystkie samochody z zajezdni
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Sprzedaj wszystkie statki ze stoczni
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Sprzedaj wszystkie samoloty z hangaru
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Pokaż listę wszystkich pociągów z tą zajezdnia w swoich poleceniach
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Pokaż listę wszystkich samochodów z tą zajezdnia w swoich poleceniach
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Pokaż listę wszystkich statków z tą stocznia w swoich poleceniach
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Pokaż listę wszystkich samolotów z hangarem na tym lotnisku w swoich poleceniach
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Pokaż listę wszystkich pociągów z tą zajezdnia w swoich poleceniach
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Pokaż listę wszystkich samochodów z tą zajezdnia w swoich poleceniach
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Pokaż listę wszystkich statków z tą stocznia w swoich poleceniach
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Pokaż listę wszystkich samolotów z hangarem na tym lotnisku w swoich poleceniach
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Zamień wszystkie pociągi w zajezdni
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Zamień wszystkie samochody w zajezdni
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Zamień wszystkie statki w stoczni
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Zamień wszystkie samoloty w hangarze
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Zamień wszystkie pociągi w zajezdni
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Zamień wszystkie samochody w zajezdni
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Zamień wszystkie statki w stoczni
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Zamień wszystkie samoloty w hangarze
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}ZastÄ…p {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Rozpocznij zastępowanie
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Zatrzymaj zastępowanie
-STR_NOT_REPLACING                                               :{BLACK}Nie zastępowane
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Brak zaznaczonych pojazdów
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Nie zastępowane
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Brak zaznaczonych pojazdów
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Wybierz typ pojazdu do zamiany
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Wybierz typ pojazdu jakim chcesz zastąpić pojazd zaznaczony po lewej stronie
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Wciśnij ten przycisk jeśli nie chcesz zmieniać pojazdu zaznaczone po lewej stronie
@@ -3632,26 +3632,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Autowymi
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zastępowanie: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Przejdź pomiędzy oknami zamiany lokomotyw i wagonów
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Pojazd nie jest dostępny
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Pojazd nie jest dostępny
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Statek nie jest dostępny
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Samolot jest niedostępny
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Pojazd nie jest dostępny
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Pojazd nie jest dostępny
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Statek nie jest dostępny
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Samolot jest niedostępny
 
-STR_ENGINES                                                     :Lokomotywy
-STR_WAGONS                                                      :Wagony
+STR_REPLACE_ENGINES                                             :Lokomotywy
+STR_REPLACE_WAGONS                                              :Wagony
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Kliknij aby zatrzymać wszystkie pociągi w zajezdni
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Kliknij aby zatrzymać wszystkie samochody w zajezdni
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Kliknij aby zatrzymać wszystkie statki w stoczni
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Kliknij aby zatrzymać wszystkie samoloty w hangarze
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Kliknij aby zatrzymać wszystkie pociągi w zajezdni
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Kliknij aby zatrzymać wszystkie samochody w zajezdni
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Kliknij aby zatrzymać wszystkie statki w stoczni
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Kliknij aby zatrzymać wszystkie samoloty w hangarze
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Kliknij aby wystartować wszystkie pociągi w zajezdni
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Kliknij aby wystartować wszystkie samochody w zajezdni
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Kliknij aby wystartować wszystkie statki w stoczni
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Kliknij aby wystartować wszystkie samoloty w hangarze
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Kliknij aby wystartować wszystkie pociągi w zajezdni
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Kliknij aby wystartować wszystkie samochody w zajezdni
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Kliknij aby wystartować wszystkie statki w stoczni
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Kliknij aby wystartować wszystkie samoloty w hangarze
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Kliknij aby zatrzymać wszystkie pojazdy na liście
-STR_MASS_START_LIST_TIP                                         :{BLACK}Kliknij aby wystartować wszystkie pojazdy na liście
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Kliknij aby zatrzymać wszystkie pojazdy na liście
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Kliknij aby wystartować wszystkie pojazdy na liście
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista tablic - {COMMA} Tablice
@@ -3660,14 +3660,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Zaplanow
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Kolej
-STR_ELRAIL_VEHICLES                                             :Kolej elektryczna
-STR_MONORAIL_VEHICLES                                           :Kolej jednoszynowa
-STR_MAGLEV_VEHICLES                                             :Kolej MagLev
+STR_REPLACE_RAIL_VEHICLES                                       :Kolej
+STR_REPLACE_ELRAIL_VEHICLES                                     :Kolej elektryczna
+STR_REPLACE_MONORAIL_VEHICLES                                   :Kolej jednoszynowa
+STR_REPLACE_MAGLEV_VEHICLES                                     :Kolej MagLev
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Koszt: {GOLD}{CURRENCY}{BLACK} Waga: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Prędkość: {GOLD}{VELOCITY}{BLACK}   Moc: {GOLD}{POWER}
@@ -3694,70 +3694,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Stwórz
-STR_RANDOM                                                      :{BLACK}Losuj
-STR_RANDOM_HELP                                                 :{BLACK}Zmień losowy numer używany przy tworzeniu terenu
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Tworzenie świata
-STR_RANDOM_SEED                                                 :{BLACK}Losowy numer:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Kliknij aby wpisać losowy numer
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Wprowadź losowe ziarno
-STR_LAND_GENERATOR                                              :{BLACK}Generator terenu:
-STR_TREE_PLACER                                                 :{BLACK}Algorytm drzew:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Obrót mapy wysokości:
-STR_TERRAIN_TYPE                                                :{BLACK}Typ terenu:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Poziom wody:
-STR_SMOOTHNESS                                                  :{BLACK}Gładkość:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Wysokość śniegu:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Ilość miast:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Ilość przedsiębiorstw
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Podnieś wysokość śniegu o jeden w górę
-STR_SNOW_LINE_DOWN                                              :{BLACK}Obniż wysokość śniegu o jeden w dół
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Zmień wysokość śniegu
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Zmień datę rozpoczęcia
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Ostrzeżenie o skali
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Nie zaleca się zbyt dużej zmiany wielkości mapy źrodłowej. Kontynuować tworzenie?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nazwa mapy wysokosci:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Rozmiar: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Stwórz
+STR_MAPGEN_RANDOM                                               :{BLACK}Losuj
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Zmień losowy numer używany przy tworzeniu terenu
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Tworzenie świata
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Losowy numer:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Kliknij aby wpisać losowy numer
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Wprowadź losowe ziarno
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generator terenu:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algorytm drzew:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Obrót mapy wysokości:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Typ terenu:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Poziom wody:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Gładkość:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Wysokość śniegu:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Ilość miast:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Ilość przedsiębiorstw
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Podnieś wysokość śniegu o jeden w górę
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Obniż wysokość śniegu o jeden w dół
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Zmień wysokość śniegu
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Zmień datę rozpoczęcia
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Ostrzeżenie o skali
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Nie zaleca się zbyt dużej zmiany wielkości mapy źrodłowej. Kontynuować tworzenie?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nazwa mapy wysokosci:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Rozmiar: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Tworzenie świata...
 STR_GENERATION_ABORT                                            :{BLACK}Przerwij
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Przerwij tworzenie świata
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Czy na pewno chcesz przerwać tworzenie?
-STR_PROGRESS                                                    :{WHITE}gotowe w {NUM} %
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Tworzenie świata
-STR_TREE_GENERATION                                             :{BLACK}Tworzenie drzew
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Tworzenie obiektów
-STR_CLEARING_TILES                                              :{BLACK}Tworzenie terenów skalistych i nierówności
-STR_SETTINGUP_GAME                                              :{BLACK}Ustawianie gry
-STR_PREPARING_TILELOOP                                          :{BLACK}Uaktywnianie pól
-STR_PREPARING_GAME                                              :{BLACK}Przygotowywanie gry
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Zmieniono poziom trudności na "własny"
-STR_SE_FLAT_WORLD                                               :{WHITE}Płaski świat
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Stwórz płaski świat
-STR_SE_RANDOM_LAND                                              :{WHITE}Losowy teren
-STR_SE_NEW_WORLD                                                :{BLACK}Stwórz nowy scenariusz
-STR_SE_CAPTION                                                  :{WHITE}Typ scenariusza
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Obniż wysokość terenu o jeden w dół
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Podnieś wysokość terenu o jeden w górę
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Zmień wysokość płaskiego świata
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Wysokość płaskiego świata:
+STR_GENERATION_PROGRESS                                         :{WHITE}gotowe w {NUM} %
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Tworzenie świata
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Tworzenie drzew
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Tworzenie obiektów
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Tworzenie terenów skalistych i nierówności
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Ustawianie gry
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Uaktywnianie pól
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Przygotowywanie gry
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Zmieniono poziom trudności na "własny"
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Płaski świat
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Stwórz płaski świat
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Losowy teren
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Stwórz nowy scenariusz
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Typ scenariusza
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Obniż wysokość terenu o jeden w dół
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Podnieś wysokość terenu o jeden w górę
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Zmień wysokość płaskiego świata
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Wysokość płaskiego świata:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Wyśrodkuj mapę na aktualnej lokalizacji
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Krańce mapy:
-STR_NORTHWEST                                                   :{BLACK}PÅ‚n.-zach.
-STR_NORTHEAST                                                   :{BLACK}PÅ‚n.-wsch.
-STR_SOUTHEAST                                                   :{BLACK}PÅ‚d.-wsch.
-STR_SOUTHWEST                                                   :{BLACK}PÅ‚d.-zach.
-STR_BORDER_FREEFORM                                             :{BLACK}Dowolne
-STR_BORDER_WATER                                                :{BLACK}Woda
-STR_BORDER_RANDOM                                               :{BLACK}Losowe
-STR_BORDER_RANDOMIZE                                            :{BLACK}Losowo
-STR_BORDER_MANUAL                                               :{BLACK}WÅ‚asne
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Krańce mapy:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}PÅ‚n.-zach.
+STR_MAPGEN_NORTHEAST                                            :{BLACK}PÅ‚n.-wsch.
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}PÅ‚d.-wsch.
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}PÅ‚d.-zach.
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Dowolne
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Woda
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Losowe
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Losowo
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}WÅ‚asne
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Małe
@@ -3782,21 +3782,21 @@ STR_MEASURE_AREA                                                :{BLACK}Obszar:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Długość: {NUM}{}Różnica wysokości: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Obszar: {NUM} x {NUM}{}Różnica wysokości: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Wartość transferu: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ta droga należy do miasta
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...droga jest zorientowana w złym kierunku
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opcje Przeźroczystości
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Przełącz przeźroczystość nazw stacji
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Przełącz przeźroczystość drzew
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Przełącz przeźroczystość budynków miejskich
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Przełącz przeźroczystość przedsiębiorstw
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Przełącz przeźroczystość infrastruktury takiej jak stacje, zajezdnie, punkty kontrolne i trakcja elektryczna
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Przełącz przeźroczystość mostów
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Przełącz przeźroczystość obiektów takich jak latarnie morskie i nadajniki, być może w przyszłości dodatki graficzne
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Przełaczaj przeźroczystość dla trakcji (linii nośnych). CTRL+klik by zablokować.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Przełącz przeźroczystość wskaźników załadunku
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Ustaw obiekty jako niewidoczne zamiast przeźroczyste
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Wartość transferu: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ta droga należy do miasta
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...droga jest zorientowana w złym kierunku
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcje Przeźroczystości
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Przełącz przeźroczystość nazw stacji
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Przełącz przeźroczystość drzew
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Przełącz przeźroczystość budynków miejskich
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Przełącz przeźroczystość przedsiębiorstw
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Przełącz przeźroczystość infrastruktury takiej jak stacje, zajezdnie, punkty kontrolne i trakcja elektryczna
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Przełącz przeźroczystość mostów
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Przełącz przeźroczystość obiektów takich jak latarnie morskie i nadajniki, być może w przyszłości dodatki graficzne
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Przełaczaj przeźroczystość dla trakcji (linii nośnych). CTRL+klik by zablokować.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Przełącz przeźroczystość wskaźników załadunku
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Ustaw obiekty jako niewidoczne zamiast przeźroczyste
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3806,7 +3806,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Wszystkie pociÄ…gi
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Wszystkie samochody
 STR_GROUP_ALL_SHIPS                                             :Wszystkie statki
@@ -3815,24 +3815,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :PociÄ…gi bez gr
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Samochody bez grupy
 STR_GROUP_DEFAULT_SHIPS                                         :Statki bez grupy
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Samoloty bez grupy
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Dodaj poj. współdzielące
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Usuń wszystkie pojazdy
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Zmień nazwę grupy
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nie można stworzyć grupy...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nie można usunąć tej grupy...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nie można zmienić nazwy grupy...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nie można usunąć wszystkich pojazdów z tej grupy...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nie można dodać pojazdu do tej grupy...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nie można dodać pojazdów współdzielących polecenia do grupy...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nie można stworzyć grupy...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nie można usunąć tej grupy...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nie można zmienić nazwy grupy...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nie można usunąć wszystkich pojazdów z tej grupy...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nie można dodać pojazdu do tej grupy...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nie można dodać pojazdów współdzielących polecenia do grupy...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupy - Kliknij na grupie aby wyświetlić wszystkie pojazdy z grupy
-STR_GROUP_CREATE_TIP                                            :{BLACK}Kliknij aby stworzyć grupę
-STR_GROUP_DELETE_TIP                                            :{BLACK}Usuń zaznaczoną grupę
-STR_GROUP_RENAME_TIP                                            :{BLACK}Zmień nazwę zaznaczonej grupy
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliknij, aby ochronić tę grupę przed globalną zamianą pojazdów
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupy - Kliknij na grupie aby wyświetlić wszystkie pojazdy z grupy
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Kliknij aby stworzyć grupę
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Usuń zaznaczoną grupę
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Zmień nazwę zaznaczonej grupy
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Kliknij, aby ochronić tę grupę przed globalną zamianą pojazdów
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3893,35 +3893,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nazwa nie może się powtarzać
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nazwa nie może się powtarzać
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Idź do następnej tablicy
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Idź do poprzedniej tablicy
-STR_SIGN_OSKTITLE                                               :{BLACK}Wpisz nazwÄ™ dla znaku
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Idź do następnej tablicy
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Idź do poprzedniej tablicy
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Wpisz nazwÄ™ dla znaku
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Ufunduj
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Zleć poszukiwanie
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Zbuduj
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Wybierz przedsiębiorstwo z listy
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Ufunduj
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Zleć poszukiwanie
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Zbuduj
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Wybierz przedsiębiorstwo z listy
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Zaawansowane
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Zaawansowany widok wyboru twarzy.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Zaawansowany widok wyboru twarzy.
 STR_FACE_SIMPLE                                                 :{BLACK}Prosty widok
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Prosty widok wyboru twarzy.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Prosty widok wyboru twarzy.
 STR_FACE_LOAD                                                   :{BLACK}Wczytaj
-STR_FACE_LOAD_TIP                                               :{BLACK}Wczytaj ulubionÄ… twarz
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Wczytaj ulubionÄ… twarz
 STR_FACE_LOAD_DONE                                              :{WHITE}Twoja ulubiona twarz została wczytana z pliku konfiguracyjnego OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Numer twarzy gracza
-STR_FACE_FACECODE_TIP                                           :{BLACK}Obejrzyj i/lub ustaw numer twarzy gracza
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Obejrzyj i/lub ustaw numer twarzy gracza
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Obejrzyj i/lub ustaw numer twarzy gracza
 STR_FACE_FACECODE_SET                                           :{WHITE}Ustawiono nowy numer twarzy gracza.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Nie można ustawić numeru twarzy gracza - musi być liczbą pomiędzy 0 a 4'294'967'295!
 STR_FACE_SAVE                                                   :{BLACK}Zapisz
-STR_FACE_SAVE_TIP                                               :{BLACK}Zapisz ulubionÄ… twarz
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Zapisz ulubionÄ… twarz
 STR_FACE_SAVE_DONE                                              :{WHITE}Ta twarz będzie zapisana w pliku konfiguracyjnym OpenTTD jako Twoja ulubiona
 STR_FACE_EUROPEAN                                               :{BLACK}Europejska
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Wybierz twarz o karnacji europejskiej
@@ -3929,51 +3929,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrykań
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Wybierz twarz o karnacji afrykańskiej
 STR_FACE_YES                                                    :Tak
 STR_FACE_NO                                                     :Nie
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Pokaż wąsy lub kolczyk
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Pokaż wąsy lub kolczyk
 STR_FACE_HAIR                                                   :WÅ‚osy:
-STR_FACE_HAIR_TIP                                               :{BLACK}Zmień włosy
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Zmień włosy
 STR_FACE_EYEBROWS                                               :Rzęsy:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Zmień rzęsy
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Zmień rzęsy
 STR_FACE_EYECOLOUR                                              :Kolor oczu:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Zmień kolor oczu
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Zmień kolor oczu
 STR_FACE_GLASSES                                                :Okulary
-STR_FACE_GLASSES_TIP                                            :{BLACK}Uaktywnij okulary
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Zmień okulary
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Uaktywnij okulary
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Zmień okulary
 STR_FACE_NOSE                                                   :Nos:
-STR_FACE_NOSE_TIP                                               :{BLACK}Zmień nos
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Zmień nos
 STR_FACE_LIPS                                                   :Usta:
 STR_FACE_MOUSTACHE                                              :WÄ…sy:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Zmień usta lub wąsy
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Zmień usta lub wąsy
 STR_FACE_CHIN                                                   :Broda:
-STR_FACE_CHIN_TIP                                               :{BLACK}Zmień brodę
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Zmień brodę
 STR_FACE_JACKET                                                 :Marynarka:
-STR_FACE_JACKET_TIP                                             :{BLACK}Zmień marynarkę
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Zmień marynarkę
 STR_FACE_COLLAR                                                 :Kołnierz:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Zmień kołnierz
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Zmień kołnierz
 STR_FACE_TIE                                                    :Krawat:
 STR_FACE_EARRING                                                :Kolczyk:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Zmień krawat lub kolczyk
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Zmień krawat lub kolczyk
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Wybór sygnałów
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Nie można tutaj zmienić sygnałów...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Sygnalizator bloku (semafor){}Najprostszy typ sygnału umożliwiający na przebywanie w jednym bloku wyłącznie jednemu pociągowi na raz.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sygnalizator wejściowy (semafor){}Zielony, póki choć jeden sygnalizator wyjściowy dla kolejnego odcinka trasy jest zielony. W przeciwnym przypadku czerwony.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Sygnalizator wyjściowy (semafor){}Zachowuje się jak sygnalizator bloku, lecz jest niezbędny do zmiany na poprawny kolor w presygnalizatorach wejściowych i złożonych.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Sygnalizator złożony (semafor){}Sygnalizator złożony jest kombinacją sygnalizatorów wejściowych oraz wyjściowych. Umożliwia to budowę wielkich "drzew" presygnalizatorów.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Sygnalizator trasy (semafor){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Zwykłe sygnalizatory trasy mogą być mijane w przeciwnym kierunku.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Jednokierunkowy sygnalizator trasy (semafor){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Sygnalizatory jednokierunkowe nie mogą być mijane w przeciwnym kierunku.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Sygnalizator bloku (elektryczny){}Najprostszy typ sygnału umożliwiający na przebywanie w jednym bloku wyłącznie jednemu pociągowi na raz.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sygnalizator wejściowy (elektryczny){}Zielony, póki choć jeden sygnalizator wyjściowy dla kolejnego odcinka trasy jest zielony. W przeciwnym przypadku czerwony.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Sygnalizator wyjściowy (elektryczny){}Zachowuje się jak sygnalizator bloku, lecz jest niezbędny do zmiany na poprawny kolor w presygnalizatorach wejściowych i złożonych.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Sygnalizator złożony (elektryczny){}Sygnalizator złożony jest kombinacją sygnalizatorów wejściowych oraz wyjściowych. Umożliwia to budowę wielkich "drzew" presygnalizatorów.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Sygnalizator trasy (elektryczny){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Zwykłe sygnalizatory trasy mogą być mijane w przeciwnym kierunku.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Jednokierunkowy sygnalizator trasy (elektryczny){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Sygnalizatory jednokierunkowe nie mogą być mijane w przeciwnym kierunku.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Zamiana sygnałów{}Jeżeli włączone, kliknięcie na istniejący sygnał spowoduje zamianę jego typu na wybrany obok. CTRL-klik przełącza wygląd semafor/świetlny.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Gęstość sygnałów przy przeciąganiu. CTRL-przeciągnij aby wypełnić trasę sygnałami.
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Zmniejsz gęstość sygnałów przy przeciąganiu
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Zwiększ gęstość sygnałów przy przeciąganiu
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Wybór sygnałów
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Nie można tutaj zmienić sygnałów...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Sygnalizator bloku (semafor){}Najprostszy typ sygnału umożliwiający na przebywanie w jednym bloku wyłącznie jednemu pociągowi na raz.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sygnalizator wejściowy (semafor){}Zielony, póki choć jeden sygnalizator wyjściowy dla kolejnego odcinka trasy jest zielony. W przeciwnym przypadku czerwony.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Sygnalizator wyjściowy (semafor){}Zachowuje się jak sygnalizator bloku, lecz jest niezbędny do zmiany na poprawny kolor w presygnalizatorach wejściowych i złożonych.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Sygnalizator złożony (semafor){}Sygnalizator złożony jest kombinacją sygnalizatorów wejściowych oraz wyjściowych. Umożliwia to budowę wielkich "drzew" presygnalizatorów.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Sygnalizator trasy (semafor){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Zwykłe sygnalizatory trasy mogą być mijane w przeciwnym kierunku.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Jednokierunkowy sygnalizator trasy (semafor){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Sygnalizatory jednokierunkowe nie mogą być mijane w przeciwnym kierunku.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Sygnalizator bloku (elektryczny){}Najprostszy typ sygnału umożliwiający na przebywanie w jednym bloku wyłącznie jednemu pociągowi na raz.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sygnalizator wejściowy (elektryczny){}Zielony, póki choć jeden sygnalizator wyjściowy dla kolejnego odcinka trasy jest zielony. W przeciwnym przypadku czerwony.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Sygnalizator wyjściowy (elektryczny){}Zachowuje się jak sygnalizator bloku, lecz jest niezbędny do zmiany na poprawny kolor w presygnalizatorach wejściowych i złożonych.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Sygnalizator złożony (elektryczny){}Sygnalizator złożony jest kombinacją sygnalizatorów wejściowych oraz wyjściowych. Umożliwia to budowę wielkich "drzew" presygnalizatorów.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Sygnalizator trasy (elektryczny){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Zwykłe sygnalizatory trasy mogą być mijane w przeciwnym kierunku.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Jednokierunkowy sygnalizator trasy (elektryczny){}Sygnalizator trasy umożliwiający wejście więcej niż jednemu pociagowi do bloku sygnalizatów, o ile pociąg może zarezerwować trasę do bezpiecznego punktu zatrzymania. Sygnalizatory jednokierunkowe nie mogą być mijane w przeciwnym kierunku.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Zamiana sygnałów{}Jeżeli włączone, kliknięcie na istniejący sygnał spowoduje zamianę jego typu na wybrany obok. CTRL-klik przełącza wygląd semafor/świetlny.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Gęstość sygnałów przy przeciąganiu. CTRL-przeciągnij aby wypełnić trasę sygnałami.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Zmniejsz gęstość sygnałów przy przeciąganiu
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Zwiększ gęstość sygnałów przy przeciąganiu
 ########
 
 ############ on screen keyboard
@@ -3985,36 +3985,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Ustawienia SI
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Wyświetl ustawienia SI
 STR_AI_DEBUG                                                    :{WHITE}Odpluskwianie SI
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nazwa SI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nazwa SI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Przeładuj SI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Zabij SI, przeładuj skrypt i zrestartuj SI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Okno debugowania AI jest dostępne tylko w serwerze
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Zabij SI, przeładuj skrypt i zrestartuj SI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Okno debugowania AI jest dostępne tylko w serwerze
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguracja SI
-STR_AI_CHANGE                                                   :{BLACK}Wybierz SI
-STR_AI_CONFIGURE                                                :{BLACK}Konfiguruj
-STR_AI_CHANGE_TIP                                               :{BLACK}Wczytaj kolejne SI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfiguruj parametry SI
-STR_AI_LIST_TIP                                                 :{BLACK}Wszystkie SI, które będą załadowane w następnej grze
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Wybierz SI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfiguruj
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Wczytaj kolejne SI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfiguruj parametry SI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Wszystkie SI, które będą załadowane w następnej grze
 STR_AI_LIST_CAPTION                                             :{WHITE}Dostępne SI
-STR_AI_AILIST_TIP                                               :{BLACK}Kliknij, aby wybrać SI
-STR_AI_ACCEPT                                                   :{BLACK}Zaakceptuj
-STR_AI_ACCEPT_TIP                                               :{BLACK}Wybierz podświetlone SI
-STR_AI_CANCEL                                                   :{BLACK}Anuluj
-STR_AI_CANCEL_TIP                                               :{BLACK}Nie zmieniaj SI
-STR_AI_CLOSE                                                    :{BLACK}Zamknij
-STR_AI_RESET                                                    :{BLACK}Resetuj
-STR_AI_HUMAN_PLAYER                                             :Ludzki gracz
-STR_AI_RANDOM_AI                                                :Losowe SI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Kliknij, aby wybrać SI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Zaakceptuj
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Wybierz podświetlone SI
+STR_AI_LIST_CANCEL                                              :{BLACK}Anuluj
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nie zmieniaj SI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zamknij
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetuj
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Ludzki gracz
+STR_AI_CONFIG_RANDOM_AI                                         :Losowe SI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parametry SI
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Wersja: {NUM}
-STR_AI_URL                                                      :{BLACK}Adres: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Jedna z działających SI przestała działać. Prosimy o zgłoszenie tego autorowi SI dołączając zrzut ekranu okna odpluskwiania SI.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Wersja: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}Adres: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna z działających SI przestała działać. Prosimy o zgłoszenie tego autorowi SI dołączając zrzut ekranu okna odpluskwiania SI.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Limit hałasu w mieście: {ORANGE}{COMMA}{BLACK}  maksymalnie: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Wytwarzany hałas: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limit hałasu w mieście: {ORANGE}{COMMA}{BLACK}  maksymalnie: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Wytwarzany hałas: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -4028,21 +4028,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenariusz
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa wysokościowa
 STR_CONTENT_TITLE                                               :{WHITE}Pobieranie zawartości
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Typ
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK} Rodzaj zawartości
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK} Rodzaj zawartości
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nazwa
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nazwa zawartości
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Kliknij na lini, aby zobaczyć szczegóły{}Kliknij na kwadracie wyboru, aby zaznaczyć go do pobrania
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nazwa zawartości
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Kliknij na lini, aby zobaczyć szczegóły{}Kliknij na kwadracie wyboru, aby zaznaczyć go do pobrania
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Zaznacz wszystko
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Zaznacz całą zawartość do pobrania
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Zaznacz całą zawartość do pobrania
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Wybierz ulepszenia
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Wybierz całą zawartość do pobrania, która jest ulepszeniem dla istniejącej zawartości
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Wybierz całą zawartość do pobrania, która jest ulepszeniem dla istniejącej zawartości
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Odznacz wszystko
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Zaznacz całą zawartość, aby nie była pobrana
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Zaznacz całą zawartość, aby nie była pobrana
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Wpisz słowo filtru
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Wpisz słowo kluczowe dla listy filtru
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Wpisz słowo kluczowe dla listy filtru
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtr etykiety/nazwy:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Pobierz
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Rozpocznij ściąganie zaznaczonych danych
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Rozpocznij ściąganie zaznaczonych danych
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Całkowity rozmiar: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}OPIS ZAWARTOÅšCI
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}To nie zsotało wybrane do ściągnięcia
@@ -4075,6 +4075,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nie udaÅ
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Sprawdź Dodatki Online
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Poszukaj nowych lub zaktualizowanych dodatków do pobrania
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Znajdź zgubiony dodatek online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Sprawdź czy zagubiony dodatek może być znaleziony online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Znajdź zgubiony dodatek online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Sprawdź czy zagubiony dodatek może być znaleziony online
 ########
diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt
index 0fb4283ce..4d4cadf80 100644
--- a/src/lang/portuguese.txt
+++ b/src/lang/portuguese.txt
@@ -453,11 +453,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Mostrar/ocultar gráfico para o tipo de carga
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Exibir detalhes de rendimentos
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Exibir detalhes de rendimentos
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Chave dos gráficos da empresa
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Clique aqui para mostrar/ocultar empresa no gráfico
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clique aqui para mostrar/ocultar empresa no gráfico
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Classificação de Empresas
@@ -492,16 +492,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Dinheiro
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Empréstimo:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Número de veículos. Incluindo veículos de estrada, comboios, barcos e aeronaves.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Número de segmentos de estação. Cada parte de uma estação (ex. estação ferroviária, paragem de autocarro, aeroporto) é contabilizado, mesmo se eles estiverem ligados a uma estação.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}O lucro do veículo com o rendimento menor (de todos os veículos com mais de 2 anos)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Dinheiro conseguido no mês com os lucros mais altos dos últimos 12 trimestres
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unidades de carga entregues nos últimos 4 trimestres.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tipos de carga entregues no último trimestre.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Dinheiro 'em mãos'
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Tem um empréstimo muito elevado?
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total de pontos sobre o máximo de pontos
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Número de veículos. Incluindo veículos de estrada, comboios, barcos e aeronaves.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de segmentos de estação. Cada parte de uma estação (ex. estação ferroviária, paragem de autocarro, aeroporto) é contabilizado, mesmo se eles estiverem ligados a uma estação.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}O lucro do veículo com o rendimento menor (de todos os veículos com mais de 2 anos)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais baixos dos últimos 12 trimestres
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Dinheiro conseguido no mês com os lucros mais altos dos últimos 12 trimestres
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unidades de carga entregues nos últimos 4 trimestres.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipos de carga entregues no último trimestre.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Dinheiro 'em mãos'
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Tem um empréstimo muito elevado?
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total de pontos sobre o máximo de pontos
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jukebox de Jazz
@@ -629,8 +629,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  GRAV
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Histórico de Mensagens
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Lista de notícias recentes
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Lista de notícias recentes
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mensagem
@@ -851,7 +851,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Seleccio
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Ecrã Inteiro
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Seleccione esta opção para jogar o OpenTTD em modo de ecrã inteiro
-STR_FULLSCREEN_FAILED                                           :{WHITE}Modo de ecrã inteiro falhou
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Modo de ecrã inteiro falhou
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolução do ecrã
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Seleccione a resolução do ecrã que deseja utilizar
@@ -904,7 +904,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair de
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Truques
-STR_CHEATS_TIP                                                  :{BLACK}As caixas de verificação indicam se já usou este truque antes
+STR_CHEATS_TOOLTIP                                              :{BLACK}As caixas de verificação indicam se já usou este truque antes
 STR_CHEATS_WARNING                                              :{BLACK}Atenção! Está prestes a trair os seus oponentes. Tenha em conta que isto ficará registado para sempre.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Aumentar dinheiro em {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jogando como empresa: {ORANGE}{COMMA}
@@ -919,14 +919,14 @@ STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Novo Esquema de Cores
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Exibir esquema de cores geral
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Exibir esquemas de cores dos comboios
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Exibir esquemas de cores dos veículos de estrada
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Exibir esquemas de cores dos navios
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Exibir esquema de cores da aeronave
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Seleccione a cor primária para o veículo seleccionado
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Seleccione a cor secundária para o esquema seleccionado
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Seleccione o esquema de cores a alterar, ou esquemas múltiplos utilizando a tecla Ctrl com o botão esquerdo do rato. Marque a caixa para comutar a utilização do esquema de cores
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Exibir esquema de cores geral
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Exibir esquemas de cores dos comboios
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Exibir esquemas de cores dos veículos de estrada
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Exibir esquemas de cores dos navios
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Exibir esquema de cores da aeronave
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Seleccione a cor primária para o veículo seleccionado
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Seleccione a cor secundária para o esquema seleccionado
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Seleccione o esquema de cores a alterar, ou esquemas múltiplos utilizando a tecla Ctrl com o botão esquerdo do rato. Marque a caixa para comutar a utilização do esquema de cores
 
 STR_LIVERY_DEFAULT                                              :Estampagem Padrão
 STR_LIVERY_STEAM                                                :Motor a Vapor
@@ -964,19 +964,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Seleccio
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nova Cara
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Gerar nova cara aleatoriamente
 STR_FACE_ADVANCED                                               :{BLACK}Avançado
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Selecção avançadade de cara
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selecção avançadade de cara
 STR_FACE_SIMPLE                                                 :{BLACK}Simples
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Selecção simples de cara
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selecção simples de cara
 STR_FACE_LOAD                                                   :{BLACK}Carregar
-STR_FACE_LOAD_TIP                                               :{BLACK}Carregar cara preferida
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Carregar cara preferida
 STR_FACE_LOAD_DONE                                              :{WHITE}A sua cara preferida foi carregada a partir do ficheiro de configuração do OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Nº de cara
-STR_FACE_FACECODE_TIP                                           :{BLACK}Ver e/ou definir número de cara do jogador
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Ver e/ou definir número de cara do jogador
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Ver e/ou definir número de cara do jogador
 STR_FACE_FACECODE_SET                                           :{WHITE}Novo número de código de cara foi definido
 STR_FACE_FACECODE_ERR                                           :{WHITE}Não foi possível definir o número de cara do jogador - deverá ser numérico entre 0 e 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Gravar
-STR_FACE_SAVE_TIP                                               :{BLACK}Gravar cara preferida
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Gravar cara preferida
 STR_FACE_SAVE_DONE                                              :{WHITE}Esta cara será gravada como a sua preferida no ficheiro de configuração do OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Europeu
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Seleccionar caras europeias
@@ -984,49 +984,49 @@ STR_FACE_AFRICAN                                                :{BLACK}Africano
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Seleccionar caras africanas
 STR_FACE_YES                                                    :Sim
 STR_FACE_NO                                                     :Não
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Activar bigode ou brinco
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Activar bigode ou brinco
 STR_FACE_HAIR                                                   :Cabelo:
-STR_FACE_HAIR_TIP                                               :{BLACK}Mudar cabelo
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Mudar cabelo
 STR_FACE_EYEBROWS                                               :Sobrancelhas:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Mudar sobrancelhas
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Mudar sobrancelhas
 STR_FACE_EYECOLOUR                                              :Cor dos olhos:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Mudar cor dos olhos
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Mudar cor dos olhos
 STR_FACE_GLASSES                                                :Óculos:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Activar óculos
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Mudar óculos
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Activar óculos
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Mudar óculos
 STR_FACE_NOSE                                                   :Nariz:
-STR_FACE_NOSE_TIP                                               :{BLACK}Mudar nariz
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Mudar nariz
 STR_FACE_LIPS                                                   :Lábios:
 STR_FACE_MOUSTACHE                                              :Bigode:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Mudar lábios ou bigode
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Mudar lábios ou bigode
 STR_FACE_CHIN                                                   :Queixo:
-STR_FACE_CHIN_TIP                                               :{BLACK}Mudar queixo
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Mudar queixo
 STR_FACE_JACKET                                                 :Casaco:
-STR_FACE_JACKET_TIP                                             :{BLACK}Mudar casaco
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Mudar casaco
 STR_FACE_COLLAR                                                 :Colarinho:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Mudar colarinho
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Mudar colarinho
 STR_FACE_TIE                                                    :Gravata:
 STR_FACE_EARRING                                                :Brinco:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Mudar gravata ou brinco
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Mudar gravata ou brinco
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Descarregamento de conteúdo
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipo
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipo de conteúdo
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipo de conteúdo
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nome
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nome do conteúdo
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Clique numa linha para ver detalhes{}Clique na caixa de verificação para a seleccionar para descarregamento
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nome do conteúdo
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Clique numa linha para ver detalhes{}Clique na caixa de verificação para a seleccionar para descarregamento
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Seleccionar tudo
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marcar todo o conteúdo para ser descarregado
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marcar todo o conteúdo para ser descarregado
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Seleccionar actualizações
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marcar todo o conteúdo que seja actualização ao conteúdo existente a ser descarregado
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marcar todo o conteúdo que seja actualização ao conteúdo existente a ser descarregado
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Desseleccionar tudo
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Marcar todo o conteúdo que não deva ser descarregado
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marcar todo o conteúdo que não deva ser descarregado
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Insira uma frase para filtrar por
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Insira uma palavra chave para filtrar a lista por
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Insira uma palavra chave para filtrar a lista por
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtrar por nome/tag:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Descarregar
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Iniciar a descarga do conteúdo seleccionado
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Iniciar a descarga do conteúdo seleccionado
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Tamanho total da descarga: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO DE CONTEÚDO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Não seleccionou isto para ser descarregado
@@ -1063,17 +1063,17 @@ STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Descarga
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} de {BYTES} descarregado ({NUM} %)
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opções de Transparência
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Comutar transparência para sinais das estações. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Comutar transparência das árvores. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Comutar transparência das casas. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Comutar transparência das indústrias. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Comutar transparência para edificações como estações, depósitos, pontos-de-passagem e catenárias. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Comutar transparência para pontes. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Comutar transparência para estruturas como faróis-terrestres e antenas. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Comutar transparência para catenária. CTRL+clique para fechar.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Alterar transparência para indicadores de carga. Pressione Ctrl enquanto clica para bloquear.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Definir objectos como invisíveis em vez de transparentes
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opções de Transparência
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Comutar transparência para sinais das estações. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Comutar transparência das árvores. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Comutar transparência das casas. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Comutar transparência das indústrias. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Comutar transparência para edificações como estações, depósitos, pontos-de-passagem e catenárias. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Comutar transparência para pontes. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Comutar transparência para estruturas como faróis-terrestres e antenas. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Comutar transparência para catenária. CTRL+clique para fechar.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Alterar transparência para indicadores de carga. Pressione Ctrl enquanto clica para bloquear.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Definir objectos como invisíveis em vez de transparentes
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Evidenciar cobertura
@@ -1111,28 +1111,28 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Seleccio
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Arrastar
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construir estação arrastando
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Escolher a classe da estação a mostrar
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Escolher o tipo de estação a construir
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Escolher a classe da estação a mostrar
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Escolher o tipo de estação a construir
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Selecção de Sinal
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Não é possível converter sinais aqui...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Sinal Normal (semáforo){}Este é o tipo mais básico de sinal, que só permite um comboio dentro da mesma linha ferroviária ao mesmo tempo.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Sinal de Entrada (semáforo){}Verde enquanto existir um ou mais sinais de saída verdes no seguimento da linha. De outro modo ficará vermelho.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Sinal de Saída (semáforo){}Funciona da mesma forma que o sinal normal mas é necessário para conseguir a cor correcta nos pré-sinais de entrada e combinado.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Sinal Combinado (semáforo){}O sinal combinado funciona como um sinal de entrada e de saída. Este permite construir grandes "árvores" de pré-sinais.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Sinal (semáforo){}Os sinais permitem que vários comboios utilizem a mesma linha desde que consigam chegar aos seus destinos em segurança.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Sinais de sentido único (semáforo){}Os sinais permitem que vários comboios utilizem a mesma linha desde que consigam chegar aos seus destinos em segurança. Os comboios apenas podem passar no sentido dos semáforos.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Sinal Normal(eléctrico){}Este é o tipo mais básico de sinal, que só permite um comboio dentro da mesma linha ferroviária ao mesmo tempo.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Sinal de Entrada (eléctrico){}Verde enquanto existir um ou mais sinais de saída verdes no seguimento da linha. De outro modo ficará vermelho.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Sinal de Saída (eléctrico){}Funciona da mesma forma que o sinal normal mas é necessário para conseguir a cor correcta nos pré-sinais de entrada e combinado.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Sinal Combinado (eléctrico){}O sinal combinado funciona como um sinal de entrada e de saída. Este permite construir grandes "árvores" de pré-sinais.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Sinal (eléctrico){}Os sinais permitem que vários comboios entrem na mesma linha ao mesmo tempo, desde que consigam chegar ao seu destino em segurança.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Um sinal de sentido único (electric){}Um sinal de trajecto permite que mais de um comboio passe ao mesmo tempo um sinal se, o comboio conseguir reservar um caminho para onde posteriormente possa parar sem prejudicar o seguinte. Sinais de um único sentido não podem ser passados no sentido contrário.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Converter Sinal{}Quando seleccionado, ao fazer clique num sinal existente este será convertido no tipo e variante de sinal seleccionado, Ctrl+clique irá comutar a variante existente.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densidade de sinais
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Diminuir densidade de sinais
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Aumentar densidade de sinais
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Selecção de Sinal
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Não é possível converter sinais aqui...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Sinal Normal (semáforo){}Este é o tipo mais básico de sinal, que só permite um comboio dentro da mesma linha ferroviária ao mesmo tempo.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Sinal de Entrada (semáforo){}Verde enquanto existir um ou mais sinais de saída verdes no seguimento da linha. De outro modo ficará vermelho.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Sinal de Saída (semáforo){}Funciona da mesma forma que o sinal normal mas é necessário para conseguir a cor correcta nos pré-sinais de entrada e combinado.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Sinal Combinado (semáforo){}O sinal combinado funciona como um sinal de entrada e de saída. Este permite construir grandes "árvores" de pré-sinais.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Sinal (semáforo){}Os sinais permitem que vários comboios utilizem a mesma linha desde que consigam chegar aos seus destinos em segurança.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Sinais de sentido único (semáforo){}Os sinais permitem que vários comboios utilizem a mesma linha desde que consigam chegar aos seus destinos em segurança. Os comboios apenas podem passar no sentido dos semáforos.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Sinal Normal(eléctrico){}Este é o tipo mais básico de sinal, que só permite um comboio dentro da mesma linha ferroviária ao mesmo tempo.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Sinal de Entrada (eléctrico){}Verde enquanto existir um ou mais sinais de saída verdes no seguimento da linha. De outro modo ficará vermelho.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Sinal de Saída (eléctrico){}Funciona da mesma forma que o sinal normal mas é necessário para conseguir a cor correcta nos pré-sinais de entrada e combinado.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Sinal Combinado (eléctrico){}O sinal combinado funciona como um sinal de entrada e de saída. Este permite construir grandes "árvores" de pré-sinais.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Sinal (eléctrico){}Os sinais permitem que vários comboios entrem na mesma linha ao mesmo tempo, desde que consigam chegar ao seu destino em segurança.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Um sinal de sentido único (electric){}Um sinal de trajecto permite que mais de um comboio passe ao mesmo tempo um sinal se, o comboio conseguir reservar um caminho para onde posteriormente possa parar sem prejudicar o seguinte. Sinais de um único sentido não podem ser passados no sentido contrário.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Converter Sinal{}Quando seleccionado, ao fazer clique num sinal existente este será convertido no tipo e variante de sinal seleccionado, Ctrl+clique irá comutar a variante existente.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Densidade de sinais
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Diminuir densidade de sinais
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Aumentar densidade de sinais
 
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Construir Estradas
@@ -1157,9 +1157,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Alternar
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientação do Depósito
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Seleccionar a orientação do depósito
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Seleccionar a orientação do depósito
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientação do depósito para eléctricos
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Escolher a orientação do depósito de eléctricos
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Escolher a orientação do depósito de eléctricos
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientação da estação de autocarros
@@ -1223,40 +1223,40 @@ STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} em rota de {STATION})
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aceita: {WHITE}
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Nenhuma carga em espera
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar todas as acções
-STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar todos os tipos de carga (incluindo carga sem espera)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver lista de designs disponíveis de locomotivas para este tipo de veículo.
-STR_MANAGE_LIST                                                 :{BLACK}Gerir lista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Enviar instruções a todos os veículos desta lista
-STR_REPLACE_VEHICLES                                            :Substituir Veículos
-STR_SEND_FOR_SERVICING                                          :Enviar para Serviço
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nenhuma carga em espera
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleccionar todas as acções
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Seleccionar todos os tipos de carga (incluindo carga sem espera)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Ver lista de designs disponíveis de locomotivas para este tipo de veículo.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Gerir lista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Enviar instruções a todos os veículos desta lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Substituir Veículos
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Enviar para Serviço
 
 STR_ERROR_OWNED_BY                                              :{WHITE}...propriedade de {STRING}
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Carga
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informação
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Capacidades
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Carga Total
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Carga total (capacidade) deste comboio:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Carga total (capacidade) deste comboio:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
-STR_MAPSIZE                                                     :{BLACK}Dim. do mapa:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Dim. do mapa:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 STR_COMPANY_SOMEONE                                             :alguém{SKIP}{SKIP}
 
 STR_ABOUT_OPENTTD                                               :{WHITE}Sobre o OpenTTD...
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Tem a certeza que deseja abandonar este jogo?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandonar jogo
-STR_SORT_ORDER_TIP                                              :{BLACK}Seleccione forma de ordenação (descendente/ascendente)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccione critério de ordenação
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Seleccione o critério de filtragem/procura
-STR_SORT_BY                                                     :{BLACK}Ordenar por
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Seleccione forma de ordenação (descendente/ascendente)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Seleccione critério de ordenação
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Seleccione o critério de filtragem/procura
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordenar por
 
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Mensagem
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mensagem de {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Cuidado!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Não é possível fazer isto....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Não é possível limpar esta área....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Direitos de autor originais {COPYRIGHT} 1995 Chris Sawyer, Todos os direitos reservados
@@ -1264,45 +1264,45 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 A equipa do OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Sair
-STR_YES                                                         :{BLACK}Sim
-STR_NO                                                          :{BLACK}Não
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Sim
+STR_QUIT_NO                                                     :{BLACK}Não
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}?
 
 STR_JUST_NOTHING                                                :Nada
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Existem demasiados veículos em jogo
 STR_BUTTON_LOCATION                                             :{BLACK}Localização
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Por Omissão
-STR_QUERY_CANCEL                                                :{BLACK}Cancelar
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Renomear
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Por Omissão
+STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Renomear
 
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Não é possível alterar o intervalo de serviço...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Fechar janela
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título da janela - arraste isto para mover a janela
-STR_STICKY_BUTTON                                               :{BLACK}Marcar esta janela como não-encerrável pela tecla 'Fechar Todas as Janelas'
-STR_RESIZE_BUTTON                                               :{BLACK}Clique e arraste para reajustar janela
+STR_TOOLTIP_STICKY                                              :{BLACK}Marcar esta janela como não-encerrável pela tecla 'Fechar Todas as Janelas'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Clique e arraste para reajustar janela
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Carregue aqui para saltar para a directoria de gravação/carregamento por defeito
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolir edifícios, etc. num quadrado de terreno
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Baixar um canto do terreno
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Levantar um canto do terreno
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Baixar um canto do terreno
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Levantar um canto do terreno
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de rolamento - rola a lista acima/abaixo
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de deslize - desloca a lista para a esquerda/direita
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Lucro deste ano: {CURRENCY} (último ano: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} ano{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ano{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ano{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ano{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Comboio
-STR_VEHICLE_ROAD_VEHICLE                                        :Veículo de estrada
-STR_VEHICLE_SHIP                                                :Barco
-STR_VEHICLE_AIRCRAFT                                            :Aeronave
+STR_REPLACE_VEHICLE_TRAIN                                       :Comboio
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Veículo de estrada
+STR_REPLACE_VEHICLE_SHIP                                        :Barco
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeronave
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informações do Terreno
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Custo para limpar: {LTBLUE}N/D
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Custo para limpar: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Receitas apuradas: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Receitas apuradas: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/D
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Proprietário: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Dono da estrada: {LTBLUE}{STRING}
@@ -1311,11 +1311,11 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Dono da
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoridade local: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nenhum
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nome
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceite: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Clique num serviço para centrar a visualização numa indústria/cidade
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Clique num serviço para centrar a visualização numa indústria/cidade
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...Muito distante do destino anterior
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
@@ -1326,7 +1326,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Diminuir
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Gerar terreno aleatório
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Repor terreno
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Repor Terreno
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Apagar todas as propriedades de jogadores do mapa
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Apagar todas as propriedades de jogadores do mapa
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Tem a certeza que quer apagar todas as propriedades de jogadores?
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Gerar Cidades
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nova Cidade
@@ -1336,11 +1336,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...muito
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...muito perto de outra cidade
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...sítio inadequado
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...demasiadas cidades
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Não é possível construir cidades
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...não existe mais espaço no mapa
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Não é possível construir cidades
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...não existe mais espaço no mapa
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Aumentar o tamanho da cidade
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}A cidade não construirá estradas. Pode-se permitir a construção de estradas por Opções Avançadas->Economia->Cidades.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}A cidade não construirá estradas. Pode-se permitir a construção de estradas por Opções Avançadas->Economia->Cidades.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Cidade Aleatória
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construir uma cidade num local aleatório
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Não é possível construir {STRING} aqui...
@@ -1354,20 +1354,20 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Colocar
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Colocar farol
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Colocar transmissor
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definir área de deserto.{}Manter a tecla CTRL pressionada para remover
-STR_CREATE_LAKE                                                 :{BLACK}Definir área de água.{}Construir um canal, a não ser que a tecla Ctrl esteja pressionada a nível do mar, nesse caso inundará as zonas circundantes
-STR_CREATE_RIVER                                                :{BLACK}Colocar rios.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definir área de água.{}Construir um canal, a não ser que a tecla Ctrl esteja pressionada a nível do mar, nesse caso inundará as zonas circundantes
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Colocar rios.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Apagar
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Apagar completamente esta cidade
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Guardar cenário
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Abrir cenário
-STR_MENU_LOAD_HEIGHTMAP                                         :Carregar mapa de alturas
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carregar mapa de alturas
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sair do editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Sair
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Guardar cenário, abrir cenário, abandonar editor de cenário, sair
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Abrir Cenário
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Guardar Cenário
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Tem a certeza que deseja abandonar este cenário ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Tem a certeza que deseja abandonar este cenário ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...só pode ser construído em cidades com pelo menos 1200 habitantes
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Retroceder data de início 1 ano
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Avançar data de início 1 ano
@@ -1375,19 +1375,19 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...ambos
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Pequena
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Média
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grande
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Aleatório
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Aleatório
 STR_FOUND_TOWN_CITY                                             :{BLACK}Cidade
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Cidades crescem mais depressa que o normal{}Dependendo da configuração, são maiores aquando da sua fundação
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Seleccione o tamanho da cidade
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Tamanho da cidade:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Disposição de estradas na cidade:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Seleccione disposição das estradas utilizada para esta cidade
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Estradas melhores
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}grelha 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}grelha 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Aleatório
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Disposição de estradas na cidade:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Seleccione disposição das estradas utilizada para esta cidade
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Estradas melhores
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}grelha 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}grelha 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aleatório
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Financiar nova indústria
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...só se pode construir em zonas de floresta
@@ -1396,15 +1396,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...só s
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Captura de ecrã gravada para o disco como '{STRING}' com sucesso
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Captura de ecrã falhada!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Comprar terreno para uso futuro
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Gravação ainda em curso,{}por favor aguarde!
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Comprar terreno para uso futuro
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Gravação ainda em curso,{}por favor aguarde!
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Falha ao guardar automaticamente
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Falha ao guardar automaticamente
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Dirige-se para {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Dirige-se a {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sem ordens
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sem ordens, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Dirige-se para {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Dirige-se a {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sem ordens
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sem ordens, {VELOCITY}
 
 STR_PASSENGERS                                                  :passageiros
 STR_BAGS                                                        :sacos
@@ -1415,9 +1415,9 @@ STR_CRATES                                                      :caixas
 STR_RES_OTHER                                                   :outros
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Não é possível partilhar a lista de ordens...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Não é possível copiar a lista de ordens...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fim de Ordens Partilhadas - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Não é possível partilhar a lista de ordens...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Não é possível copiar a lista de ordens...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fim de Ordens Partilhadas - -
 
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} é muito longo depois de substituído
 STR_ERROR_AUTOREPLACE_NOTHING_TO_DO                             :{WHITE}Sem regras de substituição/renovação.
@@ -1670,170 +1670,170 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-taman
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :desactivado
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Alterar valor
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Alterar valor
 
-STR_TEMPERATE_LANDSCAPE                                         :Terreno temperado
-STR_SUB_ARCTIC_LANDSCAPE                                        :terreno subárctico
-STR_SUB_TROPICAL_LANDSCAPE                                      :terreno subtropical
-STR_TOYLAND_LANDSCAPE                                           :terreno 'toyland'
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Terreno temperado
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :terreno subárctico
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :terreno subtropical
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :terreno 'toyland'
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Dirige-se a {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Dirige-se a {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Dirige-se a {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Dirige-se a {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Ir via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sem parar via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ir via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ir sem parar via {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Ponto de passagem {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Ponto de passagem {TOWN}#{COMMA}
-STR_BUOYNAME_CITY                                               :Bóia de {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Bóia de {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Ponto de passagem
+STR_FORMAT_WAYPOINT_NAME                                        :Ponto de passagem {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Ponto de passagem {TOWN}#{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Bóia de {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Bóia de {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Ponto de passagem
 
-STR_WAYPOINT                                                    :{WHITE}Ponto de passagem
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Seleccione um tipo de ponto de passagem
+STR_WAYPOINT_CAPTION                                            :{WHITE}Ponto de passagem
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Seleccione um tipo de ponto de passagem
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editar nome do ponto de passagem
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Não é possível alterar o nome do ponto de passagem...
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Não é possível construir ponto de passagem de comboio aqui...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Não é possível remover ponto de passagem de comboio aqui...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Não é possível alterar o nome do ponto de passagem...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Não é possível construir ponto de passagem de comboio aqui...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Não é possível remover ponto de passagem de comboio aqui...
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...não existe nenhuma cidade neste cenário
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Geração de mapa abortada...{}...não há locais apropriados para cidades
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...não existe nenhuma cidade neste cenário
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Geração de mapa abortada...{}...não há locais apropriados para cidades
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Várias cidades aleatórias
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Cobrir o mapa com cidades colocadas aleatoriamente
-STR_MANY_RANDOM_INDUSTRIES                                      :Várias indústrias aleatórias
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Cobrir o mapa com indústrias colocadas aleatoriamente
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Não é possível gerar indústrias...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Várias cidades aleatórias
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cobrir o mapa com cidades colocadas aleatoriamente
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Várias indústrias aleatórias
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Cobrir o mapa com indústrias colocadas aleatoriamente
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Não é possível gerar indústrias...
 
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Terreno
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivelar terreno
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivelar terreno
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}�rvores de tipo aleatório
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Colocar árvores de tipo aleatório
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Colocar árvores de tipo aleatório
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Não é possível construir canais aqui...
-STR_LANDINFO_CANAL                                              :Canal
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Não é possível construir canais aqui...
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Não é possível construir diques aqui...
-STR_LANDINFO_LOCK                                               :Dique
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Não é possível construir diques aqui...
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Dique
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Não se pode pôr rio aqui...
-STR_LANDINFO_RIVER                                              :Rio
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Não se pode pôr rio aqui...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rio
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...bóia está em uso!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...bóia está em uso!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Não é possível remover parte da estação...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Não é possível converter o tipo de linha aqui...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Não é possível remover parte da estação...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Não é possível converter o tipo de linha aqui...
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Arrastar locomotiva para aqui para vender todo o comboio
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Arrastar locomotiva para aqui para vender todo o comboio
 
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Desactivar tudo
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activar tudo
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desactivar tudo
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activar tudo
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Indústrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nomes de indústrias - clique no nome para centrar-se na indústria
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Indústrias
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nomes de indústrias - clique no nome para centrar-se na indústria
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...muito perto de outra indústria
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...muito perto de outra indústria
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Modificar produção
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multi-jogador
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nome do jogador:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Este é o nome pelo qual os outros jogadores o irão identificar
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Digite teu nome
-STR_NETWORK_CONNECTION                                          :{BLACK}Conexão:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Escolha entre um jogo pela Internet ou pela rede local
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Iniciar servidor
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Iniciar um servidor próprio
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nome
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nome do jogo
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versão do servidor, etc.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Clique num jogo da lista para o seleccionar
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}O Servidor ao que te juntaste a última vez:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Clique para indicar o servidor que jogaste a última vez
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Localizar servidor
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Pesquisar por um servidor na rede
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Adicionar servidor
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adiciona um servidor à lista que será sempre verificado se existem jogos a decorrer.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Introduza o endereço IP do servidor
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes ligados / máx. clientes{}Empresas ligadas / máx. empresas
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Tamanho do mapa
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Tamanho do mapa{}Clique para ordenar por área
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data de hoje
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Anos
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Número de anos{}que o jogo vai durar
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFORMAÇÃO DE JOGO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Conjunto de blocos: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamanho do Mapa: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versão do servidor: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Endereço do servidor: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data de início: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data actual: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protegido por palavra passe!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR DESLIGADO
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR CHEIO
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSÃO INCOMPAT�VEL
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF INCOMPAT�VEL
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Juntar-se ao jogo
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Iniciar novo jogo
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nome do jogo:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}O nome do jogo será mostrado aos outros jogadores no menu de selecção de jogos multi-jogador
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Digite nome para o jogo de rede
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Definir palavra passe
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Proteja o jogo com uma senha se não desejar que pessoas indesejadas se juntem
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Seleccione um mapa:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Em que mapa deseja jogar?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Rede Local
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :Rede Local / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (divulgar)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Máximo de clientes:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Escolha o número máximo de clientes. Não necessitam estar todos presentes.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} empresa{P "" s}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Máximo de empresas:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitar o servidor a um certo número de empresas
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Máximo de espectadores:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitar o servidor a um certo número de espectadores
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma falado:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Outros jogadores ficarão a conhecer o idioma utilizado no servidor.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Iniciar Jogo
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Iniciar um novo jogo em rede de um mapa aleatório, ou cenário
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Abrir Jogo
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Continuar um jogo multi-jogador anteriormente guardado (assegure-se de conectar com o jogador correcto)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multi-jogador
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Digite teu nome
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Conexão:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Escolha entre um jogo pela Internet ou pela rede local
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Iniciar servidor
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Iniciar um servidor próprio
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nome
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nome do jogo
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Idioma, versão do servidor, etc.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Clique num jogo da lista para o seleccionar
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}O Servidor ao que te juntaste a última vez:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Clique para indicar o servidor que jogaste a última vez
+
+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_ENTER_IP                                :{BLACK}Introduza o endereço IP do servidor
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clientes
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clientes ligados / máx. clientes{}Empresas ligadas / máx. empresas
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Tamanho do mapa
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Tamanho do mapa{}Clique para ordenar por área
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Data de hoje
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Anos
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Número de anos{}que o jogo vai durar
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFORMAÇÃO DE JOGO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Conjunto de blocos: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Tamanho do Mapa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versão do servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Endereço do servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data de início: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data actual: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protegido por palavra passe!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR DESLIGADO
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR CHEIO
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSÃO INCOMPAT�VEL
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF INCOMPAT�VEL
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Juntar-se ao jogo
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Iniciar novo jogo
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nome do jogo:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}O nome do jogo será mostrado aos outros jogadores no menu de selecção de jogos multi-jogador
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Digite nome para o jogo de rede
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Definir palavra passe
+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_SELECT_MAP                             :{BLACK}Seleccione um mapa:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Em que mapa deseja jogar?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Rede Local
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Rede Local / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (divulgar)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Máximo de clientes:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Escolha o número máximo de clientes. Não necessitam estar todos presentes.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} empresa{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Máximo de empresas:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limitar o servidor a um certo número de empresas
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Máximo de espectadores:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limitar o servidor a um certo número de espectadores
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Idioma falado:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Outros jogadores ficarão a conhecer o idioma utilizado no servidor.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Iniciar Jogo
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Iniciar um novo jogo em rede de um mapa aleatório, ou cenário
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Abrir Jogo
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Continuar um jogo multi-jogador anteriormente guardado (assegure-se de conectar com o jogador correcto)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Qualquer
@@ -1874,33 +1874,33 @@ STR_NETWORK_LANG_GREEK                                          :Grego
 STR_NETWORK_LANG_LATVIAN                                        :Letão
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Sala de espera de jogo multi-jogador
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Sala de espera de jogo multi-jogador
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparando para juntar: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista das empresas activas neste jogo. Pode juntar-se a uma delas ou iniciar uma nova empresa.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova empresa
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Criar uma nova empresa
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Observar jogo
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Ver jogo como um espectador
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Juntar a empresa
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Auxiliar na gestão desta empresa
-STR_NETWORK_REFRESH                                             :{BLACK}Renovar servidor
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Renovar a informação do servidor
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparando para juntar: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Lista das empresas activas neste jogo. Pode juntar-se a uma delas ou iniciar uma nova empresa.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova empresa
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Criar uma nova empresa
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Observar jogo
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Ver jogo como um espectador
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Juntar a empresa
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Auxiliar na gestão desta empresa
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Renovar servidor
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Renovar a informação do servidor
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFORMAÇÃO DA EMPRESA
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFORMAÇÃO DA EMPRESA
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nome da empresa: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguração: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valor da empresa: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanço actual: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Desempenho: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nome da empresa: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguração: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valor da empresa: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balanço actual: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Rendimento do último ano: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Desempenho: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Veículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estações: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Jogadores: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Veículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Estações: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Jogadores: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}A ligar...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}A ligar...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) A ligar..
@@ -1916,49 +1916,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}A obter
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} à sua frente
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} obtidos até agora
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Desligar
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desligar
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Insira a quantidade de dinheiro que pretende dar
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Introduza palavra-chave
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduza palavra-chave
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de clientes
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Assistir
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Empresa
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Não foram encontradas interfaces de rede ou o jogo foi compilado sem ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Não foram encontrados jogos de rede
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}O servidor não respondeu ao pedido
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Impossível ligar devido a incompatibilidade de NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}A sincronização do jogo de rede falhou.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}A conexão do jogo de rede perdeu-se.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Não foi possível abrir o jogo.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Não foi possível iniciar o servidor
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Não foi possível estabelecer ligação
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Tempo de espera esgotado na conexão #{NUM}.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Ocorreu um erro de protocolo e a ligação foi encerrada
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}A revisão deste cliente não condiz com a revisão do servidor
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Palavra-chave incorrecta
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Servidor cheio
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Foi banido deste servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Você foi expulso do jogo
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Batotas não são permitidas neste servidor
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Não foram encontradas interfaces de rede ou o jogo foi compilado sem ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Não foram encontrados jogos de rede
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}O servidor não respondeu ao pedido
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Impossível ligar devido a incompatibilidade de NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}A sincronização do jogo de rede falhou.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}A conexão do jogo de rede perdeu-se.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Não foi possível abrir o jogo.
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Não foi possível iniciar o servidor
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Não foi possível estabelecer ligação
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Tempo de espera esgotado na conexão #{NUM}.
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Ocorreu um erro de protocolo e a ligação foi encerrada
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}A revisão deste cliente não condiz com a revisão do servidor
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Palavra-chave incorrecta
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Servidor cheio
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Foi banido deste servidor
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Você foi expulso do jogo
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Batotas não são permitidas neste servidor
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :erro geral
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :erro de dessincronização
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :não foi possível carregar o mapa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :ligação perdida
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :erro de protocolo
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF incompatível
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :não autorizado
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :recebido um pacote estranho
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :revisão incorrecta
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nome já está a ser utilizado
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :palavra-chave incorrecta
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :ID da empresa errado na aplicação de rede
-STR_NETWORK_ERR_CLIENT_KICKED                                   :avisado pelo servidor
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :estava a tentar usar batota
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor cheio
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :erro geral
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :erro de dessincronização
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :não foi possível carregar o mapa
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :ligação perdida
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :erro de protocolo
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF incompatível
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :não autorizado
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :recebido um pacote estranho
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :revisão incorrecta
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nome já está a ser utilizado
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :palavra-chave incorrecta
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :ID da empresa errado na aplicação de rede
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :avisado pelo servidor
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava a tentar usar batota
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheio
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1968,15 +1968,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Jogo em pausa (
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Jogo a decorrer (cliente ligado)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Jogo a decorrer (falhou conexão cliente)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :a sair
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} entrou no jogo
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} juntou-se à empresa #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} juntou-se para assistir
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} iniciou uma nova empresa (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} deixou o jogo ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} mudou o seu nome para {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} deu à sua empresa {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Deu {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :a sair
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} entrou no jogo
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} juntou-se à empresa #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} juntou-se para assistir
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} iniciou uma nova empresa (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} deixou o jogo ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} mudou o seu nome para {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} deu à sua empresa {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Deu {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Equipa] :
 STR_NETWORK_CHAT_COMPANY                                        :[Equipa] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Equipa] Para {STRING}: {WHITE}{STRING}
@@ -1986,8 +1986,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privado] Para
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Todos] :
 STR_NETWORK_CHAT_ALL                                            :[Todos] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Introduza a mensagem para os outros jogadores
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} O servidor fechou a sessão
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} O servidor está a reiniciar...{}Por favor espere...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} O servidor fechou a sessão
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} O servidor está a reiniciar...{}Por favor espere...
 
 STR_NETWORK_SERVER                                              :Servidor
 STR_NETWORK_CLIENT                                              :Cliente
@@ -2001,19 +2001,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Falar com a emp
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Mensagem privada
 
 
-STR_NETWORK_SEND                                                :{BLACK}Enviar
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Enviar
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Impossível carregar paisagem de PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...ficheiro não encontrado.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...impossível converter imagem. Necessário PNG de 8 ou 24 bits.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...alguma coisa correu mal. Desculpe. (provavelmente um ficheiro corrompido)
+STR_ERROR_PNGMAP                                                :{WHITE}Impossível carregar paisagem de PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...ficheiro não encontrado.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...impossível converter imagem. Necessário PNG de 8 ou 24 bits.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...alguma coisa correu mal. Desculpe. (provavelmente um ficheiro corrompido)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Impossível carregar paisagem de BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...impossível converter tipo de imagem.
+STR_ERROR_BMPMAP                                                :{WHITE}Impossível carregar paisagem de BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...impossível converter tipo de imagem.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Custo: {CURRENCY}
@@ -2027,13 +2027,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Lucro Es
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Não é possível levantar terreno aqui...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Não é possível baixar terreno aqui...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Não é possível nivelar o terreno aqui...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rochas
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Terreno Irregular
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Terreno Deserto
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Terreno de Prados
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Campos
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Neve
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Deserto
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rochas
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Terreno Irregular
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Terreno Deserto
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Terreno de Prados
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campos
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Neve
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Deserto
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Terreno inclinado na direcção incorrecta
@@ -2041,11 +2041,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}CombinaÃ
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}A escavação estragaria o túnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Já está ao nível do mar
 STR_ERROR_TOO_HIGH                                              :{WHITE}Demasiado alto
-STR_ALREADY_LEVELLED                                            :{WHITE}... já plano
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... já plano
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tipo de linha não apropriado
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...já construído
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Deverá remover a linha férrea primeiro
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Estrada de sentido único ou bloqueada
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Estrada de sentido único ou bloqueada
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Construir caminhos-de-ferro
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Construir caminhos-de-ferro electrificados
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Construir monocarril
@@ -2057,43 +2057,43 @@ STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Não é
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Não é possível construir linha férrea aqui...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Não é possível remover linha férrea daqui...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Não é possível remover sinais daqui...
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Selecção de ponte - clique na ponte desejada para a construir
-STR_RAILROAD_TRACK                                              :Caminhos-de-ferro
-STR_RAILROAD_TRAIN_DEPOT                                        :Depósito ferroviário
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selecção de ponte - clique na ponte desejada para a construir
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Caminhos-de-ferro
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depósito ferroviário
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...a área é propriedade de outra empresa
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Caminhos-de-ferro com sinais normais
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Caminhos-de-ferro com pré-sinais
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Caminhos-de-ferro com sinais de saída
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Caminhos-de-ferro com sinais combinados
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Caminho de ferro com faróis de rota
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Caminho de ferro com faróis de mão única
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Carris com sinais normais e pré-sinais
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Carris com sinais normais e de saída
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Carris com sinais normais e combinados
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Caminho de ferro com obstrução e faróis de rota
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Caminho de ferro com obstrução e faróis de mão única
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Carris com pré-sinais e sinais de saída
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Carris com pré-sinais e sinais combinados
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Linha férrea com pré-sinais e sinais de trajecto
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Linha férrea com pré-sinais e sinais de sentido único
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Carris com sinais de saída e combinados
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Linha férrea com sinais de saída e de trajecto
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Linha férrea com sinais de saída e de sentido único
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Linha férrea com conjunto de sinais e sinais de trajecto
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Linha férrea com sinais multi- e de sentido único
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Linha férrea com sinais de trajecto e de sentido único
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}É preciso remover a estação primeiro
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}É preciso remover o ponto de passagem primeiro
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construir uma estação separada
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Construir um ponto de passagem separado
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Juntar estação
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Juntar ponto de passagem
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Caminhos-de-ferro com sinais normais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Caminhos-de-ferro com pré-sinais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Caminhos-de-ferro com sinais de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Caminhos-de-ferro com sinais combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Caminho de ferro com faróis de rota
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Caminho de ferro com faróis de mão única
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Carris com sinais normais e pré-sinais
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Carris com sinais normais e de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Carris com sinais normais e combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Caminho de ferro com obstrução e faróis de rota
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Caminho de ferro com obstrução e faróis de mão única
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Carris com pré-sinais e sinais de saída
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Carris com pré-sinais e sinais combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Linha férrea com pré-sinais e sinais de trajecto
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Linha férrea com pré-sinais e sinais de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Carris com sinais de saída e combinados
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Linha férrea com sinais de saída e de trajecto
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Linha férrea com sinais de saída e de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Linha férrea com conjunto de sinais e sinais de trajecto
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Linha férrea com sinais multi- e de sentido único
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Linha férrea com sinais de trajecto e de sentido único
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}É preciso remover a estação primeiro
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}É preciso remover o ponto de passagem primeiro
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construir uma estação separada
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Construir um ponto de passagem separado
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Juntar estação
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Juntar ponto de passagem
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Deverá remover a estrada primeiro
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trabalhos na estrada em curso
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Trabalhos na estrada em curso
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Seleccionar Ponte de Estrada
 STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... estradas de um sentido não podem ter junções
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Não é possível construir estrada aqui...
@@ -2106,12 +2106,12 @@ STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Não é
 STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Não é possível construir estação de carregamento de camiões...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}Não é possível construir estação de passageiros para eléctricos...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}Não é possível construir estação de carga para eléctricos...
-STR_ROAD_DESCRIPTION_ROAD                                       :Estrada
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Estrada com iluminação
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Estrada com árvores
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depósito de veículos de estrada
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Passagem de nível
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Linha de eléctrico
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Estrada
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Estrada com iluminação
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Estrada com árvores
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depósito de veículos de estrada
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Passagem de nível
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Linha de eléctrico
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Impossível remover estação...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Impossível remover estação...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Impossível remover paragem de eléctricos de passageiros
@@ -2119,12 +2119,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Impossí
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Cidades
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}O edifício deve ser demolido primeiro
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Cidade)
@@ -2137,9 +2137,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Alterar o nome da cidade
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passageiros no último mês: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Correio no último mês: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Mercadoria necessária para o progresso da cidade:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} necessário
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} entregues no mês passado
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Mercadoria necessária para o progresso da cidade:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} necessário
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} entregues no mês passado
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Edifício alto de escritórios
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Edifício de escritórios
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Edifício de apartamentos grande
@@ -2169,7 +2169,7 @@ STR_SUBSIDIES_NONE                                              :{ORANGE}Nenhum
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Serviços já subsidiados:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} de {STATION} para {STATION}{YELLOW} ({COMPANY}{YELLOW}, até {DATE_SHORT})
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} a autoridade local recusa permitir que outro aeroporto seja construído nesta cidade
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} a autoridade local não permite a construção do aeroporto devido à poluição sonora
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} a autoridade local não permite a construção do aeroporto devido à poluição sonora
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Casas de campo
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Casas
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Apartamentos
@@ -2203,7 +2203,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{WHITE}{STRING}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{WHITE}{STRING}{}{YELLOW}Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e a carga usem somente estações da sua empresa.{}Custo: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}{}{YELLOW}Subornar a autoridade local para aumentar a sua avaliação, correndo o risco de uma penalidade severa se apanhado.{}Custo: {CURRENCY}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (em construção)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (em construção)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglu
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipis
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Casa-bule
@@ -2213,17 +2213,17 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Mealheiro
 STR_PLANT_TREE_CAPTION                                          :{WHITE}�rvores
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...árvore já plantada aqui
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Impossível plantar árvore aqui...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...demasiados sinais
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Não pode colocar um sinal aqui...
-STR_SIGN_DEFAULT                                                :Sinal
+STR_DEFAULT_SIGN_NAME                                           :Sinal
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editar texto do sinal
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Não pode alterar o nome do sinal...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Não é possível apagar o sinal...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Escolha um tipo de árvore para plantar
-STR_TREE_NAME_TREES                                             :�rvores
-STR_TREE_NAME_RAINFOREST                                        :Floresta Tropical
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactos
+STR_LAI_TREE_NAME_TREES                                         :�rvores
+STR_LAI_TREE_NAME_RAINFOREST                                    :Floresta Tropical
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactos
 
 ##id 0x3000
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Demasiado perto de outra estação ferroviária
@@ -2240,7 +2240,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Precisa
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Demasiado perto de outro aeroporto
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Precisa de demolir o aeroporto primeiro
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Alterar nome de estação/local de carga
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Alterar nome de estação/local de carga
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Não pode alterar o nome da estação...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Avaliações
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aceita
@@ -2258,10 +2258,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Proeminente
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostrar todos os aviões que têm esta estação nas ordens de serviço
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostrar todos os navios de cujo itinerário esta estação faz parte
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostrar todos os aviões que têm esta estação nas ordens de serviço
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostrar todos os navios de cujo itinerário esta estação faz parte
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}Precisa de demolir a estação de autocarros primeiro
@@ -2282,41 +2282,41 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Alterar
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Mostrar lista de carga aceite
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nome da estação - clique no nome para centrar a visualização na estação
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Seleccionar tamanho/tipo de aeroporto
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Estação ferroviária
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeroporto
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :�rea de carregamento de camiões
-STR_STATION_DESCRIPTION_BUS_STATION                             :Estação de autocarros
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Doca
-STR_STATION_DESCRIPTION_BUOY                                    :Bóia
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Estação ferroviária
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeroporto
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :�rea de carregamento de camiões
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Estação de autocarros
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Doca
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bóia
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bóia no caminho
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...estação muito extensa
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...estações não-uniformes desactivadas
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Manter Ctrl premido para seleccionar mais do que um item
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...estações não-uniformes desactivadas
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Manter Ctrl premido para seleccionar mais do que um item
 
 STR_UNDEFINED                                                   :(frase indefinida)
-STR_STAT_CLASS_DFLT                                             :Estação por defeito
-STR_STAT_CLASS_WAYP                                             :Pontos de passagem
+STR_STATION_CLASS_DFLT                                          :Estação por defeito
+STR_STATION_CLASS_WAYP                                          :Pontos de passagem
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...deverá ser construído na água
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Não é possível construir depósito naval aqui...
-STR_WATER_DESCRIPTION_WATER                                     :�gua
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Costa ou margem
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Depósito naval
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Aqueduto
+STR_LAI_WATER_DESCRIPTION_WATER                                 :�gua
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Costa ou margem
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Depósito naval
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Aqueduto
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Não é possível construir na água
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Precisa de demolir o canal primeiro
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Precisa de demolir o canal primeiro
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Guardar Jogo
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Abrir Jogo
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Guardar
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Eliminar
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Espectador, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} livres
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Não é possível ler unidade
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Falha ao Guardar Jogo{}{STRING}
@@ -2332,12 +2332,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Nome escolhido para guardar o jogo
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Eliminar o jogo guardado seleccionado
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Guardar o jogo actual, usando o nome escolhido
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Gerar novo jogo aleatório
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Carregar mapa de alturas
-STR_SAVE_OSKTITLE                                               :{BLACK}Introduza um nome para o jogo gravado
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Gerar novo jogo aleatório
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Carregar mapa de alturas
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Introduza um nome para o jogo gravado
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} no caminho
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} no caminho
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Mina de Carvão
 STR_INDUSTRY_NAME_POWER_STATION                                 :Central Eléctrica
@@ -2393,23 +2393,23 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Produz:
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Produção no último mês:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% transportado)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrar visualização na localização da indústria
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Custo: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Custo: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Não é possível construir este tipo de indústria aqui...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...a floresta só pode ser plantada acima do nível de neve
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...só pode ser colocado perto das bordas do mapa
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Há outro túnel no caminho
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}O túnel terminaria fora do mapa
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}O túnel terminaria fora do mapa
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Não é possível escavar o terreno para o outro lado do túnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Deverá demolir o túnel primeiro
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Deverá demolir a ponte primeiro
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Não é possível iniciar e finalizar no mesmo ponto
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Extremos da ponte não estão ao mesmo nível
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Ponte muito baixa para o terreno
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Não é possível iniciar e finalizar no mesmo ponto
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Extremos da ponte não estão ao mesmo nível
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Ponte muito baixa para o terreno
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Início e fim devem estar alinhados
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}O sítio não é adequado para a entrada do túnel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensa, Aço
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Vigas, Aço
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Cantilever, Aço
@@ -2420,30 +2420,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Tubular, Aço
 STR_BRIDGE_TUBULAR_SILICON                                      :Tubular, Silício
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Não é possível construir ponte aqui...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Não é possível construir túnel aqui...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Túnel ferroviário
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Túnel de estrada
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ponte ferroviária suspensa em aço
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ponte ferroviária com vigas em aço
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ponte ferroviária cantilever em aço
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Ponte ferroviária suspensa de betão reforçado
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Ponte ferroviária de madeira
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Ponte ferroviária de betão
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ponte de estrada suspensa em aço
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ponte de estrada com vigas em aço
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ponte de estrada cantilever em aço
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Ponte de estrada suspensa de betão reforçado
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Ponte de estrada de madeira
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Ponte de estrada de betão
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Ponte de estrada tubular
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Ponte de estrada tubular
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Túnel ferroviário
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel de estrada
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ponte ferroviária suspensa em aço
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ponte ferroviária com vigas em aço
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ponte ferroviária cantilever em aço
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Ponte ferroviária suspensa de betão reforçado
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ponte ferroviária de madeira
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Ponte ferroviária de betão
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ponte de estrada suspensa em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ponte de estrada com vigas em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ponte de estrada cantilever em aço
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Ponte de estrada suspensa de betão reforçado
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ponte de estrada de madeira
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Ponte de estrada de betão
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Ponte de estrada tubular
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Ponte de estrada tubular
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objecto no caminho
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmissor
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Farol
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sede de Empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmissor
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Farol
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sede de Empresa
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...sede de empresa no caminho
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Terreno propriedade de uma empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Terreno propriedade de uma empresa
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Não é possível comprar esta área de terreno...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...já a possui!
 
@@ -2491,7 +2491,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Estaç
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :Nível de Dificuldade{WHITE}
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Guardar
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Guardar
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Fácil
@@ -2563,8 +2563,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Cores
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cores:
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Empresa
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Presidente
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nome da Empresa
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nome do Presidente
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nome da Empresa
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nome do Presidente
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Não é possível alterar o nome da empresa...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Não é possível alterar o nome do presidente...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanças {BLACK}{COMPANYNUM}
@@ -2589,7 +2589,7 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanço Bancário
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Empréstimo
-STR_MAX_LOAN                                                    :{WHITE}Empréstimo Máximo: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Empréstimo Máximo: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pedir emprestado {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Pagar empréstimo {SKIP}{SKIP}{CURRENCY}
@@ -2598,7 +2598,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Não é
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...não há empréstimo para pagar
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...necessário {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Não é possível pagar empréstimo...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Não é possível ceder capital proveniente de empréstimo bancário...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Não é possível ceder capital proveniente de empréstimo bancário...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Seleccione uma nova cara para o presidente
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Alterar cores dos veículos
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Alterar nome do presidente
@@ -2608,31 +2608,31 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Pagar pa
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Presidente)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Veículos:
-STR_TRAINS                                                      :{WHITE}{COMMA} comboio{P "" s}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} veículo{P "" s} de estrada
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeronave{P "" s}
-STR_SHIPS                                                       :{WHITE}{COMMA} barco{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} comboio{P "" s}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} veículo{P "" s} de estrada
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aeronave{P "" s}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} barco{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nenhum
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENTNAME}{}(Presidente)
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Estamos à procura de uma empresa de transportes para comprar a nossa empresa{}{}Deseja comprar {COMPANY} por {CURRENCY}?
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Não é possível comprar empresa...
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir sede
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construir sede da empresa / ver sede da empresa
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Reconstruir sede da empresa noutro sítio por 1% do valor da empresa
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Reconstruir sede da empresa noutro sítio por 1% do valor da empresa
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Não é possível construir sede da empresa...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Ver sede
-STR_RELOCATE_HQ                                                 :{BLACK}Mover sede
-STR_COMPANY_JOIN                                                :{BLACK}Juntar
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Juntar e jogar por esta empresa
-STR_COMPANY_PASSWORD                                            :{BLACK}Palavra passe
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Usar palavra passe na empresa para prevenir utilizadores não autorizados.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Definir palavra passe da empresa
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Mover sede
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Juntar
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Juntar e jogar por esta empresa
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Palavra passe
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Usar palavra passe na empresa para prevenir utilizadores não autorizados.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Definir palavra passe da empresa
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Não gravar a palavra passe introduzida
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Atribuir nova palavra passe à empresa
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Palavra passe da empresa
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Palavra passe pré-definida da empresa
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Usar a palavra passe desta empresa como pré-definida para novas empresas
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Alternar entre janela grande/pequena
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Palavra passe pré-definida da empresa
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usar a palavra passe desta empresa como pré-definida para novas empresas
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Alternar entre janela grande/pequena
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da empresa: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Comprar 25% de acções
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 25% de acções
@@ -2641,7 +2641,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 2
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Não é possível comprar 25% de acções nesta empresa...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Não é possível vender 25% de acções nesta empresa...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propriedade de {COMPANY})
-STR_PROTECTED                                                   :{WHITE}Esta empresa ainda não troca acções...
+STR_ERROR_PROTECTED                                             :{WHITE}Esta empresa ainda não troca acções...
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Vapor)
@@ -2948,9 +2948,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Não descarreg
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Mudar o comportamento de paragem da ordem realçada
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Mudar o comportamento de carga da ordem realçada
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Mudar o comportamento de descarga da ordem realçada
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Inserir uma ordem avançada
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Inserir uma ordem avançada
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir para o depósito mais próximo
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir para o hangar mais próximo
 STR_ORDER_NEAREST_DEPOT                                         :o mais próximo
@@ -2960,9 +2960,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Serviço ininte
 STR_ORDER_TRAIN_DEPOT                                           :Depósito de comboios
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito para veículos de estrada
 STR_ORDER_SHIP_DEPOT                                            :Depósito para navios
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Vai sempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Serviço caso necessário
@@ -2987,10 +2987,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :é mais que
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :é mais que ou igual a
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :é verdadeiro
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :é falso
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Pula para ordem {COMMA}
-STR_CONDITIONAL_NUM                                             :Pula para ordem {COMMA} quando {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Pula para ordem {COMMA} quando {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Pula para ordem {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Pula para ordem {COMMA} quando {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Pula para ordem {COMMA} quando {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Não viaja
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Viagem (sem programação)
@@ -3013,18 +3013,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Os combo
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltar
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Eliminar
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Ir Para
-STR_REFIT                                                       :{BLACK}Converter
-STR_REFIT_TIP                                                   :{BLACK}Seleccionar o tipo de carga a converter nesta ordem. Pressionar Ctrl e botão-esquerdo do rato para remover a instrução de conversão
-STR_REFIT_ORDER                                                 :(Converter para {STRING})
-STR_REFIT_STOP_ORDER                                            :(Mudar para {STRING} e parar)
-STR_STOP_ORDER                                                  :(Parar)
-STR_TIMETABLE_VIEW                                              :{BLACK}Horário
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Mudar para a vista de horário
-STR_ORDER_VIEW                                                  :{BLACK}Ordens
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Mudar para a vista ordenada
+STR_ORDER_REFIT                                                 :{BLACK}Converter
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Seleccionar o tipo de carga a converter nesta ordem. Pressionar Ctrl e botão-esquerdo do rato para remover a instrução de conversão
+STR_ORDER_REFIT_ORDER                                           :(Converter para {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Mudar para {STRING} e parar)
+STR_ORDER_STOP_ORDER                                            :(Parar)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horário
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Mudar para a vista de horário
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordens
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Mudar para a vista ordenada
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ordens)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fim de Ordens - -
-STR_SERVICE                                                     :{BLACK}Manutenção
+STR_ORDER_SERVICE                                               :{BLACK}Manutenção
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3044,7 +3044,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}veiculo
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}um veiculo a partilhar esta ordem não pode ir a essa estação
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Não é possível mover veículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}A locomotiva traseira seguirá sempre a sua parceira frontal
-STR_CARGO_N_A                                                   :N/D{SKIP}
+STR_QUANTITY_N_A                                                :N/D{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Não é possível encontrar rota para o depósito local
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}dias{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo de serviço: {LTBLUE}{COMMA}%{BLACK}   Último serviço: {LTBLUE}{DATE_LONG}
@@ -3064,10 +3064,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horário
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Muda o espaço de tempo que a ordem seleccionada deve durar
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Apagar o tempo que dura a ordem seleccionada
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Limpar o contador de atraso, para que o veículo passe a estar a horas
-STR_SERVICE_HINT                                                :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Custo: {CURRENCY} Máx. Velocidade: {VELOCITY}{}Capacidade: {CARGO}, {CARGO}{}Custo de circulação: {CURRENCY}/ano
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Custo: {CURRENCY} Máx. Velocidade: {VELOCITY}{}Capacidade: {CARGO}{}Custo de circulação: {CURRENCY}/ano
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Saltar esta ordem a menos que seja necessário manutenção
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Custo: {CURRENCY} Peso: {WEIGHT_S}{}Velocidade: {VELOCITY}  Potência: {POWER}{}Custo de circulação: {CURRENCY}/ano{}Capacidade: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Custo: {CURRENCY} Máx. Velocidade: {VELOCITY}{}Capacidade: {CARGO}, {CARGO}{}Custo de circulação: {CURRENCY}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Custo: {CURRENCY} Máx. Velocidade: {VELOCITY}{}Capacidade: {CARGO}{}Custo de circulação: {CURRENCY}/ano
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Idade: {LTBLUE}{STRING}{BLACK}   Custo de circulação: {LTBLUE}{CURRENCY}/ano
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Máx. velocidade: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potência: {LTBLUE}{POWER}{BLACK} Max. velocidade: {LTBLUE}{VELOCITY}
@@ -3086,24 +3086,24 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Acidentado
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Não é possível inverter a direcção do comboio...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Impossível inverter a direcção do veículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Não é possível virar comboios compostos por unidades múltiplas
-STR_CLEAR_TIME                                                  :{BLACK}Apagar Tempo
-STR_RESET_LATENESS                                              :{BLACK}Apagar Contad. Atraso
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Mudar o nome do ponto de passagem
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Mudar o nome da bóia
-
-STR_TRAIN_STOPPING                                              :{RED}A Parar
-STR_TRAIN_STOPPING_VEL                                          :{RED}A Parar, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Vias férreas incompatíveis
-STR_TRAIN_NO_POWER                                              :{RED}Sem energia
-STR_TRAIN_START_NO_CATENARY                                     :Esta linha não tem catenária, o comboio não pode arrancar
-STR_TRAIN_STUCK                                                 :{ORANGE}Esperando por caminho livre
-
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Não é possível vender um veículo destruído...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Não é possível converter um veículo destruído...
-
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Impossível programar veículo...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Veículos apenas podem esperar em estações.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Este veículo não pára nesta estação.
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Apagar Tempo
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Apagar Contad. Atraso
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Mudar o nome do ponto de passagem
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Mudar o nome da bóia
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}A Parar
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}A Parar, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Vias férreas incompatíveis
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sem energia
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Esta linha não tem catenária, o comboio não pode arrancar
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Esperando por caminho livre
+
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Não é possível vender um veículo destruído...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Não é possível converter um veículo destruído...
+
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Impossível programar veículo...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Veículos apenas podem esperar em estações.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Este veículo não pára nesta estação.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Mudar Tempo
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Este veículo está actualmente a andar a horas
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Este veículo está presentemente atrasado {STRING}
@@ -3117,7 +3117,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Preenche
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...deve estar parado num depósito de veículos de estrada
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Não é possível encontrar o depósito local
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Forçar veículo a dar a volta
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacidade: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacidade: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} veículo{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3130,39 +3130,39 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Não é
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}O barco deverá estar parado no depósito
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Não é possível posicionar bóia aqui...
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Não é possível construir o canal aqui...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Não é possível construir o canal aqui...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Adaptar)
 STR_REFIT_TITLE                                                 :{GOLD}Seleccionar tipo de carga:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacidade: {GOLD}{CARGO}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(adaptável)
+STR_PURCHASE_INFO_REFITTABLE                                    :(adaptável)
 
 ##id 0xA000
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Não é possível construir aeroporto aqui...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Aeronave está em voo
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}A aeronave deverá estar parada no hangar
 
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horário)
 
 ##id 0xB000
-STR_BRIBE_FAILED                                                :{WHITE}A sua tentativa de suborno foi
-STR_BRIBE_FAILED_2                                              :{WHITE}descoberta por um investigador regional
-STR_BUILD_DATE                                                  :{BLACK}Construído: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}A sua tentativa de suborno foi
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}descoberta por um investigador regional
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construído: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Tipo de Estação: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipo de Estação: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Tipo de Estação: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipo de Estação: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Definições NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplicar alterações
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Alternar palete
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Alternar a palete do NewGRF seleccionado.{}Alternar quando os gráficos deste NewGRF aparecerem cor-de-rosa no jogo
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Definir parâmetros
-STR_NEWGRF_FILENAME                                             :{BLACK}Nome do ficheiro: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palete: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar alterações
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alternar palete
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alternar a palete do NewGRF seleccionado.{}Alternar quando os gráficos deste NewGRF aparecerem cor-de-rosa no jogo
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nome do ficheiro: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palete: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Vai alterar um jogo em andamento; o OpenTTD pode terminar abruptamente.{}Tem a certeza que quer continuar?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3185,34 +3185,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de us
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém uma rotina corrompida. As rotinas corrompidas serão assinaladas com um ponto de interrogação (?) vermelho.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém 8 entradas de acção múltipla
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Carregar a predefinição seleccionada
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Guardar
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Guarde a lista como predefinição
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Introduza nome para a predefinição
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Eliminar
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Elimina a predefinição seleccionada
-STR_NEWGRF_ADD                                                  :{BLACK}Adicionar
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Adicionar um ficheiro NewGRF à lista
-STR_NEWGRF_REMOVE                                               :{BLACK}Remover
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Remover o ficheiro NewGRF seleccionado da lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Para Cima
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Mover o ficheiro NewGRF seleccionado para cima na lista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Para Baixo
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Mover o ficheiro NewGRF seleccionado para baixo na lista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Lista dos ficheiros NewGRF instalados. Clique num ficheiro para alterar os seus parâmetros
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parâmetros: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Insira parâmetros do NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}Sem informação disponível
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Carregar a predefinição seleccionada
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Guardar
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Guarde a lista como predefinição
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Introduza nome para a predefinição
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Eliminar
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Elimina a predefinição seleccionada
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Adicionar
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Adicionar um ficheiro NewGRF à lista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Remover
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Remover o ficheiro NewGRF seleccionado da lista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Para Cima
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Mover o ficheiro NewGRF seleccionado para cima na lista
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Para Baixo
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mover o ficheiro NewGRF seleccionado para baixo na lista
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos ficheiros NewGRF instalados. Clique num ficheiro para alterar os seus parâmetros
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parâmetros: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Insira parâmetros do NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Sem informação disponível
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Ficheiros NewGRF disponíveis
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Adicionar à selecção
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Adicionar o ficheiro NewGRF seleccionado à configuração
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Reler ficheiros
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Actualizar a lista de ficheiros NewGRF disponíveis
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Adicionar o ficheiro NewGRF seleccionado à configuração
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Reler ficheiros
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Actualizar a lista de ficheiros NewGRF disponíveis
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Impossível adicionar ficheiro: GRF ID duplicado
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ficheiro correspondente não encontrado
-STR_NEWGRF_DISABLED                                             :{RED}Desactivado
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ficheiro correspondente não encontrado
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivado
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ficheiro correspondente não encontrado (carregado GRF compatível)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}GRF(s) compatíveis carregados para ficheiros ausentes
@@ -3228,7 +3228,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informação de carga para '{1:ENGINE}', é diferente da que consta na lista de veículos. Isto poderá causar problemas ao ser automaticamente renovado/substituído.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' causou um loop infinito no callback de produção.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}O jogo foi salvo numa versão sem suporte a eléctricos. Todos os eléctricos foram removidos.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}O jogo foi salvo numa versão sem suporte a eléctricos. Todos os eléctricos foram removidos.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moeda Modificada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Taxa de troca: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3239,16 +3239,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Mudar p
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Mudar para Euro: {ORANGE}nunca
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Pré-visualizar: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Mudar parâmetro de moeda modificada
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Diminuir a quantidade da sua moeda para uma Libra (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Aumentar a quantidade da sua moeda para uma Libra (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Definir a taxa de câmbio da sua moeda para uma Libra (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Definir o separador para a sua moeda
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Definir o prefixo para a sua moeda
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Definir o sufixo para a sua moeda
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Mudar para Euro mais cedo
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Mudar para Euro mais tarde
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Definir o ano para mudar para Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Libras (£) na sua moeda
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Diminuir a quantidade da sua moeda para uma Libra (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Aumentar a quantidade da sua moeda para uma Libra (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Definir a taxa de câmbio da sua moeda para uma Libra (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Definir o separador para a sua moeda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Definir o prefixo para a sua moeda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Definir o sufixo para a sua moeda
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mudar para Euro mais cedo
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Mudar para Euro mais tarde
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Definir o ano para mudar para Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Libras (£) na sua moeda
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3267,8 +3267,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Barcos
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Aeronaves
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordens partilhadas de {COMMA} veículo{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Mostra todos os veículos que seguem este mesmo trajecto
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordens partilhadas de {COMMA} veículo{P "" s}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Mostra todos os veículos que seguem este mesmo trajecto
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Converter comboio
 STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Reconverter veículo
@@ -3370,39 +3370,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Reconver
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Adaptar barco de mercadorias para um tipo de carga diferente
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Adaptar aeronave para um tipo de carga diferente
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Dirige-se ao depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Dirige-se ao depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Dirige-se ao depósito de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Dirige-se ao hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Dirige-se ao hangar de {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Serviço no depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Serviço no depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Serviço no depósito de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Serviço no hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Serviço no hangar de {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar Comboio
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar Veículo
-STR_CLONE_SHIP                                                  :{BLACK}Clonar Navio
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar Aeronave
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Esta acção criará uma cópia do comboio, incluindo as carruagens. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esta acção criará uma cópia do veículo. Pressione Ctrl enquanto clica, para partilhar as ordens
-STR_CLONE_SHIP_INFO                                             :{BLACK}Esta acção criará uma cópia do navio. Pressione Ctrl enquanto clica, para partilhar as ordens
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esta acção criará uma cópia da aeronave. Pressione Ctrl enquanto clica, para partilhar as ordens
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esta acção criará uma cópia de um comboio, incluindo as carruagens. Clique neste botão e, de seguida, num comboio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esta acção criará uma cópia de um veículo. Clique neste botão e, de seguida, num veículo que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esta acção criará uma cópia de um navio. Clique neste botão e, de seguida, num navio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esta acção criará uma cópia de uma aeronave. Clique neste botão e, de seguida, numa aeronave que se encontre dentro ou fora do hangar. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Dirige-se ao depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Dirige-se ao depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Dirige-se ao depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Dirige-se ao depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Dirige-se ao hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Dirige-se ao hangar de {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Serviço no depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Serviço no depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Serviço no depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Serviço no depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Serviço no hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Serviço no hangar de {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clonar Comboio
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clonar Veículo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonar Navio
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonar Aeronave
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Esta acção criará uma cópia do comboio, incluindo as carruagens. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Esta acção criará uma cópia do veículo. Pressione Ctrl enquanto clica, para partilhar as ordens
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Esta acção criará uma cópia do navio. Pressione Ctrl enquanto clica, para partilhar as ordens
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Esta acção criará uma cópia da aeronave. Pressione Ctrl enquanto clica, para partilhar as ordens
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Esta acção criará uma cópia de um comboio, incluindo as carruagens. Clique neste botão e, de seguida, num comboio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esta acção criará uma cópia de um veículo. Clique neste botão e, de seguida, num veículo que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Esta acção criará uma cópia de um navio. Clique neste botão e, de seguida, num navio que se encontre dentro ou fora do depósito. Pressione Ctrl enquanto clica para partilhar as ordens
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Esta acção criará uma cópia de uma aeronave. Clique neste botão e, de seguida, numa aeronave que se encontre dentro ou fora do hangar. Pressione Ctrl enquanto clica para partilhar as ordens
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Novos Veículos Ferroviários
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Novos comboios para carris electrificados
@@ -3472,38 +3472,38 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Está prestes a vender todos os veículos no depósito. Tem a certeza?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito errado
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipo de depósito errado
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender todos os comboios no depósito
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vender todos os veículos no depósito
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vender todos os navios no depósito
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vender todos os aviões no hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vender todos os comboios no depósito
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vender todos os veículos no depósito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vender todos os navios no depósito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vender todos os aviões no hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obter uma lista de todos os comboios em cujas ordens conste este depósito
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Obter uma lista de todos os veículos em cujas ordens conste este depósito
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Obter uma lista de todos os navios em cujas ordens conste este depósito
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Obter uma lista de todas as aeronaves em cujas ordens conste um hangar deste aeroporto
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Obter uma lista de todos os comboios em cujas ordens conste este depósito
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Obter uma lista de todos os veículos em cujas ordens conste este depósito
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Obter uma lista de todos os navios em cujas ordens conste este depósito
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Obter uma lista de todas as aeronaves em cujas ordens conste um hangar deste aeroporto
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Autosubstituir todos os comboios no depósito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Autosubstituir todos os veículos de estrada no depósito
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Autosubstituir todos os barcos no depósito
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Autosubstituir todas as aeronaves no depósito
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Autosubstituir todos os comboios no depósito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Autosubstituir todos os veículos de estrada no depósito
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Autosubstituir todos os barcos no depósito
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Autosubstituir todas as aeronaves no depósito
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Comboios Disponíveis
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Veículos Disponíveis
-STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos Disponíveis
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aviões Disponíveis
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Comboios Disponíveis
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Veículos Disponíveis
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Barcos Disponíveis
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aviões Disponíveis
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Enviar para Depósito
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar para Depósito
-STR_SEND_SHIP_TO_DEPOT                                          :Enviar para Depósito
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar para Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar para Depósito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar para Depósito
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar para Depósito
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar para Hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Iniciar Subst. de Veículos
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar Subst. de Veículos
-STR_NOT_REPLACING                                               :{BLACK}Não substituindo
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nenhum veículo seleccionado
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Não substituindo
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nenhum veículo seleccionado
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Seleccione o tipo de motor a substituir
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Seleccione o novo tipo de motor para substituir o que seleccionou à esquerda
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Pressione para parar a subsituição do tipo de motor que seleccionou à esquerda
@@ -3515,40 +3515,40 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Forçar
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Trocando: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Alternar entre a janela de substituição de locomotivas e a janela de substituição de vagões
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Veículo não está disponível
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Veículo não está disponível
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Barco não está disponível
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronave não está disponível
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Veículo não está disponível
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Veículo não está disponível
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Barco não está disponível
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aeronave não está disponível
 
-STR_ENGINES                                                     :Locomotivas
-STR_WAGONS                                                      :Vagões
+STR_REPLACE_ENGINES                                             :Locomotivas
+STR_REPLACE_WAGONS                                              :Vagões
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os comboios no depósito
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos no depósito
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os navios no depósito
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Pressione botão esquerdo do rato para imobilizar todas as aeronaves no hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os comboios no depósito
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos no depósito
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os navios no depósito
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Pressione botão esquerdo do rato para imobilizar todas as aeronaves no hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Pressione botão esquerdo do rato para iniciar todos os comboios no depósito
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos de estrada no depósito
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Pressione botão esquerdo do rato para iniciar todos os navios no depósito
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Pressione botão esquerdo do rato para iniciar todas as aeronaves no hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Pressione botão esquerdo do rato para iniciar todos os comboios no depósito
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos de estrada no depósito
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Pressione botão esquerdo do rato para iniciar todos os navios no depósito
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Pressione botão esquerdo do rato para iniciar todas as aeronaves no hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos na lista
-STR_MASS_START_LIST_TIP                                         :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos na lista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Pressione botão esquerdo do rato para imobilizar todos os veículos na lista
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Pressione botão esquerdo do rato para iniciar todos os veículos na lista
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de sinais - {COMMA} Sinais
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Comboios
-STR_ELRAIL_VEHICLES                                             :Comboios eléctricos
-STR_MONORAIL_VEHICLES                                           :Monocarris
-STR_MAGLEV_VEHICLES                                             :Maglevs
+STR_REPLACE_RAIL_VEHICLES                                       :Comboios
+STR_REPLACE_ELRAIL_VEHICLES                                     :Comboios eléctricos
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monocarris
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglevs
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Custo: {GOLD}{CURRENCY}{BLACK} Peso: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocidade: {GOLD}{VELOCITY}{BLACK} Potência: {GOLD}{POWER}
@@ -3575,67 +3575,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Criar
-STR_RANDOM                                                      :{BLACK}Gerar aleatório
-STR_RANDOM_HELP                                                 :{BLACK}Mudar a semente aleatória para a criação do terreno
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Geração do mundo
-STR_RANDOM_SEED                                                 :{BLACK}Semente aleatória:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Clique para inserir uma semente aleatória
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Insira um número aleatório de base
-STR_LAND_GENERATOR                                              :{BLACK}Criação do terreno:
-STR_TREE_PLACER                                                 :{BLACK}Colocação árvores:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotação mapa alt.:
-STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreno:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nível do mar:
-STR_SMOOTHNESS                                                  :{BLACK}Suavidade:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altura linha neve:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Num. de cidades:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Num. de indústrias:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Mover a linha de neve um nível acima
-STR_SNOW_LINE_DOWN                                              :{BLACK}Mover a linha de neve um nível abaixo
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Mudar a altura da linha de neve
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Mudar ano de início
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Aviso de redimensionamento
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Redimensionar muito o mapa não é recomendado. Continuar com a criação?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nome mapa de alt.:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Tamanho: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Criar
+STR_MAPGEN_RANDOM                                               :{BLACK}Gerar aleatório
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Mudar a semente aleatória para a criação do terreno
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Geração do mundo
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Semente aleatória:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Clique para inserir uma semente aleatória
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Insira um número aleatório de base
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Criação do terreno:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Colocação árvores:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotação mapa alt.:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipo de terreno:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nível do mar:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Suavidade:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Altura linha neve:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Num. de cidades:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Num. de indústrias:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Mover a linha de neve um nível acima
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Mover a linha de neve um nível abaixo
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Mudar a altura da linha de neve
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Mudar ano de início
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Aviso de redimensionamento
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Redimensionar muito o mapa não é recomendado. Continuar com a criação?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nome mapa de alt.:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Tamanho: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}A gerar mundo...
 STR_GENERATION_ABORT                                            :{BLACK}Cancelar
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Cancelar criação do mundo
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Quer mesmo cancelar a criação?
-STR_PROGRESS                                                    :{WHITE}{NUM}% completo
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}A gerar mundo
-STR_TREE_GENERATION                                             :{BLACK}A gerar árvores
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Geração inamovível
-STR_CLEARING_TILES                                              :{BLACK}A gerar zonas rochosas e montanhosas
-STR_SETTINGUP_GAME                                              :{BLACK}Definindo jogo
-STR_PREPARING_TILELOOP                                          :{BLACK}A preparar o terreno
-STR_PREPARING_GAME                                              :{BLACK}A preparar jogo
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Esta acção mudou o nível de dificuldade para Personalizado
-STR_SE_FLAT_WORLD                                               :{WHITE}Terra plana
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Criar terra plana
-STR_SE_RANDOM_LAND                                              :{WHITE}Terra aleatória
-STR_SE_NEW_WORLD                                                :{BLACK}Criar novo cenário
-STR_SE_CAPTION                                                  :{WHITE}Tipo de cenário
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Mover altura da terra plana um nível abaixo
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Mover altura da terra plana um nível acima
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Mudar altura da terra plana
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Altura da terra plana:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% completo
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}A gerar mundo
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}A gerar árvores
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Geração inamovível
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}A gerar zonas rochosas e montanhosas
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Definindo jogo
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}A preparar o terreno
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}A preparar jogo
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Esta acção mudou o nível de dificuldade para Personalizado
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Terra plana
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Criar terra plana
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Terra aleatória
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Criar novo cenário
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipo de cenário
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Mover altura da terra plana um nível abaixo
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Mover altura da terra plana um nível acima
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Mudar altura da terra plana
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Altura da terra plana:
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Cantos do mapa:
-STR_NORTHWEST                                                   :{BLACK}Noroeste
-STR_NORTHEAST                                                   :{BLACK}Nordeste
-STR_SOUTHEAST                                                   :{BLACK}Sudeste
-STR_SOUTHWEST                                                   :{BLACK}Sudoeste
-STR_BORDER_FREEFORM                                             :{BLACK}Modo livre
-STR_BORDER_WATER                                                :{BLACK}�gua
-STR_BORDER_RANDOM                                               :{BLACK}Aleatório
-STR_BORDER_RANDOMIZE                                            :{BLACK}Aleatório
-STR_BORDER_MANUAL                                               :{BLACK}Manual
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Cantos do mapa:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Noroeste
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordeste
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sudeste
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sudoeste
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Modo livre
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}�gua
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleatório
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleatório
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
 
 ############ Tooltip measurment
 
@@ -3644,9 +3644,9 @@ STR_MEASURE_AREA                                                :{BLACK}�rea: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Comprimento: {NUM}{}Diferença de altura: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}�rea: {NUM} x {NUM}{}Diferença de altura: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Créditos de Transferência: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...esta estrada é detida pela cidade
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...estrada orientada na direcção incorrecta
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Créditos de Transferência: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...esta estrada é detida pela cidade
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...estrada orientada na direcção incorrecta
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3656,7 +3656,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Todos os Comboios
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Todos os veículos de estrada
 STR_GROUP_ALL_SHIPS                                             :Todos os barcos
@@ -3665,24 +3665,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Comboios sem gr
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Veículos sem grupo
 STR_GROUP_DEFAULT_SHIPS                                         :Barcos sem grupo
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeronaves sem grupo
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Adic. veíc. partilh.
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Remover todos os veículos
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Renomear um grupo
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Impossível criar grupo...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Impossível remover este grupo...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Impossível renomear o grupo...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Não é possível remover todos os veículos deste grupo...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Impossível adicionar o veículo a este grupo...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Impossível adicionar veículos com ordens partilhadas ao grupo...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Impossível criar grupo...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Impossível remover este grupo...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Impossível renomear o grupo...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Não é possível remover todos os veículos deste grupo...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Impossível adicionar o veículo a este grupo...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Impossível adicionar veículos com ordens partilhadas ao grupo...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupos - clique num grupo para listar todos os veículos contidos
-STR_GROUP_CREATE_TIP                                            :{BLACK}Clique para criar um grupo
-STR_GROUP_DELETE_TIP                                            :{BLACK}Remover o grupo seleccionado
-STR_GROUP_RENAME_TIP                                            :{BLACK}Mudar o nome do grupo seleccionado
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Clique para proteger este grupo da autosubstituição global
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos - clique num grupo para listar todos os veículos contidos
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Clique para criar um grupo
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Remover o grupo seleccionado
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Mudar o nome do grupo seleccionado
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Clique para proteger este grupo da autosubstituição global
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3699,7 +3699,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3744,19 +3744,19 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Nome deve ser único
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Nome deve ser único
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Ir para o próximo sinal
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Ir para o sinal anterior
-STR_SIGN_OSKTITLE                                               :{BLACK}Introduza um nome para o sinal
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ir para o próximo sinal
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ir para o sinal anterior
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Introduza um nome para o sinal
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Criar
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospectar
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construir
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Escolha a indústria apropriada desta lista
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Criar
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospectar
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construir
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Escolha a indústria apropriada desta lista
 
 ############ on screen keyboard
 STR_OSK_KEYBOARD_LAYOUT                                         :\1234567890'«qwertyuiop+´asdfghjklçº~<zxcvbnm,.-
@@ -3765,37 +3765,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :|!"#$%&/()=?»Q
 
 ############ AI GUI
 STR_AI_DEBUG                                                    :{WHITE}Depuração da IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nome da IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome da IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recarregar IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Terminar a IA, recarrega o script e reinicia a IA
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}A janela Depuração da IA está disponível apenas para o servidor
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Terminar a IA, recarrega o script e reinicia a IA
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}A janela Depuração da IA está disponível apenas para o servidor
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuração IA
-STR_AI_CHANGE                                                   :{BLACK}Seleccionar IA
-STR_AI_CONFIGURE                                                :{BLACK}Configurar
-STR_AI_CHANGE_TIP                                               :{BLACK}Carregar outra IA
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configurar os parâmetros da IA
-STR_AI_LIST_TIP                                                 :{BLACK}Todas as IAs que serão carregadas no próximo jogo
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Seleccionar IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carregar outra IA
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros da IA
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Todas as IAs que serão carregadas no próximo jogo
 STR_AI_LIST_CAPTION                                             :{WHITE}IAs Disponíveis
-STR_AI_AILIST_TIP                                               :{BLACK}Clique para seleccionar uma IA
-STR_AI_ACCEPT                                                   :{BLACK}Aceitar
-STR_AI_ACCEPT_TIP                                               :{BLACK}Seleccionar IA marcada
-STR_AI_CANCEL                                                   :{BLACK}Cancelar
-STR_AI_CANCEL_TIP                                               :{BLACK}Não mudar a IA
-STR_AI_CLOSE                                                    :{BLACK}Fechar
-STR_AI_RESET                                                    :{BLACK}Repor
-STR_AI_HUMAN_PLAYER                                             :Jogador humano
-STR_AI_RANDOM_AI                                                :IA Aleatória
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para seleccionar uma IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Aceitar
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Seleccionar IA marcada
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar a IA
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fechar
+STR_AI_SETTINGS_RESET                                           :{BLACK}Repor
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Jogador humano
+STR_AI_CONFIG_RANDOM_AI                                         :IA Aleatória
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parâmetros da IA
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versão: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Um dos jogadores computador teve um erro. Por favor relate isto ao autor do jogador com uma imagem da janela de depuramento de erros.
-STR_AI_NO_AI_FOUND                                              :Não foi encontrada IA adequada para carregar.{}Esta IA é um pacote vazio e não fará nada.{}Pode descarregar várias IA através do sistema 'Conteúdo Online'.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versão: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Um dos jogadores computador teve um erro. Por favor relate isto ao autor do jogador com uma imagem da janela de depuramento de erros.
+STR_ERROR_AI_NO_AI_FOUND                                        :Não foi encontrada IA adequada para carregar.{}Esta IA é um pacote vazio e não fará nada.{}Pode descarregar várias IA através do sistema 'Conteúdo Online'.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Limite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Ruído gerado: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Ruído gerado: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3805,6 +3805,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... liga
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... ficheiro não pode ser escrito
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Não foi possível descomprimir o ficheiro descarregado
 
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Encontrar conteúdo em falta online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Verifica se o conteúdo em falta pode ser encontrado online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Encontrar conteúdo em falta online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Verifica se o conteúdo em falta pode ser encontrado online
 ########
diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt
index ef47de63a..a12b0ea06 100644
--- a/src/lang/romanian.txt
+++ b/src/lang/romanian.txt
@@ -118,7 +118,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} de car
 STR_QUANTITY_BATTERIES                                          :{COMMA} bateri{P e i}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plastic
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} bido{P n ane} cu suc
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -208,26 +208,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Alegeti ordinea de sortare ascendenta/descendenta
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Alege criteriul de sortare
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selectează criteriul de filtrare
-STR_SORT_BY                                                     :{BLACK}Ordonează
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Alegeti ordinea de sortare ascendenta/descendenta
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Alege criteriul de sortare
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selectează criteriul de filtrare
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordonează
 STR_BUTTON_LOCATION                                             :{BLACK}Locatie
-STR_QUERY_RENAME                                                :{BLACK}Nume nou
+STR_BUTTON_RENAME                                               :{BLACK}Nume nou
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}ÃŽnchide fereastra
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Titlul ferestrei - trage de aici pentru a muta fereastra
-STR_STICKY_BUTTON                                               :{BLACK}Mark this window as undeletable for the 'Close All Windows' key
-STR_RESIZE_BUTTON                                               :{BLACK}Apasa si trage pentru redimensionarea ferestrei
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Comutator pentru mărimea ferestrei
+STR_TOOLTIP_STICKY                                              :{BLACK}Mark this window as undeletable for the 'Close All Windows' key
+STR_TOOLTIP_RESIZE                                              :{BLACK}Apasa si trage pentru redimensionarea ferestrei
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Comutator pentru mărimea ferestrei
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bara de defilare - defilează în listă sus/jos
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bara de defilare - stanga/dreapta
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolează clădiri, străzi, etc. pe un pătrăţel de teren
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Prestabilit(e)
-STR_QUERY_CANCEL                                                :{BLACK}Anulează
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Prestabilit(e)
+STR_BUTTON_CANCEL                                               :{BLACK}Anulează
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -316,7 +316,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}PlaseazÄ
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Salvează scenariul
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Încarcă scenariu
-STR_MENU_LOAD_HEIGHTMAP                                         :Incarca harta de inaltimi
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Incarca harta de inaltimi
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :IeÅŸire din editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :IeÅŸire din joc
@@ -504,11 +504,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Comutator pentru afişarea graficului pentru marfă
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Afişează detaliile ratingului performanţei
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Afişează detaliile ratingului performanţei
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legenda graficelor
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Clic aici pentru a comuta afişarea informaţiilor despre companie
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Clic aici pentru a comuta afişarea informaţiilor despre companie
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Clasamentul companiilor
@@ -543,16 +543,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Cont cur
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Credite:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Numãrul de vehicule. Include autovehicule, trenuri, nave si aeronave.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Numãrul statiilor. Se numãrã fiecare componentã în cazul unor statii compuse din gãri, aeroporturi, porturi, statii de autobuz, etc.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Profitul vehiculului cu cel mai mic venit (dintre toate vehiculele mai vechi de 2 ani).
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Suma de bani obtinutã în luna cu cel mai mic profit din ultimele 36 de luni.
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Suma de bani obtinutã în luna cu cel mai mare profit din ultimele 36 de luni.
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Numãrul de încãrcãturi transportate în ultimele 12 luni.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tipuri de mãrfuri transportate în ultimele 3 luni.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Balanta curentã
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Ponderea creditelor
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Punctajul total din numãrul maxim posibil
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Numãrul de vehicule. Include autovehicule, trenuri, nave si aeronave.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Numãrul statiilor. Se numãrã fiecare componentã în cazul unor statii compuse din gãri, aeroporturi, porturi, statii de autobuz, etc.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Profitul vehiculului cu cel mai mic venit (dintre toate vehiculele mai vechi de 2 ani).
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Suma de bani obtinutã în luna cu cel mai mic profit din ultimele 36 de luni.
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Suma de bani obtinutã în luna cu cel mai mare profit din ultimele 36 de luni.
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Numãrul de încãrcãturi transportate în ultimele 12 luni.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipuri de mãrfuri transportate în ultimele 3 luni.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Balanta curentã
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Ponderea creditelor
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Punctajul total din numãrul maxim posibil
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Tonomatul cu jazz
@@ -670,8 +670,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}AfiÅŸeaz
 STR_SMALLMAP_CENTER                                             :{BLACK}Centreaza harta mica la pozitia actuala
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Dezactivează toate
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activează toate
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Dezactivează toate
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activează toate
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Re-afişează ultimul mesaj
@@ -682,8 +682,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SALV
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Cronologia mesajelor
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}O listă a celor mai recente mesaje
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}O listă a celor mai recente mesaje
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mesaj
@@ -917,32 +917,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Selectea
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fişier{P "" "e"} lipsă/corupt{P "" e}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Informaţii adiţionale despre setul grafic de bază
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Comutarea in ecran-complet a esuat
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Comutarea in ecran-complet a esuat
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Monedă proprie
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Curs de schimb: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Scadevaloarea Lirei sterline (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Măreşte valoare Lirei sterline (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Setează rata de schimb a Lirei sterline (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Scadevaloarea Lirei sterline (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Măreşte valoare Lirei sterline (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Setează rata de schimb a Lirei sterline (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separator: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Caracterul separator pentru moneda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Caracterul separator pentru moneda
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefix: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Setează prefixul monedei
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Setează prefixul monedei
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufix: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Setează sufixul monedei
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Setează sufixul monedei
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Aderă la Euro: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Aderă la Euro: {ORANGE}niciodată
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Anul în care se schimba în Euro
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Trecerea la Euro - mai devreme
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Trecerea la Euro - mai târziu
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Anul în care se schimba în Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Trecerea la Euro - mai devreme
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Trecerea la Euro - mai târziu
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Previzualizare: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 de Lire sterline (£) în moneda proprie
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 de Lire sterline (£) în moneda proprie
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Schimbă un parametru al monedei proprii
 
 # Difficulty level window
@@ -956,7 +956,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Personal
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Afişează clasamentul celor mai bune punctaje
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Salvează
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Salvează
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Numărul maxim de companii concurente: {ORANGE}{COMMA}
@@ -1022,7 +1022,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :permisivă
 STR_CITY_APPROVAL_TOLERANT                                      :tolerantă
 STR_CITY_APPROVAL_HOSTILE                                       :ostilă
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Această acţiune a setat nivelul de difficultate în "Personalizat"
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Această acţiune a setat nivelul de difficultate în "Personalizat"
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Setari avansate
@@ -1271,7 +1271,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(Nere
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Marimea X a hartii: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Marimea Y a hartii: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Schimbă valoarea setării
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Schimbă valoarea setării
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1313,9 +1313,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}IeÅŸi di
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}IeÅŸire din joc
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Eşti sigur că vrei să abandonezi jocul curent şi să revii în {STRING}?
-STR_YES                                                         :{BLACK}Da
-STR_NO                                                          :{BLACK}Nu
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Eşti sigur că vrei să abandonezi jocul curent şi să revii în {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Da
+STR_QUIT_NO                                                     :{BLACK}Nu
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1331,11 +1331,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Iesire din joc
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Eşti sigur că vrei să renunţi la acest joc?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Esti sigur cã vrei sã renunti la acest scenariu?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Esti sigur cã vrei sã renunti la acest scenariu?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Cheat-uri
-STR_CHEATS_TIP                                                  :{BLACK}Bifa vă indică dacă aţi folosit anterior acest cheat
+STR_CHEATS_TOOLTIP                                              :{BLACK}Bifa vă indică dacă aţi folosit anterior acest cheat
 STR_CHEATS_WARNING                                              :{BLACK}Atenţie! Eşti pe cale să-ţi trădezi colegii de joc! Nu uita că această ruşine va rămâne înregistrată pentru totdeauna!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Măreşte fondurile cu {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Joaca ca, compania: {ORANGE}{COMMA}
@@ -1344,24 +1344,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Tunelel
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construieşte în modul pauză: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Avioanele cu reacţie nu se vor prăbuşi (frecvent) pe aeroporturile mici: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Schimbă peisajul: {ORANGE} {STRING}
-STR_TEMPERATE_LANDSCAPE                                         :peisajul temperat
-STR_SUB_ARCTIC_LANDSCAPE                                        :peisajul sub-arctic
-STR_SUB_TROPICAL_LANDSCAPE                                      :peisajul sub-tropical
-STR_TOYLAND_LANDSCAPE                                           :peisajul 'tara jucãriilor'
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :peisajul temperat
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :peisajul sub-arctic
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :peisajul sub-tropical
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :peisajul 'tara jucãriilor'
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Schimbă data: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activeaza accesul la valorile de productie: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Schemă culori nouă
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Afiseaza schemele generale de culori
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Arata schemele de culori pentru trenuri
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Arata schemele de culori pentru autovehiculele rutiere
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Arata schemele de culori pentru vase
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Arata schemele de culori pentru avioane
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Alege culoarea primară pentru schema selectată
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Alege culoarea secundară pentru schema selectată
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Alege o schemă de culori pentru modificare sau mai multe scheme, folosind Ctrl+clic. Apasă pe căsuţă pentru a comuta schema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Afiseaza schemele generale de culori
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Arata schemele de culori pentru trenuri
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Arata schemele de culori pentru autovehiculele rutiere
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Arata schemele de culori pentru vase
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Arata schemele de culori pentru avioane
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Alege culoarea primară pentru schema selectată
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Alege culoarea secundară pentru schema selectată
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Alege o schemă de culori pentru modificare sau mai multe scheme, folosind Ctrl+clic. Apasă pe căsuţă pentru a comuta schema
 
 STR_LIVERY_DEFAULT                                              :Uniforma standard
 STR_LIVERY_STEAM                                                :Motor cu abur
@@ -1399,19 +1399,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Alege fi
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Poză nouă
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generează poză aleatoare
 STR_FACE_ADVANCED                                               :{BLACK}Avansat
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Selectie avansata a fetei.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selectie avansata a fetei.
 STR_FACE_SIMPLE                                                 :{BLACK}Simplu
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Selectie simplă a fetei.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selectie simplă a fetei.
 STR_FACE_LOAD                                                   :{BLACK}Incarcare
-STR_FACE_LOAD_TIP                                               :{BLACK}Incarca o fata preferata
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Incarca o fata preferata
 STR_FACE_LOAD_DONE                                              :{WHITE}Fata dvs. preferata a fost incarcata din fisierul de configurare al OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Nr. faţă jucător
-STR_FACE_FACECODE_TIP                                           :{BLACK}Vizualizeaza si/sau seteaza numarul fetei pentru jucator
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Vizualizeaza si/sau seteaza numarul fetei pentru jucator
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Vizualizeaza si/sau seteaza numărul fetei pentru jucator
 STR_FACE_FACECODE_SET                                           :{WHITE}Noul cod numeric pentru fata a fost stabilit.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Nu am putut stabili numarul de fata al jucatorului - trebuie sa fie un numar intre 0 si 4.294.967.295!
 STR_FACE_SAVE                                                   :{BLACK}Salveaza
-STR_FACE_SAVE_TIP                                               :{BLACK}Salveaza fata preferata
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Salveaza fata preferata
 STR_FACE_SAVE_DONE                                              :{WHITE}Aceasta fata va fi salvata ca fata preferata în fisierul de configurare al OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}European
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Alege feţe europene
@@ -1419,120 +1419,120 @@ STR_FACE_AFRICAN                                                :{BLACK}African
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Alege feţe africane
 STR_FACE_YES                                                    :Da
 STR_FACE_NO                                                     :Nu
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Permite mustata sau cercei
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Permite mustata sau cercei
 STR_FACE_HAIR                                                   :Par:
-STR_FACE_HAIR_TIP                                               :{BLACK}Schimba parul
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Schimba parul
 STR_FACE_EYEBROWS                                               :Sprancene:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Schimba sprancenele
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Schimba sprancenele
 STR_FACE_EYECOLOUR                                              :Culoare ochi:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Schimba culoarea ochilor
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Schimba culoarea ochilor
 STR_FACE_GLASSES                                                :Ochelari:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Permite ochelari
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Schimba ochelari
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Permite ochelari
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Schimba ochelari
 STR_FACE_NOSE                                                   :Nas:
-STR_FACE_NOSE_TIP                                               :{BLACK}Schimba nasul
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Schimba nasul
 STR_FACE_LIPS                                                   :Buze:
 STR_FACE_MOUSTACHE                                              :Mustata:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Schimba buzele sau mustata
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Schimba buzele sau mustata
 STR_FACE_CHIN                                                   :Barbie:
-STR_FACE_CHIN_TIP                                               :{BLACK}Schimba barbia
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Schimba barbia
 STR_FACE_JACKET                                                 :Haină:
-STR_FACE_JACKET_TIP                                             :{BLACK}Schimbă haina
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Schimbă haina
 STR_FACE_COLLAR                                                 :Guler:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Schimbă gulerul
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Schimbă gulerul
 STR_FACE_TIE                                                    :Cravata:
 STR_FACE_EARRING                                                :Cercei:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Schimba cravata sau cerceii
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Schimba cravata sau cerceii
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multiplayer
-STR_NETWORK_CONNECTION                                          :{BLACK}Conexiune:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Alege între un joc pe internet şi unul în reţea (LAN)
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Numele jucătorului:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Acesta este numele prin care te vor identifica ceilalţi
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nume
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Numele jocului
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clienţi
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clienţi online / Nr. max. clienţi{}Companii online / Nr. max. companii
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Dimensiune harta
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Dimensiunea hartii jocului{}Clic pentru sortarea dupa zona
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Data
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Data curenta
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Ani
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Numbarul de ani{}de cand ruleaza jocul
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Limba, versiunea serverului, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Clic pe un joc din listă pentru a-l selecta
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server-ul la care v-aţi conectat data trecută:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Clic pentru a alege serverul de data trecută
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JOC
-STR_NETWORK_CLIENTS                                             :{SILVER}Clienţi: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Limba: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Tileset: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Marimea hartii: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versiune server: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa serverului: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Data de început: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Data curentă: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Protejat cu parola!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER PLIN
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIUNE DIFERITA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEPOTRIVIRE NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Intră în joc
-STR_NETWORK_REFRESH                                             :{BLACK}Actualizeaza serverul
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Actualizeaza informatiile despre server
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Caută server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Caută un server în reţea
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Adaugă un server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Adaugă un server pe lista care va fi verificată pentru jocuri active
-STR_NETWORK_START_SERVER                                        :{BLACK}Porneste serverul
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Porneste un server propriu
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Introduceţi-vă numele dvs.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Introdu IP-ul serverului
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multiplayer
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Conexiune:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Alege între un joc pe internet şi unul în reţea (LAN)
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+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
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nume
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Numele jocului
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clienţi
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clienţi online / Nr. max. clienţi{}Companii online / Nr. max. companii
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Dimensiune harta
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Dimensiunea hartii jocului{}Clic pentru sortarea dupa zona
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Data
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Data curenta
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Ani
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Numbarul de ani{}de cand ruleaza jocul
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Limba, versiunea serverului, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Clic pe un joc din listă pentru a-l selecta
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Server-ul la care v-aţi conectat data trecută:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Clic pentru a alege serverul de data trecută
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO JOC
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clienţi: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Limba: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Tileset: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Marimea hartii: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versiune server: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adresa serverului: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Data de început: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Data curentă: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Protejat cu parola!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER PLIN
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIUNE DIFERITA
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEPOTRIVIRE NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Intră în joc
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Actualizeaza serverul
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Actualizeaza informatiile 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 pe lista care va fi verificată pentru jocuri active
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Porneste serverul
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Porneste un server propriu
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Introduceţi-vă numele dvs.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Introdu IP-ul serverului
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}ÃŽncepe un joc nou
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nume joc:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Numele jocului va fi afişat celorlalţi jucători în meniul de selectare al jocurilor multiplayer
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Pune parola
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Protejeazã-ti jocul cu o parolã dacã nu vrei sã intre jucãtori neautorizati
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Alege o hartă:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ce hartă doreşti să joci?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generează o hartă aleatoare
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (fă reclamă)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} client{P "" i}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Număr maxim de clienţi:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Alege un număr maxim de clienţi. Nu trebuie ocupate toate locurile.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P ie ii}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Maximum companii:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitează serverul la un anumit număr de companii
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" i}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maxim spectatori:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitează serverul la un anumit număr de spectatori
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Limba vorbită:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Ceilalţi jucători vor şti în ce limbă se discută pe server.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}ÃŽncepe jocul
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Incepe un joc nou in retea cu o harta aleatoare sau intr-un scenariu
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Incarca joc
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Reia un joc multiplayer salvat anterior (asigură-te că s-au conectat jucatorii corespunzători)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Introduceţi un nume pentru joc
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}ÃŽncepe un joc nou
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nume joc:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Numele jocului va fi afişat celorlalţi jucători în meniul de selectare al jocurilor multiplayer
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Pune parola
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Protejeazã-ti jocul cu o parolã dacã nu vrei sã intre jucãtori neautorizati
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Alege o hartă:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Ce hartă doreşti să joci?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generează o hartă aleatoare
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (fă reclamă)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} client{P "" i}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Număr maxim de clienţi:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Alege un număr maxim de clienţi. Nu trebuie ocupate toate locurile.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compan{P ie ii}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Maximum companii:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limitează serverul la un anumit număr de companii
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} spectator{P "" i}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maxim spectatori:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limitează serverul la un anumit număr de spectatori
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Limba vorbită:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Ceilalţi jucători vor şti în ce limbă se discută pe server.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}ÃŽncepe jocul
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Incepe un joc nou in retea cu o harta aleatoare sau intr-un scenariu
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Incarca joc
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Reia un joc multiplayer salvat anterior (asigură-te că s-au conectat jucatorii corespunzători)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Introduceţi un nume pentru joc
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1575,32 +1575,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Letonă
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Chatul jocului multiplayer
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}În pregătire pentru joc: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Lista companiilor din jocul curent. Poti colabora cu o companie sau sa infiintezi una
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO COMPANIE
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Numele companiei: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inaugurarea: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valoarea companiei: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balanţa curentă: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Venituri anul trecut: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performanţa: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehicule: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Staţii: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Jucători: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Companie nouă
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Fondează o companie nouă
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Modul spectator
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Vizionează jocul din poziţia de spectator
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Alătură-te companiei
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Ajută la conducerea acestei companii
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Chatul jocului multiplayer
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}În pregătire pentru joc: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Lista companiilor din jocul curent. Poti colabora cu o companie sau sa infiintezi una
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO COMPANIE
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Numele companiei: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inaugurarea: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valoarea companiei: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balanţa curentă: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Venituri anul trecut: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performanţa: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vehicule: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Staţii: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Jucători: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Companie nouă
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Fondează o companie nouă
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Modul spectator
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Vizionează jocul din poziţia de spectator
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Alătură-te companiei
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Ajută la conducerea acestei companii
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Conectare...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Conectare...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Conectare..
@@ -1616,13 +1616,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Preluare
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} clien{P t ţi} înaintea noastră
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} descărcaţi până acum
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Deconectare
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Deconectare
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server protejat. Introdu parola
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Companie protejata. Introdu parola
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de clienţi
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clienţi
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Observă
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Companie nouă
 
@@ -1644,18 +1644,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduc
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Parola introdusă nu se va salva
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Schimbarea parolei pentru companie
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Parola pentru companie
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Parola implicită pentru companie
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Foloseste implicit parola acestei comanii pentru cele nou create
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Parola implicită pentru companie
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Foloseste implicit parola acestei comanii pentru cele nou create
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Intră
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Intră in joc ca membru al aceste companii
-STR_COMPANY_PASSWORD                                            :{BLACK}Parola
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Protejeaza-ti compania cu o parola pentru a preveni accesul neautorizat.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Alege parola companiei
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Intră
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Intră in joc ca membru al aceste companii
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Parola
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Protejeaza-ti compania cu o parola pentru a preveni accesul neautorizat.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Alege parola companiei
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Trimite
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Trimite
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Team] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Private] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[All] :
@@ -1668,40 +1668,40 @@ STR_NETWORK_CHAT_ALL                                            :[All] {STRING}:
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Introdu textul pentru chat in retea
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Nu am detectat o placă de reţea sau jocul a fost compilat fără ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Nu am găsit niciun joc în reţea
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Serverul nu a răspuns cererii
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Nu m-am putut conecta din cauza unei nepotriviri NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Sincronizarea jocului în reţea a eşuat.
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Conexiunea jocului în reţea a fost întreruptă.
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Nu am reuşit să încarc jocul salvat.
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Nu pot porni serverul.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Nu pot efectua conectarea.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Conexiunea #{NUM} a expirat.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Eroare de protocol. Conexiunea a fost închisă.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Versiunea acestui client este diferită de cea a serverului.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Parolă greşită.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Serverul este plin
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Acessul tău este interzis pe acest server
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Ai fost dat afară din joc
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Cheat-urile nu sunt permise pe acest server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Nu am detectat o placă de reţea sau jocul a fost compilat fără ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Nu am găsit niciun joc în reţea
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Serverul nu a răspuns cererii
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Nu m-am putut conecta din cauza unei nepotriviri NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Sincronizarea jocului în reţea a eşuat.
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Conexiunea jocului în reţea a fost întreruptă.
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Nu am reuşit să încarc jocul salvat.
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Nu pot porni serverul.
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Nu pot efectua conectarea.
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Conexiunea #{NUM} a expirat.
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Eroare de protocol. Conexiunea a fost închisă.
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Versiunea acestui client este diferită de cea a serverului.
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Parolă greşită.
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Serverul este plin
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Acessul tău este interzis pe acest server
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Ai fost dat afară din joc
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheat-urile nu sunt permise pe acest server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :eroare generală
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :eroare de desincronizare
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nu pot încărca harta
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :conexiune pierdută
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :eroare de protocol
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Nepotrivire NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :neautorizat
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :primit pachet ciudat
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :versiune incorectă
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :nume folosit deja
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :parola greşită
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :Id de companie gresit in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :dat afară de pe server
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :a încercat să folosească un cheat
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server plin
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :eroare generală
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :eroare de desincronizare
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :nu pot încărca harta
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :conexiune pierdută
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :eroare de protocol
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Nepotrivire NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :neautorizat
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :primit pachet ciudat
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :versiune incorectă
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :nume folosit deja
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :parola greşită
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :Id de companie gresit in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :dat afară de pe server
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :a încercat să folosească un cheat
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server plin
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1713,36 +1713,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Joc suspendat (
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Joc continuat (client conectat)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Joc continuat (clientul nu a reuşit să se conecteze)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :iese
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} a intrat in joc
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} a intrat în compania #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} a intrat ca spectator
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} a început o companie nouă (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} a ieÅŸit din joc ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} şi-a schimbat numele în {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} a dat companiei tale {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Ai dat {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE}Serverul a inchis conexiunea
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE}Serverul este repornit...{}Va rugam asteptati...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :iese
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} a intrat in joc
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} a intrat în compania #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} a intrat ca spectator
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} a început o companie nouă (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} a ieÅŸit din joc ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} şi-a schimbat numele în {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} a dat companiei tale {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Ai dat {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE}Serverul a inchis conexiunea
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Serverul este repornit...{}Va rugam asteptati...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Descărcare resurse online
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tip
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipul resursei
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipul resursei
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nume
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Numele resursei
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Click pe o linie pentru a vedea detaliile{}Bifează pentru a descărca
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Numele resursei
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Click pe o linie pentru a vedea detaliile{}Bifează pentru a descărca
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Selectează tot
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marchează toate resursele pentru descărcare
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marchează toate resursele pentru descărcare
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Sel. actualizări
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marchează toate resursele care sunt actualizări ale resurselor existente pentru descărcare
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marchează toate resursele care sunt actualizări ale resurselor existente pentru descărcare
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Deselectează tot
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Deselectează toate resursele selectate
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Deselectează toate resursele selectate
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Filtru
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Introduceţi un cuvânt-cheie pentru filtrarea listei
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Introduceţi un cuvânt-cheie pentru filtrarea listei
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filtru nume/etichetă:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Descarcă
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Porneşte descărcarea resurselor selectate
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Porneşte descărcarea resurselor selectate
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total de descărcat: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO RESURSÄ‚
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Această resursă nu a fost selectată pentru descărcare
@@ -1786,17 +1786,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... fiÅŸ
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Fişierul descărcat nu a putut fi decompresat
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Optiuni transparenţă
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Comută transparenţa pentru semnele de statii. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Comută transparenta pentru arbori. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Comută transparenţa pentru case. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Comută transparenţa pentru industrii. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Comuta transparenta pentru construibile, precum statii, depouri, indicatoare si linii electrificate. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Comută transparenţa pentru poduri. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Comută transparenţa pentru structuri gen faruri şi antene. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Comută transparenţa pentru catenar. Ctrl+clic pentru blocare.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Comută transparenţa pentru indicatorii de încarcare. Ctrl-Click pentru blocare.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Seteaza obiectele ca invizibile în loc de transparente
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Optiuni transparenţă
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Comută transparenţa pentru semnele de statii. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Comută transparenta pentru arbori. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Comută transparenţa pentru case. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Comută transparenţa pentru industrii. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Comuta transparenta pentru construibile, precum statii, depouri, indicatoare si linii electrificate. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Comută transparenţa pentru poduri. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Comută transparenţa pentru structuri gen faruri şi antene. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Comută transparenţa pentru catenar. Ctrl+clic pentru blocare.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Comută transparenţa pentru indicatorii de încarcare. Ctrl-Click pentru blocare.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Seteaza obiectele ca invizibile în loc de transparente
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Aria de acoperire
@@ -1808,11 +1808,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Acceptă
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Resurse: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Contopeşte (uneşte) staţia
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construieşte o staţie separată
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Contopeşte (uneşte) staţia
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construieşte o staţie separată
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}UneÅŸte punctul de tranzit
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}ConstruieÅŸte un punct de tranzit separat
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}UneÅŸte punctul de tranzit
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}ConstruieÅŸte un punct de tranzit separat
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Construcţie cale ferată
@@ -1836,8 +1836,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientar
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Alege orientarea depoului
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Punct de tranzit
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Alege tipul de punct de tranzit
+STR_WAYPOINT_CAPTION                                            :{WHITE}Punct de tranzit
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Alege tipul de punct de tranzit
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Alege tipul de gară
@@ -1850,36 +1850,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Alege lu
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Drop
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construieste o statie prin drag & drop
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Alege o clasă de staţii pentru afişare
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Alege tipul de staţie pentru construcţie
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Alege o clasă de staţii pentru afişare
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Alege tipul de staţie pentru construcţie
 
-STR_STAT_CLASS_DFLT                                             :Statie implicitã
-STR_STAT_CLASS_WAYP                                             :Punct itinerar
+STR_STATION_CLASS_DFLT                                          :Statie implicitã
+STR_STATION_CLASS_WAYP                                          :Punct itinerar
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Alegere Semnal
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Semnal standard (semafor){}Acesta este cel mai simplu tip de semnal, permiţând numai unui tren să fie în acelaşi bloc, la un moment dat.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Semnal de intrare (semafor){}Verde, atat timp cat exista unul sau mai multe semnale verzi de iesire din sectiunea urmatoare a caii ferate. Altfel indica rosu.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Semnal de ieşire (semafor){}Se comportă în acelaşi fel ca semnalul normal, dar este necesar pentru declanşarea culorii corecte la presemnalizatoarele de intrari şi combinate.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Semnal combinat (semafor){}Semnalul combinat se comporta atat ca semnal de intrare si iesire. Acest lucru permite constructiile "arborilor" mari de presemnalizare.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Semnal (semafor){}Un semnal va permite trecerea în acelaşi timp în blocurile de semnale a mai multor trenuri, dacă trenurile pot găsi o cale până la un punct sigur pentru oprire pe linie. Semnalele pot fi parcurse îm ambele sensuri.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Semnal de sens unic (semafor){}Un semnal de cale permite trecerea simultană a mai multor trenuri prin blocurile de semnale, dacă trenul poate rezerva o cale până la un punct sigur pentru oprire. Semnalele de sens unic nu pot fi parcurse în sens opus.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Semnal standard (electric){}Semnalele sunt necesare pentru prevenirea deraierii trenurilor pe retele de cai ferate cu mai mult decat un tren.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Semnal de intrare (electric){}Verde atat timp cat exista unul sau mai multe semnale de iesire in sectiunea urmatoare a caii ferate. Altfel indica rosu.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Semnal de ieşire (electric){}Se comporta în acelasi fel ca semnalul normal, dar este necesar pentru declanşarea culorii corecte la intrări şi presemnalizatoare combinate.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Semnal combinat (electric){}Semnalul combinat se comporta atat ca semnalul de intrare si iesire. Acest lucru permite construirea "arborilor" mari de presemnalizare.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Semnal (electric){}Un semnal va permite trecerea în acelaşi timp în blocurile de semnale a mai multor trenuri, dacă trenurile pot găsi o cale până la un punct sigur pentru oprire pe linie. Semnalele pot fi parcurse îm ambele sensuri.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Semnal de sens unic (electric){}Un semnal va permite trecerea în acelaşi timp în blocurile de semnale a mai multor trenuri, dacă trenurile pot găsi o cale până la un punct sigur pentru oprire pe linie. Semnalul de sens unic nu poate fi parcurs în sens opus.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Conversie semnal{}Cand este selectat, click-ul pe un semafor existent îl va converti in tipul si varianta selectată de semnalizare, iar CTRL-click va comuta varianta existenta.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Densitatea semnalelor plasate prin tragerea cu mouse-ul
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Scade densitatea semnalului de tractare
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Mareste densitatea semnalului de tractare
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Alegere Semnal
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Semnal standard (semafor){}Acesta este cel mai simplu tip de semnal, permiţând numai unui tren să fie în acelaşi bloc, la un moment dat.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Semnal de intrare (semafor){}Verde, atat timp cat exista unul sau mai multe semnale verzi de iesire din sectiunea urmatoare a caii ferate. Altfel indica rosu.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Semnal de ieşire (semafor){}Se comportă în acelaşi fel ca semnalul normal, dar este necesar pentru declanşarea culorii corecte la presemnalizatoarele de intrari şi combinate.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Semnal combinat (semafor){}Semnalul combinat se comporta atat ca semnal de intrare si iesire. Acest lucru permite constructiile "arborilor" mari de presemnalizare.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Semnal (semafor){}Un semnal va permite trecerea în acelaşi timp în blocurile de semnale a mai multor trenuri, dacă trenurile pot găsi o cale până la un punct sigur pentru oprire pe linie. Semnalele pot fi parcurse îm ambele sensuri.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Semnal de sens unic (semafor){}Un semnal de cale permite trecerea simultană a mai multor trenuri prin blocurile de semnale, dacă trenul poate rezerva o cale până la un punct sigur pentru oprire. Semnalele de sens unic nu pot fi parcurse în sens opus.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Semnal standard (electric){}Semnalele sunt necesare pentru prevenirea deraierii trenurilor pe retele de cai ferate cu mai mult decat un tren.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Semnal de intrare (electric){}Verde atat timp cat exista unul sau mai multe semnale de iesire in sectiunea urmatoare a caii ferate. Altfel indica rosu.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Semnal de ieşire (electric){}Se comporta în acelasi fel ca semnalul normal, dar este necesar pentru declanşarea culorii corecte la intrări şi presemnalizatoare combinate.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Semnal combinat (electric){}Semnalul combinat se comporta atat ca semnalul de intrare si iesire. Acest lucru permite construirea "arborilor" mari de presemnalizare.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Semnal (electric){}Un semnal va permite trecerea în acelaşi timp în blocurile de semnale a mai multor trenuri, dacă trenurile pot găsi o cale până la un punct sigur pentru oprire pe linie. Semnalele pot fi parcurse îm ambele sensuri.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Semnal de sens unic (electric){}Un semnal va permite trecerea în acelaşi timp în blocurile de semnale a mai multor trenuri, dacă trenurile pot găsi o cale până la un punct sigur pentru oprire pe linie. Semnalul de sens unic nu poate fi parcurs în sens opus.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Conversie semnal{}Cand este selectat, click-ul pe un semafor existent îl va converti in tipul si varianta selectată de semnalizare, iar CTRL-click va comuta varianta existenta.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Densitatea semnalelor plasate prin tragerea cu mouse-ul
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Scade densitatea semnalului de tractare
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Mareste densitatea semnalului de tractare
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Alege podul de cale ferată
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Alege pod rutier
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Alegere pod - clic pe podul selectat pentru a-l construi
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Alegere pod - clic pe podul selectat pentru a-l construi
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensie (oţel)
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Grindă (oţel)
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Arc (oţel)
@@ -1913,9 +1913,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Comută
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientarea autobazei
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Alege orientarea autobazei
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Alege orientarea autobazei
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientarea Depoului de Tramvaie
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Alege orientarea depoului de tramvaie
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Alege orientarea depoului de tramvaie
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orientarea staţiei
@@ -1936,8 +1936,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construi
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}ConstruieÅŸte port
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Amplasează o baliză ce poate fi utilizată pentru direcţionare
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construieste apeduct
-STR_CREATE_LAKE                                                 :{BLACK}Defineşte zona apei.{}Creează un canal, mai puţin când Ctrl este apăsat la nivelul mării, când va inunda, in loc, imprejurimile
-STR_CREATE_RIVER                                                :{BLACK}Amplasează râuri.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Defineşte zona apei.{}Creează un canal, mai puţin când Ctrl este apăsat la nivelul mării, când va inunda, in loc, imprejurimile
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Amplasează râuri.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientarea ÅŸantierului naval
@@ -1969,20 +1969,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeroport
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Aeroporturi centrale
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Heliporturi
 
-STR_STATION_NOISE                                               :{BLACK}Zgomot generat: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Zgomot generat: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Modificare peisaj
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Scade altitudinea unui punct de teren
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Măreşte altitudinea unui punct de teren
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivelează terenul
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Cumpără teren pentru folosire ulterioară
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Scade altitudinea unui punct de teren
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Măreşte altitudinea unui punct de teren
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivelează terenul
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Cumpără teren pentru folosire ulterioară
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Arbori
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Alege specia de arbori de plantat
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Arbori din specii aleatoare
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Planteazã arbori din diverse specii la întâmplare
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Planteazã arbori din diverse specii la întâmplare
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Arbori aleatori
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Plantează aleator arbori pe uscat
 
@@ -1995,9 +1995,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}PlaseazÄ
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Măreşte aria de editare a terenului
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Micşorează aria de editare a terenului
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generează teren aleator
-STR_SE_NEW_WORLD                                                :{BLACK}Creeaza o harta noua
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Creeaza o harta noua
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Resetează peisajul
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Elimina de pe harta toate proprietatile detinute de jucatori
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Elimina de pe harta toate proprietatile detinute de jucatori
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Resetare peisaj
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Esti sigur ca vrei sa elimini toate proprietatile detinute de jucatori?
@@ -2008,41 +2008,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Oras nou
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Construieste un oras nou
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}OraÅŸ aleator
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construieşte un oraş într-o locaţie aleatoare
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mai multe orase aleatoare
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Umple harta cu orase generate aleator
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Mai multe orase aleatoare
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Umple harta cu orase generate aleator
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Mărime oraş:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Mic
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mediu
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Mare
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Aleator
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Aleator
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Alege mărimea oraşului
 STR_FOUND_TOWN_CITY                                             :{BLACK}Metropolă
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Metropolele cresc mai repede decat oraşele{}În funcţie de setări, sunt mai mari când sunt fondate
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Modelul drumului:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Alege modelul de drum folosit pentru acest oraÅŸ
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Îmbunătăţit
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Grilă 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Grilă 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Aleator
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Modelul drumului:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Alege modelul de drum folosit pentru acest oraÅŸ
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Îmbunătăţit
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Grilă 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Grilă 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aleator
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}ConstruieÅŸte un nou obiectiv industrial
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Alege industria potrivită din acestă listă
-STR_MANY_RANDOM_INDUSTRIES                                      :Multe industrii aleatoare
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Umple harta cu industrii generate aleator
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cost: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospecteaza
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construieste
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finanteaza
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Alege industria potrivită din acestă listă
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Multe industrii aleatoare
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Umple harta cu industrii generate aleator
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cost: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospecteaza
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construieste
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finanteaza
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informatii teren
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Costul demolării: {LTBLUE}nu este cazul
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Costul demolării: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Incasari dupa curatare: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Incasari dupa curatare: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :nu este cazul
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Proprietar: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Proprietar al drumului: {LTBLUE}{STRING}
@@ -2050,104 +2050,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Propriet
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Proprietar al căii ferate: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoritatea locală: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :nici una
-STR_LANDINFO_COORDS                                             :{BLACK}Coordonate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Data constructiei: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Clasa statie: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tip statie: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NouGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordonate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Data constructiei: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Clasa statie: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tip statie: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NouGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Încărcături acceptate: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Stânci
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Teren pietros
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Teren viran
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Verdeaţă
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Teren agricol
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Teren înzăpezit
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :DeÅŸert
-
-STR_RAILROAD_TRACK                                              :Cale ferată
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Cale ferată cu semafoare normale
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Cale ferată cu pre-semafoare
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Cale ferată cu semafoare de ieşire
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Cale ferata cu semnale combinate
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Cale ferată cu semnalizare avansată
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Cale ferată cu semnalizare avansată în sens unic
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Cale ferată cu semafoare normale şi pre-semafoare
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Cale ferată cu semafoare normale şi semafoare de ieşire
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Cale ferată cu semnale normale şi combinate
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Cale ferată cu semnalizare normală şi avansată
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Cale ferată cu semnalizare normală şi avansată în sens unic
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Cale ferată cu pre-semafoare şi semafoare de ieşire
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Cale ferata cu pre-semnalizate si cu semnale combinate
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Cale ferată cu pre-semnalizare şi semnalizare avansată
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Cale ferată cu pre-semnalizare şi semnalizare avansată în sens unic
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Cale ferata cu post-semnalizate si cu semnale combinate
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Cale ferată cu post-semnalizare şi semnalizare avansată
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Cale ferată cu post-semnalizare şi semnalizare avansată în sens unic
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Cale ferată cu semnalizare combinată şi avansată
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Cale ferată cu semnalizare combinată şi avansată în sens unic
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Cale ferată cu semnalizare avansată şi avansată în sens unic
-STR_RAILROAD_TRAIN_DEPOT                                        :Depou de cale ferată
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Åžosea
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Stradă iluminată
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Stradă cu copaci pe margine
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Autobază
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Trecere la nivel cu calea ferată
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Şină de tramvai
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Stânci
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Teren pietros
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Teren viran
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Verdeaţă
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Teren agricol
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Teren înzăpezit
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :DeÅŸert
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Cale ferată
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Cale ferată cu semafoare normale
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Cale ferată cu pre-semafoare
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Cale ferată cu semafoare de ieşire
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Cale ferata cu semnale combinate
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Cale ferată cu semnalizare avansată
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Cale ferată cu semnalizare avansată în sens unic
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Cale ferată cu semafoare normale şi pre-semafoare
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Cale ferată cu semafoare normale şi semafoare de ieşire
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Cale ferată cu semnale normale şi combinate
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Cale ferată cu semnalizare normală şi avansată
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Cale ferată cu semnalizare normală şi avansată în sens unic
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Cale ferată cu pre-semafoare şi semafoare de ieşire
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Cale ferata cu pre-semnalizate si cu semnale combinate
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Cale ferată cu pre-semnalizare şi semnalizare avansată
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Cale ferată cu pre-semnalizare şi semnalizare avansată în sens unic
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Cale ferata cu post-semnalizate si cu semnale combinate
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Cale ferată cu post-semnalizare şi semnalizare avansată
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Cale ferată cu post-semnalizare şi semnalizare avansată în sens unic
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Cale ferată cu semnalizare combinată şi avansată
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Cale ferată cu semnalizare combinată şi avansată în sens unic
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Cale ferată cu semnalizare avansată şi avansată în sens unic
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depou de cale ferată
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Åžosea
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Stradă iluminată
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Stradă cu copaci pe margine
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Autobază
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Trecere la nivel cu calea ferată
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Şină de tramvai
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (în construcţie)
-
-STR_TREE_NAME_TREES                                             :Arbori
-STR_TREE_NAME_RAINFOREST                                        :Pădure tropicală
-STR_TREE_NAME_CACTUS_PLANTS                                     :CactuÅŸi
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Gară
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeroport
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Platformă pentru camioane
-STR_STATION_DESCRIPTION_BUS_STATION                             :Staţie de autobuz
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Port
-STR_STATION_DESCRIPTION_BUOY                                    :Baliză
-STR_LANDINFO_WAYPOINT                                           :Haltă de mişcare
-
-STR_WATER_DESCRIPTION_WATER                                     :Apă
-STR_LANDINFO_CANAL                                              :Canal
-STR_LANDINFO_LOCK                                               :Ecluză
-STR_LANDINFO_RIVER                                              :Râu
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Mal/Coastă
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Åžantier naval
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (în construcţie)
+
+STR_LAI_TREE_NAME_TREES                                         :Arbori
+STR_LAI_TREE_NAME_RAINFOREST                                    :Pădure tropicală
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :CactuÅŸi
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Gară
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeroport
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Platformă pentru camioane
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Staţie de autobuz
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Port
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Baliză
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Haltă de mişcare
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Apă
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Ecluză
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Râu
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Mal/Coastă
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Åžantier naval
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Tunel feroviar
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunel rutier
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Tunel feroviar
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunel rutier
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Pod feroviar suspendat din oţel
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Pod feroviar tip grindă din oţel
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Pod feroviar tip arc din oţel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Pod feroviar suspendat din beton
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Pod feroviar din lemn
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Pod feroviar din beton
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Pod feroviar tubular
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Pod feroviar suspendat din oţel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Pod feroviar tip grindă din oţel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Pod feroviar tip arc din oţel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Pod feroviar suspendat din beton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Pod feroviar din lemn
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Pod feroviar din beton
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Pod feroviar tubular
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Pod rutier suspendat din oţel
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Pod rutier tip grindă din oţel
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Pod rutier tip arc din oţel
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Pod rutier suspendat din beton armat
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Pod rutier din lemn
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Pod rutier din beton
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Pod rutier tubular
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Pod rutier suspendat din oţel
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Pod rutier tip grindă din oţel
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Pod rutier tip arc din oţel
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Pod rutier suspendat din beton armat
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Pod rutier din lemn
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Pod rutier din beton
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Pod rutier tubular
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Apeduct
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Apeduct
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmiţător
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Far
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sediu companie
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Teren în proprietatea unei companii
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmiţător
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Far
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sediu companie
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Teren în proprietatea unei companii
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Despre OpenTTD
@@ -2160,7 +2160,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}SalveazÄ
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Încarcă joc
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Salvează scenariu
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Încarcă scenariu
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Încarcă harta înălţimilor
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Încarcă harta înălţimilor
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Click aici pentru a ajunge la directorul predefinit pentru salvari
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} liberi
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Lista de discuri, directoare ÅŸi fiÅŸiere cu jocuri salvate
@@ -2170,119 +2170,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Åžterge
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Salvează
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Salvează cu numele selectat jocul curent
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Introduceţi un nume pentru salvare
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Introduceţi un nume pentru salvare
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generare lume
-STR_MAPSIZE                                                     :{BLACK}Marime harta:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Nr. de orase:
-STR_DATE                                                        :{BLACK}Data:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Nr. de industrii:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Inaltimea zapezii:
-STR_SNOW_LINE_UP                                                :{BLACK}Muta linia zapezii cu un punct in sus
-STR_SNOW_LINE_DOWN                                              :{BLACK}Muta linia zapezii cu un punct in jos
-STR_RANDOM_SEED                                                 :{BLACK}Parametru aleator:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Click pt introducerea unui parametru aleator
-STR_RANDOM                                                      :{BLACK}Aleator
-STR_RANDOM_HELP                                                 :{BLACK}Modifica parametrul aleator folosit la Generarea lumii
-STR_LAND_GENERATOR                                              :{BLACK}Generator de teren:
-STR_TREE_PLACER                                                 :{BLACK}Algoritm arbore:
-STR_TERRAIN_TYPE                                                :{BLACK}Tip teren:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivelul marii:
-STR_SMOOTHNESS                                                  :{BLACK}Netezime:
-STR_GENERATE                                                    :{WHITE}Genereaza
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generare lume
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Marime harta:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Nr. de orase:
+STR_MAPGEN_DATE                                                 :{BLACK}Data:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Nr. de industrii:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Inaltimea zapezii:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Muta linia zapezii cu un punct in sus
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Muta linia zapezii cu un punct in jos
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Parametru aleator:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Click pt introducerea unui parametru aleator
+STR_MAPGEN_RANDOM                                               :{BLACK}Aleator
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Modifica parametrul aleator folosit la Generarea lumii
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generator de teren:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritm arbore:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tip teren:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nivelul marii:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Netezime:
+STR_MAPGEN_GENERATE                                             :{WHITE}Genereaza
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Margine:
-STR_NORTHWEST                                                   :{BLACK}Nord-vest
-STR_NORTHEAST                                                   :{BLACK}Nortd-est
-STR_SOUTHEAST                                                   :{BLACK}Sud-est
-STR_SOUTHWEST                                                   :{BLACK}Sud-vest
-STR_BORDER_FREEFORM                                             :{BLACK}Pământ
-STR_BORDER_WATER                                                :{BLACK}Apă
-STR_BORDER_RANDOM                                               :{BLACK}Aleator
-STR_BORDER_RANDOMIZE                                            :{BLACK}Aleator
-STR_BORDER_MANUAL                                               :{BLACK}Manual
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotatie harta inaltimi:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nume harta inaltimi:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Dimensiune: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Introduceţi o valoare de pornire pentru numerele aleatoare
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Nu pot modifica inaltimea zapezii
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Modifica inceputul anului
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Margine:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nord-vest
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nortd-est
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sud-est
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sud-vest
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Pământ
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Apă
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleator
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleator
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotatie harta inaltimi:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nume harta inaltimi:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Dimensiune: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Introduceţi o valoare de pornire pentru numerele aleatoare
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Nu pot modifica inaltimea zapezii
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Modifica inceputul anului
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Tip harta
-STR_SE_FLAT_WORLD                                               :{WHITE}Teren plat
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Genereaza un teren plat
-STR_SE_RANDOM_LAND                                              :{WHITE}Teren aleator
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Inaltimea terenului plat:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Muta in jos, cu o unitate, inaltimea terenului plan
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Muta in sus, cu o unitate, inaltimea terenului plan
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tip harta
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Teren plat
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Genereaza un teren plat
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Teren aleator
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Inaltimea terenului plat:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Muta in jos, cu o unitate, inaltimea terenului plan
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Muta in sus, cu o unitate, inaltimea terenului plan
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Modifica inaltimea terenului plan
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Modifica inaltimea terenului plan
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Generez lumea...
 STR_GENERATION_ABORT                                            :{BLACK}Anuleaza
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Anuleaza Generarea Lumii
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Sigur doresti sa anulezi generarea?
-STR_PROGRESS                                                    :{WHITE}{NUM}% efectuat
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generare lume
-STR_TREE_GENERATION                                             :{BLACK}Generare arbori
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Generare fixa
-STR_CLEARING_TILES                                              :{BLACK}Generare zona dura si pietroasa
-STR_SETTINGUP_GAME                                              :{BLACK}Fac setarile jocului
-STR_PREPARING_TILELOOP                                          :{BLACK}Initializez ciclul dalelor
-STR_PREPARING_GAME                                              :{BLACK}Pregatesc jocul
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% efectuat
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generare lume
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generare arbori
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Generare fixa
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generare zona dura si pietroasa
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Fac setarile jocului
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Initializez ciclul dalelor
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Pregatesc jocul
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Setări Newgrf
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Incarcă presetarea selectată
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Salvează presetare
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Salvează lista curentă ca presetare
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Introdu un nume presetarii
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Sterge presetarea
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Sterge presetarea selectata
-STR_NEWGRF_ADD                                                  :{BLACK}Adauga
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Adauga un fisier NewGRF in lista
-STR_NEWGRF_REMOVE                                               :{BLACK}Elimina
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Elimina fisierul NewGRF ales din lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Muta Sus
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Muta fisierul NewGRF ales mai sus in lista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Muta Jos
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Muta fisierul NewGRF ales mai jos in lista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}O lista a fisierelor NewGRF instalate. Fa click pe un fisier pt a-i modifica parameterii
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Seteaza parametri
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Comuta paleta
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Schimba paleta la NewGRF ul selectat .{} Efectueaza acest lucru cand graficele din acest NewGRF sunt roz in joc
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplică schimbările
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Caută resursele lipsă online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Verifică dacă resursele care lipsesc pot fi găsite online
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Nume fisier: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametri: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}Nici o informatie disponibila
-STR_NEWGRF_NOT_FOUND                                            :{RED}Nici un fisier potrivit
-STR_NEWGRF_DISABLED                                             :{RED}Dezactivat
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Introdu parametrii NewGRF
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Incarcă presetarea selectată
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Salvează presetare
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Salvează lista curentă ca presetare
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Introdu un nume presetarii
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Sterge presetarea
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Sterge presetarea selectata
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Adauga
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Adauga un fisier NewGRF in lista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Elimina
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Elimina fisierul NewGRF ales din lista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Muta Sus
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Muta fisierul NewGRF ales mai sus in lista
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Muta Jos
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Muta fisierul NewGRF ales mai jos in lista
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}O lista a fisierelor NewGRF instalate. Fa click pe un fisier pt a-i modifica parameterii
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Seteaza parametri
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Comuta paleta
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Schimba paleta la NewGRF ul selectat .{} Efectueaza acest lucru cand graficele din acest NewGRF sunt roz in joc
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplică schimbările
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Caută resursele lipsă online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Verifică dacă resursele care lipsesc pot fi găsite online
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Nume fisier: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametri: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Nici o informatie disponibila
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Nici un fisier potrivit
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Dezactivat
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Introdu parametrii NewGRF
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Fisiere NewGRF disponibile
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Adauga la selectie
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Adauga fisierul NewGRF ales in configuratie
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Redetecteaza fisierele
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Actualizeaza lista de fisiere NewGRF disponibile
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Adauga fisierul NewGRF ales in configuratie
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Redetecteaza fisierele
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Actualizeaza lista de fisiere NewGRF disponibile
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2306,7 +2306,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Conţine multiple intrari "Acţiunea 8"
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Atentie!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Atentie!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Esti pe cale sa faci modificari intr-un joc activ. Aceasta poate destabiliza OpenTTD.{}Esti absolut sigur ca vrei sa faci asta?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nu pot adăuga fişierul: ID GRF duplicat
@@ -2331,10 +2331,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editează textul semnului
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Mergi la semnul urmator
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Mergi la semnul anterior
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Mergi la semnul urmator
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Mergi la semnul anterior
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Introdu un nume pentru semn
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Introdu un nume pentru semn
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}OraÅŸe
@@ -2348,10 +2348,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Populaţia: {ORANGE}{COMMA}{BLACK}  Locuinţe: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Călători luna trecută: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Colete poştale luna trecută: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Transporturi necesare dezvoltării oraşului:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} necesare
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} livrat luna trecută
-STR_NOISE_IN_TOWN                                               :{BLACK}Limita zgomotului în oraş: {ORANGE}{COMMA}{BLACK}  maxim: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Transporturi necesare dezvoltării oraşului:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} necesare
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} livrat luna trecută
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limita zgomotului în oraş: {ORANGE}{COMMA}{BLACK}  maxim: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Mută imaginea pe locaţia oraşului
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Autorit. locală
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Afişează informaţii referitoare la autoritatea locală
@@ -2398,18 +2398,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}- nici una
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Subvenţii acordate la ora actuală:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}- {STRING} de la {STATION} la {STATION}{YELLOW} ({COMPANY}{YELLOW}, până în {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Click pe informatie pentru a centra imaginea pe industrie/oras
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Click pe informatie pentru a centra imaginea pe industrie/oras
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Numele staţiilor - clic pe un nume pentru a centra imaginea pe staţia respectivă
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Ţine apăsat Ctrl pentru a alege mai mult decât un obiect
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Ţine apăsat Ctrl pentru a alege mai mult decât un obiect
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Staţi{P e i}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Nici una -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Alege toate facilităţile
-STR_SELECT_ALL_TYPES                                            :{BLACK}Alege toate tipurile de încãrcãturi (inclusiv încãrcãturile care nu sunt în asteptare)
-STR_NO_WAITING_CARGO                                            :{BLACK}Nu este nici un fel de încărcătură în aşteptare
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Alege toate facilităţile
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Alege toate tipurile de încãrcãturi (inclusiv încãrcãturile care nu sunt în asteptare)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nu este nici un fel de încărcătură în aşteptare
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2440,18 +2440,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Fantastic
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrează imaginea pe locaţia staţiei
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Schimbă numele staţiei
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Afiseaza toate trenurile care opresc in aceasta statie
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Afiseaza toate autovehiculele care opresc in aceasta statie
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Afiseaza toate aeronavele care opresc in aceasta statie
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Afiseaza toate navele care opresc in aceasta statie
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Afiseaza toate trenurile care opresc in aceasta statie
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Afiseaza toate autovehiculele care opresc in aceasta statie
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Afiseaza toate aeronavele care opresc in aceasta statie
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Afiseaza toate navele care opresc in aceasta statie
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Redenumeşte staţia
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Redenumeşte staţia
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrază fereasta principală pe punctul de tranzit
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Schimba numele haltei
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Schimba numele haltei
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrează fereastra principală pe locaţia balizei
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Schimbă numele balizei
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Schimbă numele balizei
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editează numele haltei
 
@@ -2477,7 +2477,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balanţă curentă
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Credite
-STR_MAX_LOAN                                                    :{WHITE}Limită credit: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Limită credit: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Împrumută {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Împrumută o nouă sumă de bani
@@ -2491,10 +2491,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Anul înfiinţării: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Schemă culori:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehicule:
-STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" uri}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} autovehicul{P "" e}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeronav{P ă e}
-STR_SHIPS                                                       :{WHITE}{COMMA} nav{P ã e}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren{P "" uri}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} autovehicul{P "" e}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aeronav{P ă e}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} nav{P ã e}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nici unul
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valoarea companiei: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% deţinute de {COMPANY})
@@ -2502,8 +2502,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Constr. sediu
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Vezi sediul
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construieşte sau arată sediul companiei
-STR_RELOCATE_HQ                                                 :{BLACK}Mută sediu
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Mută sediul companiei (costa 1% din valoarea companiei)
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Mută sediu
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Mută sediul companiei (costa 1% din valoarea companiei)
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Schimbă poza
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Alege o nouă poză a preşedintelui
@@ -2519,17 +2519,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vinde 25
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Cumpără 25% din acţiunile acestei companii
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vinde 25% din acţiunile acestei companii
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Noul nume al companiei
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Noul nume al preÅŸedintelui
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Noul nume al companiei
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Noul nume al preÅŸedintelui
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Căutăm o companie de transport care să preia societatea noastră {}{}Doriţi să cumpăraţi {COMPANY} la preţul de {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrii
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Numele industriilor - clic pe nume pentru focalizarea pe industrie
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrii
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportat)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportat)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Numele industriilor - clic pe nume pentru focalizarea pe industrie
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2565,26 +2565,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}AeronavÄ
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Profit anul acesta: {CURRENCY} (anul trecut: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trenuri disponibile
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehicule disponibile
-STR_AVAILABLE_SHIPS                                             :{BLACK}Nave disponibile
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aeronave disponibile
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Vezi o lista de proiecte disponibile de motoare pentru acest tip de vehicul.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trenuri disponibile
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Vehicule disponibile
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Nave disponibile
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aeronave disponibile
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Vezi o lista de proiecte disponibile de motoare pentru acest tip de vehicul.
 
-STR_MANAGE_LIST                                                 :{BLACK}Gestioneaza lista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Trimite instructiunile tuturor vehiculelor din aceasta lista
-STR_REPLACE_VEHICLES                                            :Inlocuieste vehiculele
-STR_SEND_FOR_SERVICING                                          :Trimite in service
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Gestioneaza lista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Trimite instructiunile tuturor vehiculelor din aceasta lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Inlocuieste vehiculele
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Trimite in service
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Trimite la depou
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Trimite la depou
-STR_SEND_SHIP_TO_DEPOT                                          :Trimite la depou
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Trimite la hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Trimite la depou
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Trimite la depou
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Trimite la depou
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Trimite la hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Click pt oprirea tuturor vehiculelor din listă
-STR_MASS_START_LIST_TIP                                         :{BLACK}Apasa pentru pornirea tuturor vehiclulelor din lista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Click pt oprirea tuturor vehiculelor din listă
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Apasa pentru pornirea tuturor vehiclulelor din lista
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Comenzi sincronizate pentru {COMMA} vehicul{P "" e}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Comenzi sincronizate pentru {COMMA} vehicul{P "" e}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Toate trenurile
@@ -2597,11 +2597,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Vehicule rutier
 STR_GROUP_DEFAULT_SHIPS                                         :Nave negrupate
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeronave negrupate
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupuri - Dă clic pe un grup pentru lista completă a vehiculelor acestuia
-STR_GROUP_CREATE_TIP                                            :{BLACK}Da click pentru a creea un grup
-STR_GROUP_DELETE_TIP                                            :{BLACK}Åžterge grupul selectat
-STR_GROUP_RENAME_TIP                                            :{BLACK}Redenumeste grupul selectat
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Click aici pentru a proteja acest grup de la inlocuirile automate globale
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupuri - Dă clic pe un grup pentru lista completă a vehiculelor acestuia
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Da click pentru a creea un grup
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Åžterge grupul selectat
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Redenumeste grupul selectat
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Click aici pentru a proteja acest grup de la inlocuirile automate globale
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Adauga vehiculele partajate
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Elimina toate vehiculele
@@ -2624,7 +2624,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Viteză:
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Viteza: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Cost de rulare: {GOLD}{CURRENCY}/an
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacitate: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(suportă alte mărfuri)
+STR_PURCHASE_INFO_REFITTABLE                                    :(suportă alte mărfuri)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}An aparitie: {GOLD}{NUM}{BLACK} Durata de viata: {GOLD}{COMMA} years
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Eficienţă max.: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Cost: {GOLD}{CURRENCY}
@@ -2688,17 +2688,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Mută un
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Trage nava aici pentru a o vinde
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Trage aeronava aici pentru a o vinde
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Trage locomotiva aici pentru a vinde întregul tren
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Trage locomotiva aici pentru a vinde întregul tren
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vinde toate trenurile din the depou
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vinde toate autovehiculele din depou
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vinde toate vasele din depou
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vinde toate aeronavele din hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vinde toate trenurile din the depou
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vinde toate autovehiculele din depou
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vinde toate vasele din depou
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vinde toate aeronavele din hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}înlocuieşte automat toate din depou
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}înlocuieşte automat toate autovehiculele din depou
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}înlocuieşte automat toate vasele din depou
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}înlocuieşte automat toate aeronavele din hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}înlocuieşte automat toate din depou
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}înlocuieşte automat toate autovehiculele din depou
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}înlocuieşte automat toate vasele din depou
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}înlocuieşte automat toate aeronavele din hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Vehicule noi
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Autovehicule noi
@@ -2710,35 +2710,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}CumpărÄ
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construieşte o navă nouă
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Cumpără o aeronavă
 
-STR_CLONE_TRAIN                                                 :{BLACK}Clonare tren
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonare vehicul
-STR_CLONE_SHIP                                                  :{BLACK}Clonare navă
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonare aeronavă
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clonare tren
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clonare vehicul
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonare navă
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonare aeronavă
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Acest buton va crea o copie a trenului, cu tot cu vagoane. Apasă acest buton, apoi dă clic pe un tren din interiorul sau exteriorul depoului. Ctrl+clic va împărţi comenzile
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Acest buton va crea o copie a autovehiculului. Apasă acest buton, apoi dă clic pe un autovehicul din interiorul sau afara depoului. Ctrl+clic va împărţi comenzile
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Acest buton va crea o copie a navei. Apasă acest buton, apoi dă clic pe o navă din interiorul sau exteriorul depoului. Ctrl+clic va împărţi comenzile
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Acest buton va crea o copie a aeronavei. Apasă acest buton, apoi dă clic pe o aeronavă din interiorul sau exteriorul hangarului. Ctrl+clic va împărţi comenzile
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Acest buton va crea o copie a trenului, cu tot cu vagoane. Apasă acest buton, apoi dă clic pe un tren din interiorul sau exteriorul depoului. Ctrl+clic va împărţi comenzile
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Acest buton va crea o copie a autovehiculului. Apasă acest buton, apoi dă clic pe un autovehicul din interiorul sau afara depoului. Ctrl+clic va împărţi comenzile
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Acest buton va crea o copie a navei. Apasă acest buton, apoi dă clic pe o navă din interiorul sau exteriorul depoului. Ctrl+clic va împărţi comenzile
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Acest buton va crea o copie a aeronavei. Apasă acest buton, apoi dă clic pe o aeronavă din interiorul sau exteriorul hangarului. Ctrl+clic va împărţi comenzile
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrează imaginea pe locaţia depoului
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrează imaginea pe locaţia acestei autobaze
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrează imaginea pe locaţia şantierului
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrează imaginea pe locaţia hangarului
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obtine o lista ordonata a tuturor trenurilor din depoul actual
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Obtine o lista ordonata a tuturor autovehiculelor din depoul actual
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Obtine o lista ordonata a tuturor vaselor din depoul actual
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Obtine o lista ordonata a tuturor aeronavelor din orice hangar al acestui aeroport
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Obtine o lista ordonata a tuturor trenurilor din depoul actual
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Obtine o lista ordonata a tuturor autovehiculelor din depoul actual
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Obtine o lista ordonata a tuturor vaselor din depoul actual
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Obtine o lista ordonata a tuturor aeronavelor din orice hangar al acestui aeroport
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Click pt oprirea tuturor trenurilor din depou
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Click pt oprirea tuturor autovehiculelor din depou
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Click pt oprirea tuturor vaselor din depou
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Click pt oprirea tuturor aeronavelor din hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Click pt oprirea tuturor trenurilor din depou
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Click pt oprirea tuturor autovehiculelor din depou
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Click pt oprirea tuturor vaselor din depou
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Click pt oprirea tuturor aeronavelor din hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Click pt pornirea tuturor trenurilor din depou
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Click pt pornirea tuturor autovehiculelor din depou
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Click pt pornirea tuturor vaselor din depou
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Click pt pornirea tuturor aeronavelor din hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Click pt pornirea tuturor trenurilor din depou
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Click pt pornirea tuturor autovehiculelor din depou
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Click pt pornirea tuturor vaselor din depou
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Click pt pornirea tuturor aeronavelor din hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Esti pe cale sa vinzi toate vehiculele din depou. Esti sigur?
 
@@ -2752,38 +2752,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :navă
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotivă monoşină
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotivă pernă magnetică
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cost: {CURRENCY} Greutate: {WEIGHT_S}{}Vitezã: {VELOCITY}  Putere: {POWER}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cost: {CURRENCY} Viteză max.: {VELOCITY}{}Capacitate: {CARGO}, {CARGO}{}Mentenanţă: {CURRENCY}/an
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cost: {CURRENCY} Viteză max.: {VELOCITY}{}Capacitate: {CARGO}{}Mentenanţă: {CURRENCY}/an
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {CURRENCY} Greutate: {WEIGHT_S}{}Vitezã: {VELOCITY}  Putere: {POWER}{}Cost de rulare: {CURRENCY}/an{}Capacitate: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY} Viteză max.: {VELOCITY}{}Capacitate: {CARGO}, {CARGO}{}Mentenanţă: {CURRENCY}/an
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY} Viteză max.: {VELOCITY}{}Capacitate: {CARGO}{}Mentenanţă: {CURRENCY}/an
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}ÃŽnlocuieste {STRING}
-STR_VEHICLE_TRAIN                                               :Trenul
-STR_VEHICLE_ROAD_VEHICLE                                        :Autovehicolul
-STR_VEHICLE_SHIP                                                :Nava
-STR_VEHICLE_AIRCRAFT                                            :Aeronava
+STR_REPLACE_VEHICLE_TRAIN                                       :Trenul
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Autovehicolul
+STR_REPLACE_VEHICLE_SHIP                                        :Nava
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeronava
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Alege tipul de motor pentru înlocuire
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Alege noul tip de motor pe care doreşti să-l foloseşti în locul motorului selectat în stânga
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Incepere inlocuire vehicule
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Apasa aici pentru a incepe inlocuirea motorului selectat in stanga cu cel selectat in dreapta
-STR_NOT_REPLACING                                               :{BLACK}Neinlocuire
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nici un vehicul selectat
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Neinlocuire
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nici un vehicul selectat
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Oprire inlocuire vehicule
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Apasa aici pentru oprirea inlocuirii motorului selectat in stanga
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}ÃŽnlocuire: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Comutã între ferestrele de înlocuire motoare si vagoane
-STR_ENGINES                                                     :Motoare
-STR_WAGONS                                                      :Vagoane
+STR_REPLACE_ENGINES                                             :Motoare
+STR_REPLACE_WAGONS                                              :Vagoane
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Alege un tip de cale ferată pentru care să înlocuieşti motoarele
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Arata care va fi  inlocuitorul motorului selectat in stanga
-STR_RAIL_VEHICLES                                               :Vehicule feroviare
-STR_ELRAIL_VEHICLES                                             :Vehicule Electrificate pe Sine
-STR_MONORAIL_VEHICLES                                           :Vehicule Monorail
-STR_MAGLEV_VEHICLES                                             :Vehicule Pernă Magnetică
+STR_REPLACE_RAIL_VEHICLES                                       :Vehicule feroviare
+STR_REPLACE_ELRAIL_VEHICLES                                     :Vehicule Electrificate pe Sine
+STR_REPLACE_MONORAIL_VEHICLES                                   :Vehicule Monorail
+STR_REPLACE_MAGLEV_VEHICLES                                     :Vehicule Pernă Magnetică
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Retragere vagoane: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Fã optiunea de autoînlocuire sã pãstreze identicã lungimea unui tren prin eliminarea vagoanelor (începând din fatã), dacã înlocuirea motorului ar face trenul mai lung.
@@ -2801,10 +2801,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Trimite
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Trimite nava în şantier. Ctrl+clic pentru întreţinere
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Trimite aeronava la hangar. Ctrl+clic pentru întreţinere
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Acest buton va crea o copie a întregului tren. Ctrl+clic a împărţi comenzile
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Acest buton va crea o copie a autovehiculului. Ctrl+clic va împărţi comenzile
-STR_CLONE_SHIP_INFO                                             :{BLACK}Acest buton va crea o copie a navei. Ctrl+clic va împărţi comenzile
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Acest buton va crea o copie a aeronavei. Ctrl+clic va împărţi comenzile
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Acest buton va crea o copie a întregului tren. Ctrl+clic a împărţi comenzile
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Acest buton va crea o copie a autovehiculului. Ctrl+clic va împărţi comenzile
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Acest buton va crea o copie a navei. Ctrl+clic va împărţi comenzile
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Acest buton va crea o copie a aeronavei. Ctrl+clic va împărţi comenzile
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forţează trenul să ignore semnalizarea de oprire
 
@@ -2837,36 +2837,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Pleaca
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Accident!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Defect
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Oprit
-STR_TRAIN_STOPPING                                              :{RED}Oprire
-STR_TRAIN_STOPPING_VEL                                          :{RED}Oprire, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Fara curent
-STR_TRAIN_STUCK                                                 :{ORANGE}Astept cale libera
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Spre {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Spre {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Fără comenzi
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Fără comenzi, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Merge spre {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Merge spre {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Merge la Depoul {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Merge la Depoul {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Merge la Autobaza {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Merge la Autobaza {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Merge la Santierul {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Merge la Santierul {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Merge la Hangarul {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Merge la Hangarul {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service la Depoul {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service la Depoul {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service la Autobaza {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service la Autobaza {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service la Santierul Naval {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service la Santierul Naval {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service la Hangarul {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service la Hangarul {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Oprire
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Oprire, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Fara curent
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Astept cale libera
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Spre {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Spre {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Fără comenzi
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Fără comenzi, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Merge spre {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Merge spre {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Merge la Depoul {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Merge la Depoul {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Merge la Autobaza {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Merge la Autobaza {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Merge la Santierul {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Merge la Santierul {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Merge la Hangarul {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Merge la Hangarul {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Service la Depoul {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Service la Depoul {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Service la Autobaza {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Service la Autobaza {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Service la Santierul Naval {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service la Santierul Naval {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service la Hangarul {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service la Hangarul {STATION}, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalii)
@@ -2879,8 +2879,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}DenumeÅŸ
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Vechime: {LTBLUE}{STRING}{BLACK}   Mentenanţă: {LTBLUE}{CURRENCY}/an
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} an{P "" i} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} an{P "" i} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} an{P "" i} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} an{P "" i} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Viteză max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Greutate: {LTBLUE}{WEIGHT_S} {BLACK}Putere: {LTBLUE}{POWER}{BLACK} Viteză max.: {LTBLUE}{VELOCITY}
@@ -2894,7 +2894,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacita
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacitate: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacitate: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfera Credit: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfera Credit: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalul pentru întreţinere: {LTBLUE}{COMMA}zile{BLACK}   Ultima întreţinere: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalul de service: {LTBLUE}{COMMA}%{BLACK}   Ultimul service: {LTBLUE}{DATE_LONG}
@@ -2910,9 +2910,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}DenumeÅŸ
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Cumpărat: {LTBLUE}{NUM}{BLACK} Valoare: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valoare: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Încãrcãtura totalã (capacitatea) acestui tren:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Gol
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} de la {STATION}
@@ -2927,7 +2927,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}AfiÅŸeaz
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Încãrcãturi
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Afiseazã capacitãtile totale ale trenului, diferentiate pe tip de încãrcãturã
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacitate: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacitate: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Schimbă marfa)
@@ -2951,15 +2951,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Schimbă
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Comenzi)
-STR_TIMETABLE_VIEW                                              :{BLACK}Orar
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Comuta in modul de vizualizare orar
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Orar
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Comuta in modul de vizualizare orar
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Lista de comenzi - clic pe o comandă pentru a o selecta. Ctrl+clic poziţionează ecranul pe staţie
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Sfârşitul comenzilor - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Sfârşitul comenzilor sincronizate - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Sfârşitul comenzilor sincronizate - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Non-stop
@@ -2983,14 +2983,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transferă
 STR_ORDER_DROP_NO_UNLOADING                                     :Nu descărca
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Schimbă comportamentul de descărcare pentru ordinul selectat
 
-STR_REFIT                                                       :{BLACK}Rearanjeaza
-STR_REFIT_TIP                                                   :{BLACK}Alege tipul de marfă pentru rearanjarea în comandă. Ctrl+clic pentru a anula rearanjarea
+STR_ORDER_REFIT                                                 :{BLACK}Rearanjeaza
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Alege tipul de marfă pentru rearanjarea în comandă. Ctrl+clic pentru a anula rearanjarea
 
-STR_SERVICE                                                     :{BLACK}Service
+STR_ORDER_SERVICE                                               :{BLACK}Service
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Todeauna avanseaza
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service daca este nevoie
 STR_ORDER_DROP_HALT_DEPOT                                       :Stop
-STR_SERVICE_HINT                                                :{BLACK}Sari peste aceastã comandã dacã nu este necesar un service
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Sari peste aceastã comandã dacã nu este necesar un service
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Datele vehiculului pe care se bazează
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Procentaj încărcare
@@ -3011,7 +3011,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :este adevărat
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :este fals
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Valoarea cu care se compară
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduceţi valoarea de comparat
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Treci la următoarea
@@ -3025,13 +3025,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Du-te la cel ma
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Du-te la cel mai apropiat hangar
 STR_ORDER_CONDITIONAL                                           :Salt in ordine conditionata
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Adaugă o comandă înaintea celei selectate, sau la sfârşitul listei
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Adaugă o comandă avansată
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Adaugă o comandă avansată
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Arata toate vehiculele care se incadreaza in acest program
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Arata toate vehiculele care se incadreaza in acest program
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Mergi via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Mergi fără oprire via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Mergi via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Mergi fără oprire via {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Service la
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Service non-stop la
@@ -3041,15 +3041,15 @@ STR_ORDER_NEAREST_HANGAR                                        :cel mai apropia
 STR_ORDER_TRAIN_DEPOT                                           :Depou de Trenuri
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Autobază
 STR_ORDER_SHIP_DEPOT                                            :Åžantier Naval
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
-STR_REFIT_ORDER                                                 :(Rearanjeaza in {STRING})
-STR_REFIT_STOP_ORDER                                            :(Modifică pentru {STRING} şi opreşte)
-STR_STOP_ORDER                                                  :(Stop)
+STR_ORDER_REFIT_ORDER                                           :(Rearanjeaza in {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Modifică pentru {STRING} şi opreşte)
+STR_ORDER_STOP_ORDER                                            :(Stop)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Încărcare maximă)
 STR_ORDER_FULL_LOAD_ANY                                         :(Încărcare orice produs)
@@ -3070,16 +3070,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[la capatul apr
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[la mijloc]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[la capătul îndepărtat]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Salt la comanda {COMMA}
-STR_CONDITIONAL_NUM                                             :Salt la comanda {COMMA} cand {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Salt la comanda {COMMA} cand {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Salt la comanda {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Salt la comanda {COMMA} cand {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Salt la comanda {COMMA} cand {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Comenzi eronate)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Orar)
-STR_ORDER_VIEW                                                  :{BLACK}Comenzi
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Schimba la panoul de comenzi
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Comenzi
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Schimba la panoul de comenzi
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Orar - click on an order to highlight it.
 
@@ -3101,10 +3101,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Momentan
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Modifica timpul
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Modifică durata de timp alocată pentru comanda selectată
 
-STR_CLEAR_TIME                                                  :{BLACK}Curata timp
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Curata timp
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Elimina durata de timp pentru comanda selectata
 
-STR_RESET_LATENESS                                              :{BLACK}Reinitializeaza contorul de intarziere
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reinitializeaza contorul de intarziere
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reinitializeaza contorul de intarziere, astfel ca vehiculul sa ajunga la timp
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Auto-completare
@@ -3112,42 +3112,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Complete
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}Depanare IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Numele Inteligenţei Artificiale
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Numele Inteligenţei Artificiale
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Reîncarcă IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Opreşte IA, raîncarcă scriptul, apoi reporneşte IA
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Opreşte IA, raîncarcă scriptul, apoi reporneşte IA
 
-STR_AI_NO_AI_FOUND                                              :Nici o IA potrivită a fost găsită{}Această IA este nefuncţională.{}Poţi descărca IA-uri folsind opţiunea "Resurse online" din meniul principal.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}O Inteligentă Artificială s-a oprit în mod eronat. Raportează această problemă autorului împreună cu o captură de ecran a ferestrei Depanare IA
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Fereastra pentru depanare IA este disponibilă doar serverului
+STR_ERROR_AI_NO_AI_FOUND                                        :Nici o IA potrivită a fost găsită{}Această IA este nefuncţională.{}Poţi descărca IA-uri folsind opţiunea "Resurse online" din meniul principal.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}O Inteligentă Artificială s-a oprit în mod eronat. Raportează această problemă autorului împreună cu o captură de ecran a ferestrei Depanare IA
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Fereastra pentru depanare IA este disponibilă doar serverului
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuraţie IA
-STR_AI_LIST_TIP                                                 :{BLACK}Toate IA care vor fi încărcate la următorul joc
-STR_AI_HUMAN_PLAYER                                             :Jucator uman
-STR_AI_RANDOM_AI                                                :IA aleator
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Toate IA care vor fi încărcate la următorul joc
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Jucator uman
+STR_AI_CONFIG_RANDOM_AI                                         :IA aleator
 
-STR_AI_CHANGE                                                   :{BLACK}Selectează IA
-STR_AI_CHANGE_TIP                                               :{BLACK}Încarcă alt IA
-STR_AI_CONFIGURE                                                :{BLACK}Configurază
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configurează parametrii IA
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Selectează IA
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Încarcă alt IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurază
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurează parametrii IA
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}IA disponibile
-STR_AI_AILIST_TIP                                               :{BLACK}Click pentru a selecta o IA
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Click pentru a selecta o IA
 
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versiune: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versiune: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Acceptă
-STR_AI_ACCEPT_TIP                                               :{BLACK}Select ează IA marcată
-STR_AI_CANCEL                                                   :{BLACK}Anulează
-STR_AI_CANCEL_TIP                                               :{BLACK}Nu schimba IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Acceptă
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select ează IA marcată
+STR_AI_LIST_CANCEL                                              :{BLACK}Anulează
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nu schimba IA
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parametri IA
-STR_AI_CLOSE                                                    :{BLACK}ÃŽnchide
-STR_AI_RESET                                                    :{BLACK}Resetează
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}ÃŽnchide
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetează
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3168,8 +3168,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Cost est
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Venit estimat: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Salvarea se efectueaza încã,{}vã rugãm asteptati pânã se încheie!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Auto-salvarea a esuat
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Salvarea se efectueaza încã,{}vã rugãm asteptati pânã se încheie!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Auto-salvarea a esuat
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Discul nu a putut fi citit
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Salvarea jocului eşuată{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}Ştergerea jocului eşuată
@@ -3180,22 +3180,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :Slavarea a fost
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Fisierul nu poate fi citit
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :Fisierul nu poate fi scris
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Integritatea datelor compromisă
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Jocul a fost salvat într-o versiune fără suport pentru tramvaie. Toate tramvaiele au fost eliminate.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Jocul a fost salvat într-o versiune fără suport pentru tramvaie. Toate tramvaiele au fost eliminate.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generarea hărţii a eşuat...{}...nici o locaţie potrivită pentru oraş
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...în acest scenariu nu există nici un oraş
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generarea hărţii a eşuat...{}...nici o locaţie potrivită pentru oraş
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...în acest scenariu nu există nici un oraş
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nu pot încărca peisajul din PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fisierul lipseste.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nu am reusit conversia tipului de imagine. Introdu un imagine PNG 8 sau 24-bit.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...ceva a mers gresit. Scuze. (probabil fisierul este defect)
+STR_ERROR_PNGMAP                                                :{WHITE}Nu pot încărca peisajul din PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fisierul lipseste.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nu am reusit conversia tipului de imagine. Introdu un imagine PNG 8 sau 24-bit.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...ceva a mers gresit. Scuze. (probabil fisierul este defect)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Nu pot încărca peisajul din BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nu am putut converti tipul de imagine.
+STR_ERROR_BMPMAP                                                :{WHITE}Nu pot încărca peisajul din BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nu am putut converti tipul de imagine.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Avertisment de scala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Redimensionarea excesiva a hartii nu este recomandata. Continui cu generarea?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Avertisment de scala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Redimensionarea excesiva a hartii nu este recomandata. Continui cu generarea?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Imagine salvată cu succes pe disc în fişierul '{STRING}'
@@ -3218,15 +3218,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...locaÅ
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...deja construit
 STR_ERROR_OWNED_BY                                              :{WHITE}...apartine companiei {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...terenul se află în proprietatea altei companii
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Numele trebuie să fie unic
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} în cale
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Numele trebuie să fie unic
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} în cale
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}Autorităţile locale din {TOWN} refuză să permită această acţiune
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Autoritatea locală din {TOWN} refuză să permită construirea unui nou aeroport în acest oraş
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}Autoritatea locală din {TOWN} nu permite construirea unui nou aeroport datorită poluării fonice
-STR_BRIBE_FAILED                                                :{WHITE}ÃŽncercarea ta de mituire
-STR_BRIBE_FAILED_2                                              :{WHITE}a fost descoperită de un procuror local
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}Autoritatea locală din {TOWN} nu permite construirea unui nou aeroport datorită poluării fonice
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}ÃŽncercarea ta de mituire
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}a fost descoperită de un procuror local
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Nu se poate înălţa terenul...
@@ -3235,7 +3235,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Terenul
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Săpăturile ar afecta tunelul
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Deja la nivelul mării
 STR_ERROR_TOO_HIGH                                              :{WHITE}Prea înalt
-STR_ALREADY_LEVELLED                                            :{WHITE}... este deja plat
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... este deja plat
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Nu se poate schimba numele companiei...
@@ -3246,29 +3246,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nu mai p
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...nu ai nici un credit de plătit
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...ai nevoie de {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nu poţi plăti creditul...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nu poţi dona din banii împrumutaţi de la bancă...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Nu poţi dona din banii împrumutaţi de la bancă...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Nu se poate cumpăra compania...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nu se poate construi sediul companiei...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Nu se pot cumpăra 25% din acţiunile acestei companii...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Nu se pot vinde 25% din acţiunile acestei companii...
-STR_PROTECTED                                                   :{WHITE}Această companie încă nu vinde acţiuni...
+STR_ERROR_PROTECTED                                             :{WHITE}Această companie încă nu vinde acţiuni...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nu pot construi nici un oras
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nu pot construi nici un oras
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Nu se poate redenumi oraÅŸul...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Nu se poate construi un oraÅŸ aici...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...prea aproape de marginea hărţii
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...prea aproape de alt oras
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...prea multe oraÅŸe
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nu mai este loc pe hartă
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Oraşul nu va construi drumuri. Poţi activa construirea drumurilor via Setari avansate -> Economie -> Oraşe
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Lucrari la drum in curs de desfasurare
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...nu mai este loc pe hartă
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Oraşul nu va construi drumuri. Poţi activa construirea drumurilor via Setari avansate -> Economie -> Oraşe
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Lucrari la drum in curs de desfasurare
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nu pot genera industrii...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nu pot genera industrii...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Nu se poate construi {STRING} aici...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Acest tip de industrie nu se poate construi aici...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...prea aproape de altă industrie
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...prea aproape de altă industrie
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}...mai întâi trebuie creat un oraş
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}...un singur obiectiv de acest tip este permis într-un oraş
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...Se poate construi doar în oraşe cu populaţia de cel puţin 1200
@@ -3289,7 +3289,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Nu se po
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Este adiacentă mai multor staţii
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...staţie prea mare
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...staţiile neuniforme nu sunt permise
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...staţiile neuniforme nu sunt permise
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Prea multe staţii
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Staţia are prea multe componente
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Prea multe staţii de autobuz
@@ -3299,12 +3299,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Prea apr
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Prea aproape de alt port
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Prea aproape de alt aeroport
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Nu se poate redenumi staţia...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...drum in proprietatea orasului
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...drum orientat in directia gresita
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...drum in proprietatea orasului
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...drum orientat in directia gresita
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nu pot demola o parte din statie...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Trebuie mai intai sa demolati gara
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nu pot demola o parte din statie...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Trebuie mai intai sa demolati gara
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nu pot elimina statia de autobus...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nu pot elimina statia de camioane...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nu pot înlătura staţia de tramvai...
@@ -3322,14 +3322,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Mai înt
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}UneÅŸte mai multe puncte de tranzit
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Prea aproape de alt punct de tranzit
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Nu se poate plasa o haltă aici...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Nu se poate plasa o haltă aici...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Nu se poate amplasa baliză aici...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nu pot schimba numele haltei...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nu pot schimba numele haltei...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Nu se poate desfiinţa halta de aici...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Trebuie îndepărtat punctul de tranzit feroviar mai intai
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Nu se poate desfiinţa halta de aici...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Trebuie îndepărtat punctul de tranzit feroviar mai intai
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...baliză în cale
-STR_BUOY_IS_IN_USE                                              :{WHITE}... baliza in uz!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... baliza in uz!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Nu se poate construi depou feroviar aici...
@@ -3346,14 +3346,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Trenuril
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren prea lung
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Nu se poate inversa direcţia vehiculului...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nu se pot întoarce vehiculele alcătuite din mai multe unităţi
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipuri de sine incompatibile
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Tipuri de sine incompatibile
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nu se poate muta vehiculul...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Al doilea vagon+motor va avea mereu aceeasi destinatie ca si primul
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nu se poate găsi un drum spre un depou apropiat
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nu pot găsi o autobază apropiată
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tip incorect de depou
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tip incorect de depou
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} este prea lung după înlocuire
@@ -3364,14 +3364,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(fonduri limita
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Combinaţie de linii imposibilă
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Cale ferată nepotrivită
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Mai întâi trebuie înlăturată calea ferată
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Drum cu sens unic sau blocat
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Drum cu sens unic sau blocat
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Nu se pot plasa semafoare aici...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Nu se poate construi cale ferată aici...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Nu se poate înlătura calea ferată...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Nu se pot înlătura semafoarele de aici...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Nu se pot transforma semnalele...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Nu se pot transforma semnalele...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Nu pot converti linia aici...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Nu pot converti linia aici...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Mai întâi trebuie înlăturată şoseaua
@@ -3382,13 +3382,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Nu se po
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}Nu pot înlătura şina de tramvai de aici...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Nu pot construi un canal aici...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Nu se poate construi o ecluză aici...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Nu pot plasa râuri aici...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Nu pot construi un canal aici...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Nu se poate construi o ecluză aici...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Nu pot plasa râuri aici...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...trebuie construit pe apă
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Nu se poate construi pe apă
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Trebuie sa demolezi canalul inainte
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Nu pot construi apeductul aici...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Trebuie sa demolezi canalul inainte
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Nu pot construi apeductul aici...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...sunt deja plantaţi arbori
@@ -3397,9 +3397,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Nu se po
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Nu se poate construi pod aici...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Mai întâi trebuie demolat podul
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Cele două capete nu se pot situa în acelaşi loc
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Capetele podului nu sunt la acelasi nivel
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Podul este prea jos pentru terenul corespunzator
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Cele două capete nu se pot situa în acelaşi loc
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Capetele podului nu sunt la acelasi nivel
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Podul este prea jos pentru terenul corespunzator
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Cele două capete trebuie să se situeze în linie
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...ambele capete ale podului trebuie să se situeze pe uscat
 
@@ -3408,7 +3408,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Nu se po
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Loc nepotrivit pentru intrarea într-un tunel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Mai întâi trebuie demolat tunelul
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Intersectare cu alt tunel
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunelul ar ieşi din hartă
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunelul ar ieşi din hartă
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Terenul de la celălalt capăt al tunelului este imposibil de excavat
 
 # Unmovable related errors
@@ -3418,12 +3418,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Nu poţi
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...este deja în proprietatea ta!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nu pot crea grup...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nu pot ÅŸterge grup...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nu pot redenumi grupul...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nu pot elimina toate vehiculele din acest grup...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nu pot adauga vehiculul in acest grup...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nu pot adauga vehicule partajate in grup...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nu pot crea grup...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nu pot ÅŸterge grup...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nu pot redenumi grupul...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nu pot elimina toate vehiculele din acest grup...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nu pot adauga vehiculul in acest grup...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nu pot adauga vehicule partajate in grup...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tren în drum
@@ -3466,21 +3466,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}Nu se po
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}Nu pot vinde nava...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}Nu se poate vinde aeronava...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehiculul nu este disponibil
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehiculul nu este disponibil
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Vasul nu este disponibil
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronava nu este disponibilă
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehiculul nu este disponibil
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehiculul nu este disponibil
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Vasul nu este disponibil
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aeronava nu este disponibilă
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Prea multe vehicule în joc
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nu se poate schimba intervalul de întreţinere...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Vehiculul distrus nu poate fi vandut...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nu putem repara vehiculele distruse...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Vehiculul distrus nu poate fi vandut...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nu putem repara vehiculele distruse...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}Nu se poate permite trenului să treacă în caz de pericol...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nu se poate schimba sensul de mers al trenului...
-STR_TRAIN_START_NO_CATENARY                                     :Aceasta sina nu este electrificata, deci trenul nu poate porni
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Aceasta sina nu este electrificata, deci trenul nu poate porni
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Vehicolul nu poate întoarce la 180 de grade...
 
@@ -3499,14 +3499,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}vehicolu
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vehicolul nu poate ajunge la acea staţie
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un vehicol care are acest ordin nu poate ajunge la acea staţie
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nu se poate trece la comenzi sincronizate...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nu pot copia lista de comenzi...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nu se poate trece la comenzi sincronizate...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nu pot copia lista de comenzi...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...prea departe de destinaţia precedentă
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Nu pot programa vehiculul...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vehiculele pot astepta numai in statii.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Acest vehicul nu are oprire în această staţie.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Nu pot programa vehiculul...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vehiculele pot astepta numai in statii.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Acest vehicul nu are oprire în această staţie.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...prea multe semne
@@ -3896,35 +3896,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Baliza
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Baliza #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Baliza
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Baliza #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Companie {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Grup {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :Halta {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Halta {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Halta {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Halta {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :statie necunoscuta
-STR_SIGN_DEFAULT                                                :Semn
+STR_DEFAULT_SIGN_NAME                                           :Semn
 STR_COMPANY_SOMEONE                                             :cineva{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Spectator, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Spectator, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3942,7 +3942,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3956,25 +3956,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/russian.txt b/src/lang/russian.txt
index e475c3dba..a210e73b0 100644
--- a/src/lang/russian.txt
+++ b/src/lang/russian.txt
@@ -244,7 +244,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} ири
 STR_QUANTITY_BATTERIES                                          :{COMMA} батаре{P йка йки ек}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} пла�тика
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} бан{P ка ки ок} газировки
-STR_CARGO_N_A                                                   :от�ут�твует{SKIP}
+STR_QUANTITY_N_A                                                :от�ут�твует{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -334,26 +334,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} м³
 STR_UNITS_FORCE_SI                                              :{COMMA} к�
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Смена направлени� �ортировки (убывание/возра�тание)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Смена критери� �ортировки
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Выберите фильтр
-STR_SORT_BY                                                     :{BLACK}Сортировка
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Смена направлени� �ортировки (убывание/возра�тание)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Смена критери� �ортировки
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Выберите фильтр
+STR_BUTTON_SORT_BY                                              :{BLACK}Сортировка
 STR_BUTTON_LOCATION                                             :{BLACK}Обзор
-STR_QUERY_RENAME                                                :{BLACK}Переимен.
+STR_BUTTON_RENAME                                               :{BLACK}Переимен.
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Закрыть окно
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Заголовок окна - дл� перемещени� окна тащить за него
-STR_STICKY_BUTTON                                               :{BLACK}Игнорировать нажати� клавиши «Закрыть в�е окна»
-STR_RESIZE_BUTTON                                               :{BLACK}�ажмите и тащите дл� изменени� размера окна
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Большое/маленькое окно
+STR_TOOLTIP_STICKY                                              :{BLACK}Игнорировать нажати� клавиши «Закрыть в�е окна»
+STR_TOOLTIP_RESIZE                                              :{BLACK}�ажмите и тащите дл� изменени� размера окна
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Большое/маленькое окно
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Прокрутка вверх/вниз
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Прокрутка  влево/вправо
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Полна� очи�тка пр�моугольного уча�тка земли
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}По умолчанию
-STR_QUERY_CANCEL                                                :{BLACK}Отмена
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}По умолчанию
+STR_BUTTON_CANCEL                                               :{BLACK}Отмена
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -442,7 +442,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}У�та
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Сохранить �ценарий
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Загрузить �ценарий
-STR_MENU_LOAD_HEIGHTMAP                                         :Загрузить карту вы�от
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Загрузить карту вы�от
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Выйти из редактора
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Выход
@@ -642,11 +642,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Включить/выключить отображение груза на графике
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Показать �о�тавл�ющие ча�ти рейтинга
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Показать �о�тавл�ющие ча�ти рейтинга
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Легенда
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Включить/выключить отображение компании на графике
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Включить/выключить отображение компании на графике
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Сравнительна� таблица компаний
@@ -681,16 +681,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}День
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Займ:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}В�его:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Общее количе�тво тран�портных �ред�тв
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Чи�ло ча�тей �танции. Кажда� ча�ть �танции (т.е. ЖД �танции, о�тановки, а�ропорт) под�читана, даже е�ли они �в�заны как одна �танци�
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Прибыль тран�порта � �амым низким доходом (из в�ех тран�портных �ред�тв �тарше 2х лет)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Доход в ме��це � наименьшей прибылью (за по�ледние 12 кварталов)
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Доход в ме��це � наибольшей прибылью (за по�ледние 12 кварталов)
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Кол-во груза, до�тавленного за по�ледние 4 квартала
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Количе�тво типов груза, до�тавленного за по�ледний квартал
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Количе�тво денег на банков�ком �чету компании
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Размер ��уды, полученной �той компанией в банке
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}В�его пунктов из общего количе�тва возможных
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Общее количе�тво тран�портных �ред�тв
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Чи�ло ча�тей �танции. Кажда� ча�ть �танции (т.е. ЖД �танции, о�тановки, а�ропорт) под�читана, даже е�ли они �в�заны как одна �танци�
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Прибыль тран�порта � �амым низким доходом (из в�ех тран�портных �ред�тв �тарше 2х лет)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Доход в ме��це � наименьшей прибылью (за по�ледние 12 кварталов)
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Доход в ме��це � наибольшей прибылью (за по�ледние 12 кварталов)
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Кол-во груза, до�тавленного за по�ледние 4 квартала
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Количе�тво типов груза, до�тавленного за по�ледний квартал
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Количе�тво денег на банков�ком �чету компании
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Размер ��уды, полученной �той компанией в банке
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}В�его пунктов из общего количе�тва возможных
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Музыкальный автомат
@@ -815,8 +815,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Вклю
 STR_SMALLMAP_CENTER                                             :{BLACK}Центрировать миникарту по �той позиции
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Выключить в�е
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Включить в�е
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Выключить в�е
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Включить в�е
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Показать по�леднее �ообщение или ново�ть
@@ -827,8 +827,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  СО
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}И�тори� �ообщений
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Спи�ок недавних ново�тей
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Спи�ок недавних ново�тей
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Сообщение
@@ -1062,32 +1062,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Выбр
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} от�ут�твующи{P й х х}/повреждённы{P й х х} файл{P "" а ов}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Дополнительна� информаци� о базовом наборе графики
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}Сбой полно�кранного режима
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Сбой полно�кранного режима
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Сво� валюта
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Обменный кур�: {ORANGE}{0:CURRENCY} = £{1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Повы�ить кур� вашей валюты по отношению к фунту (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Понизить кур� вашей валюты по отношению к фунту (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}У�тановить кур� вашей валюты по отношению к фунту (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Повы�ить кур� вашей валюты по отношению к фунту (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Понизить кур� вашей валюты по отношению к фунту (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}У�тановить кур� вашей валюты по отношению к фунту (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Разделитель: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}У�тановить разделитель ты��ч
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}У�тановить разделитель ты��ч
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Префик�: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}У�тановить префик� вашей валюты
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}У�тановить префик� вашей валюты
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Суффик�: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}У�тановить �уффик� вашей валюты
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}У�тановить �уффик� вашей валюты
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Переход на евро: {ORANGE}� {5:NUM} года
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Переход на евро: {ORANGE}никогда
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}У�тановить год перехода на евро
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Перейти на евро раньше
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Перейти на евро позже
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}У�тановить год перехода на евро
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Перейти на евро раньше
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Перейти на евро позже
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Образец: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 англ. фунтов (£) в вашей валюте
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 англ. фунтов (£) в вашей валюте
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Изменить параметр валюты
 
 # Difficulty level window
@@ -1105,7 +1105,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM.f                                   :{BLACK}поль
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Показать таблицу рекордов
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Сохранить
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Сохранить
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Мак�имальное количе�тво конкурентов: {ORANGE}{COMMA}
@@ -1175,7 +1175,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :ДозволÑ�Ñ
 STR_CITY_APPROVAL_TOLERANT                                      :Терпимое
 STR_CITY_APPROVAL_HOSTILE                                       :Враждебное
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ваши дей�тви� �менили уровень �ложно�ти на пользователь�кий
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Ваши дей�тви� �менили уровень �ложно�ти на пользователь�кий
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Ра�ширенные на�тройки
@@ -1424,7 +1424,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(�е
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Горизонтальный размер карты: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Вертикальный размер карты: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Изменить значение
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Изменить значение
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1466,9 +1466,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Выйт
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Выход
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Вы уверены, что хотите прервать игру и вернуть�� в {STRING}?
-STR_YES                                                         :{BLACK}Да
-STR_NO                                                          :{BLACK}�ет
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Вы уверены, что хотите прервать игру и вернуть�� в {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Да
+STR_QUIT_NO                                                     :{BLACK}�ет
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1484,11 +1484,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}В главное меню
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Вы дей�твительно хотите выйти из игры?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Вы уверены, что хотите выйти из �того �ценари�?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Вы уверены, что хотите выйти из �того �ценари�?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}ЧИТЫ
-STR_CHEATS_TIP                                                  :{BLACK}Галочка показывает, и�пользовали ли Вы �тот ЧИТ раньше
+STR_CHEATS_TOOLTIP                                              :{BLACK}Галочка показывает, и�пользовали ли Вы �тот ЧИТ раньше
 STR_CHEATS_WARNING                                              :{BLACK}Внимание, вы �обираете�ь предать �воих �оперников! Этого вам никогда не про�т�т!
 STR_CHEAT_MONEY                                                 :{LTBLUE}Увеличить деньги на {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Игра за компанию: {ORANGE}{COMMA}
@@ -1497,24 +1497,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}ТунÐ
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Строить в режиме паузы: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Большие �амолёты реже разбивают�� в малых а�ропортах: {ORANGE}{STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Сменить климат на: {ORANGE} {STRING}
-STR_TEMPERATE_LANDSCAPE                                         :Умеренный ландшафт
-STR_SUB_ARCTIC_LANDSCAPE                                        :Субарктиче�кий ландшафт
-STR_SUB_TROPICAL_LANDSCAPE                                      :Субтропиче�кий ландшафт
-STR_TOYLAND_LANDSCAPE                                           :Игрушечный ландшафт
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Умеренный ландшафт
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Субарктиче�кий ландшафт
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Субтропиче�кий ландшафт
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Игрушечный ландшафт
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Изменение даты: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Разрешить изменение производительно�ти: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}�ова� цветова� �хема
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}�а�тройка о�новной цветовой �хемы
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}�а�тройка цветовой �хемы поездов
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}�а�тройка цветовой �хемы автотран�порта
-STR_LIVERY_SHIP_TIP                                             :{BLACK}�а�тройка цветовой �хемы �удов
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}�а�тройка цветовой �хемы авиатран�порта
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}�а�тройка о�новного цвета
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}�а�тройка дополнительного цвета
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Выберите цветовую �хему дл� изменени�, либо не�колько �хем � Ctrl. Кликните на чекбок� дл� и�пользовани� выбранной �хемы.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}�а�тройка о�новной цветовой �хемы
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}�а�тройка цветовой �хемы поездов
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}�а�тройка цветовой �хемы автотран�порта
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}�а�тройка цветовой �хемы �удов
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}�а�тройка цветовой �хемы авиатран�порта
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}�а�тройка о�новного цвета
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}�а�тройка дополнительного цвета
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Выберите цветовую �хему дл� изменени�, либо не�колько �хем � Ctrl. Кликните на чекбок� дл� и�пользовани� выбранной �хемы.
 
 STR_LIVERY_DEFAULT                                              :Стандарт. ра�кра�ка
 STR_LIVERY_STEAM                                                :Паровоз
@@ -1552,19 +1552,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Выбо
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Мне повезёт!
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Создание внешно�ти �лучайным образом
 STR_FACE_ADVANCED                                               :{BLACK}Детально
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Ра�ширенна� на�тройка внешно�ти
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Ра�ширенна� на�тройка внешно�ти
 STR_FACE_SIMPLE                                                 :{BLACK}Про�то
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Про�тое �оздание внешно�ти
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Про�тое �оздание внешно�ти
 STR_FACE_LOAD                                                   :{BLACK}Загрузить
-STR_FACE_LOAD_TIP                                               :{BLACK}Загрузить внешно�ть
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Загрузить внешно�ть
 STR_FACE_LOAD_DONE                                              :{WHITE}Ваша внешно�ть загружена из файла конфигурации.
 STR_FACE_FACECODE                                               :{BLACK}Чи�ловой код
-STR_FACE_FACECODE_TIP                                           :{BLACK}По�мотреть или у�тановить код внешно�ти
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}По�мотреть или у�тановить код внешно�ти
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Чи�ловой код внешнего вида
 STR_FACE_FACECODE_SET                                           :{WHITE}Чи�ловой код нового лица у�тановлен.
 STR_FACE_FACECODE_ERR                                           :{WHITE}�е могу изменить внешно�ть - значение должно быть целым и лежать в диапазоне от 0 до 4 294 967 295
 STR_FACE_SAVE                                                   :{BLACK}Сохранить
-STR_FACE_SAVE_TIP                                               :{BLACK}Сохранить внешно�ть
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Сохранить внешно�ть
 STR_FACE_SAVE_DONE                                              :{WHITE}Это лицо �охранено в файле конфигурации.
 STR_FACE_EUROPEAN                                               :{BLACK}Европ.
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Выбор европеоидного типа лица
@@ -1572,120 +1572,120 @@ STR_FACE_AFRICAN                                                :{BLACK}�фри
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Выбор африкан�кого типа лица
 STR_FACE_YES                                                    :Да
 STR_FACE_NO                                                     :�ет
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Включить у�ы или �ерьги
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Включить у�ы или �ерьги
 STR_FACE_HAIR                                                   :Воло�ы:
-STR_FACE_HAIR_TIP                                               :{BLACK}Изменить воло�ы
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Изменить воло�ы
 STR_FACE_EYEBROWS                                               :Брови:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Изменить брови
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Изменить брови
 STR_FACE_EYECOLOUR                                              :Цвет глаз:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Изменить цвет глаз
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Изменить цвет глаз
 STR_FACE_GLASSES                                                :Очки:
-STR_FACE_GLASSES_TIP                                            :{BLACK}�аличие очков
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Изменить очки
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}�аличие очков
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Изменить очки
 STR_FACE_NOSE                                                   :�о�:
-STR_FACE_NOSE_TIP                                               :{BLACK}Изменить но�
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Изменить но�
 STR_FACE_LIPS                                                   :Губы:
 STR_FACE_MOUSTACHE                                              :У�ы:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Изменить губы или у�ы
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Изменить губы или у�ы
 STR_FACE_CHIN                                                   :Подбородок:
-STR_FACE_CHIN_TIP                                               :{BLACK}Изменить подбородок
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Изменить подбородок
 STR_FACE_JACKET                                                 :Пиджак:
-STR_FACE_JACKET_TIP                                             :{BLACK}Изменить пиджак
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Изменить пиджак
 STR_FACE_COLLAR                                                 :Воротник:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Изменить воротник
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Изменить воротник
 STR_FACE_TIE                                                    :Гал�тук:
 STR_FACE_EARRING                                                :Серьга:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Изменить гал�тук или �ерьгу
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Изменить гал�тук или �ерьгу
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Сетева� игра
-STR_NETWORK_CONNECTION                                          :{BLACK}Соединение:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}И�кать �ерверы в локальной �ети или в Интернете
-STR_NETWORK_LAN                                                 :Локальна� �еть
-STR_NETWORK_INTERNET                                            :Интернет
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Им� игрока:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Это им�, под которым вы пред�тавите�ь другим игрокам
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}�азвание
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}�азвание игры
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Клиенты
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Клиентов �ейча�/мак�. {}Компаний �ейча�/мак�.
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Размер карты
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Размер карты игры{}�ажмите дл� �ортировки по площади
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Дата
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Текуща� дата
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Года
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Количе�тво лет{}в игре
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Язык, вер�и� �ервера и т.п.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Выберите игру из �пи�ка
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}По�ледний �ервер, к которому вы подключали�ь:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}�ажмите дл� выбора по�леднего �ервера
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}И�ФОРМ�ЦИЯ ОБ ИГРЕ
-STR_NETWORK_CLIENTS                                             :{SILVER}Клиенты: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Язык: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Климат: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Размер карты: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Вер�и� �ервера: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}�дре� �ервера: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Дата начала: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Текуща� дата: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Защищено паролем!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}СЕРВЕР ОТКЛЮЧЕ�
-STR_NETWORK_SERVER_FULL                                         :{SILVER}СЕРВЕР З�ПОЛ�Е�
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ВЕРСИЯ �Е ПОДХОДИТ
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}�Е СОВП�Д�ЕТ ��БОР NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}При�оединить��
-STR_NETWORK_REFRESH                                             :{BLACK}Обновить �ервер
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Обновить информацию о �ервере
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Обновить
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Обновить �пи�ок �ерверов, которые �ейча� е�ть в �ети
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Добавить �ервер
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Добавить �ервер, который будет автоматиче�ки обновл�ть�� при открытии �того окна
-STR_NETWORK_START_SERVER                                        :{BLACK}Запу�к �ервера
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Запу�к �ервера на вашем компьютере. К �той игре �могут под�оедин�ть�� другие игроки.
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Введите ваше им�
-STR_NETWORK_ENTER_IP                                            :{BLACK}Введите адре� �ервера
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Сетева� игра
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Соединение:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}И�кать �ерверы в локальной �ети или в Интернете
+STR_NETWORK_SERVER_LIST_LAN                                     :Локальна� �еть
+STR_NETWORK_SERVER_LIST_INTERNET                                :Интернет
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Им� игрока:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Это им�, под которым вы пред�тавите�ь другим игрокам
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}�азвание
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}�азвание игры
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Клиенты
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Клиентов �ейча�/мак�. {}Компаний �ейча�/мак�.
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Размер карты
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Размер карты игры{}�ажмите дл� �ортировки по площади
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Дата
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Текуща� дата
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Года
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Количе�тво лет{}в игре
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Язык, вер�и� �ервера и т.п.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Выберите игру из �пи�ка
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}По�ледний �ервер, к которому вы подключали�ь:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}�ажмите дл� выбора по�леднего �ервера
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}И�ФОРМ�ЦИЯ ОБ ИГРЕ
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Клиенты: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Язык: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Климат: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Размер карты: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Вер�и� �ервера: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}�дре� �ервера: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Дата начала: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Текуща� дата: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Защищено паролем!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}СЕРВЕР ОТКЛЮЧЕ�
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}СЕРВЕР З�ПОЛ�Е�
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}ВЕРСИЯ �Е ПОДХОДИТ
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}�Е СОВП�Д�ЕТ ��БОР NEWGRF
+
+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}Запу�к �ервера
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Запу�к �ервера на вашем компьютере. К �той игре �могут под�оедин�ть�� другие игроки.
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Введите ваше им�
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Введите адре� �ервера
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Запу�к новой �етевой игры
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}�азвание игры:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}�азвание игры, которое игроки увид�т в меню выбора �етевой игры
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}У�тановить пароль
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Защитите вашу игру паролем, е�ли не хотите, чтобы к ней могли подключить�� по�торонние.
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Выбор карты:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}�а какой карте вы хотите играть?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Сгенерировать �лучайную карту
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :Лок. �еть / Интернет
-STR_NETWORK_INTERNET_ADVERTISE                                  :Интернет (объ�вл.)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} клиент{P "" а ов}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Мак�. клиентов:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Выбор мак�имального чи�ла клиентов. �е в�е ме�та должны быть зан�ты
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} компани{P � и й}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Мак�. компаний:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Ограничить мак�имальное чи�ло компаний на �ервере
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} наблюдател{P ь � ей}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Мак�. наблюдателей:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Ограничить мак�имальное количе�тво наблюдателей на �ервере
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Язык общени�:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Другие игроки будут знать, на каком �зыке общают�� на �ервере
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Запу�к игры
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Запу�к новой �етевой игры � произвольной карты или �ценари�
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Загрузка игры
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Продолжить ранее �охранённую �етевую игру (проверьте, что под�оединили�ь прежним игроком)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Введите ваше им� дл� �етевой игры
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Запу�к новой �етевой игры
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}�азвание игры:
+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_SELECT_MAP                             :{BLACK}Выбор карты:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}�а какой карте вы хотите играть?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Сгенерировать �лучайную карту
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Лок. �еть / Интернет
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Интернет (объ�вл.)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} клиент{P "" а ов}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Мак�. клиентов:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Выбор мак�имального чи�ла клиентов. �е в�е ме�та должны быть зан�ты
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} компани{P � и й}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Мак�. компаний:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Ограничить мак�имальное чи�ло компаний на �ервере
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} наблюдател{P ь � ей}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Мак�. наблюдателей:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Ограничить мак�имальное количе�тво наблюдателей на �ервере
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Язык общени�:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Другие игроки будут знать, на каком �зыке общают�� на �ервере
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Запу�к игры
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Запу�к новой �етевой игры � произвольной карты или �ценари�
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Загрузка игры
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Продолжить ранее �охранённую �етевую игру (проверьте, что под�оединили�ь прежним игроком)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Введите ваше им� дл� �етевой игры
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1728,32 +1728,32 @@ STR_NETWORK_LANG_LATVIAN                                        :ЛатвийÑ�Ð
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Со�то�ние �етевой игры
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Подготовка �оединени�: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Спи�ок компаний в игре. Вы можете при�оединить�� к �уще�твующей или о�новать новую, е�ли е�ть така� возможно�ть
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}И�ФОРМ�ЦИЯ О КОМП��ИИ
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Им� компании: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}О�нована: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Оценочна� �тоимо�ть: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Текущий балан�: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Доход в прошлом году: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Результативно�ть: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Тран�п. �ред�тва: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Станции: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Игроки: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}�ова� компани�
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}О�новать новую компанию
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}�аблюдать за игрой
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Следить за игрой в каче�тве зрител�
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}При�оединить��
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}При�оединить�� к компании и помочь в управлении ею
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Со�то�ние �етевой игры
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Подготовка �оединени�: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Спи�ок компаний в игре. Вы можете при�оединить�� к �уще�твующей или о�новать новую, е�ли е�ть така� возможно�ть
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}И�ФОРМ�ЦИЯ О КОМП��ИИ
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Им� компании: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}О�нована: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Оценочна� �тоимо�ть: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Текущий балан�: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Доход в прошлом году: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Результативно�ть: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Тран�п. �ред�тва: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Станции: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Игроки: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}�ова� компани�
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}О�новать новую компанию
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}�аблюдать за игрой
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Следить за игрой в каче�тве зрител�
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}При�оединить��
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}При�оединить�� к компании и помочь в управлении ею
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Соединение...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Соединение...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Соединение...
@@ -1769,13 +1769,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Полу
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}готовит�� при�оединить�� {NUM} клиентов
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK} загружено {BYTES} / {BYTES}
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Отключить��
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Отключить��
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сервер защищён. Введите пароль.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компани� защищена. Введите пароль.
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Спи�ок клиентов
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Спи�ок клиентов
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}�аблюдатель
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}�ова� компани�
 
@@ -1797,18 +1797,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Введ
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}�е �охран�ть пароль
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Задать новый пароль компании
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Пароль компании
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Пароль компании по умолчанию
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}И�пользовать �тот пароль дл� в�ех новых компаний по умолчанию
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Пароль компании по умолчанию
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}И�пользовать �тот пароль дл� в�ех новых компаний по умолчанию
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Подключить��
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Подключить�� и играть за �ту компанию
-STR_COMPANY_PASSWORD                                            :{BLACK}Пароль
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Защитить вашу компанию паролем, чтобы по�торонние пользователи не могли при�оединить��.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}У�тановить пароль компании
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Подключить��
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Подключить�� и играть за �ту компанию
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Пароль
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Защитить вашу компанию паролем, чтобы по�торонние пользователи не могли при�оединить��.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}У�тановить пароль компании
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Отправить
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Отправить
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Команда] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Лично] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[В�ем] :
@@ -1821,40 +1821,40 @@ STR_NETWORK_CHAT_ALL                                            :[В�ем] {STR
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Введите тек�т дл� �етевого �ообщени�
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}�е найдены �етевые у�трой�тва или игра �компилирована без поддержки �ети
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}�е �мог найти �етевые игры
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Сервер не ответил на запро�
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}�евозможно при�оединить�� из-за не�оответ�тви� NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Синхронизаци� �етевой игры не удала�ь
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Соединение �етевой игры потер�но
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}�е �мог загрузить �охранение
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}�е �мог запу�тить �ервер
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}�е �мог �оединить��
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Тайм-аут дл� �оединени� #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Произошла ошибка протокола, и �оединение было закрыто
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Вер�и� �того клиента не �овме�тима � вер�ией �ервера
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}�еверный пароль
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Сервер переполнен
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Вам запрещено пользовать�� �тим �ервером
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Ва� выкинули из игры
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Чит-коды не разрешены на �том �ервере
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}�е найдены �етевые у�трой�тва или игра �компилирована без поддержки �ети
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}�е �мог найти �етевые игры
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Сервер не ответил на запро�
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}�евозможно при�оединить�� из-за не�оответ�тви� NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Синхронизаци� �етевой игры не удала�ь
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Соединение �етевой игры потер�но
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}�е �мог загрузить �охранение
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}�е �мог запу�тить �ервер
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}�е �мог �оединить��
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Тайм-аут дл� �оединени� #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Произошла ошибка протокола, и �оединение было закрыто
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Вер�и� �того клиента не �овме�тима � вер�ией �ервера
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}�еверный пароль
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Сервер переполнен
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Вам запрещено пользовать�� �тим �ервером
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Ва� выкинули из игры
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Чит-коды не разрешены на �том �ервере
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :обща� ошибка
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :ошибка �инхронизации
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :не �мог загрузить карту
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :�оединение потер�но
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :ошибка протокола
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :�е�оответ�твие NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :не авторизован
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :получен �транный пакет
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :вер�ии не �овпадают
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :�то им� уже и�пользует��
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :неверный пароль
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :неправильный параметр company в DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :ва� выкинул �ервер
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :попытал�� применить чит
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :�ервер переполнен
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :обща� ошибка
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :ошибка �инхронизации
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :не �мог загрузить карту
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :�оединение потер�но
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :ошибка протокола
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :�е�оответ�твие NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :не авторизован
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :получен �транный пакет
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :вер�ии не �овпадают
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :�то им� уже и�пользует��
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :неверный пароль
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :неправильный параметр company в DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :ва� выкинул �ервер
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :попытал�� применить чит
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :�ервер переполнен
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1866,36 +1866,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Пауза (пÐ
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Игра запущена (клиент подключил��)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Игра запущена (клиент не �мог подключить��)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :покинул
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} подключил�� к игре
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} подключил�� к компании #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} подключил�� наблюдателем
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} о�новал новую компанию (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} покинул игру ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} изменил �вое им� на {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} передал вашей компании {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Вы передали {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Сервер закрыл �е��ию
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE}Сервер перезапу�кает��...{}Пожалуй�та, подождите...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :покинул
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} подключил�� к игре
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} подключил�� к компании #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} подключил�� наблюдателем
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} о�новал новую компанию (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} покинул игру ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} изменил �вое им� на {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} передал вашей компании {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Вы передали {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Сервер закрыл �е��ию
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE}Сервер перезапу�кает��...{}Пожалуй�та, подождите...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Загрузка контента
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Тип
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Тип контента
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Тип контента
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Им�
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}�аименование контента
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}�ажмите на �троке дл� про�мотра подробно�тей{}Отметьте чекбок� дл� загрузки
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}�аименование контента
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}�ажмите на �троке дл� про�мотра подробно�тей{}Отметьте чекбок� дл� загрузки
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Выбрать в�ё
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Пометить ве�ь контент дл� загрузки
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Пометить ве�ь контент дл� загрузки
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Выбрать обновл.
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Отметить дл� загрузки обновлени� дл� имеющего�� контента
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Отметить дл� загрузки обновлени� дл� имеющего�� контента
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Сн�ть выделение
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}�ичего не загружать
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}�ичего не загружать
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Введите �троку фильтра
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Введите ключевое �лово дл� фильтрации �пи�ка
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Введите ключевое �лово дл� фильтрации �пи�ка
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Фильтр:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Скачать
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}�ачать загрузку выбранного контента
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}�ачать загрузку выбранного контента
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}В�его дл� загруки: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}И�ФОРМ�ЦИЯ О КО�ТЕ�ТЕ
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}�е выбран дл� загрузки
@@ -1945,17 +1945,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}...не
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}�е могу ра�паковать �качанный файл
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}�а�тройки прозрачно�ти
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Переключение прозрачно�ти значков �танций. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Переключение прозрачно�ти деревьев. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Переключение прозрачно�ти город�ких зданий. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Переключение прозрачно�ти промышленных объектов. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Переключение прозрачно�ти по�троенных игроками объектов: �танций, депо, точек пути и пр. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Переключение прозрачно�ти мо�тов. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Переключение прозрачно�ти таких �ооружений, как ма�ки и антенны. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Переключение прозрачно�ти контактной �ети. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Переключение прозрачно�ти индикаторов загрузки. Ctrl+щелчок - блокировка.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Сделать объекты не прозрачными, а полно�тью невидимыми
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}�а�тройки прозрачно�ти
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Переключение прозрачно�ти значков �танций. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Переключение прозрачно�ти деревьев. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Переключение прозрачно�ти город�ких зданий. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Переключение прозрачно�ти промышленных объектов. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Переключение прозрачно�ти по�троенных игроками объектов: �танций, депо, точек пути и пр. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Переключение прозрачно�ти мо�тов. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Переключение прозрачно�ти таких �ооружений, как ма�ки и антенны. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Переключение прозрачно�ти контактной �ети. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Переключение прозрачно�ти индикаторов загрузки. Ctrl+щелчок - блокировка.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Сделать объекты не прозрачными, а полно�тью невидимыми
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Под�ветка зоны покрыти�
@@ -1967,11 +1967,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Прин
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Отправл�ют��: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Объединить �танции
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}По�троить отдельную �танцию
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Объединить �танции
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}По�троить отдельную �танцию
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Объединить точки
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}По�тавить отдельную точку пути
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Объединить точки
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}По�тавить отдельную точку пути
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Железные дороги
@@ -1995,8 +1995,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}�апр
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Выбор направлени� депо
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Точка пути
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Выбор типа точки пути
+STR_WAYPOINT_CAPTION                                            :{WHITE}Точка пути
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Выбор типа точки пути
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Выбор ж/д �танции
@@ -2009,36 +2009,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Выбе
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Уча�ток
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}По�тройка �танции на указанном игроком уча�тке
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Выберите кла�� �танций дл� отображени�
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Выберите тип �танции дл� по�тройки
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Выберите кла�� �танций дл� отображени�
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Выберите тип �танции дл� по�тройки
 
-STR_STAT_CLASS_DFLT                                             :По умолчанию
-STR_STAT_CLASS_WAYP                                             :Точки пути
+STR_STATION_CLASS_DFLT                                          :По умолчанию
+STR_STATION_CLASS_WAYP                                          :Точки пути
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Выбор �игналов
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Стандартный �емафор{}�е позвол�ет не�кольким поездам одновременно находить�� на одном блок-уча�тке.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Входной �емафор{}Открыт, е�ли хот� бы один из выходных �игналов на �ледующей �екции путей открыт. В о�тальных �луча�х закрыт.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Выходной �емафор{}Работает как обычный �емафор, но его �о�то�ние учитывает�� при работе вход�щих и комбинированных �игналов.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Комбинированный �емафор{}Работает одновременно как входной и выходной �емафор. Это позвол�ет по�троить большую разветвлённую �еть.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Маршрутный �емафор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. Допу�кает �ледование поездов в обе �тороны.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Одно�торонний маршрутн. �емафор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. �е допу�кает �ледовани� поездов в обратную �торону.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Стандартный �ветофор{}�е позвол�ет не�кольким поездам одновременно находить�� на одном блок-уча�тке.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Входной �ветофор{}Открыт, е�ли хот� бы один из выходных �игналов на �ледующей �екции путей открыт. В о�тальных �луча�х закрыт.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Выходной �ветофор{}Работает как обычный �ветофор, но его �о�то�ние учитывает�� при работе вход�щих и комбинированных �игналов.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Комбинированный �ветофор{}Работает одновременно как входной и выходной �ветофор. Это позвол�ет по�троить большую разветвлённую �еть.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Маршрутный �ветофор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. Допу�кает �ледование поездов в обе �тороны.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Одно�торонний маршрутн. �ветофор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. �е допу�кает �ледовани� поездов в обратную �торону.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Изменение типа �игнала{}Когда кнопка нажата, щёлкните дл� преобразовани� �уще�твующего �игнала в �игнал выбранного типа и варианта, или щёлкните � нажатым Ctrl дл� перебора �уще�твующих вариантов.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Плотно�ть ра��тановки �игналов при прот�гивании.
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Уменьшить плотно�ть �игналов при прот�гивании
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Увеличить плотно�ть �игналов при прот�гивании
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Выбор �игналов
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Стандартный �емафор{}�е позвол�ет не�кольким поездам одновременно находить�� на одном блок-уча�тке.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Входной �емафор{}Открыт, е�ли хот� бы один из выходных �игналов на �ледующей �екции путей открыт. В о�тальных �луча�х закрыт.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Выходной �емафор{}Работает как обычный �емафор, но его �о�то�ние учитывает�� при работе вход�щих и комбинированных �игналов.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Комбинированный �емафор{}Работает одновременно как входной и выходной �емафор. Это позвол�ет по�троить большую разветвлённую �еть.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Маршрутный �емафор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. Допу�кает �ледование поездов в обе �тороны.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Одно�торонний маршрутн. �емафор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. �е допу�кает �ледовани� поездов в обратную �торону.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Стандартный �ветофор{}�е позвол�ет не�кольким поездам одновременно находить�� на одном блок-уча�тке.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Входной �ветофор{}Открыт, е�ли хот� бы один из выходных �игналов на �ледующей �екции путей открыт. В о�тальных �луча�х закрыт.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Выходной �ветофор{}Работает как обычный �ветофор, но его �о�то�ние учитывает�� при работе вход�щих и комбинированных �игналов.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Комбинированный �ветофор{}Работает одновременно как входной и выходной �ветофор. Это позвол�ет по�троить большую разветвлённую �еть.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Маршрутный �ветофор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. Допу�кает �ледование поездов в обе �тороны.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Одно�торонний маршрутн. �ветофор{}Позвол�ет не�кольким поездам находить�� в одном �игнальном блоке, е�ли каждый из них может зарезервировать безопа�ный путь. �е допу�кает �ледовани� поездов в обратную �торону.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Изменение типа �игнала{}Когда кнопка нажата, щёлкните дл� преобразовани� �уще�твующего �игнала в �игнал выбранного типа и варианта, или щёлкните � нажатым Ctrl дл� перебора �уще�твующих вариантов.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Плотно�ть ра��тановки �игналов при прот�гивании.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Уменьшить плотно�ть �игналов при прот�гивании
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Увеличить плотно�ть �игналов при прот�гивании
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Выберите железнодорожный мо�т
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Выберите тип мо�та
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Выбор мо�та - кликните на изображении мо�та, который вы хотите по�троить
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING}{}{VELOCITY}; {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Выбор мо�та - кликните на изображении мо�та, который вы хотите по�троить
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING}{}{VELOCITY}; {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Ви��чий �тальной
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Балочный �тальной
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Кон�ольный �тальной
@@ -2072,9 +2072,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Стро
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}�аправление гаража
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Выбор ориентации гаража
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Выбор ориентации гаража
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Ориентаци� трамвайного депо
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Выбор ориентации трамвайного депо
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Выбор ориентации трамвайного депо
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}�аправление о�тановки
@@ -2095,8 +2095,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Стро
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Строитель�тво при�таней
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Буи помогают в навигации на больших ра��то�ни�х; и�пользуйте их как маршрутные точки
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Строитель�тво акведуков
-STR_CREATE_LAKE                                                 :{BLACK}Создать канал.{}При зажатом Ctrl клетка на уровне мор� наполн�ет�� водой.
-STR_CREATE_RIVER                                                :{BLACK}Разме�тить реки.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Создать канал.{}При зажатом Ctrl клетка на уровне мор� наполн�ет�� водой.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Разме�тить реки.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}�аправление дока
@@ -2128,20 +2128,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Сред
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Большие а�ропорты
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Вертолётные площадки
 
-STR_STATION_NOISE                                               :{BLACK}Производимый шум: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Производимый шум: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Ландшафт
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Опу�тить угол земли
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Подн�ть угол земли
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Выровн�ть землю
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Покупка земли
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Опу�тить угол земли
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Подн�ть угол земли
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Выровн�ть землю
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Покупка земли
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Деревь�
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Выбор типа деревьев дл� по�адки
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Деревь� �лучайного типа
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Вы�адка деревьев �лучайного типа
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Вы�адка деревьев �лучайного типа
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Ра��тавить по карте
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Разме�тить по карте деревь� �лучайным образом
 
@@ -2154,9 +2154,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}По�т
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Увеличить площадь изменени� рельефа
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Уменьшить площадь изменени� рельефа
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Создать �лучайную карту
-STR_SE_NEW_WORLD                                                :{BLACK}Создать новый �ценарий
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Создать новый �ценарий
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Сбро�ить карту
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Удалить � карты в�ё имуще�тво, принадлежащее игрокам
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Удалить � карты в�ё имуще�тво, принадлежащее игрокам
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Сбро�ить карту
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Вы уверены, что хотите удалить в�е имуще�тво игроков?
@@ -2167,41 +2167,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}�овы
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}По�троить новый город
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Случайный город
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Создать город в �лучайном ме�те
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Много �лучайных городов
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Случайно разме�тить на карте города
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Много �лучайных городов
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Случайно разме�тить на карте города
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Размер города:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Малый
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Средний
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Большой
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Случайно
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Случайно
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Выбор размера города
 STR_FOUND_TOWN_CITY                                             :{BLACK}Мегаполи�
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Большие города ра�тут бы�трее, чем маленькие.{}В зави�имо�ти от на�троек, они при �оздании имеют больший размер.
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Сеть город�ких дорог:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Выбрать алгоритм �оздани� �ети город�ких дорог
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Оригинальна�
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Улучшенна�
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Случайно
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Сеть город�ких дорог:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Выбрать алгоритм �оздани� �ети город�ких дорог
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Оригинальна�
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Улучшенна�
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Случайно
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Создать новое предпри�тие
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Выберите тип производ�тва из �пи�ка
-STR_MANY_RANDOM_INDUSTRIES                                      :Много предпри�тий
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Случайно разме�тить предпри�ти� на карте
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Цена: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Разведать
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}По�троить
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Профинан�ировать
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Выберите тип производ�тва из �пи�ка
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Много предпри�тий
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Случайно разме�тить предпри�ти� на карте
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Цена: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Разведать
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}По�троить
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Профинан�ировать
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Информаци� об уча�тке земли
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Чтобы очи�тить, надо: {LTBLUE}(нет данных)
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Чтобы очи�тить, надо: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Выручка от продажи: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Выручка от продажи: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :нет данных
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Владелец: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Владелец дороги: {LTBLUE}{STRING}
@@ -2209,104 +2209,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Влад
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Владелец ж/д пути: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}�дмини�траци�: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :�ет
-STR_LANDINFO_COORDS                                             :{BLACK}Координаты: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}По�троено: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Кла�� �танции: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Тип �танции: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Координаты: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}По�троено: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Кла�� �танции: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Тип �танции: {LTBLUE}{STRING}
+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})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Скалы
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Груба� земл�
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Гола� земл�
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Трава
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Пол�
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :За�неженна� земл�
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Пу�тын�
-
-STR_RAILROAD_TRACK                                              :Рель�ы
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Ж/д пути � обычными �игналами
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Ж/д пути �о входными �игналами
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Ж/д пути � выходными �игналами
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Ж/д пути � комбинированными �игналами
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Ж/д пути � маршрутными �игналами
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Ж/д пути � одно�тор. маршрутными �игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Ж/д пути � обычными и входными �игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Ж/д пути � обычными и выходными �игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Ж/д пути � обычными и комбо-�игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Ж/д пути � обычными и маршрутными �игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Ж/д пути � обычными и одно�тор. маршр. �игналами
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Ж/д пути �о входными и выходными �игналами
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Ж/д пути �о входными и комбо-�игналами
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Ж/д пути �о входными и маршрутными �игналами
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Ж/д пути �о входными и одно�тор. маршр. �игналами
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Ж/д пути � выходными и комбо-�игналами
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Ж/д пути � выходными и маршрутными �игналами
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Ж/д пути � выходными и одно�тор. маршр. �игналами
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Ж/д пути � комбо- и маршрутными �игналами
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Ж/д пути � комбо- и одно�тор. маршр. �игналами
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Ж/д пути � маршр. и одно�тор. маршр. �игналами
-STR_RAILROAD_TRAIN_DEPOT                                        :Ж/д депо
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Дорога
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Дорога � уличным о�вещением
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Шо��е
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Гараж
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Железнодорожный переезд
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Трамвайные рель�ы
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Скалы
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Груба� земл�
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Гола� земл�
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Трава
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Пол�
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :За�неженна� земл�
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Пу�тын�
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Рель�ы
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Ж/д пути � обычными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Ж/д пути �о входными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Ж/д пути � выходными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Ж/д пути � комбинированными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Ж/д пути � маршрутными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Ж/д пути � одно�тор. маршрутными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Ж/д пути � обычными и входными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Ж/д пути � обычными и выходными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Ж/д пути � обычными и комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Ж/д пути � обычными и маршрутными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Ж/д пути � обычными и одно�тор. маршр. �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Ж/д пути �о входными и выходными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Ж/д пути �о входными и комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Ж/д пути �о входными и маршрутными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Ж/д пути �о входными и одно�тор. маршр. �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Ж/д пути � выходными и комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Ж/д пути � выходными и маршрутными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Ж/д пути � выходными и одно�тор. маршр. �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Ж/д пути � комбо- и маршрутными �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Ж/д пути � комбо- и одно�тор. маршр. �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Ж/д пути � маршр. и одно�тор. маршр. �игналами
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Ж/д депо
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Дорога
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Дорога � уличным о�вещением
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Шо��е
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Гараж
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Железнодорожный переезд
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Трамвайные рель�ы
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (на рекон�трукции)
-
-STR_TREE_NAME_TREES                                             :Деревь�
-STR_TREE_NAME_RAINFOREST                                        :Джунгли
-STR_TREE_NAME_CACTUS_PLANTS                                     :Какту�ы
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Ж/д �танци�
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :�нгар
-STR_STATION_DESCRIPTION_AIRPORT                                 :��ропорт
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Погрузочна� платформа
-STR_STATION_DESCRIPTION_BUS_STATION                             :�втобу�на� о�тановка
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :При�тань
-STR_STATION_DESCRIPTION_BUOY                                    :Буй
-STR_LANDINFO_WAYPOINT                                           :Точка пути
-
-STR_WATER_DESCRIPTION_WATER                                     :Вода
-STR_LANDINFO_CANAL                                              :Канал
-STR_LANDINFO_LOCK                                               :Шлюз
-STR_LANDINFO_RIVER                                              :Река
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Мор�кой или речной берег
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Верфь
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (на рекон�трукции)
+
+STR_LAI_TREE_NAME_TREES                                         :Деревь�
+STR_LAI_TREE_NAME_RAINFOREST                                    :Джунгли
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Какту�ы
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Ж/д �танци�
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :�нгар
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :��ропорт
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Погрузочна� платформа
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :�втобу�на� о�тановка
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :При�тань
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Буй
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Точка пути
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Вода
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Канал
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Шлюз
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Река
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Мор�кой или речной берег
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Верфь
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Железнодорожный туннель
-STR_TUNNEL_DESCRIPTION_ROAD                                     :�втомобильный туннель
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Железнодорожный туннель
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :�втомобильный туннель
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Стальной ви��чий ж/д мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Стальной балочный ж/д мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Стальной кон�ольный ж/д мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Железобетонный ви��чий ж/д мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Дерев�нный ж/д мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Бетонный ж/д мо�т
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Трубчатый ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Стальной ви��чий ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Стальной балочный ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Стальной кон�ольный ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Железобетонный ви��чий ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Дерев�нный ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Бетонный ж/д мо�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Трубчатый ж/д мо�т
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Стальной ви��чий автомобильный мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Стальной балочный автомобильный мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Стальной кон�ольный автомобильный мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Железобетонный ви��чий автомобильный мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Дерев�нный автомобильный мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Бетонный автомобильный мо�т
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Трубчатый автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Стальной ви��чий автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Стальной балочный автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Стальной кон�ольный автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Железобетонный ви��чий автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Дерев�нный автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Бетонный автомобильный мо�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Трубчатый автомобильный мо�т
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :�кведук
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :�кведук
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Передатчик
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Ма�к
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Штаб-квартира компании
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Земл� в �об�твенно�ти компании
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Передатчик
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Ма�к
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Штаб-квартира компании
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Земл� в �об�твенно�ти компании
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Об OpenTTD
@@ -2319,7 +2319,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Сохр
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Загрузить игру
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Сохранить �ценарий
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Загрузить �ценарий
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Загрузить карту
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Загрузить карту
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Кликните, чтобы перейти к текущей папке загрузки/�охранени� по умолчанию
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} �вободно
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Спи�ок ди�ков, папок и �охранённых игр
@@ -2329,119 +2329,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Удал
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Сохранить
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Сохранить игру, и�пользу� выбранное им�
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Введите им� �охран�емой игры
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Введите им� �охран�емой игры
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Создание мира
-STR_MAPSIZE                                                     :{BLACK}Размер карты:
-STR_BY                                                          :{BLACK}×
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Чи�ло городов:
-STR_DATE                                                        :{BLACK}Дата:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Чи�ло промышл.:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Снегова� лини�:
-STR_SNOW_LINE_UP                                                :{BLACK}Подн�ть �неговую линию
-STR_SNOW_LINE_DOWN                                              :{BLACK}Опу�тить �неговую линию
-STR_RANDOM_SEED                                                 :{BLACK}�ачальное чи�ло:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Ландшафт генерирует�� п�евдо�лучайно, чи�ло - опорна� точка в по�ледовательно�ти �лучайных чи�ел.
-STR_RANDOM                                                      :{BLACK}Случайное
-STR_RANDOM_HELP                                                 :{BLACK}Изменить �лучайный номер, и�пользуемый генератором ландшафта
-STR_LAND_GENERATOR                                              :{BLACK}Генератор ландш.:
-STR_TREE_PLACER                                                 :{BLACK}Генератор ле�ов:
-STR_TERRAIN_TYPE                                                :{BLACK}Тип ландшафта:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Количе�тво воды:
-STR_SMOOTHNESS                                                  :{BLACK}Гладко�ть:
-STR_GENERATE                                                    :{WHITE}Создать
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Создание мира
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Размер карты:
+STR_MAPGEN_BY                                                   :{BLACK}×
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Чи�ло городов:
+STR_MAPGEN_DATE                                                 :{BLACK}Дата:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Чи�ло промышл.:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Снегова� лини�:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Подн�ть �неговую линию
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Опу�тить �неговую линию
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}�ачальное чи�ло:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Ландшафт генерирует�� п�евдо�лучайно, чи�ло - опорна� точка в по�ледовательно�ти �лучайных чи�ел.
+STR_MAPGEN_RANDOM                                               :{BLACK}Случайное
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Изменить �лучайный номер, и�пользуемый генератором ландшафта
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Генератор ландш.:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Генератор ле�ов:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Тип ландшафта:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Количе�тво воды:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Гладко�ть:
+STR_MAPGEN_GENERATE                                             :{WHITE}Создать
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Кра� карты:
-STR_NORTHWEST                                                   :{BLACK}Северо-запад
-STR_NORTHEAST                                                   :{BLACK}Северо-во�ток
-STR_SOUTHEAST                                                   :{BLACK}Юго-во�ток
-STR_SOUTHWEST                                                   :{BLACK}Юго-запад
-STR_BORDER_FREEFORM                                             :{BLACK}Свободный
-STR_BORDER_WATER                                                :{BLACK}Водный
-STR_BORDER_RANDOM                                               :{BLACK}Случайно
-STR_BORDER_RANDOMIZE                                            :{BLACK}Случайный
-STR_BORDER_MANUAL                                               :{BLACK}Вручную
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Поворот карты:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Им� карты:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Размер: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Введите �лучайное чи�ло
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Изменить вы�оту �неговой линии
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Изменить год начала игры
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Кра� карты:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Северо-запад
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Северо-во�ток
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Юго-во�ток
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Юго-запад
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Свободный
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Водный
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Случайно
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Случайный
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Вручную
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Поворот карты:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Им� карты:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Размер: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Введите �лучайное чи�ло
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Изменить вы�оту �неговой линии
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Изменить год начала игры
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Тип �ценари�
-STR_SE_FLAT_WORLD                                               :{WHITE}Пло�кий рельеф
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Создать ровную землю
-STR_SE_RANDOM_LAND                                              :{WHITE}Случайный рельеф
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Вы�ота над уровнем мор�:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Подн�ть уровень ровной земли на 1
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Опу�тить уровень ровной земли на 1
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Тип �ценари�
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Пло�кий рельеф
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Создать ровную землю
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Случайный рельеф
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Вы�ота над уровнем мор�:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Подн�ть уровень ровной земли на 1
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Опу�тить уровень ровной земли на 1
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Изменить вы�оту ровной земли
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Изменить вы�оту ровной земли
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Создание мира...
 STR_GENERATION_ABORT                                            :{BLACK}Отмена
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Прервать �оздание игрового мира
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Вы �ерьезно хотите прервать �оздание мира?
-STR_PROGRESS                                                    :{WHITE}{NUM}% готово
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Создание мира
-STR_TREE_GENERATION                                             :{BLACK}Вы�адка ле�ов
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Генераци� недвижимо�ти
-STR_CLEARING_TILES                                              :{BLACK}Ра��тановка декораций и камней
-STR_SETTINGUP_GAME                                              :{BLACK}�а�тройка
-STR_PREPARING_TILELOOP                                          :{BLACK}Подготовка к запу�ку...
-STR_PREPARING_GAME                                              :{BLACK}Подготовка игры
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% готово
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Создание мира
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Вы�адка ле�ов
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Генераци� недвижимо�ти
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Ра��тановка декораций и камней
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}�а�тройка
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Подготовка к запу�ку...
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Подготовка игры
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}�а�тройки NewGRF
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Загрузить выбранный набор
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Сохранить набор
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Сохранить �тот �пи�ок как набор
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}�азвание набора
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Удалить набор
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Удалить выбранный набор
-STR_NEWGRF_ADD                                                  :{BLACK}Добавить
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Добавить файл NewGRF в �пи�ок
-STR_NEWGRF_REMOVE                                               :{BLACK}Удалить
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Удалить выбранный файл NewGRF из �пи�ка
-STR_NEWGRF_MOVEUP                                               :{BLACK}Вверх
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Переме�тить выбранный файл NewGRF выше
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Вниз
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Переме�тить выбранный файл NewGRF ниже
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Спи�ок у�тановленных файлов NewGRF. Выберите файл дл� про�мотра информации о нем
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Параметры
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Переключить палитру
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Переключить палитру дл� выбраного NewGRF файла.{}И�пользуйте переключение, е�ли графика отри�овывает�� розовым цветом.
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Применить изменени�
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}�айти недо�тающий контент в �ети
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Отметьте, чтобы найти недо�тающий контент в �ети
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Им� файла: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}Сумма MD5: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Палитра: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Параметры: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}�ет до�тупной информации
-STR_NEWGRF_NOT_FOUND                                            :{RED}Файл не найден
-STR_NEWGRF_DISABLED                                             :{RED}Отключено
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Введите параметры файла NewGRF
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Загрузить выбранный набор
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Сохранить набор
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Сохранить �тот �пи�ок как набор
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}�азвание набора
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Удалить набор
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Удалить выбранный набор
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Добавить
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Добавить файл NewGRF в �пи�ок
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Удалить
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Удалить выбранный файл NewGRF из �пи�ка
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Вверх
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Переме�тить выбранный файл NewGRF выше
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Вниз
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Переме�тить выбранный файл NewGRF ниже
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Спи�ок у�тановленных файлов NewGRF. Выберите файл дл� про�мотра информации о нем
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Параметры
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Переключить палитру
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Переключить палитру дл� выбраного NewGRF файла.{}И�пользуйте переключение, е�ли графика отри�овывает�� розовым цветом.
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Применить изменени�
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}�айти недо�тающий контент в �ети
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Отметьте, чтобы найти недо�тающий контент в �ети
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Им� файла: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}Сумма MD5: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Палитра: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Параметры: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}�ет до�тупной информации
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Файл не найден
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Отключено
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Введите параметры файла NewGRF
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}До�тупные файлы NewGRF
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Добавить выбранное
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Добавить выбранный файл NewGRF в вашу конфигурацию
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Обновить
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Обновить �пи�ок до�тупных файлов NewGRF
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Добавить выбранный файл NewGRF в вашу конфигурацию
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Обновить
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Обновить �пи�ок до�тупных файлов NewGRF
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2465,7 +2465,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Содержит не�колько Action 8 дей�твий.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}О�торожно!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}О�торожно!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Вы вно�ите изменени� в загруженной карте - �то может приве�ти к не�табильно�ти игры.{}{}Вы дей�твительно хотите �того?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}�евозможно добавить файл - дублируют�� GRF ID
@@ -2490,10 +2490,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Спи�
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Редактировать надпи�ь на знаке
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}К �ледующему знаку
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}К предыдущему знаку
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}К �ледующему знаку
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}К предыдущему знаку
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Введите название знака
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Введите название знака
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Города
@@ -2507,10 +2507,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}�а�еление: {ORANGE}{COMMA}{BLACK}  Зданий: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Па��ажиров за прошлый ме��ц: {ORANGE}{COMMA}{BLACK}  мак�.: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Почты за прошлый ме��ц: {ORANGE}{COMMA}{BLACK}  мак�.: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Груз, необходимый дл� ро�та города:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} необходимо
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} до�тавлено в прошлом ме��це
-STR_NOISE_IN_TOWN                                               :{BLACK}Уровень шума в городе: {ORANGE}{COMMA}{BLACK}  мак�: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Груз, необходимый дл� ро�та города:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} необходимо
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} до�тавлено в прошлом ме��це
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Уровень шума в городе: {ORANGE}{COMMA}{BLACK}  мак�: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Отцентрировать о�новное окно по городу
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Ме�тные вла�ти
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Информаци� о ме�тных вла�т�х
@@ -2557,18 +2557,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}нет
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Суб�идируемые маршруты:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} по маршруту из {STATION} в {STATION}{YELLOW} ({COMPANY}{YELLOW}, до {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}�ажмите на маршрут дл� отображени� предпри�ти�/города
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}�ажмите на маршрут дл� отображени� предпри�ти�/города
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}�азвани� �танций - кликните дл� того, чтобы показать �танцию в о�новном окне
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}�ажмите и держите Ctrl дл� выбора более одного варианта
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}�ажмите и держите Ctrl дл� выбора более одного варианта
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} �танци{P � и й}
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- �ет -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Показать в�е �танции
-STR_SELECT_ALL_TYPES                                            :{BLACK}Выбрать в�е типы грузов
-STR_NO_WAITING_CARGO                                            :{BLACK}�а �танции нет грузов, ожидающих погрузки
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Показать в�е �танции
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Выбрать в�е типы грузов
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}�а �танции нет грузов, ожидающих погрузки
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2599,18 +2599,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :ОтличныÐ
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Показать �танцию в о�новном окне
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Переименовать �танцию
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Показать в�е поезда, в ра�пи�ании которых е�ть �та �танци�
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Показать в�е автомобили, в ра�пи�ании которых е�ть �та �танци�/о�тановка
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Показать ве�ь авиатран�порт, в ра�пи�ании которого е�ть �тот а�ропорт
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Показать в�е корабли, в ра�пи�ании которых е�ть �та при�тань
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Показать в�е поезда, в ра�пи�ании которых е�ть �та �танци�
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Показать в�е автомобили, в ра�пи�ании которых е�ть �та �танци�/о�тановка
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Показать ве�ь авиатран�порт, в ра�пи�ании которого е�ть �тот а�ропорт
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Показать в�е корабли, в ра�пи�ании которых е�ть �та при�тань
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Переименовать �танцию
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Переименовать �танцию
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Показать точку пути в о�новном окне
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Переименовать точку пути
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Переименовать точку пути
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Показать буй в о�новном окне
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Изменить название бу�
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Изменить название бу�
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Переименовать точку пути
 
@@ -2636,7 +2636,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}ИТОГО:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Балан�
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}С�уда
-STR_MAX_LOAN                                                    :{WHITE}Мак�. ��уда: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Мак�. ��уда: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Зан�ть {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Вз�ть деньги в кредит. Ctrl+щелчок - увеличить кредит до мак�имума.
@@ -2650,10 +2650,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}В должно�ти � {WHITE}{NUM} года
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Цвет:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Тран�порт:
-STR_TRAINS                                                      :{WHITE}{COMMA} поезд{P "" а ов}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} автомобил{P ь � ей}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} авиатран�порт
-STR_SHIPS                                                       :{WHITE}{COMMA} корабл{P ь � ей}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} поезд{P "" а ов}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} автомобил{P ь � ей}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} авиатран�порт
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} корабл{P ь � ей}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}нет
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Стоимо�ть компании: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% владеет {COMPANY})
@@ -2661,8 +2661,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}По�троить штаб
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}О�мотреть штаб
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}По�троить/о�мотреть штаб-квартиру компании
-STR_RELOCATE_HQ                                                 :{BLACK}Переме�тить
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Переме�тить штаб компании в другом ме�те за 1% оценочной �тоимо�ти капитала компании
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Переме�тить
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Переме�тить штаб компании в другом ме�те за 1% оценочной �тоимо�ти капитала компании
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Внешно�ть
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Выбрать новое лицо директора
@@ -2678,17 +2678,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Прод
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Купить 25% акций �той компании
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Продать 25% акций �той компании
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Компани�
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Им� директора
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Компани�
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Им� директора
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Мы ищем тран�портную компанию дл� при�оединени� к ней.{}{}Вы хотите купить {COMPANY} за {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Промышленно�ть
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% перевезено)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}�азвание производ�тва, нажмите дл� центровки
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Промышленно�ть
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% перевезено)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}�азвание производ�тва, нажмите дл� центровки
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2724,26 +2724,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}�виа
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Прибыль в �том году: {CURRENCY} (прошлый год: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}До�тупные поезда
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}До�тупные автомобили
-STR_AVAILABLE_SHIPS                                             :{BLACK}До�тупные �уда
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}До�тупные �амолёты
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Спи�ок до�тупного тран�порта
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}До�тупные поезда
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}До�тупные автомобили
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}До�тупные �уда
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}До�тупные �амолёты
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Спи�ок до�тупного тран�порта
 
-STR_MANAGE_LIST                                                 :{BLACK}Организаци�
-STR_MANAGE_LIST_TIP                                             :{BLACK}Управление тран�портом, наход�щим�� в �том �пи�ке
-STR_REPLACE_VEHICLES                                            :Замена тран�порта
-STR_SEND_FOR_SERVICING                                          :По�лать об�лужить
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Организаци�
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Управление тран�портом, наход�щим�� в �том �пи�ке
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Замена тран�порта
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :По�лать об�лужить
 
-STR_SEND_TRAIN_TO_DEPOT                                         :По�лать в депо
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :По�лать в гараж
-STR_SEND_SHIP_TO_DEPOT                                          :По�лать в док
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :По�лать в ангар
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :По�лать в депо
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :По�лать в гараж
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :По�лать в док
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :По�лать в ангар
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}�ажмите дл� о�тановки в�его тран�порта в �пи�ке
-STR_MASS_START_LIST_TIP                                         :{BLACK}�ажмите дл� запу�ка в�его тран�порта в �пи�ке
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}�ажмите дл� о�тановки в�его тран�порта в �пи�ке
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}�ажмите дл� запу�ка в�его тран�порта в �пи�ке
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Общие задани� дл� {COMMA} ед. тран�порта
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Общие задани� дл� {COMMA} ед. тран�порта
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :В�е поезда
@@ -2756,11 +2756,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Без груп
 STR_GROUP_DEFAULT_SHIPS                                         :Без группы
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Без группы
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Щёлкните по имени группы дл� отображени� �пи�ка тран�порта
-STR_GROUP_CREATE_TIP                                            :{BLACK}Создать группу
-STR_GROUP_DELETE_TIP                                            :{BLACK}Удалить выбранную группу
-STR_GROUP_RENAME_TIP                                            :{BLACK}Переименовать выбранную группу
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Защита тран�порта в группе от глобальной автозамены
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Щёлкните по имени группы дл� отображени� �пи�ка тран�порта
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Создать группу
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Удалить выбранную группу
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Переименовать выбранную группу
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Защита тран�порта в группе от глобальной автозамены
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Добавить � общими задани�ми
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Удалить в�ех
@@ -2783,7 +2783,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Скор
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Скоро�ть: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Стоимо�ть об�луживани�: {GOLD}{CURRENCY}/год
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}�мко�ть: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(переоб.)
+STR_PURCHASE_INFO_REFITTABLE                                    :(переоб.)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Разработан в {GOLD}{NUM} г.{BLACK} Срок �лужбы: {GOLD}{COMMA} {P год года лет}
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Мак�. надёжно�ть: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Цена: {GOLD}{CURRENCY}
@@ -2847,17 +2847,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Пере
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Перетащите �юда корабль, чтобы продать его
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Перетащите �юда тран�порт, чтобы продать его
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Перетащите �юда локомотив дл� продажи в�его поезда
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Перетащите �юда локомотив дл� продажи в�его поезда
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Продать в�е поезда в депо
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Продать в�е авто в гараже
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Продать в�е �уда в доке
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Продать ве�ь авиатран�порт в ангаре
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Продать в�е поезда в депо
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Продать в�е авто в гараже
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Продать в�е �уда в доке
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Продать ве�ь авиатран�порт в ангаре
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}�втозамена в�ех поездов в депо
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}�втозамена в�ех авто в гараже
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}�втозамена в�ех �удов в доке
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}�втозамена в�его авиатран�порта в ангаре
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}�втозамена в�ех поездов в депо
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}�втозамена в�ех авто в гараже
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}�втозамена в�ех �удов в доке
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}�втозамена в�его авиатран�порта в ангаре
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}�овый тран�порт
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}�ова� машина
@@ -2869,35 +2869,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Купи
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Купить новый корабль
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Купить новый авиатран�порт
 
-STR_CLONE_TRAIN                                                 :{BLACK}Копировать �о�тав
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Копировать
-STR_CLONE_SHIP                                                  :{BLACK}Копировать
-STR_CLONE_AIRCRAFT                                              :{BLACK}Копировать
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Копировать �о�тав
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Копировать
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Копировать
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Копировать
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Создать копию поезда, включа� в�е вагоны. �ажмите на кнопку, а затем на поезд внутри или �наружи депо. Ctrl+щелчок �озда�т поезд � общими задани�ми.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Создать копию автомобил�. �ажмите на кнопку, а затем на машину внутри или �наружи гаража. Ctrl+щелчок �озда�т автомобиль � общими задани�ми.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Создать копию корабл�. �ажмите на кнопку, а затем на корабль внутри или �наружи дока. Control+щелчок �озда�т корабль � общими задани�ми.
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Создать копию �амолёта. �ажмите на кнопку, а потом на возд. �удно внутри или �наружи ангара. Ctrl+щелчок �озда�т копию � общими задани�ми.
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Создать копию поезда, включа� в�е вагоны. �ажмите на кнопку, а затем на поезд внутри или �наружи депо. Ctrl+щелчок �озда�т поезд � общими задани�ми.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Создать копию автомобил�. �ажмите на кнопку, а затем на машину внутри или �наружи гаража. Ctrl+щелчок �озда�т автомобиль � общими задани�ми.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Создать копию корабл�. �ажмите на кнопку, а затем на корабль внутри или �наружи дока. Control+щелчок �озда�т корабль � общими задани�ми.
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Создать копию �амолёта. �ажмите на кнопку, а потом на возд. �удно внутри или �наружи ангара. Ctrl+щелчок �озда�т копию � общими задани�ми.
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Показать депо в о�новном окне
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Показать гараж в главном окне
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Показать док в о�новном окне
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Показать ангар в главном окне
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Получить �пи�ок поездов, у которых в задани�х е�ть �то депо
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Получить �пи�ок автомобилей, у которых в задани�х е�ть �тот гараж
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Получить �пи�ок �удов, у которых в задани�х е�ть �тот док
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Получить �пи�ок авиатран�порта, у которого в задани�х е�ть �тот ангар
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Получить �пи�ок поездов, у которых в задани�х е�ть �то депо
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Получить �пи�ок автомобилей, у которых в задани�х е�ть �тот гараж
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Получить �пи�ок �удов, у которых в задани�х е�ть �тот док
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Получить �пи�ок авиатран�порта, у которого в задани�х е�ть �тот ангар
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}�ажмите дл� о�тановки в�ех поездов в депо
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}�ажмите дл� о�тановки в�ех авто в гараже
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}�ажмите дл� о�тановки в�ех кораблей в доке
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}�ажмите дл� о�тановки в�его авиатран�порта в ангаре
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}�ажмите дл� о�тановки в�ех поездов в депо
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}�ажмите дл� о�тановки в�ех авто в гараже
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}�ажмите дл� о�тановки в�ех кораблей в доке
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}�ажмите дл� о�тановки в�его авиатран�порта в ангаре
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}�ажмите дл� запу�ка в�ех поездов в депо
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}�ажмите дл� запу�ка в�ех авто в гараже
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}�ажмите дл� запу�ка в�ех �удов в доке
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}�ажмите дл� запу�ка в�его авиатран�порта в ангаре
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}�ажмите дл� запу�ка в�ех поездов в депо
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}�ажмите дл� запу�ка в�ех авто в гараже
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}�ажмите дл� запу�ка в�ех �удов в доке
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}�ажмите дл� запу�ка в�его авиатран�порта в ангаре
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Ве�ь тран�порт в депо будет продан. Вы уверены?
 
@@ -2917,42 +2917,42 @@ STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE.gen                      :монорелÑ
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :магниторель�овый локомотив
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE.gen                        :магниторель�ового локомотива
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Цена: {CURRENCY} Ве�: {WEIGHT_S}{}Скоро�ть: {VELOCITY}  Мощно�ть: {POWER}{}Цена об�луж.: {CURRENCY}/год{}�мко�ть: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Цена: {CURRENCY} Мак�. �коро�ть: {VELOCITY}{}�мко�ть: {CARGO}, {CARGO}{}Стоимо�ть об�луживани�: {CURRENCY}/год
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Цена: {CURRENCY} Мак�. �коро�ть: {VELOCITY}{}�мко�ть: {CARGO}{}Стоимо�ть об�луживани�: {CURRENCY}/год
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Цена: {CURRENCY} Ве�: {WEIGHT_S}{}Скоро�ть: {VELOCITY}  Мощно�ть: {POWER}{}Цена об�луж.: {CURRENCY}/год{}�мко�ть: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Цена: {CURRENCY} Мак�. �коро�ть: {VELOCITY}{}�мко�ть: {CARGO}, {CARGO}{}Стоимо�ть об�луживани�: {CURRENCY}/год
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Цена: {CURRENCY} Мак�. �коро�ть: {VELOCITY}{}�мко�ть: {CARGO}{}Стоимо�ть об�луживани�: {CURRENCY}/год
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Замена {STRING.gen}
-STR_VEHICLE_TRAIN                                               :Поезд
-STR_VEHICLE_TRAIN.gen                                           :ж/д тран�порта
-STR_VEHICLE_ROAD_VEHICLE                                        :�втотран�порт
-STR_VEHICLE_ROAD_VEHICLE.gen                                    :автотран�порта
-STR_VEHICLE_SHIP                                                :Корабль
-STR_VEHICLE_SHIP.gen                                            :кораблей
-STR_VEHICLE_AIRCRAFT                                            :Воздушный тран�порт
-STR_VEHICLE_AIRCRAFT.gen                                        :воздушного тран�порта
+STR_REPLACE_VEHICLE_TRAIN                                       :Поезд
+STR_REPLACE_VEHICLE_TRAIN.gen                                   :ж/д тран�порта
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :�втотран�порт
+STR_REPLACE_VEHICLE_ROAD_VEHICLE.gen                            :автотран�порта
+STR_REPLACE_VEHICLE_SHIP                                        :Корабль
+STR_REPLACE_VEHICLE_SHIP.gen                                    :кораблей
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Воздушный тран�порт
+STR_REPLACE_VEHICLE_AIRCRAFT.gen                                :воздушного тран�порта
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Выбор типа тран�порта дл� замены
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Выбор типа тран�порта, на который �ледует заменить
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}�ачать замену
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}�ачать замену выбранных типов тран�порта
-STR_NOT_REPLACING                                               :{BLACK}�ет замены
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Тран�порт не выбран
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}�ет замены
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Тран�порт не выбран
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Прекратить замену
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Прекратить замену тран�порта
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Замен�ем: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Переключение между окнами замены локомотивов и вагонов
-STR_ENGINES                                                     :Локомотивы
-STR_WAGONS                                                      :Вагоны
+STR_REPLACE_ENGINES                                             :Локомотивы
+STR_REPLACE_WAGONS                                              :Вагоны
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Тип ж/д тран�порта, подлежащего замене
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}�а какой тан�порт прои�ходит замена
-STR_RAIL_VEHICLES                                               :Поезда
-STR_ELRAIL_VEHICLES                                             :Электропоезда
-STR_MONORAIL_VEHICLES                                           :Монорель�овые
-STR_MAGLEV_VEHICLES                                             :Магнитные
+STR_REPLACE_RAIL_VEHICLES                                       :Поезда
+STR_REPLACE_ELRAIL_VEHICLES                                     :Электропоезда
+STR_REPLACE_MONORAIL_VEHICLES                                   :Монорель�овые
+STR_REPLACE_MAGLEV_VEHICLES                                     :Магнитные
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Удаление вагонов: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Разрешить при автозамене �охран�ть длину поездов путём удалени� вагонов (начина� � головы поезда), е�ли при автозамене локомотива увеличит�� длина поезда.
@@ -2970,10 +2970,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Отпр
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Отправить корабль в док. Ctrl+клик - только дл� об�луживани�
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}По�лать авиатран�порт в ангар. Ctrl+клик - только дл� об�луживани�.
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Создать копию поезда, включа� в�е вагоны. Ctrl+щелчок �озда�т поезд � общими задани�ми.
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Создать копию автомобил�. Control+щелчок �озда�т автомобиль � общими задани�ми.
-STR_CLONE_SHIP_INFO                                             :{BLACK}Создать копию корабл�. Control+щелчок �озда�т корабль � общими задани�ми.
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Создать копию возд. �удна. Control+щелчок �озда�т копию � общими задани�ми.
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Создать копию поезда, включа� в�е вагоны. Ctrl+щелчок �озда�т поезд � общими задани�ми.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Создать копию автомобил�. Control+щелчок �озда�т автомобиль � общими задани�ми.
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Создать копию корабл�. Control+щелчок �озда�т корабль � общими задани�ми.
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Создать копию возд. �удна. Control+щелчок �озда�т копию � общими задани�ми.
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}За�тавить поезд проехать на кра�ный �игнал �ветофора
 
@@ -3006,36 +3006,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}ОтъÐ
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}Потерпел крушение!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Поломка
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}О�тановлен
-STR_TRAIN_STOPPING                                              :{RED}О�тановлен
-STR_TRAIN_STOPPING_VEL                                          :{RED}О�танавливает��; {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}�ет тока.
-STR_TRAIN_STUCK                                                 :{ORANGE}Ожидает �вободного пути
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Идёт к {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Идёт к {STATION}; {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}�ет заданий
-STR_NO_ORDERS_VEL                                               :{LTBLUE}�ет заданий; {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Идёт к {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Идёт к {WAYPOINT}; {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Идёт в депо {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Идёт в депо {TOWN}; {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Идёт в гараж {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Идёт в гараж {TOWN}; {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Идёт в док {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Идёт в док {TOWN}; {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Летит в �нгар {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Идёт в ангар {STATION}; {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Об�луж. в депо {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Об�луж. в депо {TOWN}; {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Об�луж. в гараже {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Об�луж. в гараже {TOWN}; {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Об�луж. в доке {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Об�луж. в доке {TOWN}; {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Об�луж. в ангаре {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Об�луж. в ангаре {STATION}; {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}О�тановлен
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}О�танавливает��; {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}�ет тока.
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Ожидает �вободного пути
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Идёт к {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Идёт к {STATION}; {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}�ет заданий
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}�ет заданий; {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Идёт к {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Идёт к {WAYPOINT}; {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Идёт в депо {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Идёт в депо {TOWN}; {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Идёт в гараж {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Идёт в гараж {TOWN}; {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Идёт в док {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Идёт в док {TOWN}; {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Летит в �нгар {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Идёт в ангар {STATION}; {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Об�луж. в депо {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Об�луж. в депо {TOWN}; {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Об�луж. в гараже {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Об�луж. в гараже {TOWN}; {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Об�луж. в доке {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Об�луж. в доке {TOWN}; {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Об�луж. в ангаре {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Об�луж. в ангаре {STATION}; {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Детали)
@@ -3048,8 +3048,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}�азв
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Возра�т: {LTBLUE}{STRING}{BLACK}   Стоимо�ть об�луживани�: {LTBLUE}{CURRENCY}/год
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} {P год года лет} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} {P год года лет} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} {P год года лет} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} {P год года лет} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Мак�. �коро�ть: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Ве�: {LTBLUE}{WEIGHT_S} {BLACK}Мощно�ть: {LTBLUE}{POWER}{BLACK} Мак�. �коро�ть: {LTBLUE}{VELOCITY}
@@ -3063,7 +3063,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}�мко
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}�мко�ть: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}�мко�ть: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Выручка перевозки: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Выручка перевозки: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}О�мотр каждые {LTBLUE}{COMMA}дней{BLACK}   По�ледний раз: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Интервал об�луж.: {LTBLUE}{COMMA}%{BLACK}   По�ледний раз: {LTBLUE}{DATE_LONG}
@@ -3079,9 +3079,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}�азв
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}  По�троен в {LTBLUE}{NUM} г.{BLACK} Стоимо�ть: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Стоимо�ть: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Обща� загруженно�ть �того тран�порта:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} (В�его: {SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Обща� загруженно�ть �того тран�порта:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} (В�его: {SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Пу�то
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} из {STATION}
@@ -3096,7 +3096,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Пока
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Общий груз
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Показать общую вме�тимо�ть поезда по типам грузов
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}�мко�ть: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}�мко�ть: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Переоборудование)
@@ -3120,15 +3120,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Пере
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Задани�)
-STR_TIMETABLE_VIEW                                              :{BLACK}Ра�пи�ание
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Про�мотр ра�пи�ани�
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Ра�пи�ание
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Про�мотр ра�пи�ани�
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Показ �пи�ка заданий - щёлкните дл� выделени�. Е�ли зажать Ctrl - обзор �танции.
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Конец заданий - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Конец общих заданий - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Конец общих заданий - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Без о�тановки
@@ -3152,14 +3152,14 @@ STR_ORDER_DROP_TRANSFER                                         :ПередатÑ
 STR_ORDER_DROP_NO_UNLOADING                                     :�е разгружать��
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Изменить �по�об разгрузки дл� выделенного задани�
 
-STR_REFIT                                                       :{BLACK}Переоб.
-STR_REFIT_TIP                                                   :{BLACK}Выберите тип грузов дл� переоборудовани�. Ctrl+клик - дл� удалени�.
+STR_ORDER_REFIT                                                 :{BLACK}Переоб.
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Выберите тип грузов дл� переоборудовани�. Ctrl+клик - дл� удалени�.
 
-STR_SERVICE                                                     :{BLACK}Об�луж.
+STR_ORDER_SERVICE                                               :{BLACK}Об�луж.
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :В�егда идти
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Об�луж., е�ли необходимо
 STR_ORDER_DROP_HALT_DEPOT                                       :Стоп
-STR_SERVICE_HINT                                                :{BLACK}Пропу�тить �то задание, е�ли об�луживание не требует��
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Пропу�тить �то задание, е�ли об�луживание не требует��
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Параметр тран�порта дл� �равнени�
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Процент погрузки
@@ -3180,7 +3180,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :и�тина
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :ложь
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}Значение дл� �равнени� � данными тран�порта
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Введите значение дл� �равнени�
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Пропу�к
@@ -3194,13 +3194,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Идти к бÐ
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Идти к ближайшему ангару
 STR_ORDER_CONDITIONAL                                           :У�ловный переход к заданию
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}В�тавить новое задание перед выделенным, или в конец �пи�ка
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Добавить ра�ширенное задание
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Добавить ра�ширенное задание
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Показать ве�ь тран�порт � общими задани�ми
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Показать ве�ь тран�порт � общими задани�ми
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Ехать через {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ехать через {WAYPOINT} без о�тановки
+STR_ORDER_GO_TO_WAYPOINT                                        :Ехать через {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ехать через {WAYPOINT} без о�тановки
 
 STR_ORDER_SERVICE_AT                                            :Об�луживание в
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Об�луживание без о�тановки в
@@ -3210,15 +3210,15 @@ STR_ORDER_NEAREST_HANGAR                                        :ближайшÐ
 STR_ORDER_TRAIN_DEPOT                                           :депо
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :гараж
 STR_ORDER_SHIP_DEPOT                                            :док
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} �нгар ({STATION})
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} �нгар ({STATION})
 
-STR_REFIT_ORDER                                                 :(Переоборуд. под {STRING.acc})
-STR_REFIT_STOP_ORDER                                            :(Переоборуд. дл� {STRING} и �топ)
-STR_STOP_ORDER                                                  :(Стоп)
+STR_ORDER_REFIT_ORDER                                           :(Переоборуд. под {STRING.acc})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Переоборуд. дл� {STRING} и �топ)
+STR_ORDER_STOP_ORDER                                            :(Стоп)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Полна� погрузка)
 STR_ORDER_FULL_LOAD_ANY                                         :(Полна� погрузка любым грузом)
@@ -3239,16 +3239,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[начало Ñ
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[�ередина �танции]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[конец �танции]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Перейти к заданию {COMMA}
-STR_CONDITIONAL_NUM                                             :Перейти к заданию {COMMA}, е�ли {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Перейти к заданию {COMMA}, е�ли {STRING} - {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Перейти к заданию {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Перейти к заданию {COMMA}, е�ли {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Перейти к заданию {COMMA}, е�ли {STRING} - {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (�еверный Маршрут)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Ра�пи�ание)
-STR_ORDER_VIEW                                                  :{BLACK}Задани�
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Переключить�� на про�мотр заданий
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Задани�
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Переключить�� на про�мотр заданий
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Ра�пи�ание - выберите задание.
 
@@ -3270,10 +3270,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Этот
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Изм. врем�
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Изменить врем� дл� выделенного задани�
 
-STR_CLEAR_TIME                                                  :{BLACK}Сбро�ить врем�
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Сбро�ить врем�
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Сбро�ить врем� в выделенном задании
 
-STR_RESET_LATENESS                                              :{BLACK}Сбро� �чётчика
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Сбро� �чётчика
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Сбро�ить �чётчик так, чтобы тран�порт прибыл воврем�.
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}�втомат.
@@ -3281,42 +3281,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Запо
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}Отладка ИИ
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Им� ИИ
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Им� ИИ
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Перезагрузить ИИ
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Удалить ИИ, перезагрузить �крипт и перезапу�тить ИИ
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Удалить ИИ, перезагрузить �крипт и перезапу�тить ИИ
 
-STR_AI_NO_AI_FOUND                                              :�е найдено подход�щих модулей ИИ,{}по�тому конкуренты ничего делать не будут.{}Модули ИИ можно �качать через �и�тему онлайн-контента.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Один из запущенных ИИ выполнил недопу�тимую операцию и был закрыт. Пожалуй�та, �ообщите об �том автору ИИ, приложив �криншот окна отладки.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Окно отладки ИИ до�тупно только дл� �ервера
+STR_ERROR_AI_NO_AI_FOUND                                        :�е найдено подход�щих модулей ИИ,{}по�тому конкуренты ничего делать не будут.{}Модули ИИ можно �качать через �и�тему онлайн-контента.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Один из запущенных ИИ выполнил недопу�тимую операцию и был закрыт. Пожалуй�та, �ообщите об �том автору ИИ, приложив �криншот окна отладки.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Окно отладки ИИ до�тупно только дл� �ервера
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Конфигураци� ИИ
-STR_AI_LIST_TIP                                                 :{BLACK}ИИ, которые будут и�пользовать�� в игре
-STR_AI_HUMAN_PLAYER                                             :Человек
-STR_AI_RANDOM_AI                                                :Случ. ИИ
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}ИИ, которые будут и�пользовать�� в игре
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Человек
+STR_AI_CONFIG_RANDOM_AI                                         :Случ. ИИ
 
-STR_AI_CHANGE                                                   :{BLACK}Выбор ИИ
-STR_AI_CHANGE_TIP                                               :{BLACK}Загрузить другой ИИ
-STR_AI_CONFIGURE                                                :{BLACK}Конфигураци�
-STR_AI_CONFIGURE_TIP                                            :{BLACK}�а�троить параметры ИИ
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Выбор ИИ
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Загрузить другой ИИ
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Конфигураци�
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}�а�троить параметры ИИ
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}До�тупные ИИ
-STR_AI_AILIST_TIP                                               :{BLACK}Кликнуть дл� выбора ИИ
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Кликнуть дл� выбора ИИ
 
-STR_AI_AUTHOR                                                   :{BLACK}�втор: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Вер�и�: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}�втор: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Вер�и�: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Выбрать
-STR_AI_ACCEPT_TIP                                               :{BLACK}Выбрать под�веченный ИИ
-STR_AI_CANCEL                                                   :{BLACK}Отмена
-STR_AI_CANCEL_TIP                                               :{BLACK}�е выбирать ИИ
+STR_AI_LIST_ACCEPT                                              :{BLACK}Выбрать
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Выбрать под�веченный ИИ
+STR_AI_LIST_CANCEL                                              :{BLACK}Отмена
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�е выбирать ИИ
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Параметры ИИ
-STR_AI_CLOSE                                                    :{BLACK}Закрыть
-STR_AI_RESET                                                    :{BLACK}Сбро�
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Закрыть
+STR_AI_SETTINGS_RESET                                           :{BLACK}Сбро�
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3337,8 +3337,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Пред
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Предполагаемый доход: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Идёт �охранение,{}пожалуй�та, дождите�ь завершени�!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Ошибка авто�охранени�
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Идёт �охранение,{}пожалуй�та, дождите�ь завершени�!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Ошибка авто�охранени�
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}�е удало�ь прочитать ди�к
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}�евозможно �охранить игру{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}�евозможно удалить файл
@@ -3349,22 +3349,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :СохранеÐ
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :Файл не читает��
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :�езапи�ываемый файл
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :�арушена цело�тно�ть
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Игра была �охранена в игре без поддержки трамваев. В�е трамваи были отключены.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Игра была �охранена в игре без поддержки трамваев. В�е трамваи были отключены.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Генераци� карты о�тановлена...{}...нет до�тупных ме�т дл� размещени� городов
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... в �том �ценарии нет городов
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Генераци� карты о�тановлена...{}...нет до�тупных ме�т дл� размещени� городов
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... в �том �ценарии нет городов
 
-STR_PNGMAP_ERROR                                                :{WHITE}�е могу загрузить ландшафт из PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... файл не найден.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}... не могу преобразовать изображение. Треб. PNG 8 или 24-бит глубины цвета.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}... что-то пошло не так. Извините. (Возможно, файл повреждён)
+STR_ERROR_PNGMAP                                                :{WHITE}�е могу загрузить ландшафт из PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... файл не найден.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}... не могу преобразовать изображение. Треб. PNG 8 или 24-бит глубины цвета.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... что-то пошло не так. Извините. (Возможно, файл повреждён)
 
-STR_BMPMAP_ERROR                                                :{WHITE}�е могу загрузить ландшафт из BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}... невозможно преобразовать тип изображени�.
+STR_ERROR_BMPMAP                                                :{WHITE}�е могу загрузить ландшафт из BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}... невозможно преобразовать тип изображени�.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Выход за пределы до�тупных значений
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Изменение размеров и�ходной карты до таких значений не рекомендует��. Продолжить?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Выход за пределы до�тупных значений
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Изменение размеров и�ходной карты до таких значений не рекомендует��. Продолжить?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Скриншот �охранён под именем «{STRING}»
@@ -3387,15 +3387,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}... не
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... уже по�троено
 STR_ERROR_OWNED_BY                                              :{WHITE}... принадлежит {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... обла�ть принадлежит другой компании
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Им� должно быть уникальным
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} на пути
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Им� должно быть уникальным
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} на пути
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}...админи�траци� города {TOWN} запрещает вам �то делать
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}�дмини�траци� г.{NBSP}{TOWN} запрещает по�тройку ещё одного а�ропорта в городе
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}�дмини�траци� г.{NBSP}{TOWN} не разрешает �троитель�тво а�ропорта из-за вы�окого уровн� шума.
-STR_BRIBE_FAILED                                                :{WHITE}Ваша попытка дать вз�тку была
-STR_BRIBE_FAILED_2                                              :{WHITE}обнаружена региональным �ледователем
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}�дмини�траци� г.{NBSP}{TOWN} не разрешает �троитель�тво а�ропорта из-за вы�окого уровн� шума.
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Ваша попытка дать вз�тку была
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}обнаружена региональным �ледователем
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Зде�ь невозможно повы�ить уровень земли...
@@ -3404,7 +3404,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Зде�
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Земл�ные работы разрушат туннель
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Уже на уровне мор�
 STR_ERROR_TOO_HIGH                                              :{WHITE}Слишком вы�око
-STR_ALREADY_LEVELLED                                            :{WHITE}...уже ровно
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}...уже ровно
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}�евозможно изменить название компании...
@@ -3415,29 +3415,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}�ево
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... ��уда полно�тью погашена
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... требует�� {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}�евозможно пога�ить ��уду...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}�евозможно отдать ��уженные банком деньги...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}�евозможно отдать ��уженные банком деньги...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}�евозможно приобре�ти компанию...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}�евозможно по�троить штаб-квартиру компании...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}�е могу купить 25% акций �той компании...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}�е могу продать 25% акций �той компании...
-STR_PROTECTED                                                   :{WHITE}Эта компани� ещё не выпу�кает акции...
+STR_ERROR_PROTECTED                                             :{WHITE}Эта компани� ещё не выпу�кает акции...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�евозможно по�троить города...
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�евозможно по�троить города...
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}�е могу переименовать город...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Зде�ь невозможно по�троить город...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... �лишком близко к краю карты
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}... �лишком близко к другому городу
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}... �лишком много городов
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}... нет ме�та на карте
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Города не �тро�т дорог. Вы можете включить �тоитель�тво дорог в Ра�ш. на�тройки->Экономика->Города.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Идут дорожные работы...
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... нет ме�та на карте
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Города не �тро�т дорог. Вы можете включить �тоитель�тво дорог в Ра�ш. на�тройки->Экономика->Города.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Идут дорожные работы...
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}�евозможно �оздать промышленно�ть...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}�евозможно �оздать промышленно�ть...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Зде�ь нельз� �оздать {STRING}...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}По�троить зде�ь �то предпри�тие невозможно...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... �лишком близко к другому предпри�тию
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... �лишком близко к другому предпри�тию
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}... �начала по�тройте город
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... такой объект уже е�ть в городе
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... можно по�троить в городах � на�елением не менее 1200 жителей
@@ -3458,7 +3458,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Зде�
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}При�оедин�ет�� более чем к одной �уще�твующей �танции
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... �танци� �лишком больша�
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... и�пользование непр�моугольных �танций запрещено
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... и�пользование непр�моугольных �танций запрещено
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Слишком много �танций и о�тановок
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Слишком больша� ж/д �танци�
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Слишком много автобу�ных о�тановок
@@ -3468,12 +3468,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Слиш
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Слишком близко к другой при�тани
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Слишком близко к другому а�ропорту
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}�е могу переименовать �танцию...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... �та дорога принадлежит городу
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... неверное направление дороги
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... �та дорога принадлежит городу
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... неверное направление дороги
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}�евозможно удалить ча�ть �танции...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Сначала удалите ж/д �танцию
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}�евозможно удалить ча�ть �танции...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Сначала удалите ж/д �танцию
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}�евозможно удалить автобу�ную о�тановку...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}�евозможно удалить грузовой терминал...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}�е могу удалить па��ажир�кую трамвайную о�тановку...
@@ -3491,14 +3491,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Снач
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Примыкает к не�кольким точкам пути
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Слишком близко к другой точке пути
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Зде�ь невозможно по�тавить точку пути...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Зде�ь невозможно по�тавить точку пути...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}�е могу у�тановить зде�ь буй...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}�евозможно переименовать точку пути...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}�евозможно переименовать точку пути...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}�евозможно удалить точку пути...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Сначала нужно убрать точку пути
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}�евозможно удалить точку пути...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Сначала нужно убрать точку пути
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... буй на пути
-STR_BUOY_IS_IN_USE                                              :{WHITE}... �тот буй и�пользует��!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... �тот буй и�пользует��!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}Зде�ь невозможно по�троить депо...
@@ -3515,14 +3515,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Стру
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Поезд �лишком длинный
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}�ельз� развернуть поезд...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}�евозможно развернуть много�о�тавной тран�порт
-STR_INCOMPATIBLE_RAIL_TYPES                                     :I�е�овме�тимый тип рель�
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :I�е�овме�тимый тип рель�
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}�евозможно переме�тить тран�п. �ред�тво...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Тыловой локомотив в�егда �ледует за его передней ча�тью
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}�евозможно найти дорогу к депо
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}�евозможно найти гараж
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :�еверный тип депо
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :�еверный тип депо
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}ТС «{VEHICLE}» �лишком длинное по�ле замены
@@ -3533,14 +3533,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(денег мÐ
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}�евозможна� комбинаци� путей
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}�ет подход�щих рель�ов
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Сначала надо удалить рель�ы
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Дорога одно�торонн�� или блокирована
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Дорога одно�торонн�� или блокирована
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Зде�ь невозможно по�тавить �ветофор...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Зде�ь невозможно проложить рель�ы...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}�евозможно удалить рель�ы...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}�евозможно удалить �ветофор...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}�евозможно преобразовать зде�ь �игнал...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}�евозможно преобразовать зде�ь �игнал...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Зде�ь невозможно преобразовать тип рель�а...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Зде�ь невозможно преобразовать тип рель�а...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Сначала удалите дорогу
@@ -3551,13 +3551,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}Ð�е мÐ
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}�е могу удалить трамвайные рель�ы...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}Зде�ь невозможно по�троить канал...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Зде�ь невозможно по�троить шлюз...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Зде�ь невозможно ра�положить реку...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Зде�ь невозможно по�троить канал...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Зде�ь невозможно по�троить шлюз...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Зде�ь невозможно ра�положить реку...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... нужно �троить в воде
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... нельз� �троить в воде
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Сначала надо уничтожить канал
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Зде�ь невозможно по�троить акведук...
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Сначала надо уничтожить канал
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Зде�ь невозможно по�троить акведук...
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... уже е�ть дерево
@@ -3566,9 +3566,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}�ево
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Зде�ь невозможно по�троить мо�т...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Сначала удалите мо�т
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}�е может начинать�� и заканчивать�� в той же точке
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Опоры мо�тов должны быть на одном уровне
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Слишком низкий мо�т
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}�е может начинать�� и заканчивать�� в той же точке
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Опоры мо�тов должны быть на одном уровне
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Слишком низкий мо�т
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}�ачало и конец должны быть на одной линии
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... оба конца мо�та должны опирать�� на землю
 
@@ -3577,7 +3577,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Зде�
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}�еподход�щее ме�то дл� �троитель�тва туннел�
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Сначала удалите туннель
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Другой туннель на пути
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Туннель заканчивает�� за пределами карты
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Туннель заканчивает�� за пределами карты
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}�евозможно подн�ть/опу�тить землю дл� другого конца туннел�
 
 # Unmovable related errors
@@ -3587,12 +3587,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}�ево
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... вы и так уже владеете �тим!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}�е могу �оздать группу...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}�е могу удалить группу...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}�е могу переименовать группу...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}�е могу удалить ве�ь тран�порт из группы...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}�е могу добавить тран�порт в группу...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}�е могу добавить тран�порт � общими задани�ми в группу...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}�е могу �оздать группу...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}�е могу удалить группу...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}�е могу переименовать группу...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}�е могу удалить ве�ь тран�порт из группы...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}�е могу добавить тран�порт в группу...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}�е могу добавить тран�порт � общими задани�ми в группу...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Поезд мешает
@@ -3635,21 +3635,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}�ево
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}�евозможно продать корабль...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}�е могу продать авиатран�порт...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Локомотив недо�тупен
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}�втотран�порт недо�тупен
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Корабль недо�тупен
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}�виатран�порт недо�тупен
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Локомотив недо�тупен
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}�втотран�порт недо�тупен
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Корабль недо�тупен
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}�виатран�порт недо�тупен
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Слишком много тран�порта в игре
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}�евозможно изменить �ерви�ный интервал...
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}�ельз� продать уничтоженный тран�порт...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}�ельз� переоборудовать уничтоженный тран�порт...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}�ельз� продать уничтоженный тран�порт...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}�ельз� переоборудовать уничтоженный тран�порт...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}�евозможно игнорировать �игнал. Опа�но...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}�евозможно развернуть поезд...
-STR_TRAIN_START_NO_CATENARY                                     :Кто-то украл в�е провода, поезд не может ехать.
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Кто-то украл в�е провода, поезд не может ехать.
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}�ельз� развернуть машину...
 
@@ -3668,14 +3668,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}... ТС
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}... ТС не может до�тигнуть �той �танции
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}... ТС не может до�тигнуть �той �танции
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}�евозможно и�пользовать общий �пи�ок заданий
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}�евозможно �копировать �пи�ок заданий
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}�евозможно и�пользовать общий �пи�ок заданий
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}�евозможно �копировать �пи�ок заданий
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}... �лишком далеко от предыдущей точки
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}�е могу �о�тавить ра�пи�ание дл� �того тран�порта...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Тран�порт может ждать только на �танции.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Этот тран�порт не о�танавливает�� на �той �танции.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}�е могу �о�тавить ра�пи�ание дл� �того тран�порта...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Тран�порт может ждать только на �танции.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Этот тран�порт не о�танавливает�� на �той �танции.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... �лишком много знаков
@@ -4065,35 +4065,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING.gen} {NUM} г.
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :Буй {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Буй {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Буй {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Буй {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Компани� {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Группа {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :Точка пути {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Точка пути {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Точка пути {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Точка пути {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :неизве�тна� �транци�
-STR_SIGN_DEFAULT                                                :Знак
+STR_DEFAULT_SIGN_NAME                                           :Знак
 STR_COMPANY_SOMEONE                                             :кто-нибудь{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :�аблюдатель, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :�аблюдатель, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -4111,7 +4111,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -4125,25 +4125,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{BLACK}{TINYFONT}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt
index 62e202fe0..bd0bf7998 100644
--- a/src/lang/serbian.txt
+++ b/src/lang/serbian.txt
@@ -628,11 +628,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Uklju�i/Isklju�i grafikone po vrsti tovara
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Prikaži detaljne ocene u�inka
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Prikaži detaljne ocene u�inka
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Legenda grafikona kompanije
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Kliknite ovde za uklju�enje/isklju�enje prikaza kompanije na grafikonu
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Kliknite ovde za uklju�enje/isklju�enje prikaza kompanije na grafikonu
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Tabela lige kompanija
@@ -667,16 +667,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Novac:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Zajam:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Ukupno:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Broj vozila; ukupan broj drumskih, železni�kih vozila, brodova i letilica
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Broj stanica. Posebno se broji svaki deo (npr. železni�ko, autobusko stajalište ili aerodrom) stanice.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Dobit vozila sa najmanjim prihodom (svih vozila starijih od 2 godine)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Koli�ina novca zarađena u mesecu sa najmanjom dobiti u proteklih 12 tromese�ja
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Koli�ina novca zarađena u mesecu sa najvećom dobiti u proteklih 12 tromese�ja
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Jedinica tereta dostavljenih u proteklih �etiri tromese�ja
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Broj vrsta tereta dostavljenih u proteklom tromese�ju
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Koli�ina novca koju ova kompanija ima u banci
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Koli�ina novca koju ova kompanije je pozajmila
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Ukupno bodova od nejviše mogućih
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Broj vozila; ukupan broj drumskih, železni�kih vozila, brodova i letilica
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Broj stanica. Posebno se broji svaki deo (npr. železni�ko, autobusko stajalište ili aerodrom) stanice.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Dobit vozila sa najmanjim prihodom (svih vozila starijih od 2 godine)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Koli�ina novca zarađena u mesecu sa najmanjom dobiti u proteklih 12 tromese�ja
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Koli�ina novca zarađena u mesecu sa najvećom dobiti u proteklih 12 tromese�ja
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Jedinica tereta dostavljenih u proteklih �etiri tromese�ja
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Broj vrsta tereta dostavljenih u proteklom tromese�ju
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Koli�ina novca koju ova kompanija ima u banci
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Koli�ina novca koju ova kompanije je pozajmila
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Ukupno bodova od nejviše mogućih
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Džez džuboks
@@ -811,8 +811,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ÄŒUV
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Arhiva Vesti
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Spisak skorašnjih novosti
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Spisak skorašnjih novosti
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Poruka
@@ -1033,7 +1033,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Odaberit
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Ceo ekran
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Pritisnite ovde kako bi ste igrali OpenTTD na celom ekranu
-STR_FULLSCREEN_FAILED                                           :{WHITE}Neuspešno prebacivanje u ceo ekran
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Neuspešno prebacivanje u ceo ekran
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Veli�ina ekrana
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Odaberite željenu veli�inu ekrana
@@ -1086,7 +1086,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Napusti
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Varanja
-STR_CHEATS_TIP                                                  :{BLACK}Štiklirano polje ozna�ava da ste i ranije koristili ovu opciju
+STR_CHEATS_TOOLTIP                                              :{BLACK}Štiklirano polje ozna�ava da ste i ranije koristili ovu opciju
 STR_CHEATS_WARNING                                              :{BLACK}Upozorenje! Upravo ćete prevariti vaše saradnike. Imajte na umu da će takav loš postupak biti trajno upamćen.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Dodati još {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Upravljanje kompanijom: {ORANGE}{COMMA}
@@ -1101,14 +1101,14 @@ STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Dozvoli
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nova Å¡ema boja
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Prikaži generalnu mustru boja
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Prikaži mustre boja vozova
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Prikaži mustre boja drumskih vozila
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Prikaži mustre boja brodova
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Prikaži mustre boja letilica
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Izaberite osnovnu boju za ozna�enu kategoriju
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Izaberite dodatnu boju za ozna�enu kategoriju
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Ozna�ite kategoriju za izmenu boje, ili više njih koristeći Ctrl+Klik. Kliknite na kvadratić kako biste aktivirali korišćenje boje
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Prikaži generalnu mustru boja
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Prikaži mustre boja vozova
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Prikaži mustre boja drumskih vozila
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Prikaži mustre boja brodova
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Prikaži mustre boja letilica
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Izaberite osnovnu boju za ozna�enu kategoriju
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Izaberite dodatnu boju za ozna�enu kategoriju
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Ozna�ite kategoriju za izmenu boje, ili više njih koristeći Ctrl+Klik. Kliknite na kvadratić kako biste aktivirali korišćenje boje
 
 STR_LIVERY_DEFAULT                                              :Generalne Boje
 STR_LIVERY_STEAM                                                :Parna Lokomotiva
@@ -1146,19 +1146,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Izbor ž
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Novo lice
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generiši novo lice
 STR_FACE_ADVANCED                                               :{BLACK}Napredno
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Napredni odabir lica.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Napredni odabir lica.
 STR_FACE_SIMPLE                                                 :{BLACK}Jednostavno
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Jodnostavan odabir lica.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Jodnostavan odabir lica.
 STR_FACE_LOAD                                                   :{BLACK}U�itaj
-STR_FACE_LOAD_TIP                                               :{BLACK}U�itavanje omiljenog lica
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}U�itavanje omiljenog lica
 STR_FACE_LOAD_DONE                                              :{WHITE}Vaše omiljeno lice je u�itano iz OpenTTD datoteke podešavanja.
 STR_FACE_FACECODE                                               :{BLACK}Redni broj lica
-STR_FACE_FACECODE_TIP                                           :{BLACK}Pregled i/ili postavljanje rednog broja lica
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Pregled i/ili postavljanje rednog broja lica
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Pregled i/ili postavljanje rednog broja lica igra�a
 STR_FACE_FACECODE_SET                                           :{WHITE}Novi redni broj lica je postavljen.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Broj lica se ne može postaviti - vrednost mora biti broj između 0 i 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Sa�uvaj
-STR_FACE_SAVE_TIP                                               :{BLACK}ÄŒuvanje omiljenog lica
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}ÄŒuvanje omiljenog lica
 STR_FACE_SAVE_DONE                                              :{WHITE}Ovo lice će biti sa�uvano kao omiljeno u OpenTTD datoteci podešavanja.
 STR_FACE_EUROPEAN                                               :{BLACK}Evropski
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Evropski izgled lica
@@ -1166,49 +1166,49 @@ STR_FACE_AFRICAN                                                :{BLACK}Afri�ki
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Afri�ki izgled lica
 STR_FACE_YES                                                    :Da
 STR_FACE_NO                                                     :Ne
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Dodavanje brkova ili minđuša
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Dodavanje brkova ili minđuša
 STR_FACE_HAIR                                                   :Kosa:
-STR_FACE_HAIR_TIP                                               :{BLACK}Promena kose
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Promena kose
 STR_FACE_EYEBROWS                                               :Obrve:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Promena obrva
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Promena obrva
 STR_FACE_EYECOLOUR                                              :Boja o�iju:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Promena boje o�iju
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Promena boje o�iju
 STR_FACE_GLASSES                                                :Nao�are:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Dodavanje nao�ara
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Promena nao�ara
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Dodavanje nao�ara
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Promena nao�ara
 STR_FACE_NOSE                                                   :Nos:
-STR_FACE_NOSE_TIP                                               :{BLACK}Promena nos
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Promena nos
 STR_FACE_LIPS                                                   :Usna:
 STR_FACE_MOUSTACHE                                              :Brk:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Promena usna ili brk
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Promena usna ili brk
 STR_FACE_CHIN                                                   :Brada:
-STR_FACE_CHIN_TIP                                               :{BLACK}Promena brada
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Promena brada
 STR_FACE_JACKET                                                 :Jakna:
-STR_FACE_JACKET_TIP                                             :{BLACK}Promena jakna
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Promena jakna
 STR_FACE_COLLAR                                                 :Ovratnik:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Promena ovratnik
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Promena ovratnik
 STR_FACE_TIE                                                    :Kravata:
 STR_FACE_EARRING                                                :Minđuše:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Promena kravate ili minđuša
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Promena kravate ili minđuša
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Dodaci za preuzimanje
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Vrsta
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Vrsta dodatka
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Vrsta dodatka
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Naziv
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Naziv dodatka
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Kliknite kako biste videli detalje{}Kliknite na kvadratić kako biste ga ozna�ili za skidanje
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Naziv dodatka
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Kliknite kako biste videli detalje{}Kliknite na kvadratić kako biste ga ozna�ili za skidanje
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Ozna�i sve
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Obeležava sve dodatke za preuzimanje
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Obeležava sve dodatke za preuzimanje
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Obeleži ažurirana
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Obeležava sve preuzete dodatke koje imaju novija izdanja za preuzimanje
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Obeležava sve preuzete dodatke koje imaju novija izdanja za preuzimanje
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Odzna�i sve
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Otkazuje preuzimanje svih dodataka
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Otkazuje preuzimanje svih dodataka
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Unes filter teksta
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Unesite klju�nu re� kako bi se filtriralo spisak
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Unesite klju�nu re� kako bi se filtriralo spisak
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filter po klju�u/nazivu:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Preuzmi
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Zapo�inje preuzimanje odabranih dodataka
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Zapo�inje preuzimanje odabranih dodataka
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Ukupna koli�ina za preuzimanje: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}PODACI O DODATKU
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Dodatak nije ozna�en preuzimanje
@@ -1245,17 +1245,17 @@ STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Preuzima
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} od {BYTES} preuzetih ({NUM} %)
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Podešavanja Prozirnosti
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Promena prozirnosti naziva stanica. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Promena prozirnosti drveća. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Promena prozirnosti zgrada. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Promena prozirnosti fabrika. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Promena prozirnosti građevina poput stanica, depoa i putanja. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Promena prozirnosti mostova. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Promena prozirnosti građevina poput svetionika i repetitora. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Promena prozirnosti kontaktnih mreža. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Promena prozirnosti pokazatelja utovara. Sa Ctrl+Klik se zaklju�ava.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}ÄŒini objekte nevidljivim umesto prozirnim
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Podešavanja Prozirnosti
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Promena prozirnosti naziva stanica. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Promena prozirnosti drveća. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Promena prozirnosti zgrada. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Promena prozirnosti fabrika. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Promena prozirnosti građevina poput stanica, depoa i putanja. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Promena prozirnosti mostova. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Promena prozirnosti građevina poput svetionika i repetitora. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Promena prozirnosti kontaktnih mreža. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Promena prozirnosti pokazatelja utovara. Sa Ctrl+Klik se zaklju�ava.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}ÄŒini objekte nevidljivim umesto prozirnim
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Ozna�avanje zahvaćenog podru�ja
@@ -1293,28 +1293,28 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Izbor du
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Prevla�enje
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Gradnja stanice prevla�enjem
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Odaberite klasu stanice za gradnju
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Odaberite vrstu stanice za gradnju
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Odaberite klasu stanice za gradnju
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Odaberite vrstu stanice za gradnju
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Izbor Signalizacije
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Signalizacije se ovde ne može promeniti...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Blok Signalizacija (semafor){}Ovo je najosnovnija vrsta signalizacije, dozvoljava samo jedan voz da bude u istoj deonici.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Ulazna Signalizacija (semafor){}Otvoren prolaz ukoliko postoji jedan ili više otvorenih izlaznih signalizacija sa nastupajuće deonica. U suprotnom je zatvoren.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Izlazna Signalizacija (semafor){}Ponaša se isto kao i blok signalizacija ali je neophodan za uparivanje sa ulaznom i/ili kombinovanom signalizacijom.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinovana Signalizacija (semafor){}Kombinovana signalizacija se ponaša kao ulazna i izlazna signalizacija. Ovim se omogućava gradnja velikih "stabala" predsignalizacije.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Putna Signalizacija (semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Standardnu putnu signalizaciju moguće je proći i sa suprotnog smera.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Jednosmerna Putna Signalizacija (semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Jednosmerna putna signalizacija zabranjuje prolaz sa suprotnog smera.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Blok Signalizacija (svetlosni semafor){}Ovo je najosnovnija vrsta signalizacije, dozvoljava samo jedan voz da bude u istoj deonici.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Ulazna Signalizacija (svetlosni semafor){}Otvoren prolaz ukoliko postoji jedan ili više otvorenih izlaznih signalizacija sa nastupajuće deonica. U suprotnom je zatvoren.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Izlazna Signalizacija (svetlosni semafor){}Ponaša se isto kao i blok signalizacija ali je neophodan za uparivanje sa ulaznom i/ili kombinovanom signalizacijom.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinovana Signalizacija (svetlosni semafor){}Kombinovana signalizacija se ponaša kao ulazna i izlazna signalizacija. Ovim se omogućava gradnja velikih "stabala" predsignalizacije.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Putna Signalizacija (svetlosni semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Standardnu putnu signalizaciju moguće je proći i sa suprotnog smera.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Jednosmerna Putna Signalizacija (svetlosni semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Jednosmerna putna signalizacija zabranjuje prolaz sa suprotnog smera.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Promena Signalizacije{}Kada je ozna�eno, klikom na postojeću signalizaciju promeniće je na izabranu vrstu i podvrstu, sa Ctrl+Klik će se ozna�iti postojeća podvrsta.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Razmak između signalizacija tokom povla�enja
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Smanjivanje razmaka između signalizacija
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Povećavanje razmaka između signalizacija
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Izbor Signalizacije
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Signalizacije se ovde ne može promeniti...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Blok Signalizacija (semafor){}Ovo je najosnovnija vrsta signalizacije, dozvoljava samo jedan voz da bude u istoj deonici.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Ulazna Signalizacija (semafor){}Otvoren prolaz ukoliko postoji jedan ili više otvorenih izlaznih signalizacija sa nastupajuće deonica. U suprotnom je zatvoren.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Izlazna Signalizacija (semafor){}Ponaša se isto kao i blok signalizacija ali je neophodan za uparivanje sa ulaznom i/ili kombinovanom signalizacijom.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinovana Signalizacija (semafor){}Kombinovana signalizacija se ponaša kao ulazna i izlazna signalizacija. Ovim se omogućava gradnja velikih "stabala" predsignalizacije.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Putna Signalizacija (semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Standardnu putnu signalizaciju moguće je proći i sa suprotnog smera.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Jednosmerna Putna Signalizacija (semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Jednosmerna putna signalizacija zabranjuje prolaz sa suprotnog smera.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blok Signalizacija (svetlosni semafor){}Ovo je najosnovnija vrsta signalizacije, dozvoljava samo jedan voz da bude u istoj deonici.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Ulazna Signalizacija (svetlosni semafor){}Otvoren prolaz ukoliko postoji jedan ili više otvorenih izlaznih signalizacija sa nastupajuće deonica. U suprotnom je zatvoren.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Izlazna Signalizacija (svetlosni semafor){}Ponaša se isto kao i blok signalizacija ali je neophodan za uparivanje sa ulaznom i/ili kombinovanom signalizacijom.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinovana Signalizacija (svetlosni semafor){}Kombinovana signalizacija se ponaša kao ulazna i izlazna signalizacija. Ovim se omogućava gradnja velikih "stabala" predsignalizacije.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Putna Signalizacija (svetlosni semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Standardnu putnu signalizaciju moguće je proći i sa suprotnog smera.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Jednosmerna Putna Signalizacija (svetlosni semafor){}Putna signalizacija omogućava da više vozova istovremeno uđe u istu deonicu, ukoliko mogu da obezbede put do zasebnog zaustavnog koloseka. Jednosmerna putna signalizacija zabranjuje prolaz sa suprotnog smera.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Promena Signalizacije{}Kada je ozna�eno, klikom na postojeću signalizaciju promeniće je na izabranu vrstu i podvrstu, sa Ctrl+Klik će se ozna�iti postojeća podvrsta.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Razmak između signalizacija tokom povla�enja
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Smanjivanje razmaka između signalizacija
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Povećavanje razmaka između signalizacija
 
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Izgradnja puta
@@ -1339,9 +1339,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Uklanjan
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orijentacija drumskog depoa
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Izbor orijentacije drumskog depoa
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Izbor orijentacije drumskog depoa
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Izbor orijentacije tramvajskog depoa
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Izbor orijentacije tramvajskog depoa
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Izbor orijentacije tramvajskog depoa
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orijentacija autobuske stanice
@@ -1405,40 +1405,40 @@ STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} na putu iz {STATION})
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Prihvata: {WHITE}
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Ni jedna vrsta tovara nije na �ekanju
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Odaberi sve objekte
-STR_SELECT_ALL_TYPES                                            :{BLACK}Odaberi sve vrste tovara (uklju�ujući i one bez tovara)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Pogledajte listu raspoloživih mašina za ovu vrstu vozila.
-STR_MANAGE_LIST                                                 :{BLACK}Upravljanje
-STR_MANAGE_LIST_TIP                                             :{BLACK}Pošaljite naredbu svim vozilima na ovoj listi
-STR_REPLACE_VEHICLES                                            :Obnovi vozila
-STR_SEND_FOR_SERVICING                                          :Pošalji na Servisiranje
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Ni jedna vrsta tovara nije na �ekanju
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Odaberi sve objekte
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Odaberi sve vrste tovara (uklju�ujući i one bez tovara)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Pogledajte listu raspoloživih mašina za ovu vrstu vozila.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Upravljanje
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Pošaljite naredbu svim vozilima na ovoj listi
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Obnovi vozila
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Pošalji na Servisiranje
 
 STR_ERROR_OWNED_BY                                              :{WHITE}...je u vlasništvu igra�a {STRING}
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Tovar
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informacija
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapaciteti
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Ukupni tovar
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Ukupan kapacitet ovog voza:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Ukupan kapacitet ovog voza:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
-STR_MAPSIZE                                                     :{BLACK}Veli�ina mapa:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Veli�ina mapa:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 STR_COMPANY_SOMEONE                                             :neko{SKIP}{SKIP}
 
 STR_ABOUT_OPENTTD                                               :{WHITE}O OpenTTD-u
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Da li stvarno želite da napustite ovu partiju?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Napusti igru
-STR_SORT_ORDER_TIP                                              :{BLACK}Odaberite na�in sortiranja (opadajući/rastući)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Odaberite kriterijum za sortiranje
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Izaberite na�in filtriranja
-STR_SORT_BY                                                     :{BLACK}Sortiraj po
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Odaberite na�in sortiranja (opadajući/rastući)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Odaberite kriterijum za sortiranje
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Izaberite na�in filtriranja
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortiraj po
 
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Poruka
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}{STRING} je poslao/la poruku
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Oprez!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Oprez!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Neizvodljivo...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Podru�je ne može biti o�išćeno...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Originalni kopirajt {COPYRIGHT} 1995 Chris Sawyer, Sva prava zadržana
@@ -1446,55 +1446,55 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2006 OpenTTD tim
 
 STR_QUIT_CAPTION                                                :{WHITE}Izađi
-STR_YES                                                         :{BLACK}Da
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Da li ste sigurni da želite da napustite OpenTTD i vratite se u {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Da
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Da li ste sigurni da želite da napustite OpenTTD i vratite se u {STRING}?
 
 STR_JUST_NOTHING                                                :Ništa
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Previše je vozila u igri
 STR_BUTTON_LOCATION                                             :{BLACK}Mesto
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Prvobitno
-STR_QUERY_CANCEL                                                :{BLACK}Otkaži
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Preimenuj
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Prvobitno
+STR_BUTTON_CANCEL                                               :{BLACK}Otkaži
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Preimenuj
 
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Servisni interval nije moguće promeniti...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zatvori prozor
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Naslov - povucite mišem da biste pomerili prozor
-STR_STICKY_BUTTON                                               :{BLACK}Pridenite kako bi ovaj prozor ostao otvoren prilikom pritiska na dugme za zatvaranje svih prozora
-STR_RESIZE_BUTTON                                               :{BLACK}Pritisnite i povucite kako bi prozor promenio veli�inu
+STR_TOOLTIP_STICKY                                              :{BLACK}Pridenite kako bi ovaj prozor ostao otvoren prilikom pritiska na dugme za zatvaranje svih prozora
+STR_TOOLTIP_RESIZE                                              :{BLACK}Pritisnite i povucite kako bi prozor promenio veli�inu
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Pritisnite ovde kako bi ste otišli u uobi�ajni direktorijum za �uvanje pozicije
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Sruši građevinu i sl. na kvadratu tla
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Spusti ugao tla
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Podigni ugao tla
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Spusti ugao tla
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Podigni ugao tla
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Skrol - pomera spisak gore/dole
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Kliza� - pomera spisak levo/desno
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Ovogodišnja zarada: {CURRENCY} (prošle godine: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} godin{P a e a} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} godin{P a e a} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} godin{P a e a} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} godin{P a e a} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :voz
-STR_VEHICLE_TRAIN.big                                           :Voz
-STR_VEHICLE_TRAIN.gen                                           :voza
-STR_VEHICLE_TRAIN.aku                                           :voz
-STR_VEHICLE_ROAD_VEHICLE                                        :drumsko vozilo
-STR_VEHICLE_ROAD_VEHICLE.big                                    :Drumsko vozilo
-STR_VEHICLE_ROAD_VEHICLE.gen                                    :drumskog vozila
-STR_VEHICLE_ROAD_VEHICLE.aku                                    :drumsko vozilo
-STR_VEHICLE_SHIP                                                :brod
-STR_VEHICLE_SHIP.big                                            :Brod
-STR_VEHICLE_SHIP.gen                                            :broda
-STR_VEHICLE_SHIP.aku                                            :brod
-STR_VEHICLE_AIRCRAFT                                            :letelica
-STR_VEHICLE_AIRCRAFT.aku                                        :letelicu
+STR_REPLACE_VEHICLE_TRAIN                                       :voz
+STR_REPLACE_VEHICLE_TRAIN.big                                   :Voz
+STR_REPLACE_VEHICLE_TRAIN.gen                                   :voza
+STR_REPLACE_VEHICLE_TRAIN.aku                                   :voz
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :drumsko vozilo
+STR_REPLACE_VEHICLE_ROAD_VEHICLE.big                            :Drumsko vozilo
+STR_REPLACE_VEHICLE_ROAD_VEHICLE.gen                            :drumskog vozila
+STR_REPLACE_VEHICLE_ROAD_VEHICLE.aku                            :drumsko vozilo
+STR_REPLACE_VEHICLE_SHIP                                        :brod
+STR_REPLACE_VEHICLE_SHIP.big                                    :Brod
+STR_REPLACE_VEHICLE_SHIP.gen                                    :broda
+STR_REPLACE_VEHICLE_SHIP.aku                                    :brod
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :letelica
+STR_REPLACE_VEHICLE_AIRCRAFT.aku                                :letelicu
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Prikaži informacije o zemljištu
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Cena �išćenja: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Cena �išćenja: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Dobit po uklanjanju: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Dobit po uklanjanju: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Vlasnik: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Vlasnik kolovoza: {LTBLUE}{STRING}
@@ -1503,11 +1503,11 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Vlasnuk
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokalna vlast: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nema
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Tovar prihvaćen: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik na uslugu centrira pogled na industriju/naselje
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik na uslugu centrira pogled na industriju/naselje
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...previše udaljeno od prethodne destinacije
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
@@ -1518,7 +1518,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Smanji p
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generiši nov nasumi�an teren
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Obnovi reljef
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Obnovi reljef
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Ukoni sve objekte u vlasništvu igra�a na mapi
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Ukoni sve objekte u vlasništvu igra�a na mapi
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Da li sigurno želite da uklonite sve objekte u vlasništvu igra�a?
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Generator naselja
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Novo naselje
@@ -1528,11 +1528,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...previ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...drugo naselje je previše blizu
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...mesto je neadekvatno
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...previše naselja
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ne mogu da napravim naselje
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...više ne postoji slobodnog prostora na mapi
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Ne mogu da napravim naselje
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...više ne postoji slobodnog prostora na mapi
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Uvećaj površinu naselja
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Proširi
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Naselje neće graditi kolovoze. Možete uklju�iti gradnju kolovoza preko Napredna Podešavalja->Ekonomija->Naselja.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Naselje neće graditi kolovoze. Možete uklju�iti gradnju kolovoza preko Napredna Podešavalja->Ekonomija->Naselja.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Nasumi�no naselje
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Izgradi naselje na nasumi�noj lokaciji
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE} {STRING} je nemoguće izgraditi ovde...
@@ -1546,20 +1546,20 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Postavi
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Postavi svetionik
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Postavi predajnik
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definiši pustinjsku oblast.{}Pritisni i drži Ctrl da je ukloniš
-STR_CREATE_LAKE                                                 :{BLACK}Vodena površina.{}Napravite kanal, ukoliko držite i Ctrl dok ste na nivou mora, tada popunjavate okolinu vodom
-STR_CREATE_RIVER                                                :{BLACK}Mjesto reka.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Vodena površina.{}Napravite kanal, ukoliko držite i Ctrl dok ste na nivou mora, tada popunjavate okolinu vodom
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Mjesto reka.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Obriši
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Potpuno ukloni ovo naselje
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Sa�uvaj scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :U�itaj scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Teret visina
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Teret visina
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Napusti editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Napusti
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Sa�uvaj scenario, u�itaj scenario, napusti editor, izađi
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}U�itaj scenario
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Sa�uvaj scenario
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Da li ste sigurni da želite da izađete iz ovog scenarija?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Da li ste sigurni da želite da izađete iz ovog scenarija?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...dozvoljeno izgraditi samo u naseljima sa populacijom od najmanje 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Pomeranje datuma po�etka za jednu godinu unazad
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Pomeranje datuma po�etka za jednu godinu unapred
@@ -1567,19 +1567,19 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...oba k
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Malo
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Srednje
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Veliko
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Slu�ajan
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Slu�ajan
 STR_FOUND_TOWN_CITY                                             :{BLACK}Grad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Gradovi rasti brže nego pravilan gradski stanovništvo{}Ovisno o postavljanje , oni biti veći našto valjan
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Izbor veli�ine naselja
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Veli�ina naselja:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Grad cesta raspored:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Izabrati cesta raspored iskorišten umjesto današji grad
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originalan
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bolji rub ceste
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 rešetka
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 rešetka
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Slu�ajan
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Grad cesta raspored:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Izabrati cesta raspored iskorišten umjesto današji grad
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originalan
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bolji rub ceste
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 rešetka
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 rešetka
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Slu�ajan
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Finansiranje izgradnje nove industrije
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...gradnja je dozvoljena samo u podru�jima pod tropskim šumama
@@ -1588,15 +1588,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...gradn
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Slika je snimljena pod imenom '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Slika nije snimljena!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kupovina zemljišta za kasnije korišćenje
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Čuvanje je još u toku,{}molim sa�ekajte dok se ne završi!
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kupovina zemljišta za kasnije korišćenje
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Čuvanje je još u toku,{}molim sa�ekajte dok se ne završi!
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Neuspešno automatsko �uvanje
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Neuspešno automatsko �uvanje
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Ide ka {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Ide ka {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Nema naredbi
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Nema naredbi, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Ide ka {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Ide ka {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Nema naredbi
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Nema naredbi, {VELOCITY}
 
 STR_PASSENGERS                                                  :putnike
 STR_BAGS                                                        :džakove
@@ -1607,9 +1607,9 @@ STR_CRATES                                                      :sanduka
 STR_RES_OTHER                                                   :drugo
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Lista naredbi se ne može deliti...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Lista naredbi se ne može kopirati...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Kraj Zajedni�kih Naredbi - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Lista naredbi se ne može deliti...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Lista naredbi se ne može kopirati...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Kraj Zajedni�kih Naredbi - -
 
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} je preduga�ak posle zamene
 STR_ERROR_AUTOREPLACE_NOTHING_TO_DO                             :{WHITE}Automatska zamena/obnova nije primenjena.
@@ -1862,170 +1862,170 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-veliÄ
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :isklju�eno
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Promena vrednosti
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Promena vrednosti
 
-STR_TEMPERATE_LANDSCAPE                                         :Umereni klimatski pojas
-STR_SUB_ARCTIC_LANDSCAPE                                        :Subpolarni klimatki pojas
-STR_SUB_TROPICAL_LANDSCAPE                                      :Suptropski klimatski pojas
-STR_TOYLAND_LANDSCAPE                                           :Zemlja igra�aka
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Umereni klimatski pojas
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Subpolarni klimatki pojas
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Suptropski klimatski pojas
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Zemlja igra�aka
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Ide ka {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Ide ka {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Ide ka {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Ide ka {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Idi preko {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Idi direktno preko {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Idi preko {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Idi direktno preko {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Putanja
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Putanja #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Bova
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Bova #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Putanja
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Putanja
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Putanja #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Bova
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bova #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Putanja
 
-STR_WAYPOINT                                                    :{WHITE}Putanja
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Odaberite tip putanje
+STR_WAYPOINT_CAPTION                                            :{WHITE}Putanja
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Odaberite tip putanje
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Promena naziva putanje
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Neuspešana promena naziva putanje...
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Ovde se ne može izgraditi putanja za prugu...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Odavde se ne može ukloniti putanja za prugu...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Neuspešana promena naziva putanje...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Ovde se ne može izgraditi putanja za prugu...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Odavde se ne može ukloniti putanja za prugu...
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...nepostoji nijedno naselje u ovom scenariju
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Kreiranje mape otkazano...{}...nepostoje prikladne lokacije za naselja
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...nepostoji nijedno naselje u ovom scenariju
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Kreiranje mape otkazano...{}...nepostoje prikladne lokacije za naselja
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Mnogo nasumi�nih naselja
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Popunite mapu sa nasumi�no rasporđenim naseljima
-STR_MANY_RANDOM_INDUSTRIES                                      :Mnogo nasumi�nih industrija
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Popunite mapu sa nasumi�no rasporđenim industrijama
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nemoguće generisanje industrija...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Mnogo nasumi�nih naselja
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Popunite mapu sa nasumi�no rasporđenim naseljima
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Mnogo nasumi�nih industrija
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Popunite mapu sa nasumi�no rasporđenim industrijama
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nemoguće generisanje industrija...
 
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Oblikovanje reljefa
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivo zemljišta
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivo zemljišta
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Drveće proizvoljne vrste
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Posadite drveće proizvoljne vrste
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Posadite drveće proizvoljne vrste
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Ovde je nemoguća izgradnja kanala...
-STR_LANDINFO_CANAL                                              :Kanal
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Ovde je nemoguća izgradnja kanala...
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Ovde je nemoguća izgradnja brane...
-STR_LANDINFO_LOCK                                               :Brana
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Ovde je nemoguća izgradnja brane...
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Brana
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Ovde je nemoguće postavljanje reke...
-STR_LANDINFO_RIVER                                              :Reka
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Ovde je nemoguće postavljanje reke...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Reka
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...plovak se koristi!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...plovak se koristi!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Kordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Kordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Deo stanice se ne može ukloniti...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Vrsta pruge se ovde ne može promeniti...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Deo stanice se ne može ukloniti...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Vrsta pruge se ovde ne može promeniti...
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Prevucite ovde lokomotivu kako bi prodali ceo voz
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Prevucite ovde lokomotivu kako bi prodali ceo voz
 
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Sva zabranjena
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Sva dozvoljena
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Sva zabranjena
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Sva dozvoljena
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Fabrike
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prevezeno)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prevezeno)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena fabrika - kliknite na ime kako bi otišli do fabrike
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Fabrike
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prevezeno)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prevezeno)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Imena fabrika - kliknite na ime kako bi otišli do fabrike
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...previše blizu druge fabrike
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...previše blizu druge fabrike
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Promena proizvodnje
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Mrežna partija
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ime igra�a:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Sa ovim imenom će Vas drugi igra�i (pre)poznavati
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Unesite Vaše ime
-STR_NETWORK_CONNECTION                                          :{BLACK}Povezivanje:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Izaberite na�in poveivanja između interneta ili lokalne mreže (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Pokreni server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Pokrenite sopstveni server
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Naziv
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Naziv partije
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Jezik, verzija servera, itd.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Kliknite na partiju sa spiska da bi je obeležili
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Server na koji ste se priklju�ili prošli put:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Kliknite kako bi ste ozna�ili server na kome ste igrali prošli put
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Pronađi server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Pretražuje mrežu kako bi pronašao servere
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Dodaj server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Dodaje server na spisak na kojem se prikazuju aktivne partije.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Unesite adresu ra�unara-servera
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Igra�i
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Priklju�eno igra�a / najviše igra�a{}Aktivnio kompanija / najviše kompanija
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Veli�ina mape
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Veli�ina mape u partiji{}Kliknite da bi pređali po veli�ini
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Trenutni datum u partiji
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Godina
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Ukupan broj godina{}koliko traje partija
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}PODACI O PARTIJI
-STR_NETWORK_CLIENTS                                             :{SILVER}Igra�a: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Jezik: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klima: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Veli�ina mape: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzija servera: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Po�etni datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Trenutni datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Zaštićeno šifrom!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER JE VAN MREŽE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER JE POPUNJEN
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}NEODGOVARAJUĆA VERZIJA
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF NEPOKLAPANJE
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Priklju�i se
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Pokreni novu mrežnu partiju
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Naziv partije:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Naziv partije će se prikazati na spisku izbora mrežnih partija drugih igra�a
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Unos naziva mrežne partije
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Postavi lozinku
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Ukoliko ne želite da bude javno dostupna zaštitite Vašu partiju lozinkom
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Odaberite mapu:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Koju mapu želite da igrate?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (sa oglašavanjem)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} igra�{P "" a a}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Najviše igra�a:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Odaberite koliko najviše može da ima igra�a. Nemoraju sva mesta da budu popunjena
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanij{P a e a}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Najviše kompanija:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Odaberite koliko najviše može biti kompanija na serveru
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} posmatra�{P "" a a}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Najviše posmatra�a:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Odaberite koliko najviše može biti posmatra�a na serveru
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Govorni jezik:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Drugi igra�i će znati sa kojim jezikom se razgovara na serveru
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Pokreni partiju
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Pokreće novu mrežnu partiju sa proizvoljnom mapom, ili scenarijom
-STR_NETWORK_LOAD_GAME                                           :{BLACK}U�itaj Partiju
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Nastavlja ranije sa�uvanu mrežnu partiju (proverite da li ste postavljeni igra� kao ranije)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Mrežna partija
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Unesite Vaše ime
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Povezivanje:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Izaberite na�in poveivanja između interneta ili lokalne mreže (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Pokreni server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Pokrenite sopstveni server
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Naziv
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Naziv partije
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Jezik, verzija servera, itd.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Kliknite na partiju sa spiska da bi je obeležili
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Server na koji ste se priklju�ili prošli put:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Kliknite kako bi ste ozna�ili server na kome ste igrali prošli put
+
+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 prikazuju aktivne partije.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Unesite adresu ra�unara-servera
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Igra�i
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Priklju�eno igra�a / najviše igra�a{}Aktivnio kompanija / najviše kompanija
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Veli�ina mape
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Veli�ina mape u partiji{}Kliknite da bi pređali po veli�ini
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Trenutni datum u partiji
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Godina
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Ukupan broj godina{}koliko traje partija
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}PODACI O PARTIJI
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Igra�a: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Jezik: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Klima: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Veli�ina mape: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Verzija servera: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adresa servera: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Po�etni datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Trenutni datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Zaštićeno šifrom!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER JE VAN MREŽE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER JE POPUNJEN
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}NEODGOVARAJUĆA VERZIJA
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF NEPOKLAPANJE
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Priklju�i se
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Pokreni novu mrežnu partiju
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Naziv partije:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Naziv partije će se prikazati na spisku izbora mrežnih partija drugih igra�a
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Unos naziva mrežne partije
+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_SELECT_MAP                             :{BLACK}Odaberite mapu:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Koju mapu želite da igrate?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (sa oglašavanjem)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} igra�{P "" a a}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Najviše igra�a:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Odaberite koliko najviše može da ima igra�a. Nemoraju sva mesta da budu popunjena
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} kompanij{P a e a}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Najviše kompanija:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Odaberite koliko najviše može biti kompanija na serveru
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} posmatra�{P "" a a}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Najviše posmatra�a:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Odaberite koliko najviše može biti posmatra�a na serveru
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Govorni jezik:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Drugi igra�i će znati sa kojim jezikom se razgovara na serveru
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Pokreni partiju
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Pokreće novu mrežnu partiju sa proizvoljnom mapom, ili scenarijom
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}U�itaj Partiju
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Nastavlja ranije sa�uvanu mrežnu partiju (proverite da li ste postavljeni igra� kao ranije)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Bilo koji
@@ -2066,33 +2066,33 @@ STR_NETWORK_LANG_GREEK                                          :Gr�ki
 STR_NETWORK_LANG_LATVIAN                                        :Letonski
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Predvorje partije sa više igra�a
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Predvorje partije sa više igra�a
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Pripremanje za ulazak: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Spisak svih kompanija u ovoj partiji. Možete se priklju�iti nekoj ili osnovati novu ukoliko postoji slobodno mesto
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nova kompanija
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Osnujte novu kompaniju
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Posmatranje partije
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Priklju�ite se partiji kao posmatra�
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Pridruženje kompaniji
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Pomozite upravljanje ovom kompanijom
-STR_NETWORK_REFRESH                                             :{BLACK}Ažuriranje servera
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Ažurirajte podatke sa servera
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Pripremanje za ulazak: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Spisak svih kompanija u ovoj partiji. Možete se priklju�iti nekoj ili osnovati novu ukoliko postoji slobodno mesto
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nova kompanija
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Osnujte novu kompaniju
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Posmatranje partije
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Priklju�ite se partiji kao posmatra�
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Pridruženje kompaniji
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Pomozite upravljanje ovom kompanijom
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Ažuriranje servera
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Ažurirajte podatke sa servera
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}PODACI O KOMPANIJI
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}PODACI O KOMPANIJI
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Naziv kompanije: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguracija: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Vrednost kompanije: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Trenutni odnos: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Prošlogodišnji prihod: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Uspešnost: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Naziv kompanije: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguracija: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Vrednost kompanije: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Trenutni odnos: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Prošlogodišnji prihod: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Uspešnost: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozila: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Igra�i: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vozila: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Igra�i: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Povezivanje...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Povezivanje...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Spajam se..
@@ -2108,49 +2108,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Tražim
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} igra�{P "" a a} je ispred Vas
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} skinuto do sada
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Isklju�enje
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Isklju�enje
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Unesite svotu novca koju želite dati
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server je zaštićen. Unesite lozinku
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Preduzeće je zaštićeno. Unesite lozinku
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Spisak klijenata
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Spisak klijenata
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Praćenje
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nova Kompanija
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Nijedan mrežni uređaj nije nađen ili je igra kompajlirana bez ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Nijedna mrežna partija nije nađena
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Server nije odgovorio na zahtev
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Povezivanje je neuspešno zbog nepoklapanja NewGRF-ova
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Neuspešna sinhronizacija mrežne partije
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Veza sa mrežnom partijom je pukla
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Neuspešno u�itavanje sa�uvane partije
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Neuspešno pokretanje servera
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Neuspešno povezivanje
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Istekao rok �ekanja za Vezu #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Nastala je greška u protokolu i veza je zatvorena
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revizija igre ovog klijenta se ne poklapa sa revizijom servera
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Pogrešna lozinka
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Server je pun
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Vi ste zauvek izba�eni sa ovog servera
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Vi ste izba�eni iz ove partije
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Varanja nisu dozvoljena na ovom serveru
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Nijedan mrežni uređaj nije nađen ili je igra kompajlirana bez ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Nijedna mrežna partija nije nađena
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Server nije odgovorio na zahtev
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Povezivanje je neuspešno zbog nepoklapanja NewGRF-ova
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Neuspešna sinhronizacija mrežne partije
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Veza sa mrežnom partijom je pukla
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Neuspešno u�itavanje sa�uvane partije
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Neuspešno pokretanje servera
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Neuspešno povezivanje
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Istekao rok �ekanja za Vezu #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Nastala je greška u protokolu i veza je zatvorena
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Revizija igre ovog klijenta se ne poklapa sa revizijom servera
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Pogrešna lozinka
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server je pun
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Vi ste zauvek izba�eni sa ovog servera
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Vi ste izba�eni iz ove partije
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Varanja nisu dozvoljena na ovom serveru
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :opšta greška
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desinhronizacija
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :neuspešno u�itavanje mape
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :veza je izgubljena
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokolna greška
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :neusaglašenost NewGRF-a
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :neovlašćeno
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :primljen nepoznat paket
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :pogrešna revizija
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :ime se već koristi
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :pogrešna lozinka
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :pogrešan id kompanije u mrežnom paketu (DoCommand)
-STR_NETWORK_ERR_CLIENT_KICKED                                   :izba�en od strane servera
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :pokušaj korišćenja varanja
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server je pun
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :opšta greška
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desinhronizacija
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :neuspešno u�itavanje mape
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :veza je izgubljena
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokolna greška
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :neusaglašenost NewGRF-a
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :neovlašćeno
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :primljen nepoznat paket
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :pogrešna revizija
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :ime se već koristi
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :pogrešna lozinka
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :pogrešan id kompanije u mrežnom paketu (DoCommand)
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :izba�en od strane servera
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :pokušaj korišćenja varanja
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server je pun
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -2160,15 +2160,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Partija pauzira
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Partija nastavljena (igra� je priklju�en)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Partija nastavljena (igra� nije priklju�en)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :napušta
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} se priklju�io partiji
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} se pridružio kompaniji #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} se pridružio posmatra�ima
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} je osnovao novu kompaniju (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} je napustio partiju ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} je promenio/la ime u {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} je dao vašoj kompaniji {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Dali ste {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :napušta
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} se priklju�io partiji
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} se pridružio kompaniji #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} se pridružio posmatra�ima
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} je osnovao novu kompaniju (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} je napustio partiju ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} je promenio/la ime u {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} je dao vašoj kompaniji {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dali ste {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Ekipi] :
 STR_NETWORK_CHAT_COMPANY                                        :[Ekipi] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Ekipi] Za {STRING}: {WHITE}{STRING}
@@ -2178,8 +2178,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privatno] Za {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Svima] :
 STR_NETWORK_CHAT_ALL                                            :[Svima] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Unesite tekst poruke za razgovor
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Server je zatvorio sesiju
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Server se ponovo pokreće...{}Molimo sa�ekajte...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Server je zatvorio sesiju
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Server se ponovo pokreće...{}Molimo sa�ekajte...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Igra�
@@ -2193,19 +2193,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Razgovaraj sa e
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privatna poruka
 
 
-STR_NETWORK_SEND                                                :{BLACK}Pošalji
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Pošalji
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Ne može se naparaviti reljef iz PNG slike...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...datoteka nije nađena.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ne može se preraditi vrsta slike. Potrebna je 8 ili 24-bitna PNG slika.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...nešto nije uredu. Žao nam je. (verovatno je datoteka oštećena)
+STR_ERROR_PNGMAP                                                :{WHITE}Ne može se naparaviti reljef iz PNG slike...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...datoteka nije nađena.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...ne može se preraditi vrsta slike. Potrebna je 8 ili 24-bitna PNG slika.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...nešto nije uredu. Žao nam je. (verovatno je datoteka oštećena)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Ne može se naparaviti reljef iz BMP slike...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...ne može se preraditi vrsta slike.
+STR_ERROR_BMPMAP                                                :{WHITE}Ne može se naparaviti reljef iz BMP slike...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...ne može se preraditi vrsta slike.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Trošak: {CURRENCY}
@@ -2219,13 +2219,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Procena
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Nije izvodljivo ovde podići zemljište...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Nije izvodljivo ovde spustiti zemljište...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Nije izvodljivo ovde poravnati zemljište...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Stene
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Grub teren
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Ogoljeno tlo
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Trava
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Polja
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snegom prekrivena zemlja
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Pustinja
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Stene
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Grub teren
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Ogoljeno tlo
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Trava
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Polja
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snegom prekrivena zemlja
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Pustinja
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Teren je nagnut na lošu stranu
@@ -2233,11 +2233,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Nemoguć
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Iskopavanje bi oštetilo tunel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}...teren je već na nivou mora
 STR_ERROR_TOO_HIGH                                              :{WHITE}...previsoko
-STR_ALREADY_LEVELLED                                            :{WHITE}... već je ravno
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... već je ravno
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Nedostaje odgovarajuća železni�ka pruga
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...već izgrađeno
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Potrebno je prvo ukloniti železni�ku prugu
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Put je jednosmeran ili je blokiran
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Put je jednosmeran ili je blokiran
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Izgradnja železni�ke pruge
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Izgradnja elektrifikovane železni�ke pruge
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Izgradnja jednošinske pruge (Monorail)
@@ -2249,43 +2249,43 @@ STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Izgradnj
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Izgradnja železni�ke pruge ovde nije moguća...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Nemoguće je ukloniti železni�ku prugu odatle...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Nemoguće je ukloniti signalizaciju odatle...
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Izbor mosta - gradnja se potvrđuje klikom na željeni most
-STR_RAILROAD_TRACK                                              :Železni�ka pruga
-STR_RAILROAD_TRAIN_DEPOT                                        :Železni�ki depo
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Izbor mosta - gradnja se potvrđuje klikom na željeni most
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Železni�ka pruga
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Železni�ki depo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...zemljište je u vlasništvu druge kompanije
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Pruga sa blok signalizacijom
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Pruga sa predsignalizacijom
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Pruga sa izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Pruga sa ulzno-izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Pruga sa putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Pruga sa jednosmernom putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Pruga sa predsignalizacijom i blok signalizacijom
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Pruga sa blok i izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Pruga sa blok i ulazno-izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Pruga sa blok i putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Pruga sa blok i jednosmernom putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Pruga sa predsignalizacijom i izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Pruga sa predsignalizacijom i ulazno-izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Pruga sa predsignalizacijom i putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Pruga sa predsignalizacijom i jednosmernom putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Pruga sa izlaznom i ulazno-izlaznom signalizacijom
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Pruga sa izlaznom i putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Pruga sa izlaznom i jednosmernom putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Pruga sa ulazno-izlaznom i putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Pruga sa ulazno-izlaznom i jednosmernom putnom signalizacijom
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Pruga sa putnom i jednosmernom putnom signalizacijom
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Mora se prvo ukloniti železni�ka stanica
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Prvo se mora ukloniti putanja za prugu
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Izgradi zasebnu stanicu
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Napravi zasebnu putanju
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Pridruži stanicu
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Spoji putanje
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Pruga sa blok signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Pruga sa predsignalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Pruga sa izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Pruga sa ulzno-izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Pruga sa putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Pruga sa jednosmernom putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Pruga sa predsignalizacijom i blok signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Pruga sa blok i izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Pruga sa blok i ulazno-izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Pruga sa blok i putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Pruga sa blok i jednosmernom putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Pruga sa predsignalizacijom i izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Pruga sa predsignalizacijom i ulazno-izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Pruga sa predsignalizacijom i putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Pruga sa predsignalizacijom i jednosmernom putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Pruga sa izlaznom i ulazno-izlaznom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Pruga sa izlaznom i putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Pruga sa izlaznom i jednosmernom putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Pruga sa ulazno-izlaznom i putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Pruga sa ulazno-izlaznom i jednosmernom putnom signalizacijom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Pruga sa putnom i jednosmernom putnom signalizacijom
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Mora se prvo ukloniti železni�ka stanica
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Prvo se mora ukloniti putanja za prugu
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Izgradi zasebnu stanicu
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Napravi zasebnu putanju
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Pridruži stanicu
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Spoji putanje
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Neophodno je prvo ukloniti put
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Putni radovi u toku
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Putni radovi u toku
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Izbor drumskog mosta
 STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... jednosmerni putevi ne mogu imati raskrsnice
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Izgradnja puta ovde nije moguća...
@@ -2298,12 +2298,12 @@ STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Izgradnj
 STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Izgradnja stanice za utovar/istovar kamiona ovde nije moguća...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}Izgradnja putni�ke tramvajske stanice ovde nije moguća...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}Izgradnja teretne tramvajske stanice ovde nije moguća...
-STR_ROAD_DESCRIPTION_ROAD                                       :Put
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Put sa signalizacijom
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Put sa drvoredom
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Drumski depo
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Ukrštanje pruge i puta
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramvaj
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Put
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Put sa signalizacijom
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Put sa drvoredom
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Drumski depo
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Ukrštanje pruge i puta
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramvaj
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nemoguće je ukloniti autobusku stanicu odatle...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nemoguće je ukloniti teretnu stanicu odatle...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nemoguće je ukloniti putni�ku tramvajsku stanicu odatle...
@@ -2311,12 +2311,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nemoguć
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Naselja
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Zgradu bi trebalo srušiti prethodno
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Grad)
@@ -2329,9 +2329,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Pozicion
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Promeni ime naselja
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Broj putnika tokom meseca: {ORANGE}{COMMA}{BLACK}  maksimum: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Koli�ina pošte tokom meseca: {ORANGE}{COMMA}{BLACK}  maksimum: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Tovar potreban za razvoj naselja:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} potrebno
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} dostavljeno prošlog meseca
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Tovar potreban za razvoj naselja:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} potrebno
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} dostavljeno prošlog meseca
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visoka radionica
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Radionica
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Male blagoste
@@ -2361,7 +2361,7 @@ STR_SUBSIDIES_NONE                                              :{ORANGE}Nema
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Odobrene subvencije:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} između stanica {STATION} i {STATION}{YELLOW} ({COMPANY}{YELLOW}, do {DATE_SHORT})
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Lokalna uprava naselja {TOWN} ne namerava da izda dozvolu za gradnju još jednog aerodroma
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} lokalna vlast odbija da dâ dozvolu za aerodrom zbog visokog nivoa buke
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} lokalna vlast odbija da dâ dozvolu za aerodrom zbog visokog nivoa buke
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Brvnare
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Kuće
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Stambene zgrade
@@ -2395,7 +2395,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{WHITE}{STRING}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{WHITE}{STRING}{}{YELLOW} Kupovina ekskluzivnih transportnih prava od lokalne vlasti na godinu dana, osigurava da će lokalni korisnici transporta koristiti isklju�ivo usluge vaše kompanije.{} Trošak: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}{}{YELLOW} Davanje mita lokalnoj vlasti kako bi porastao rejting vaše kompanije, uz rizik velike štete ukoliko se otkrije.{} Cena: {CURRENCY}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (izgradnja u toku)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (izgradnja u toku)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvami
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Čajnik-kuća
@@ -2405,17 +2405,17 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Kasica-prasica
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drveće
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...drvo je već na tom mestu
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Ovde je nemoguće posaditi drvo...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...previše je znakova
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Ovde je nemoguće postaviti znak...
-STR_SIGN_DEFAULT                                                :Znak
+STR_DEFAULT_SIGN_NAME                                           :Znak
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Unos teksta znaka
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Ime znaka se ne može promeniti...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nemoguće je izbrisati znak...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Izbor vrste drveta
-STR_TREE_NAME_TREES                                             :Drveće
-STR_TREE_NAME_RAINFOREST                                        :Tropska Å¡uma
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusi
+STR_LAI_TREE_NAME_TREES                                         :Drveće
+STR_LAI_TREE_NAME_RAINFOREST                                    :Tropska Å¡uma
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusi
 
 ##id 0x3000
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Previše je blizu drugoj železni�koj stanici
@@ -2432,7 +2432,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Potrebno
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Previše je blizu drugog aerodroma
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Potrebno je prvo srušiti aerodrom
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Preimenuj stanicu
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Preimenuj stanicu
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Ova stanica ne može biti preimenovana...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ocene
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prihvata
@@ -2450,10 +2450,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :izvanredno
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Prikazuje sve vozove koji imaju ovu stanicu u svom voznom redu
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikazuje sva drumka vozila koja imaju ovu stanicu u svom voznom redu
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikazuje sve letilice koje imaju ovu stanicu u svom voznom redu
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikazuje sve brodove koji imaju ovu stanicu u svom voznom redu
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Prikazuje sve vozove koji imaju ovu stanicu u svom voznom redu
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Prikazuje sva drumka vozila koja imaju ovu stanicu u svom voznom redu
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Prikazuje sve letilice koje imaju ovu stanicu u svom voznom redu
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Prikazuje sve brodove koji imaju ovu stanicu u svom voznom redu
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}Potrebno je prvo srušiti autobusku stanicu
@@ -2474,41 +2474,41 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Preimenu
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Prikaži spisak tovara koji stanica prihvata
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Imena stanica - klik na ime centrira pogled na stanicu
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Izbor veli�ine/tipa aerodroma
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Železni�ka stanica
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aerodrom
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Stanica za utovar kamiona
-STR_STATION_DESCRIPTION_BUS_STATION                             :Autobuska stanica
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Pristanište
-STR_STATION_DESCRIPTION_BUOY                                    :Bova
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Železni�ka stanica
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aerodrom
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Stanica za utovar kamiona
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Autobuska stanica
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Pristanište
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bova
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bova stoji na putu
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...stanica je previše rasprostranjena
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...zabranjene su stanice razli�itih oblika
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Držite Ctrl kako biste ozna�ili više od jedne stavke
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...zabranjene su stanice razli�itih oblika
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Držite Ctrl kako biste ozna�ili više od jedne stavke
 
 STR_UNDEFINED                                                   :(nedefinisana niska znakova)
-STR_STAT_CLASS_DFLT                                             :Uobi�ajna stanica
-STR_STAT_CLASS_WAYP                                             :Putanje
+STR_STATION_CLASS_DFLT                                          :Uobi�ajna stanica
+STR_STATION_CLASS_WAYP                                          :Putanje
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...mora biti izgrađen na vodi
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Ovde nije moguće izgraditi brodski hangar
-STR_WATER_DESCRIPTION_WATER                                     :Voda
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Obala
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Brodski hangar
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvadukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Voda
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Obala
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Brodski hangar
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Ne može se graditi na vodi
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Prvo se mora ukloniti kanal
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Prvo se mora ukloniti kanal
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Sa�uvaj poziciju
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}U�itaj igru
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Sa�uvaj
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Obriši
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Posmatra�, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Posmatra�, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} slobodno
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}ÄŒitanje sa diska nije uspelo
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}ÄŒuvanje pozicije nije uspelo{}{STRING}
@@ -2524,12 +2524,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Spisak d
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Ime sa�uvane pozicije
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Obriši izabrani fajl sa sa�uvanom pozicijom
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Sa�uvaj tekuću igru, koristeći odabrano ime
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Nasumi�no generisanje nove igre
-STR_LOAD_HEIGHTMAP                                              :{WHITE}U�itavanje Visinske mape
-STR_SAVE_OSKTITLE                                               :{BLACK}Unesite naziv sa�ivane partije
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Nasumi�no generisanje nove igre
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}U�itavanje Visinske mape
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Unesite naziv sa�ivane partije
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} je na putu
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} je na putu
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Rudnik uglja
 STR_INDUSTRY_NAME_POWER_STATION                                 :Termoelektrana
@@ -2585,23 +2585,23 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Proizvod
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Prošlomese�na proizvodnja:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% transportovano)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centriraj glavni pogled na lokaciju industrije
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Trošak: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Trošak: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Nije moguće ovde izgraditi taj tip industrije...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...šuma može biti posađena samo iznad linije snega
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...može biti postavljeno samo blizu ivica mape
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Drugi tunel je na putu
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunel bi završio van okvira mape
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunel bi završio van okvira mape
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nije moguće iskopati drugi kraj tunela
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Potrebno je prvo uništiti tunel
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Potrebno je prvo srušiti most
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Ne može da se završava na istom mestu gde i po�inje
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Krajevi mosta nisu na istom nivou
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Most je nizak u odnosu na teren
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Ne može da se završava na istom mestu gde i po�inje
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Krajevi mosta nisu na istom nivou
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je nizak u odnosu na teren
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Po�etak i kraj moraju biti u istoj liniji
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Lokacija neadekvatna za ulaz tunela
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Viseći, �eli�ni
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Gredni, �eli�ni
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Obešeni, �eli�ni
@@ -2612,30 +2612,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cevasti, Ä�eliÄ
 STR_BRIDGE_TUBULAR_SILICON                                      :Cevni, Silicijumski
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Nije moguće ovde izgraditi most...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Nije moguće ovde izgraditi tunel...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Železni�ki tunel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Drumski tunel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Čeli�ni viseći železni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Čeli�ni gredni železni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Čeli�ni obešeni železni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Viseći železni�ki most od prednapregnutog betona
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Drveni železni�ki most
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonski železni�ki most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Čeli�ni viseći drumski most
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Čeli�ni gredni drumski most
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Čeli�ni obešeni drumski most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Viseći drumski most od prednapregnutog betona
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Drveni drumski most
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonski drumski most
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Cevasti železni�ki most
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Cevasti drumski most
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Železni�ki tunel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Drumski tunel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Čeli�ni viseći železni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Čeli�ni gredni železni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Čeli�ni obešeni železni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Viseći železni�ki most od prednapregnutog betona
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Drveni železni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonski železni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Čeli�ni viseći drumski most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Čeli�ni gredni drumski most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Čeli�ni obešeni drumski most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Viseći drumski most od prednapregnutog betona
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Drveni drumski most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonski drumski most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Cevasti železni�ki most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Cevasti drumski most
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objekat na putu
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Predajnik
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Svetionik
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Centrala kompanije
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Predajnik
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Svetionik
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Centrala kompanije
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...centrala kompanije na putu
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Zemljište u posedu kompanije
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Zemljište u posedu kompanije
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Ovo zemljište se ne može kupiti...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...već pripada kompaniji!
 
@@ -2683,7 +2683,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stanic
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Nivo težine
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Sa�uvaj
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Sa�uvaj
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}lak
@@ -2755,8 +2755,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Å ema bo
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Å ema boja:
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Ime kompanije
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Ime vlasnika
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Ime kompanije
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Ime vlasnika
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Ime kompanije
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Ime vlasnika
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kompanija se ne može preimenovati...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Vlasnik se ne može preimenovati...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finansije {BLACK}{COMPANYNUM}
@@ -2781,7 +2781,7 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Ukupno:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Stanje na ra�unu
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Zajam
-STR_MAX_LOAN                                                    :{WHITE}Najviša Pozajmica: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Najviša Pozajmica: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pozajmi {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Vrati {SKIP}{SKIP}{CURRENCY}
@@ -2790,7 +2790,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nije mog
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...nema duga
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...potrebno {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Nije moguće vratiti deo zajma...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nemoguće je dati novac koji je pozajmljen od banke...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Nemoguće je dati novac koji je pozajmljen od banke...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Izbor novog lica za vlasnika
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Promena izgleda vozila kompanije
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Promena imena vlasnika
@@ -2800,31 +2800,31 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Otplati
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(vlasnik)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Osnovano: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vozila:
-STR_TRAINS                                                      :{WHITE}{COMMA} voz{P "" a ova}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} drums{P o a a} vozil{P o a a}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} letilic{P a e a}
-STR_SHIPS                                                       :{WHITE}{COMMA} brod{P "" a ova}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} voz{P "" a ova}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} drums{P o a a} vozil{P o a a}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} letilic{P a e a}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} brod{P "" a ova}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nema
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENTNAME}{}(vlasnik)
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}U potrazi smo za kompanijom koja bi preuzela našu.{}{}Da li biste kupili {COMPANY} za {CURRENCY}?
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Nije moguće kupiti kompaniju...
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Izgradnja centrale kompanije
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Izgradnja i prikaz centrale kompanije
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Premesti sedište kompanije drugde za cenu od 1% vrednosti kompanije
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Premesti sedište kompanije drugde za cenu od 1% vrednosti kompanije
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nije moguće izgraditi centralu...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Prikaži centralu kompanije
-STR_RELOCATE_HQ                                                 :{BLACK}Preseli Sedište
-STR_COMPANY_JOIN                                                :{BLACK}Pridružite se
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Pridruži se i igraj kao ova kompanija
-STR_COMPANY_PASSWORD                                            :{BLACK}Lozinka
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Zaštitite vašu kompaniju lozinkom kako se ne bi korisnici neovlašćeno pridruživali.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Postavi lozinku za kompaniju
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Preseli Sedište
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Pridružite se
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Pridruži se i igraj kao ova kompanija
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Lozinka
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Zaštitite vašu kompaniju lozinkom kako se ne bi korisnici neovlašćeno pridruživali.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Postavi lozinku za kompaniju
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Otkaži unetu lozinku
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Postavi kompaniji novu lozinku
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Lozinka za kompaniju
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Uobi�ajna lozinka za kompaniju
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Koristite ovu lozinku kao uobi�ajnu za nove kompanije
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Izbor velikog/malog prozora
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Uobi�ajna lozinka za kompaniju
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Koristite ovu lozinku kao uobi�ajnu za nove kompanije
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Izbor velikog/malog prozora
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Vrednost kompanije: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Otkup 25% udela u kompaniji
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Prodaja 25% udela u kompaniji
@@ -2833,7 +2833,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Prodaj 2
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Otkup 25% udela ove kompanije nije moguć...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Prodaja 25% udela ove kompanije nije moguća...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% u vlasništvu kompanije {COMPANY})
-STR_PROTECTED                                                   :{WHITE}Ova kompanije nije dovoljno dugo aktivna za trgovinu akcijama...
+STR_ERROR_PROTECTED                                             :{WHITE}Ova kompanije nije dovoljno dugo aktivna za trgovinu akcijama...
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (para)
@@ -3140,9 +3140,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Bez iztovara i
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Promena na�ina zaustavljnja u ozna�enoj naredbi
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Promena na�ina utovara u ozna�enoj naredbi
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Promena na�ina iztovara u ozna�enoj naredbi
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Dodavanje složene naredbe
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Dodavanje složene naredbe
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Idi do najbližeg depoa
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Idi do najbližeg hangara
 STR_ORDER_NEAREST_DEPOT                                         :najbliži
@@ -3152,9 +3152,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Diektno na serv
 STR_ORDER_TRAIN_DEPOT                                           :Železni�ki Depo
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Drumski Depo
 STR_ORDER_SHIP_DEPOT                                            :Brodogradilište
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Uvek
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servis po potrebi
@@ -3179,10 +3179,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :veće od
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :veće ili jednako
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :potreban
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :nepotreban
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Pređi na naredbu {COMMA}
-STR_CONDITIONAL_NUM                                             :Pređi na naredbu {COMMA} kada je {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Pređi na naredbu {COMMA} kada je {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Pređi na naredbu {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Pređi na naredbu {COMMA} kada je {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Pređi na naredbu {COMMA} kada je {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Nema putovanja
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Putovanje (bez rasporeda)
@@ -3205,18 +3205,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vozovi s
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Presko�i
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Izbriši
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Idi do
-STR_REFIT                                                       :{BLACK}Prepravi
-STR_REFIT_TIP                                                   :{BLACK}Ozna�ite za koji tovar da se prepravi u ovoj naredbi. Ctrl+Klik za uklanjanje prepravljanja
-STR_REFIT_ORDER                                                 :(Prepravi za {STRING})
-STR_REFIT_STOP_ORDER                                            :(Prepravi za {STRING} i stani)
-STR_STOP_ORDER                                                  :(Stani)
-STR_TIMETABLE_VIEW                                              :{BLACK}Raspored
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Prelazi na raspored
-STR_ORDER_VIEW                                                  :{BLACK}Naredbe
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prelazi na naredbe
+STR_ORDER_REFIT                                                 :{BLACK}Prepravi
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Ozna�ite za koji tovar da se prepravi u ovoj naredbi. Ctrl+Klik za uklanjanje prepravljanja
+STR_ORDER_REFIT_ORDER                                           :(Prepravi za {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Prepravi za {STRING} i stani)
+STR_ORDER_STOP_ORDER                                            :(Stani)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Raspored
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Prelazi na raspored
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Naredbe
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Prelazi na naredbe
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Naredbe)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Kraj Naredbi - -
-STR_SERVICE                                                     :{BLACK}Servis
+STR_ORDER_SERVICE                                               :{BLACK}Servis
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Kupljen: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3236,7 +3236,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vozilo n
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozilo koje takođe ima ovu naredbu ne može da ide na tu stanicu
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Ne može se ukloniti vozilo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadnja lokomotiva u kompoziciji uvek prati prednju
-STR_CARGO_N_A                                                   :Nepoznato{SKIP}
+STR_QUANTITY_N_A                                                :Nepoznato{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nepostoji putanja do lokalnog depoa
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Period servisiranja: {LTBLUE}{COMMA}dana{BLACK}   Poslednji servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Period servisiranja: {LTBLUE}{COMMA}%{BLACK}   Poslednji servis: {LTBLUE}{DATE_LONG}
@@ -3256,10 +3256,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Raspored
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Menjanje koli�ine vremena za koje će obeležena naredba trajati
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Uklanja vreme koje je određeno za obeleženu naredbu
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Poništava mera� kašnjenja, tako da vozilo ide na vreme
-STR_SERVICE_HINT                                                :{BLACK}Preska�e ovu naredbu ukoliko servis nije potreban
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY}  Snaga: {POWER}{}Cena Održavanja: {CURRENCY}/god.{}Nosivost: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cena: {CURRENCY} Najveća Brzina: {VELOCITY}{}Nosivost: {CARGO}, {CARGO}{}Cena Održavanja: {CURRENCY}/god.
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cena: {CURRENCY} Najveća Brzina: {VELOCITY}{}Nosivost: {CARGO}{}Cena Održavanja: {CURRENCY}/god.
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Preska�e ovu naredbu ukoliko servis nije potreban
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY} Težina: {WEIGHT_S}{}Brzina: {VELOCITY}  Snaga: {POWER}{}Cena Održavanja: {CURRENCY}/god.{}Nosivost: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cena: {CURRENCY} Najveća Brzina: {VELOCITY}{}Nosivost: {CARGO}, {CARGO}{}Cena Održavanja: {CURRENCY}/god.
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cena: {CURRENCY} Najveća Brzina: {VELOCITY}{}Nosivost: {CARGO}{}Cena Održavanja: {CURRENCY}/god.
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Cena Održavanja: {LTBLUE}{CURRENCY}/god.
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Najveća brzina: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Težina: {LTBLUE}{WEIGHT_S} {BLACK}Snaga: {LTBLUE}{POWER}{BLACK} Najveća brzina: {LTBLUE}{VELOCITY}
@@ -3278,24 +3278,24 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Havarisan!
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nije moguće obrnuti smer kretanja voza...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Voz ne može da promeni smer...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ne može se okrenuti vozilo od više delova
-STR_CLEAR_TIME                                                  :{BLACK}Ukloni Vreme
-STR_RESET_LATENESS                                              :{BLACK}Poništi Mera� Kašnjenja
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Promena naziva putanje
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Promeni naziv bove
-
-STR_TRAIN_STOPPING                                              :{RED}Zaustavlja se
-STR_TRAIN_STOPPING_VEL                                          :{RED}Zaustavlja se, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Razli�ite vrste železnice
-STR_TRAIN_NO_POWER                                              :{RED}Nema struje
-STR_TRAIN_START_NO_CATENARY                                     :Voz ne može da se kreće jer pruga nije elektrifikovana
-STR_TRAIN_STUCK                                                 :{ORANGE}ÄŒekanje za slobadan prolaz
-
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Ne može se prodati havarisano vozilo...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Ne može se prepravljati havarisano vozilo...
-
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Raspored se ne može dodeliti vozilu...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vozilo može �ekati samo na stanicama.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Ovo vozilo ne staje na tu stanicu.
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Ukloni Vreme
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Poništi Mera� Kašnjenja
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Promena naziva putanje
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Promeni naziv bove
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Zaustavlja se
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Zaustavlja se, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Razli�ite vrste železnice
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Nema struje
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Voz ne može da se kreće jer pruga nije elektrifikovana
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}ÄŒekanje za slobadan prolaz
+
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Ne može se prodati havarisano vozilo...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Ne može se prepravljati havarisano vozilo...
+
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Raspored se ne može dodeliti vozilu...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vozilo može �ekati samo na stanicama.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Ovo vozilo ne staje na tu stanicu.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Promena Vremena
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Vozilo trenutno ide po rasporedu
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Vozilo trenutno kasni za {STRING} od rasporeda
@@ -3309,7 +3309,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Popunjav
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...mora se zaustaviti unutar depoa za drumska vozila
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Neuspešan pronalazak lokalnog depoa
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Naterajte vozilo da okrene
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Nosivost: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Nosivost: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o a a}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3322,39 +3322,39 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Izgradnj
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Brod mora biti zaustavljen u depou
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Bova se ovde ne može postaviti...
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Akvadukt se ovde ne može izgraditi...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Akvadukt se ovde ne može izgraditi...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prepravljanje)
 STR_REFIT_TITLE                                                 :{GOLD}Izaberite vrstu tereta za prevoz:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova nosivost: {GOLD}{CARGO}{}{BLACK}Cena prepravke: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(prepravljiv)
+STR_PURCHASE_INFO_REFITTABLE                                    :(prepravljiv)
 
 ##id 0xA000
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Aerodrom se ovde ne može izgraditi...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Letilica je u vazduhu
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Letilica se mora zaustaviti u nekom hangaru
 
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Raspored)
 
 ##id 0xB000
-STR_BRIBE_FAILED                                                :{WHITE}Vaš pokušaj podmićivanja je
-STR_BRIBE_FAILED_2                                              :{WHITE}otkriven zahvaljujući regionalnim istražiteljima
-STR_BUILD_DATE                                                  :{BLACK}Sagrađeno: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Vaš pokušaj podmićivanja je
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}otkriven zahvaljujući regionalnim istražiteljima
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Sagrađeno: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Klasa stanice: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Vrsta stanice: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Klasa stanice: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Vrsta stanice: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF podešavanja
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Primeni promene
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Promeni paletu
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Menja paletu ozna�enog NewGRF-a.{}Promenite paletu ako grafici iz NewGRF-a su ruži�asti tokom igre
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Postavi parametre
-STR_NEWGRF_FILENAME                                             :{BLACK}Datoteka: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Primeni promene
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Promeni paletu
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Menja paletu ozna�enog NewGRF-a.{}Promenite paletu ako grafici iz NewGRF-a su ruži�asti tokom igre
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Postavi parametre
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Datoteka: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Upravo ćete na�initi izmene na tekuću partiju; to može srušiti igru.{}Da li ste apsolutno sigurni da ovo želite?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3377,34 +3377,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :PokuÅ¡ano koriÅ
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} sadrži neispravan sprajt. Svi neispravni sprajtovi će biti prikazani kao crveni znakovi pitanja (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Sadrži višestruke Action 8 unose.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}U�itava ozna�enu postavku
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Sa�uvaj postavku
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Sa�uvajte trenutni spisak u postavku
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Unesite ime za postavku
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Izbriši postavku
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Izbrišite trenutno ozna�enu postavku
-STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodajte NewGRF fajl u spisak
-STR_NEWGRF_REMOVE                                               :{BLACK}Ukloni
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Uklonite ozna�eni NewGRF fajl sa spiska
-STR_NEWGRF_MOVEUP                                               :{BLACK}Naviše
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Pomerite ozna�eni NewGRF fajl više na spisku
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Naniže
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Pomerite ozna�eni NewGRF fajl niže na spisku
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Spisak instaliranih NewGRF fajlova. Kliknite na fajl kako bi promenili njegova svojstva
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametri: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Unesite NewGRF parametre
-STR_NEWGRF_NO_INFO                                              :{BLACK}Informacije nepostoje
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}U�itava ozna�enu postavku
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Sa�uvaj postavku
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Sa�uvajte trenutni spisak u postavku
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Unesite ime za postavku
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Izbriši postavku
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Izbrišite trenutno ozna�enu postavku
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Dodaj
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Dodajte NewGRF fajl u spisak
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Ukloni
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Uklonite ozna�eni NewGRF fajl sa spiska
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Naviše
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Pomerite ozna�eni NewGRF fajl više na spisku
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Naniže
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Pomerite ozna�eni NewGRF fajl niže na spisku
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Spisak instaliranih NewGRF fajlova. Kliknite na fajl kako bi promenili njegova svojstva
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametri: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Unesite NewGRF parametre
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Informacije nepostoje
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupne NewGRF datoteke
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Dodaj na listu
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Dodajte odabranu NewGRF datoteku na vaš listu
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Osveži izbor
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Osvežite izbor dostupnih NewGRF datoteka
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Dodajte odabranu NewGRF datoteku na vaš listu
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Osveži izbor
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Osvežite izbor dostupnih NewGRF datoteka
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nemoguće dodati: duplicirani GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Odabrana datoteka nije nađena
-STR_NEWGRF_DISABLED                                             :{RED}Isklju�en
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Odabrana datoteka nije nađena
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Isklju�en
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Odabrana datoteka nije nađena (kompatibilan GRF u�itan)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilni GRF(ovi) u�itani umesto nepronađenih datoteka
@@ -3420,7 +3420,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Podaci o tovaru/prenameni za '{1:ENGINE}' se posle izgradnje razlikuju od nabavne liste. Ovo može izazvati neispravnu automatsku zamenu/preuređenje.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' je izazvao beskrajnu petlju poziva proizvodnje industrija.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Partija je sa�uvana u vreziji bez podrške za tramvaje. Svi tramvaji su uklonjeni.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Partija je sa�uvana u vreziji bez podrške za tramvaje. Svi tramvaji su uklonjeni.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Sopstvena moneta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Devizni kurs: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3431,16 +3431,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Pelazak
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Prelazak na Euro: {ORANGE}nikada
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Primer: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Promena parametara sopstvene monete
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Smanjite vrednost vaše monete u odnosu na jednu funtu (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Povećajte vrednost vaše monete u odnosu na jednu funtu (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Postavite vrednost vaše monete u odnosu na jednu funtu (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Postavite razdelnik za vašu monetu
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Postavite prefiks za vašu monetu
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Postavite sufiks za vašu monetu
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Raniji prelazak na euro
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Kasniji prelazak na euro
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Odredite godinu za prelazak na euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 funti (£) u vašoj moneti
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Smanjite vrednost vaše monete u odnosu na jednu funtu (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Povećajte vrednost vaše monete u odnosu na jednu funtu (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Postavite vrednost vaše monete u odnosu na jednu funtu (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Postavite razdelnik za vašu monetu
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Postavite prefiks za vašu monetu
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Postavite sufiks za vašu monetu
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Raniji prelazak na euro
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Kasniji prelazak na euro
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Odredite godinu za prelazak na euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 funti (£) u vašoj moneti
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3459,8 +3459,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Brod{P "" a ova}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Leteluca
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Deljene naredbe {COMMA} Vozil{P o a a}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Prikazuje sva vozila koja dele ovaj red vožnje
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Deljene naredbe {COMMA} Vozil{P o a a}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Prikazuje sva vozila koja dele ovaj red vožnje
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Prepavi voz
 STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Prepravi drumsko vozilo
@@ -3562,39 +3562,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prepravi
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prepravite brod kako bi prevozio drugu vrstu tereta
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prepravite letilicu kako bi prevozila drugu vrstu tereta
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Ide za {TOWN} Železni�ki Depo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Ide za {TOWN} Železni�ki Depo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Ide ka {TOWN} Drumskom Depou
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Ide ka {TOWN} Drumskom Depou, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Ide za {TOWN} Brodski Depo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Ide za {TOWN} Brodski Depo, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Ide za {STATION} Hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Ide za {STATION} Hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servisiranje u {TOWN} Železni�kom Depou
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servisiranje u {TOWN} Železni�kom Depou, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servisiranje u {STATION} Hangaru
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servisiranje u {STATION} Hangaru, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Kopiraj Voz
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kopiraj Vozilo
-STR_CLONE_SHIP                                                  :{BLACK}Kopiraj Brod
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kopiraj Letilicu
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Ovim ćete kupiti istu kompoziciju. Sa Ctrl+Klik će imati zajedni�ke naredbe
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Sa Ctrl+Klik će imati zajedni�ke naredbe
-STR_CLONE_SHIP_INFO                                             :{BLACK}Ovim ćete kupiti isti brod. Sa Ctrl+Klik će imati zajedni�ke naredbe
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Ovim ćete kupiti istu letilicu. Sa Ctrl+Klik će imati zajedni�ke naredbe
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Ovim ćete kupiti istu kompoziciju. Kliknite na dugme i potom na voz koji je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Kliknite na dugme i potom na drumsko vozilo koje je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Ovim ćete kupiti isti brod. Kliknite na dugme i potom na brod koji je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Ovim ćete kupiti istu letilicu. Kliknite na dugme i potom na letilicu koje je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Ide za {TOWN} Železni�ki Depo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Ide za {TOWN} Železni�ki Depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Ide ka {TOWN} Drumskom Depou
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Ide ka {TOWN} Drumskom Depou, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Ide za {TOWN} Brodski Depo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Ide za {TOWN} Brodski Depo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Ide za {STATION} Hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Ide za {STATION} Hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servisiranje u {TOWN} Železni�kom Depou
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servisiranje u {TOWN} Železni�kom Depou, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servisiranje u {TOWN} Drumskom Depou, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servisiranje u {TOWN} Brodskom Depou, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Servisiranje u {STATION} Hangaru
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Servisiranje u {STATION} Hangaru, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kopiraj Voz
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kopiraj Vozilo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kopiraj Brod
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kopiraj Letilicu
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Ovim ćete kupiti istu kompoziciju. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Ovim ćete kupiti isti brod. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Ovim ćete kupiti istu letilicu. Sa Ctrl+Klik će imati zajedni�ke naredbe
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Ovim ćete kupiti istu kompoziciju. Kliknite na dugme i potom na voz koji je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Ovim ćete kupiti isto drumsko vozilo. Kliknite na dugme i potom na drumsko vozilo koje je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Ovim ćete kupiti isti brod. Kliknite na dugme i potom na brod koji je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Ovim ćete kupiti istu letilicu. Kliknite na dugme i potom na letilicu koje je u ili van depoa. Sa Ctrl+Klik će imati zajedni�ke naredbe
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova Železni�ka Vozila
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova Železni�ka Elektri�na Vozila
@@ -3664,38 +3664,38 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Prebacit
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Upravo ćete prodati sva vozila u depou. Da li ste sigurni?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Pogrešna vrsta depoa
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Pogrešna vrsta depoa
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Prodaje sve vozove u depou
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Prodaje sva drumska vozila u depou
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Prodaje sve brodove u depou
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Prodaje sve letilice u hangaru
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Prodaje sve vozove u depou
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Prodaje sva drumska vozila u depou
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Prodaje sve brodove u depou
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Prodaje sve letilice u hangaru
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Dohvata spisak svih vozova sa ovim depoom u naredbama
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Dohvata spisak svih drumskih vozila sa ovim depoom u naredbama
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Dohvata spisak svih brodova sa ovim depoom u naredbama
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Dohvata spisak svih letilica sa hangarom na ovoj stanici u naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Dohvata spisak svih vozova sa ovim depoom u naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Dohvata spisak svih drumskih vozila sa ovim depoom u naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Dohvata spisak svih brodova sa ovim depoom u naredbama
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Dohvata spisak svih letilica sa hangarom na ovoj stanici u naredbama
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Automatsko obnavljanje svih vozova u depou
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Automatsko obnavljanje svih drumskih vozila u depou
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automatsko obnavljanje svih brodova u depou
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automatsko obnavljanje svih letelica u hangaru
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Automatsko obnavljanje svih vozova u depou
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Automatsko obnavljanje svih drumskih vozila u depou
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Automatsko obnavljanje svih brodova u depou
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Automatsko obnavljanje svih letelica u hangaru
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupni Vozovi
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupna Drumska Vozila
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupni Brodovi
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupne Letelice
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Dostupni Vozovi
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Dostupna Drumska Vozila
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Dostupni Brodovi
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Dostupne Letelice
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Pošalji u Depo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Pošalji u Depo
-STR_SEND_SHIP_TO_DEPOT                                          :Pošalji u Depo
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošalji u Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Pošalji u Depo
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Pošalji u Depo
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Pošalji u Depo
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Pošalji u Hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zameni {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Po�ni Zamenu Vozila
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Zaustavi Zamenu Vozila
-STR_NOT_REPLACING                                               :{BLACK}Nezamenjuje se
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nijedno vozilo nije ozna�eno
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Nezamenjuje se
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nijedno vozilo nije ozna�eno
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izaberite vrstu lokomotive za zamenu
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Izaberite novu vrstu lokomotive koju biste želeli da koristite umesto obeležene s leve strane
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Pritisnite kako bi se zaustavila zamena vrsta lokomotive ozna�ene sa leve strane
@@ -3707,40 +3707,40 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Ukoliko
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zamenjuje se: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Prebacuje između prikaza zamene lokomotiva i zamene vagona
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Å insko vozilo nije dostupno
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Drumsko vozilo nije dostupno
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Brod nije dostupan
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Letilica nije dostupna
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Å insko vozilo nije dostupno
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Drumsko vozilo nije dostupno
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Brod nije dostupan
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Letilica nije dostupna
 
-STR_ENGINES                                                     :Lokomotive
-STR_WAGONS                                                      :Vagoni
+STR_REPLACE_ENGINES                                             :Lokomotive
+STR_REPLACE_WAGONS                                              :Vagoni
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klikom se zaustavljaju svi vozovi unutar depoa
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klikom se zaustavljaju sva drumska vozila unutar depoa
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klikom se zaustavljaju svi brodovi unutar depoa
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klikom se zaustavljaju sve letilice unutar hangara
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klikom se zaustavljaju svi vozovi unutar depoa
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klikom se zaustavljaju sva drumska vozila unutar depoa
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klikom se zaustavljaju svi brodovi unutar depoa
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klikom se zaustavljaju sve letilice unutar hangara
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klikom se pokreću svi vozovi u depoima
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klikom se pokreću sva drumska vozila u depoima
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klikom se pokreću svi brodovi u depoima
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klikom se pokreću sve letilice u hangarima
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klikom se pokreću svi vozovi u depoima
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klikom se pokreću sva drumska vozila u depoima
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klikom se pokreću svi brodovi u depoima
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klikom se pokreću sve letilice u hangarima
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klikom se zaustavljaju sva vozila na spisku
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klikom se pokreću sva vozila na spisku
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klikom se zaustavljaju sva vozila na spisku
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klikom se pokreću sva vozila na spisku
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Spisak Znakova - {COMMA} Znak{P "" a ova}
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Å inska Vozila
-STR_ELRAIL_VEHICLES                                             :Elektrošinska Vozila
-STR_MONORAIL_VEHICLES                                           :Jednošinska Vozila
-STR_MAGLEV_VEHICLES                                             :Magnetnošinska Vozila
+STR_REPLACE_RAIL_VEHICLES                                       :Å inska Vozila
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrošinska Vozila
+STR_REPLACE_MONORAIL_VEHICLES                                   :Jednošinska Vozila
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magnetnošinska Vozila
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Težina: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Brzina: {GOLD}{VELOCITY}{BLACK} Snaga: {GOLD}{POWER}
@@ -3767,67 +3767,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generiši
-STR_RANDOM                                                      :{BLACK}Proizvoljno
-STR_RANDOM_HELP                                                 :{BLACK}Promena klice prizvoljnosti Generatora Terena
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Svet stvaranje
-STR_RANDOM_SEED                                                 :{BLACK}Klica Proizvoljnosti:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Sa klikom se unosi nova vrednos klice
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Unos nove vrednosti klice
-STR_LAND_GENERATOR                                              :{BLACK}Generator zemljišta:
-STR_TREE_PLACER                                                 :{BLACK}Algoritam za drveća:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotacija visinske mape:
-STR_TERRAIN_TYPE                                                :{BLACK}Vrsta terena:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivo mora:
-STR_SMOOTHNESS                                                  :{BLACK}Postepenost:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Nivo snežnog pokriva�a:
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Broj naselja:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Broj fabrika:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Sužava snežni pokriva� naviše za jedan
-STR_SNOW_LINE_DOWN                                              :{BLACK}Proširuje snežni pojas naniže za jedan
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Promena donjeg nivoa snežnog pojasa
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Promena po�etne godine
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Upozorenje o veli�ini
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Preterana promena veli�ine mape nije preporu�ljiva. Da li da se nastavi generisanje?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Naziv visinske mape:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Veli�ina: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generiši
+STR_MAPGEN_RANDOM                                               :{BLACK}Proizvoljno
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Promena klice prizvoljnosti Generatora Terena
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Svet stvaranje
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Klica Proizvoljnosti:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Sa klikom se unosi nova vrednos klice
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Unos nove vrednosti klice
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generator zemljišta:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritam za drveća:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotacija visinske mape:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Vrsta terena:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nivo mora:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Postepenost:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Nivo snežnog pokriva�a:
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Broj naselja:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Broj fabrika:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Sužava snežni pokriva� naviše za jedan
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Proširuje snežni pojas naniže za jedan
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Promena donjeg nivoa snežnog pojasa
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Promena po�etne godine
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Upozorenje o veli�ini
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Preterana promena veli�ine mape nije preporu�ljiva. Da li da se nastavi generisanje?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Naziv visinske mape:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Veli�ina: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generisanje sveta...
 STR_GENERATION_ABORT                                            :{BLACK}Prekini
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Prekida generisanje sveta
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Da li stvarno želite da prekinete generisanje?
-STR_PROGRESS                                                    :{WHITE}{NUM}% završeno
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Svet stvaranje
-STR_TREE_GENERATION                                             :{BLACK}Postavljanje drveća
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Postavljenje nepomi�nih objekata
-STR_CLEARING_TILES                                              :{BLACK}Dodavanje grubih i stenovitih podru�ja
-STR_SETTINGUP_GAME                                              :{BLACK}Podešavanje partije
-STR_PREPARING_TILELOOP                                          :{BLACK}Razrađivanje plo�ica
-STR_PREPARING_GAME                                              :{BLACK}Pripremanje partije
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Ova izmena je prebacila nivo težine na sopstven
-STR_SE_FLAT_WORLD                                               :{WHITE}Ravan teren
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generiše ravan teren
-STR_SE_RANDOM_LAND                                              :{WHITE}Proizvoljan oblik terena
-STR_SE_NEW_WORLD                                                :{BLACK}Napravi novi scenarijo
-STR_SE_CAPTION                                                  :{WHITE}Vrsta scenarija
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Smanjuje visinu ravnog terena za jedan
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Povećava visinu ravnog terena za jedan
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Promena visine ravnog terena
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Visina ravnog terena:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% završeno
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Svet stvaranje
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Postavljanje drveća
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Postavljenje nepomi�nih objekata
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Dodavanje grubih i stenovitih podru�ja
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Podešavanje partije
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Razrađivanje plo�ica
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Pripremanje partije
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Ova izmena je prebacila nivo težine na sopstven
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Ravan teren
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generiše ravan teren
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Proizvoljan oblik terena
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Napravi novi scenarijo
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Vrsta scenarija
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Smanjuje visinu ravnog terena za jedan
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Povećava visinu ravnog terena za jedan
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Promena visine ravnog terena
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Visina ravnog terena:
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Ivice mape:
-STR_NORTHWEST                                                   :{BLACK}Severozapad
-STR_NORTHEAST                                                   :{BLACK}Severoistok
-STR_SOUTHEAST                                                   :{BLACK}Jugoistok
-STR_SOUTHWEST                                                   :{BLACK}Jugozapad
-STR_BORDER_FREEFORM                                             :{BLACK}Zemlja
-STR_BORDER_WATER                                                :{BLACK}Voda
-STR_BORDER_RANDOM                                               :{BLACK}Proizvoljno
-STR_BORDER_RANDOMIZE                                            :{BLACK}Proizvoljno
-STR_BORDER_MANUAL                                               :{BLACK}Podešeno
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Ivice mape:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Severozapad
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Severoistok
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Jugoistok
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Jugozapad
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Zemlja
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Voda
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Proizvoljno
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Proizvoljno
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Podešeno
 
 ############ Tooltip measurment
 
@@ -3836,9 +3836,9 @@ STR_MEASURE_AREA                                                :{BLACK}Podru�j
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dužina: {NUM}{}Visinska razlika: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Podru�je: {NUM} x {NUM}{}Visinska razlika: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Zarada od transfera: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ova ulica je u vlasništvu naselja
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...ulica je okrenuta u drugom pravcu
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Zarada od transfera: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ova ulica je u vlasništvu naselja
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...ulica je okrenuta u drugom pravcu
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3848,7 +3848,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Svi vozovi
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Sva drumska vozila
 STR_GROUP_ALL_SHIPS                                             :Svi brodovi
@@ -3857,24 +3857,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Negrupisani voz
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Negrupisana drumska vozila
 STR_GROUP_DEFAULT_SHIPS                                         :Negrupisani brodovi
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Negrupisane letilice
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Dodaj deljeno vozilo
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Ukloni sva vozila
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Preimenuj grupu
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Grupa se ne može napraviti...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Grupa se ne može izbrisati...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Grupa se ne može preimenovati...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Ne mogu se sva vozila ukloniti iz grupe...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Vozilo se ne može dodati u ovu grupu...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Deljena vozila se ne mogu dodati u grupu...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Grupa se ne može napraviti...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Grupa se ne može izbrisati...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Grupa se ne može preimenovati...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Ne mogu se sva vozila ukloniti iz grupe...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Vozilo se ne može dodati u ovu grupu...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Deljena vozila se ne mogu dodati u grupu...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupe - klikom na grupu se prikazuje spisak vozila u grupi
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klikom se pravi nova grupa
-STR_GROUP_DELETE_TIP                                            :{BLACK}Briše se ozna�ena grupa
-STR_GROUP_RENAME_TIP                                            :{BLACK}Preimenovanje ozna�ene grupe
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikom se ova grupa Å¡titi od globalne automatske zamene
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupe - klikom na grupu se prikazuje spisak vozila u grupi
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikom se pravi nova grupa
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Briše se ozna�ena grupa
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Preimenovanje ozna�ene grupe
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikom se ova grupa Å¡titi od globalne automatske zamene
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3891,7 +3891,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3936,19 +3936,19 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Naziv mora biti jedinstven
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Naziv mora biti jedinstven
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Položaj sledećeg znaka
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Položaj prethodnog znaka
-STR_SIGN_OSKTITLE                                               :{BLACK}Unos naziva znaka
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Položaj sledećeg znaka
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Položaj prethodnog znaka
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Unos naziva znaka
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Finansiraj
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Istraži
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Izgradi
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Izaberite odgovarajuću fabriku sa spiska
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Finansiraj
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Istraži
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Izgradi
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Izaberite odgovarajuću fabriku sa spiska
 
 ############ on screen keyboard
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertzuiopšđasdfghjkl�ćž yxcvbnm,./'.
@@ -3957,37 +3957,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 
 ############ AI GUI
 STR_AI_DEBUG                                                    :{WHITE}VI Korekcija
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Naziv VI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Naziv VI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Ponovno u�itavanje
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Zaustavlja Vešta�ku Inteligenciju, ponovo u�itava skriptu, i restartuje je
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Prozor VI Korekcije je dostupna samo na serveru
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Zaustavlja Vešta�ku Inteligenciju, ponovo u�itava skriptu, i restartuje je
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Prozor VI Korekcije je dostupna samo na serveru
 STR_AI_CONFIG_CAPTION                                           :{WHITE}VI Podešavanja
-STR_AI_CHANGE                                                   :{BLACK}Odabiranje
-STR_AI_CONFIGURE                                                :{BLACK}Podešavanje
-STR_AI_CHANGE_TIP                                               :{BLACK}U�itavanje druge Vešta�ke Inteligencije
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Podešavanje parametara Vešta�ke Iteligencije
-STR_AI_LIST_TIP                                                 :{BLACK}Sve VI će biti u�itane u sledećoj partiji
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Odabiranje
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Podešavanje
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}U�itavanje druge Vešta�ke Inteligencije
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Podešavanje parametara Vešta�ke Iteligencije
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Sve VI će biti u�itane u sledećoj partiji
 STR_AI_LIST_CAPTION                                             :{WHITE}Dostupne VI
-STR_AI_AILIST_TIP                                               :{BLACK}Kliknite kako biste izabrali Vešta�ku Inteligenciju
-STR_AI_ACCEPT                                                   :{BLACK}Prihvati
-STR_AI_ACCEPT_TIP                                               :{BLACK}Izabira ozna�enu Vešta�ku Inteligenciju
-STR_AI_CANCEL                                                   :{BLACK}Otkaži
-STR_AI_CANCEL_TIP                                               :{BLACK}Ne menja izbor Vešta�ke Inteligencije
-STR_AI_CLOSE                                                    :{BLACK}Zatvori
-STR_AI_RESET                                                    :{BLACK}Resetuj
-STR_AI_HUMAN_PLAYER                                             :Ljudsko biće
-STR_AI_RANDOM_AI                                                :Proizvoljna VI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Kliknite kako biste izabrali Vešta�ku Inteligenciju
+STR_AI_LIST_ACCEPT                                              :{BLACK}Prihvati
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Izabira ozna�enu Vešta�ku Inteligenciju
+STR_AI_LIST_CANCEL                                              :{BLACK}Otkaži
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne menja izbor Vešta�ke Inteligencije
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zatvori
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetuj
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Ljudsko biće
+STR_AI_CONFIG_RANDOM_AI                                         :Proizvoljna VI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}VI Parametri
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Izdanje: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Jedna od VI je krahirala. Molimo vas da prijavite grešku autoru VI-e sa slikom prozora VI Korekcije .
-STR_AI_NO_AI_FOUND                                              :Nije pronađena nijadna prikladna VI.{}U�itana VI je kao zamena i neće raditi ništa.{}Možete skinuti nekoliko VI preko sistema za preuzimanje dodataka.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Izdanje: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna od VI je krahirala. Molimo vas da prijavite grešku autoru VI-e sa slikom prozora VI Korekcije .
+STR_ERROR_AI_NO_AI_FOUND                                        :Nije pronađena nijadna prikladna VI.{}U�itana VI je kao zamena i neće raditi ništa.{}Možete skinuti nekoliko VI preko sistema za preuzimanje dodataka.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Nivo buke u naselju: {ORANGE}{COMMA}{BLACK}  najviše: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Proizvedena buka: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Nivo buke u naselju: {ORANGE}{COMMA}{BLACK}  najviše: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Proizvedena buka: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3997,6 +3997,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... prek
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... datoteka se nije mogla zapisati
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Preuzeta datoteka se ne može otpakovati
 
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Traži nedostajući fajl na Mreži
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Pretražuje za nedostajuću dodataku na Internetu
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Traži nedostajući fajl na Mreži
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Pretražuje za nedostajuću dodataku na Internetu
 ########
diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt
index ae936353b..53d02a95e 100644
--- a/src/lang/simplified_chinese.txt
+++ b/src/lang/simplified_chinese.txt
@@ -118,7 +118,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} 太妃
 STR_QUANTITY_BATTERIES                                          :{COMMA} 箱电池
 STR_QUANTITY_PLASTIC                                            :{VOLUME} å¡‘æ–™
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} 瓶跳跳水
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -208,26 +208,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} ç«‹æ–¹ç
 STR_UNITS_FORCE_SI                                              :{COMMA} �牛
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}选择排�方法 （��/��）
-STR_SORT_CRITERIA_TIP                                           :{BLACK}选择排�标准
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}选择过滤标准
-STR_SORT_BY                                                     :{BLACK}排�
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}选择排�方法 （��/��）
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}选择排�标准
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}选择过滤标准
+STR_BUTTON_SORT_BY                                              :{BLACK}排�
 STR_BUTTON_LOCATION                                             :{BLACK}定�
-STR_QUERY_RENAME                                                :{BLACK}�命�
+STR_BUTTON_RENAME                                               :{BLACK}�命�
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}关闭窗�
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}窗�标题 - 拖动这里�以移动该窗�
-STR_STICKY_BUTTON                                               :{BLACK}�定窗� 使用“关闭所有窗��快�键时�留此窗�
-STR_RESIZE_BUTTON                                               :{BLACK}点击并拖动这里�以缩放窗�
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}切�窗�大�
+STR_TOOLTIP_STICKY                                              :{BLACK}�定窗� 使用“关闭所有窗��快�键时�留此窗�
+STR_TOOLTIP_RESIZE                                              :{BLACK}点击并拖动这里�以缩放窗�
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}切�窗�大�
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}滚动� - 上下滚动列表
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}滚动� - 左�滚动列表
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}拆除地�上的建筑物等设施
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}默认
-STR_QUERY_CANCEL                                                :{BLACK}�消
-STR_QUERY_OK                                                    :{BLACK}确定
+STR_BUTTON_DEFAULT                                              :{BLACK}默认
+STR_BUTTON_CANCEL                                               :{BLACK}�消
+STR_BUTTON_OK                                                   :{BLACK}确定
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -316,7 +316,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}放置æ 
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :�存场景
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :读�场景
-STR_MENU_LOAD_HEIGHTMAP                                         :读�高度图
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :读�高度图
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :退出编辑器
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :退出
@@ -504,11 +504,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}切�是�显示��货物
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}查看详细数�
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}查看详细数�
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}公�图表索引
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}点击这里切�显示公�
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}点击这里切�显示公�
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}公�评价排�
@@ -543,16 +543,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}现金ï¼
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}贷款：
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}总表现值：
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}车船总数{}包括�车�汽车�船�和飞机
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}包括车站�机场��头的{}总数� �使多�类型的车站{}连接在一起也将被分别计算
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}�一�输工具最低年利润{}�计算使用两年以上的车辆,船�和飞机
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}在过去 12 个月中{}利润最少的月份的现金收入
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}在过去 12 个月中{}利润最多的月份的现金收入
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}在过去 4 个季度中�输的货物总数
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}在上一个季度中�输的货物�类数
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}银行中存款的数�
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}�银行贷款的数�
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}总的评价点数
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}车船总数{}包括�车�汽车�船�和飞机
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}包括车站�机场��头的{}总数� �使多�类型的车站{}连接在一起也将被分别计算
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}�一�输工具最低年利润{}�计算使用两年以上的车辆,船�和飞机
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}在过去 12 个月中{}利润最少的月份的现金收入
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}在过去 12 个月中{}利润最多的月份的现金收入
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}在过去 4 个季度中�输的货物总数
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}在上一个季度中�输的货物�类数
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}银行中存款的数�
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}�银行贷款的数�
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}总的评价点数
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}爵士点唱机
@@ -670,8 +670,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}切æ�¢æ˜
 STR_SMALLMAP_CENTER                                             :{BLACK}把地图显示的中心点对准�幕中心�置
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}全部�用
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}全部�用
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}全部�用
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}全部�用
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}显示最�一�消�或新闻
@@ -682,8 +682,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ä¿�å
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}消�历�
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}最新的新闻列表
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}最新的新闻列表
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}消�
@@ -917,32 +917,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}选择è¦
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} 文件{}未找到或�正确
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}关于基本图组的�外信�
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}无法切�到全�模�{}�试使用��的分辨率
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}无法切�到全�模�{}�试使用��的分辨率
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}自定义货�
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}兑�汇率： {ORANGE}{0:CURRENCY} = {1:COMMA} 英镑(£)
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}�少英磅(£)兑�自定义货�的数�
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}增加英磅(£)兑�自定义货�的数�
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}设置自定义货�与英磅(£)的兑�比率
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}�少英磅(£)兑�自定义货�的数�
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}增加英磅(£)兑�自定义货�的数�
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}设置自定义货�与英磅(£)的兑�比率
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}分隔符： {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}设置��分隔符
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}设置��分隔符
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}�缀： {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}设置自定义货�的首字
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}设置自定义货�的首字
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}�缀： {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}设置自定义货�的尾字
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}设置自定义货�的尾字
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}转�为欧元： {ORANGE}{5:NUM} 年�
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}转�为欧元： {ORANGE}�转�
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}设置转�为欧元货�的起始年份
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}�早转�为欧元货�的起始年份
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}延�转�为欧元货�的起始年份
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}设置转�为欧元货�的起始年份
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}�早转�为欧元货�的起始年份
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}延�转�为欧元货�的起始年份
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}预览：{ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 英磅(£) 兑�自定义货�的数�
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 英磅(£) 兑�自定义货�的数�
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}改�当�的货��数
 
 # Difficulty level window
@@ -956,7 +956,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}自定ä¹
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}查看高分榜
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}�存
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}�存
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}最大竞争对手个数：{ORANGE}{COMMA}
@@ -1022,7 +1022,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :宽容
 STR_CITY_APPROVAL_TOLERANT                                      :��
 STR_CITY_APPROVAL_HOSTILE                                       :对立
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}已将游�难度设置为自定义级别
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}已将游�难度设置为自定义级别
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}高级设置
@@ -1271,7 +1271,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(ä¸�æ
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}地图的 X 方�大�：{ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}地图的 Y 方�大�：{ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}改�设置值
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}改�设置值
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1313,9 +1313,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}退出 '
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}退出
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}你确定�放弃当�游�并{}退出到 {STRING} �？
-STR_YES                                                         :{BLACK}是
-STR_NO                                                          :{BLACK}�
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}你确定�放弃当�游�并{}退出到 {STRING} �？
+STR_QUIT_YES                                                    :{BLACK}是
+STR_QUIT_NO                                                     :{BLACK}�
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1331,11 +1331,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}放弃游�
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}你确定�放弃当�的游��？
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}你确定�退出当�场景�？
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}你确定�退出当�场景�？
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}作弊
-STR_CHEATS_TIP                                                  :{BLACK}标志您是�用过此作弊选项的�选框
+STR_CHEATS_TOOLTIP                                              :{BLACK}标志您是�用过此作弊选项的�选框
 STR_CHEATS_WARNING                                              :{BLACK}警告�你将�背�你的盟�，这将被永久记录�
 STR_CHEAT_MONEY                                                 :{LTBLUE}增加 {CURRENCY} 现金
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}作为{ORANGE}{COMMA}进行游�
@@ -1344,24 +1344,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}隧é�“å
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}�以在暂�模�进行建设：{ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}喷气�飞机�会(�常)在�机场��：{ORANGE}{STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}改�气候：{ORANGE}{STRING}
-STR_TEMPERATE_LANDSCAPE                                         :温带景观
-STR_SUB_ARCTIC_LANDSCAPE                                        :寒带景观
-STR_SUB_TROPICAL_LANDSCAPE                                      :沙漠景观
-STR_TOYLAND_LANDSCAPE                                           :奇幻景观
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :温带景观
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :寒带景观
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :沙漠景观
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :奇幻景观
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}改�日期：{ORANGE}{DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}开��调整产�模�：{ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}新色彩方案
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}显示总体�色方案
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}显示列车�色方案
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}显示汽车�色方案
-STR_LIVERY_SHIP_TIP                                             :{BLACK}显示船��色方案
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}显示飞机�色方案
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}为选定的�色方案指定主色调
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}为选定的�色方案指定副色调
-STR_LIVERY_PANEL_TIP                                            :{BLACK}选择一个或多个(CTRL+�击){}�更改的�色方案{}点击方��以切���的方案
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}显示总体�色方案
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}显示列车�色方案
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}显示汽车�色方案
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}显示船��色方案
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}显示飞机�色方案
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}为选定的�色方案指定主色调
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}为选定的�色方案指定副色调
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}选择一个或多个(CTRL+�击){}�更改的�色方案{}点击方��以切���的方案
 
 STR_LIVERY_DEFAULT                                              :标准外观
 STR_LIVERY_STEAM                                                :蒸汽机车
@@ -1399,19 +1399,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}选择å¥
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}�一个�
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}生�一个�机的头�
 STR_FACE_ADVANCED                                               :{BLACK}高级
-STR_FACE_ADVANCED_TIP                                           :{BLACK}切�到高级头�选�
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}切�到高级头�选�
 STR_FACE_SIMPLE                                                 :{BLACK}简易
-STR_FACE_SIMPLE_TIP                                             :{BLACK}切�到简易头�选�
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}切�到简易头�选�
 STR_FACE_LOAD                                                   :{BLACK}载入头�
-STR_FACE_LOAD_TIP                                               :{BLACK}载入预存喜好的头�
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}载入预存喜好的头�
 STR_FACE_LOAD_DONE                                              :{WHITE}你喜好的头�已�从 OpenTTD �置文件中读�
 STR_FACE_FACECODE                                               :{BLACK}头���
-STR_FACE_FACECODE_TIP                                           :{BLACK}查看或设置头�编�
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}查看或设置头�编�
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}头�编�
 STR_FACE_FACECODE_SET                                           :{WHITE}新编�已��用
 STR_FACE_FACECODE_ERR                                           :{WHITE}编�必须在 0 ~ 4,294,967,295 范围内!
 STR_FACE_SAVE                                                   :{BLACK}储存头�
-STR_FACE_SAVE_TIP                                               :{BLACK}储存喜好的头�
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}储存喜好的头�
 STR_FACE_SAVE_DONE                                              :{WHITE}该头�已被储存至 OpenTTD �置文件中
 STR_FACE_EUROPEAN                                               :{BLACK}欧洲人
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}使用欧洲人�孔
@@ -1419,120 +1419,120 @@ STR_FACE_AFRICAN                                                :{BLACK}é�žæ´²äº
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}使用�洲人�孔
 STR_FACE_YES                                                    :是
 STR_FACE_NO                                                     :�
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}是�有 胡�或耳环
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}是�有 胡�或耳环
 STR_FACE_HAIR                                                   :�型
-STR_FACE_HAIR_TIP                                               :{BLACK}选择�型
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}选择�型
 STR_FACE_EYEBROWS                                               :眉毛
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}选择眉毛
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}选择眉毛
 STR_FACE_EYECOLOUR                                              :眼�
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}选择眼�颜色
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}选择眼�颜色
 STR_FACE_GLASSES                                                :眼镜
-STR_FACE_GLASSES_TIP                                            :{BLACK}是�有 眼镜
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}选择眼镜
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}是�有 眼镜
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}选择眼镜
 STR_FACE_NOSE                                                   :鼻�
-STR_FACE_NOSE_TIP                                               :{BLACK}选择鼻�
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}选择鼻�
 STR_FACE_LIPS                                                   :嘴唇
 STR_FACE_MOUSTACHE                                              :胡�
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}选择嘴唇或是胡�
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}选择嘴唇或是胡�
 STR_FACE_CHIN                                                   :下巴
-STR_FACE_CHIN_TIP                                               :{BLACK}选择下巴
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}选择下巴
 STR_FACE_JACKET                                                 :外衣
-STR_FACE_JACKET_TIP                                             :{BLACK}选择外衣
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}选择外衣
 STR_FACE_COLLAR                                                 :领�
-STR_FACE_COLLAR_TIP                                             :{BLACK}选择领�
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}选择领�
 STR_FACE_TIE                                                    :领带
 STR_FACE_EARRING                                                :耳环
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}选择领带或是耳环
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}选择领带或是耳环
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}�机游�
-STR_NETWORK_CONNECTION                                          :{BLACK}连接：
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}选择一个 Internet 上的游�或局域网 (LAN) 中的游�
-STR_NETWORK_LAN                                                 :局域网
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}玩家�称：
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}其他玩家将通过该�字�认识您
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}�称
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}游�的�称
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}客户端
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}在线客户端 / 最多 - 在线公� / 最多
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}地图尺寸
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}游�地图大�{}点击�以按地图大�排列
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}日期
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}当�日期
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}å¹´
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}年数{}游�正在�行的
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}语言，�务器版本和其他信�
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}点击列表中的�务器�以选定它
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}上一次加入的�务器:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}点击选择您上次加入的�务器
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}游�信�
-STR_NETWORK_CLIENTS                                             :{SILVER}客 户 端: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}语　　言： {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}场景类型: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}地图尺寸: {WHITE}{COMMA}×{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}�务器版本: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}�务器地�: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}开始日期: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}当�日期: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}有密��护�
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}�务器离线
-STR_NETWORK_SERVER_FULL                                         :{SILVER}�务器满员
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}版本�匹�
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF �匹�
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}加入游�
-STR_NETWORK_REFRESH                                             :{BLACK}刷新�务器
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}刷新�务器信�
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}�索�务器
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}在网络上�索�务器
-STR_NETWORK_ADD_SERVER                                          :{BLACK}添加�务器
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}添加一个永远显示在列表中的�务器
-STR_NETWORK_START_SERVER                                        :{BLACK}�动�务器
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}�动本机作为�务器
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}请输入大�
-STR_NETWORK_ENTER_IP                                            :{BLACK}输入�务器地�
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}�机游�
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}连接：
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}选择一个 Internet 上的游�或局域网 (LAN) 中的游�
+STR_NETWORK_SERVER_LIST_LAN                                     :局域网
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}玩家�称：
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}其他玩家将通过该�字�认识您
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}�称
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}游�的�称
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}客户端
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}在线客户端 / 最多 - 在线公� / 最多
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}地图尺寸
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}游�地图大�{}点击�以按地图大�排列
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}日期
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}当�日期
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}å¹´
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}年数{}游�正在�行的
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}语言，�务器版本和其他信�
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}点击列表中的�务器�以选定它
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}上一次加入的�务器:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}点击选择您上次加入的�务器
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}游�信�
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}客 户 端: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}语　　言： {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}场景类型: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}地图尺寸: {WHITE}{COMMA}×{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}�务器版本: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}�务器地�: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}开始日期: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}当�日期: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}有密��护�
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}�务器离线
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}�务器满员
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}版本�匹�
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF �匹�
+
+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}�动�务器
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}�动本机作为�务器
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}请输入大�
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}输入�务器地�
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}开始新的�机游�
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}游��称：
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}游��称将显示在其他玩家的�机游�界�中
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}设置密�：
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}如果�希望你的游�被外人加入，请设置一个密�
-STR_NETWORK_SELECT_MAP                                          :{BLACK}选择地图：
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}选择你�玩的地图
-STR_NETWORK_SERVER_RANDOM_GAME                                  :�机生�新游�
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :局域网 / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertise)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} 客户端
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}玩家数目：
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}选择�以�加的玩家上�（达�到此数��然�以开始游�）
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} 公�
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}公�数�：
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}�制�务器上�以创建的公�数�
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} 观众
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}�观数�：
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}�制�务器上�观者的数�
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}语言选项：
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}其他玩家�以知��务器的官方语言
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}开始游�
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}以指定场景或�机地图开始游�
-STR_NETWORK_LOAD_GAME                                           :{BLACK}读�游�
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}��以��存的�机游�{}(请确认所有玩家都连接正确)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}为您的�机游�起�
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}开始新的�机游�
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}游��称：
+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_SELECT_MAP                             :{BLACK}选择地图：
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}选择你�玩的地图
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :�机生�新游�
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :局域网 / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (advertise)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} 客户端
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}玩家数目：
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}选择�以�加的玩家上�（达�到此数��然�以开始游�）
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} 公�
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}公�数�：
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}�制�务器上�以创建的公�数�
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} 观众
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}�观数�：
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}�制�务器上�观者的数�
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}语言选项：
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}其他玩家�以知��务器的官方语言
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}开始游�
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}以指定场景或�机地图开始游�
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}读�游�
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}��以��存的�机游�{}(请确认所有玩家都连接正确)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}为您的�机游�起�
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1575,32 +1575,32 @@ STR_NETWORK_LANG_LATVIAN                                        :拉脱维亚语
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}�机游�大厅
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}正在准备加入: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}当��与游�的公�列表{}您�以加入其中一个公�{}或者在有空�的情况下�建一个公�
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}公�信�
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}公�信�: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}开业时间: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}公�市值: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}�动资金: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}去年收入: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}表现评价: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}车辆船�: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}站�: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}玩家：{WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}新公�
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}创建一个新公�
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}�观公�
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}作为�观者观看公�
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}加入公�
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}帮助管�公�
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}�机游�大厅
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}正在准备加入: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}当��与游�的公�列表{}您�以加入其中一个公�{}或者在有空�的情况下�建一个公�
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}公�信�
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}公�信�: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}开业时间: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}公�市值: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}�动资金: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}去年收入: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}表现评价: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}车辆船�: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}站�: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}玩家：{WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}新公�
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}创建一个新公�
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}�观公�
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}作为�观者观看公�
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}加入公�
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}帮助管�公�
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}正在连接……
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}正在连接……
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) 正在连接……
@@ -1616,13 +1616,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}获å�–å…
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}您��还有 {NUM} 个客户端
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} 已下载
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}æ–­å¼€
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}æ–­å¼€
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}�务器需�密�：
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}公�需�密�：
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}客户端列表
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}客户端列表
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}�观
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新公�
 
@@ -1644,18 +1644,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}请输å…
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}��存所输入的密�
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}为公�设置新密�
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}公�密�
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}默认公�密�
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}将此公�密�作为新公�的默认密�
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}默认公�密�
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}将此公�密�作为新公�的默认密�
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}加入
-STR_COMPANY_JOIN_TIP                                            :{BLACK}加入该公�
-STR_COMPANY_PASSWORD                                            :{BLACK}密�
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}设置密��以防止未�授�的用户��加入。
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}设置公�密�
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}加入
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}加入该公�
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}密�
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}设置密��以防止未�授�的用户��加入。
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}设置公�密�
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}��
+STR_NETWORK_CHAT_SEND                                           :{BLACK}��
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[团队] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[��] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[全体] :
@@ -1668,40 +1668,40 @@ STR_NETWORK_CHAT_ALL                                            :[全体] {STRIN
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}请输入�机�天内容
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} 没有网络设备或者编译时未使用 ENABLE_NETWORK �数
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} 未找到任何�机游�
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} �务器没有�应
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} 因为 NewGRF �匹�而无法连接
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} �机游��步失败
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} �机游�被断开
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} 无法读�存档
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} 无法�动�务器模�
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} 无法连接
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} 连接 #{NUM} 超时
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} 传输�议错误，连接断开
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} 此客户端版本与�务器端�匹�
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} 密�错误
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} �务器已�满员
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} 您的IP已被该�务器��(ban)
-STR_NETWORK_ERR_KICKED                                          :{WHITE} 您已被踢出�务器
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} 此�务器��许作弊
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} 没有网络设备或者编译时未使用 ENABLE_NETWORK �数
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} 未找到任何�机游�
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} �务器没有�应
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} 因为 NewGRF �匹�而无法连接
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} �机游��步失败
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} �机游�被断开
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} 无法读�存档
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} 无法�动�务器模�
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} 无法连接
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} 连接 #{NUM} 超时
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} 传输�议错误，连接断开
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} 此客户端版本与�务器端�匹�
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} 密�错误
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} �务器已�满员
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} 您的IP已被该�务器��(ban)
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} 您已被踢出�务器
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} 此�务器��许作弊
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :一般错误
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :�步错误
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :�能读�地图
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :连接丢失
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :套接字错误
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF �匹�
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :没有授�
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :收到异常包
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :错误的版本
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :已�有人用这个�字了
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :错误的密�
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :错误的公�ID于DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :被�务器踢出
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :正在�试作弊
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :�务器满员
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :一般错误
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :�步错误
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :�能读�地图
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :连接丢失
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :套接字错误
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF �匹�
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :没有授�
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :收到异常包
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :错误的版本
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :已�有人用这个�字了
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :错误的密�
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :错误的公�ID于DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :被�务器踢出
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :正在�试作弊
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :�务器满员
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1713,36 +1713,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :游æˆ�æš‚å�œ (è
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :游�继续 (玩家链入)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :游�继续 (玩家链入失败)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :离开
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} 已加入游�
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} 已加入 #{2:NUM} 公�
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} 已作为观众加入
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} �立了新公� (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} 已离开游� ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} 已更改姓�为 {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} �给您的公� {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** 您�了 {2:CURRENCY} 给 {1:STRING}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} �务器关闭了进程
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} �务器正在�新�动。{}请等待……
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :离开
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} 已加入游�
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} 已加入 #{2:NUM} 公�
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} 已作为观众加入
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} �立了新公� (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} 已离开游� ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} 已更改姓�为 {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} �给您的公� {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** 您�了 {2:CURRENCY} 给 {1:STRING}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} �务器关闭了进程
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} �务器正在�新�动。{}请等待……
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}下载内容
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}类型
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}扩展包类型
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}扩展包类型
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}�称
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}内容�称
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}�击一行以查看详情{}�击�选框选择下载
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}内容�称
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}�击一行以查看详情{}�击�选框选择下载
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}全选
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}选定所有扩展包
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}选定所有扩展包
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}选择�级
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}更新所有已下载的扩展包
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}更新所有已下载的扩展包
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}�消全选
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}�消全部选择
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}�消全部选择
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}输入过滤器字符串
-STR_CONTENT_FILTER_TIP                                          :{BLACK}输入用以过滤此列表的关键�
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}输入用以过滤此列表的关键�
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}标签/�称过滤器
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}下载
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}下载选定的内容
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}下载选定的内容
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}总计下载大�: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}扩展包信�
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}您尚未选择下载该扩展包
@@ -1786,17 +1786,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... æ–‡ä
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}无法解压该扩展包
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}�明选项
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}调整标志是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}调整树木是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}调整建筑是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}调整工业设施是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}调整车站��头�路点等是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}调整桥�是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}调整�塔�信��射塔是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}调整电气�路电线是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}调整装载进度显示是�为�明{}CTRL+点击 �定
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}选择设置为：�显示或�明
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}�明选项
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}调整标志是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}调整树木是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}调整建筑是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}调整工业设施是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}调整车站��头�路点等是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}调整桥�是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}调整�塔�信��射塔是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}调整电气�路电线是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}调整装载进度显示是�为�明{}CTRL+点击 �定
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}选择设置为：�显示或�明
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}显示覆盖区域
@@ -1808,11 +1808,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}接å�—ï¼
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}供给: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}�并车站
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}建造分体车站
+STR_JOIN_STATION_CAPTION                                        :{BLACK}�并车站
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}建造分体车站
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}�并路点
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}建造分体路点
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}�并路点
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}建造分体路点
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}�路建设
@@ -1836,8 +1836,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}列车è½
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}选择列车车库的方�
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}路点
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}选择路点类型
+STR_WAYPOINT_CAPTION                                            :{WHITE}路点
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}选择路点类型
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}�车站选�
@@ -1850,36 +1850,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}选择è½
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}拖动模�
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}使用拖动模�建设车站
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}选择一个�显示车站类型
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}选择�建造的车站类型
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}选择一个�显示车站类型
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}选择�建造的车站类型
 
-STR_STAT_CLASS_DFLT                                             :默认车站
-STR_STAT_CLASS_WAYP                                             :路标
+STR_STATION_CLASS_DFLT                                          :默认车站
+STR_STATION_CLASS_WAYP                                          :路标
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}信��
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}标准信�（悬臂）{}信��是多列车�路系统的必备设施
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}入�信�（悬臂）{}在下一轨�区间上{}当至少有一个出�信�是绿色时{}此信�亮绿� �则亮红�
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}出�信�（悬臂）{}�作等�与普通信�{}但是对于触�入����信��{}�说是必�的
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}��信�（悬臂）{}��信���完全担当{}入�信��和出�信��的功能{}并�建立大的树状信��系统
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}��高级信�（悬臂）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}��高级信�（悬臂）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}标准信�（电�）{}信��是多列车�路系统的必备设施
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}入�信�（电�）{}在下一轨�区间上{}当至少有一个出�信�是绿色时{}此信�亮绿� �则亮红�
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}出�信�（电�）{}�作等�与普通信�{}但是对于触�入����信��{}�说是必�的
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}��信�（电�）{}��信���完全担当{}入�信��和出�信��的功能{}并�建立大的树状信��系统
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}��高级信�（电�）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}��高级信�（电�）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}信��转�工具{}当此按钮按下时�选择信���类{}就�以转�信��为选择的�类{}CTRL+点击{}�以把现有信��在电�和旗帜间转�
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}拖拽布置信��的间隔�离
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}�少拖拽布置信��的间隔�离
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}增加拖拽布置信��的间隔�离
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}信��
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}标准信�（悬臂）{}信��是多列车�路系统的必备设施
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}入�信�（悬臂）{}在下一轨�区间上{}当至少有一个出�信�是绿色时{}此信�亮绿� �则亮红�
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}出�信�（悬臂）{}�作等�与普通信�{}但是对于触�入����信��{}�说是必�的
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}��信�（悬臂）{}��信���完全担当{}入�信��和出�信��的功能{}并�建立大的树状信��系统
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}��高级信�（悬臂）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}��高级信�（悬臂）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}标准信�（电�）{}信��是多列车�路系统的必备设施
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}入�信�（电�）{}在下一轨�区间上{}当至少有一个出�信�是绿色时{}此信�亮绿� �则亮红�
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}出�信�（电�）{}�作等�与普通信�{}但是对于触�入����信��{}�说是必�的
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}��信�（电�）{}��信���完全担当{}入�信��和出�信��的功能{}并�建立大的树状信��系统
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}��高级信�（电�）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}��高级信�（电�）{}高级信��许列车在一个信�区间内{}预留一�到安全�止�的路径{}因此高级信��以�许一列以上列车{}�时进入和通过一个信�区间
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}信��转�工具{}当此按钮按下时�选择信���类{}就�以转�信��为选择的�类{}CTRL+点击{}�以把现有信��在电�和旗帜间转�
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}拖拽布置信��的间隔�离
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}�少拖拽布置信��的间隔�离
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}增加拖拽布置信��的间隔�离
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}选择�路桥
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}选择公路桥�
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}选择桥� - 点击喜欢的桥���建设
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING}，{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}选择桥� - 点击喜欢的桥���建设
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING}，{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :钢制悬索
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :钢制�桥
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :钢制悬臂
@@ -1913,9 +1913,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}建设/æ
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}汽车车库的方�……
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}选择汽车车库方�
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}选择汽车车库方�
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}建设电车车库
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}选择电车车库方�
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}选择电车车库方�
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}公共汽车站的方�
@@ -1936,8 +1936,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}建造èˆ
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}建造�头
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}放置一个浮标
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}建设水渠
-STR_CREATE_LAKE                                                 :{BLACK}修建�河  当地形处于海平�时{}按� Ctrl键 �以定义水域
-STR_CREATE_RIVER                                                :{BLACK}放置河�
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}修建�河  当地形处于海平�时{}按� Ctrl键 �以定义水域
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}放置河�
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}船�方�……
@@ -1969,20 +1969,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}大型æœ
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}空�枢纽
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}直�机机场
 
-STR_STATION_NOISE                                               :{BLACK}产生的噪音: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}产生的噪音: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}景观美化
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}�低地�的一角
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}�高地�的一角
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}拉平地�
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}购买土地以备将�使用
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}�低地�的一角
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}�高地�的一角
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}拉平地�
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}购买土地以备将�使用
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}树木
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}选择���的树木类型
 STR_TREES_RANDOM_TYPE                                           :{BLACK}�机类型的树木
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}���机类型的树木
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}���机类型的树木
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}�机树木
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}�机地��一些树木
 
@@ -1995,9 +1995,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}放置è½
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}增加��高/�低的土地�积
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}�少��高/�低的土地�积
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}�机生�土地
-STR_SE_NEW_WORLD                                                :{BLACK}创建新的场景
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}创建新的场景
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}�置景观
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}清除地图上所有由玩家拥有的财产
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}清除地图上所有由玩家拥有的财产
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}�置景观
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}你确定�清除所有由玩家拥有的财产�？
@@ -2008,41 +2008,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}新建åŸ
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}在指定�置设置一个新的城镇
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}�机城镇
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}�机新增一个城镇
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}大��机城镇
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}在地图上�机创建大�城镇
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}大��机城镇
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}在地图上�机创建大�城镇
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}城镇规模：
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}å°�
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}中
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}大
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}�机
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}�机
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}选择城镇规模
 STR_FOUND_TOWN_CITY                                             :{BLACK}城市
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}城市增长速度高于一般城镇{}它们建立时规模更大
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}城镇�路布局：
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}为此城镇选择使用的�路布局
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}原版
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}改良
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 网格
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 网格
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}�机
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}城镇�路布局：
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}为此城镇选择使用的�路布局
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}原版
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}改良
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 网格
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 网格
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}�机
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}建设新的工业设施
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}请选择工业设施
-STR_MANY_RANDOM_INDUSTRIES                                      :大��机工业
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}在地图上创建大��机的工业设施
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}费用：{YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}勘探
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}建设
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}建设
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}请选择工业设施
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :大��机工业
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}在地图上创建大��机的工业设施
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}费用：{YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}勘探
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}建设
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}建设
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}地�信�
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}清除费用：{LTBLUE}N/A �能清除
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}清除费用：{RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}清除时确认收入： {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}清除时确认收入： {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :æ— 
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}产�所属：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}�路所属：{LTBLUE}{STRING}
@@ -2050,104 +2050,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}有轨ç”
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}�路所属：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}地方政府：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :没有
-STR_LANDINFO_COORDS                                             :{BLACK}�标： {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}建造时间：{LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}车站分类: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}车站类型: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}�标： {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}建造时间：{LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}车站分类: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}车站类型: {LTBLUE}{STRING}
+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})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :岩石
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :�地
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :土地
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :�地
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :田地
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :雪地
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :沙漠
-
-STR_RAILROAD_TRACK                                              :�轨
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :带有普通信��的�路
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :带有入�信��的�路
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :带有出�信��的�路
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :带有��信��的�路
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :带有高级信��的�路
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :带有��高级信��的�路
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :带有普通和入�信��的�路
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :带有普通和出�信��的�路
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :带有普通和��信��的�路
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :带有普通和高级信��的�路
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :带有普通和��高级信��的�路
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :带有入�和出�信��的�路
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :带有入�和��信��的�路
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :带有入�和高级信��的�路
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :带有入�和��高级信��的�路
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :带有出�和��信��的�路
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :带有出�和高级信��的�路
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :带有出�和��高级信��的�路
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :带有��和高级信��的�路
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :带有��和��高级信��的�路
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :带有高级和��高级信��的�路
-STR_RAILROAD_TRAIN_DEPOT                                        :列车车库
-
-STR_ROAD_DESCRIPTION_ROAD                                       :公路
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :带路�的公路
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :林�公路
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :汽车车库
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :公路�路平交路�
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :电车
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :岩石
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :�地
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :土地
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :�地
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :田地
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :雪地
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :沙漠
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :�轨
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :带有普通信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :带有入�信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :带有出�信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :带有��信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :带有高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :带有��高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :带有普通和入�信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :带有普通和出�信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :带有普通和��信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :带有普通和高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :带有普通和��高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :带有入�和出�信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :带有入�和��信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :带有入�和高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :带有入�和��高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :带有出�和��信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :带有出�和高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :带有出�和��高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :带有��和高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :带有��和��高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :带有高级和��高级信��的�路
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :列车车库
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :公路
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :带路�的公路
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :林�公路
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :汽车车库
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :公路�路平交路�
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :电车
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (建设中)
-
-STR_TREE_NAME_TREES                                             :树木
-STR_TREE_NAME_RAINFOREST                                        :雨林
-STR_TREE_NAME_CACTUS_PLANTS                                     :仙人掌
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :�车站
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :机库
-STR_STATION_DESCRIPTION_AIRPORT                                 :机场
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :汽车货场
-STR_STATION_DESCRIPTION_BUS_STATION                             :公共汽车站
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :�头
-STR_STATION_DESCRIPTION_BUOY                                    :浮标
-STR_LANDINFO_WAYPOINT                                           :路点
-
-STR_WATER_DESCRIPTION_WATER                                     :æ°´
-STR_LANDINFO_CANAL                                              :�河
-STR_LANDINFO_LOCK                                               :船闸
-STR_LANDINFO_RIVER                                              :æ²³
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :海岸线或河岸
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :船�
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (建设中)
+
+STR_LAI_TREE_NAME_TREES                                         :树木
+STR_LAI_TREE_NAME_RAINFOREST                                    :雨林
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :仙人掌
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :�车站
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :机库
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :机场
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :汽车货场
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :公共汽车站
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :�头
+STR_LAI_STATION_DESCRIPTION_BUOY                                :浮标
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :路点
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :æ°´
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :�河
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :船闸
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :æ²³
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :海岸线或河岸
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :船�
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :�路隧�
-STR_TUNNEL_DESCRIPTION_ROAD                                     :公路隧�
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :�路隧�
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :公路隧�
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :钢制悬索�路桥
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :钢制�路�桥
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :钢制悬臂�路桥
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :钢筋混�土悬索�路桥
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :木制�路桥
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :混�土�路桥
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :函��路桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :钢制悬索�路桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :钢制�路�桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :钢制悬臂�路桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :钢筋混�土悬索�路桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :木制�路桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :混�土�路桥
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :函��路桥
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :钢制悬索公路桥
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :钢制公路�桥
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :钢制悬臂公路桥
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :钢筋混�土悬索公路桥
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :木制公路桥
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :混�土公路桥
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :函�公路桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :钢制悬索公路桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :钢制公路�桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :钢制悬臂公路桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :钢筋混�土悬索公路桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :木制公路桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :混�土公路桥
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :函�公路桥
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :水渠
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :水渠
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :转播塔
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :�塔
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :公�总部
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :公�属地
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :转播塔
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :�塔
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :公�总部
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :公�属地
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}关于 OpenTTD
@@ -2160,7 +2160,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}ä¿�å­˜æ¸
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}读�存档
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}�存场景
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}读�场景
-STR_LOAD_HEIGHTMAP                                              :{WHITE}读�地形图
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}读�地形图
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}点击这里返回默认的游�存档目录
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} �用
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}驱动器�目录和游�存档列表
@@ -2170,119 +2170,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}删除é€
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}�存
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}以选定的�字�存当�游�
 
-STR_SAVE_OSKTITLE                                               :{BLACK}为存档命�
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}为存档命�
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}地图生�器
-STR_MAPSIZE                                                     :{BLACK}地图规模：
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}城镇数�：
-STR_DATE                                                        :{BLACK}日期:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}工业数�：
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}雪线高度：
-STR_SNOW_LINE_UP                                                :{BLACK}�高雪线高度
-STR_SNOW_LINE_DOWN                                              :{BLACK}�低雪线高度
-STR_RANDOM_SEED                                                 :{BLACK}�机��：
-STR_RANDOM_SEED_HELP                                            :{BLACK}点志这里�以输入一个�机��
-STR_RANDOM                                                      :{BLACK}�机��
-STR_RANDOM_HELP                                                 :{BLACK}改�生�地形所用的�机��
-STR_LAND_GENERATOR                                              :{BLACK}生�地形：
-STR_TREE_PLACER                                                 :{BLACK}生�树木：
-STR_TERRAIN_TYPE                                                :{BLACK}地形特点：
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}海洋�积：
-STR_SMOOTHNESS                                                  :{BLACK}平滑度：
-STR_GENERATE                                                    :{WHITE}生�
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}地图生�器
+STR_MAPGEN_MAPSIZE                                              :{BLACK}地图规模：
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}城镇数�：
+STR_MAPGEN_DATE                                                 :{BLACK}日期:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}工业数�：
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}雪线高度：
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}�高雪线高度
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}�低雪线高度
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}�机��：
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}点志这里�以输入一个�机��
+STR_MAPGEN_RANDOM                                               :{BLACK}�机��
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}改�生�地形所用的�机��
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}生�地形：
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}生�树木：
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}地形特点：
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}海洋�积：
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}平滑度：
+STR_MAPGEN_GENERATE                                             :{WHITE}生�
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}地图边缘：
-STR_NORTHWEST                                                   :{BLACK}西北
-STR_NORTHEAST                                                   :{BLACK}东北
-STR_SOUTHEAST                                                   :{BLACK}东�
-STR_SOUTHWEST                                                   :{BLACK}西�
-STR_BORDER_FREEFORM                                             :{BLACK}自由形�
-STR_BORDER_WATER                                                :{BLACK}水�
-STR_BORDER_RANDOM                                               :{BLACK}�机
-STR_BORDER_RANDOMIZE                                            :{BLACK}�机
-STR_BORDER_MANUAL                                               :{BLACK}手动
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}高度图旋转：
-STR_HEIGHTMAP_NAME                                              :{BLACK}高度图�称：
-STR_HEIGHTMAP_SIZE                                              :{BLACK}地图尺寸： {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}请输入�机��
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}改�雪线高度
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}改�游�开始的日期
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}地图边缘：
+STR_MAPGEN_NORTHWEST                                            :{BLACK}西北
+STR_MAPGEN_NORTHEAST                                            :{BLACK}东北
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}东�
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}西�
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}自由形�
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}水�
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}�机
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}�机
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}手动
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}高度图旋转：
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}高度图�称：
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}地图尺寸： {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}请输入�机��
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}改�雪线高度
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}改�游�开始的日期
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}场景类型：
-STR_SE_FLAT_WORLD                                               :{WHITE}平�水�
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}生�平�水�
-STR_SE_RANDOM_LAND                                              :{WHITE}�机地�
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}地�高度：
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}��地�高度
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}�低地�高度
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}场景类型：
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}平�水�
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}生�平�水�
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}�机地�
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}地�高度：
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}��地�高度
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}�低地�高度
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}改�地�的高度
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}改�地�的高度
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}正在生�地图……
 STR_GENERATION_ABORT                                            :{BLACK}放弃
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}放弃生�地图
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}确定�放弃正在生�的地图�？
-STR_PROGRESS                                                    :{WHITE}已完� {NUM}%
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}地图生�
-STR_TREE_GENERATION                                             :{BLACK}生�树木
-STR_UNMOVABLE_GENERATION                                        :{BLACK}生�固定设施
-STR_CLEARING_TILES                                              :{BLACK}生�岩石地貌
-STR_SETTINGUP_GAME                                              :{BLACK}设置游�
-STR_PREPARING_TILELOOP                                          :{BLACK}地貌细节生�
-STR_PREPARING_GAME                                              :{BLACK}准备游�
+STR_GENERATION_PROGRESS                                         :{WHITE}已完� {NUM}%
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}地图生�
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}生�树木
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}生�固定设施
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}生�岩石地貌
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}设置游�
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}地貌细节生�
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}准备游�
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF 设置
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}装载选定的预定义
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}�存预定义
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}将当�组�存为预定义
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}为预定义组起�
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}删除预定义组
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}删掉当�预定义组
-STR_NEWGRF_ADD                                                  :{BLACK}增加
-STR_NEWGRF_ADD_TIP                                              :{BLACK}�列表中增加一个 NewGRF 文件
-STR_NEWGRF_REMOVE                                               :{BLACK}删除
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}从列表中删除一个 NewGRF 文件
-STR_NEWGRF_MOVEUP                                               :{BLACK}上移
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}将选定的 NewGRF 文件�上移动
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}下移
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}将选定的 NewGRF 文件�下移动
-STR_NEWGRF_FILE_TIP                                             :{BLACK}已�安装的 NewGRF 文件列表{}点击�以改��数
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}设置�数
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}切�调色�
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}切�选定GRF的调色.{}本功能用于游�使用时GRF呈粉色
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}应用
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}在线查找缺失的扩展包
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}看看您需�的扩展包是�能在线找到
-
-STR_NEWGRF_FILENAME                                             :{BLACK}文件�：{SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID：{SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 �：{SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}调色�: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}�数：{SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}没有�用的信�
-STR_NEWGRF_NOT_FOUND                                            :{RED}没有找到对应的文件
-STR_NEWGRF_DISABLED                                             :{RED}�用
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}输入 NewGRF �数
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}装载选定的预定义
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}�存预定义
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}将当�组�存为预定义
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}为预定义组起�
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}删除预定义组
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}删掉当�预定义组
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}增加
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}�列表中增加一个 NewGRF 文件
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}删除
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}从列表中删除一个 NewGRF 文件
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}上移
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}将选定的 NewGRF 文件�上移动
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}下移
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}将选定的 NewGRF 文件�下移动
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}已�安装的 NewGRF 文件列表{}点击�以改��数
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}设置�数
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}切�调色�
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}切�选定GRF的调色.{}本功能用于游�使用时GRF呈粉色
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}应用
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}在线查找缺失的扩展包
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}看看您需�的扩展包是�能在线找到
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}文件�：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5 �：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}调色�: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}�数：{SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}没有�用的信�
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}没有找到对应的文件
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}�用
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}输入 NewGRF �数
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}�用的 NewGRF 文件
 STR_NEWGRF_ADD_FILE                                             :{BLACK}加入选择的范围
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}将选定的 NewGRF 文件添加到你的�置中
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}�新检索文件
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}刷新�用的 NewGRF 文件列表
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}将选定的 NewGRF 文件添加到你的�置中
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}�新检索文件
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}刷新�用的 NewGRF 文件列表
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2306,7 +2306,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :包��数的 Action 8 入�。
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}注��
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注��
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}你将�改�一个正在�行的游�，{}这�能导致该游�崩溃，{}你确定�这样��？
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}�能添加文件：��的 GRF ID
@@ -2331,10 +2331,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}标志åˆ
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}标记标志文字
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}�往下个标记
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}�往上个标记
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}�往下个标记
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}�往上个标记
 
-STR_SIGN_OSKTITLE                                               :{BLACK}为标记起�
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}为标记起�
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}城镇
@@ -2348,10 +2348,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}人�：{ORANGE}{COMMA}{BLACK}  房屋：{ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}上月旅客数�：{ORANGE}{COMMA}{BLACK}  最大值：{ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}上月邮包数�：{ORANGE}{COMMA}{BLACK}  最大值：{ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}城镇�展所必需的货物：
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{BLACK} 需�： {ORANGE}{STRING}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{BLACK} 上个月已�到： {ORANGE}{CARGO}
-STR_NOISE_IN_TOWN                                               :{BLACK}当�城镇噪音: {ORANGE}{COMMA}{BLACK}  最大: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}城镇�展所必需的货物：
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{BLACK} 需�： {ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{BLACK} 上个月已�到： {ORANGE}{CARGO}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}当�城镇噪音: {ORANGE}{COMMA}{BLACK}  最大: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}将�幕中心移动到城镇所在的�置
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}地方政府
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}显示地方政府的信�
@@ -2398,18 +2398,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}å°† {ST
 STR_SUBSIDIES_NONE                                              :{ORANGE}没有
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}已�中标的项目：
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}将 {STRING} 从 {STATION} ��到 {STATION}{YELLOW} ({COMPANY}{YELLOW}，截止日期为 {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}点击项目�将�幕中心移动到{}城镇/工业 所在的�置
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}点击项目�将�幕中心移动到{}城镇/工业 所在的�置
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}车站�称{}点击�将�幕中心移动到车站所在�置
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}�� CTRL �以选择多个项目
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}�� CTRL �以选择多个项目
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} 车站
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- 没有 -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}选择全部�输工具�类
-STR_SELECT_ALL_TYPES                                            :{BLACK}选择所有货物类型{}（包括�在等待列表中的）
-STR_NO_WAITING_CARGO                                            :{BLACK}选择无等待货物车站
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}选择全部�输工具�类
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}选择所有货物类型{}（包括�在等待列表中的）
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}选择无等待货物车站
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2440,18 +2440,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :完美（最高
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}将�幕中心移动到车站所在的�置
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}�命�车站
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}显示所有调度计划中�有此车站的列车
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}显示所有调度计划中�有此车站的汽车
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}显示所有调度计划中�有此机场的飞机
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}显示所有调度计划中�有此�头的船�
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}显示所有调度计划中�有此车站的列车
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}显示所有调度计划中�有此车站的汽车
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}显示所有调度计划中�有此机场的飞机
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}显示所有调度计划中�有此�头的船�
 
-STR_QUERY_RENAME_STATION_CAPTION                                :�命�车站
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :�命�车站
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}将�幕中心移动到路点所在的�置
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}修改路点�
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}修改路点�
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}将�幕中心移动到浮标所在的�置
-STR_CHANGE_BUOY_NAME                                            :{BLACK}修改浮标�
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}修改浮标�
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}编辑路点�称
 
@@ -2477,7 +2477,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}总计：
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}�动资金
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}已贷款�
-STR_MAX_LOAN                                                    :{WHITE}最大贷款�度：{BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}最大贷款�度：{BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}贷款 {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}贷款{}Ctrl+点击 �贷款最大�度
@@ -2491,10 +2491,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}开业时间：{WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}色彩方案：
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}车船概况：
-STR_TRAINS                                                      :{WHITE}{COMMA} 列 �车
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} 辆 汽车
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} 驾 飞机
-STR_SHIPS                                                       :{WHITE}{COMMA} 艘 船舶
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} 列 �车
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} 辆 汽车
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} 驾 飞机
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} 艘 船舶
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}æ— 
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}公�市值：{WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% 由 {COMPANY} 所有)
@@ -2502,8 +2502,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}设立总部
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}查看总部
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}建设/查看公�总部
-STR_RELOCATE_HQ                                                 :{BLACK}�置总部
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}以公�市值 1% 的代价�建总部
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}�置总部
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}以公�市值 1% 的代价�建总部
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}新的头�
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}为总�选择新头�
@@ -2519,17 +2519,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}出售å…
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}购买此公� 25% 的股份
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}出售此公� 25% 的股份
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :公��称
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :总�姓�
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :公��称
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :总�姓�
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}我们正在寻找一家愿�收购我们的公�。{}{}您愿�收购 {COMPANY} ({CURRENCY}) �？
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}工业设施
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% 已�输)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% 已�输)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工业设施{}点击�以将�幕中心移动到其所在�置
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}工业设施
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% 已�输)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% 已�输)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}工业设施{}点击�以将�幕中心移动到其所在�置
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2565,26 +2565,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}飞机 -
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}今年利润：{CURRENCY} (去年利润：{CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}�用的列车
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}�用的汽车
-STR_AVAILABLE_SHIPS                                             :{BLACK}�用的船�
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}�用的飞机
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}查看此�输工具类型的{}全部�选购列表
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}�用的列车
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}�用的汽车
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}�用的船�
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}�用的飞机
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}查看此�输工具类型的{}全部�选购列表
 
-STR_MANAGE_LIST                                                 :{BLACK}管�列表
-STR_MANAGE_LIST_TIP                                             :{BLACK}�所有在此列表中的�输工具�出指令
-STR_REPLACE_VEHICLES                                            :替�车辆/飞机/船�
-STR_SEND_FOR_SERVICING                                          :进行�养
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}管�列表
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}�所有在此列表中的�输工具�出指令
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :替�车辆/飞机/船�
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :进行�养
 
-STR_SEND_TRAIN_TO_DEPOT                                         :�往列车车库
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :�往汽车车库
-STR_SEND_SHIP_TO_DEPOT                                          :�往船�
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :�往机库
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :�往列车车库
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :�往汽车车库
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :�往船�
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :�往机库
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}点击这里�以�止列表中的{}所有车辆/船�/飞机
-STR_MASS_START_LIST_TIP                                         :{BLACK}点击这里�以�动列表中的{}所有车辆/船�/飞机
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}点击这里�以�止列表中的{}所有车辆/船�/飞机
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}点击这里�以�动列表中的{}所有车辆/船�/飞机
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}与 {COMMA} 车辆/船�/飞机共享调度计划
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}与 {COMMA} 车辆/船�/飞机共享调度计划
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :全部�车
@@ -2597,11 +2597,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :未分组汽车
 STR_GROUP_DEFAULT_SHIPS                                         :未分组船�
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :未分组飞机
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}组 - 点击以列出本组所有车辆
-STR_GROUP_CREATE_TIP                                            :{BLACK}创建分组
-STR_GROUP_DELETE_TIP                                            :{BLACK}删除分组
-STR_GROUP_RENAME_TIP                                            :{BLACK}�命�该分组
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}点击以�止本组自动更新功能的使用
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}组 - 点击以列出本组所有车辆
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}创建分组
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}删除分组
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}�命�该分组
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}点击以�止本组自动更新功能的使用
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :添加共享车辆
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :移除所有车辆
@@ -2624,7 +2624,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}速度ï¼
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}速度：{GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}�行费用：{GOLD}{CURRENCY}/年
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}�载能力：{GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(�改装)
+STR_PURCHASE_INFO_REFITTABLE                                    :(�改装)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}设计日期：{GOLD}{NUM}{BLACK}     寿命：{GOLD}{COMMA} 年
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}最大��性：{GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}售价：{GOLD}{CURRENCY}
@@ -2688,17 +2688,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}将汽è½
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}将船�拖到这里以出售
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}将飞机拖到这里以出售
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}将车头拖到这里�以出售整列�车
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}将车头拖到这里�以出售整列�车
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}出售车库中的所有列车
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}出售车库中的所有汽车
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}出售船�中的所有船�
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}出售机库中的所有飞机
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}出售车库中的所有列车
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}出售车库中的所有汽车
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}出售船�中的所有船�
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}出售机库中的所有飞机
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}自动更新车库中的所有列车
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}自动更新车库中的所有汽车
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}自动更新船�中的所有船�
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}自动更新机库中的所有飞机
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}自动更新车库中的所有列车
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}自动更新车库中的所有汽车
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}自动更新船�中的所有船�
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}自动更新机库中的所有飞机
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}购买列车
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}购买汽车
@@ -2710,35 +2710,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}è´­ä¹°
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}购买新船�
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}购买飞机
 
-STR_CLONE_TRAIN                                                 :{BLACK}克隆列车
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}克隆汽车
-STR_CLONE_SHIP                                                  :{BLACK}克隆船�
-STR_CLONE_AIRCRAFT                                              :{BLACK}克隆飞机
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}克隆列车
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}克隆汽车
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}克隆船�
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}克隆飞机
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}�制列车 按此按钮�{}点击一辆在车库内或外�的列车��{}Ctrl+�击 �以�时共享调度计划
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}�制汽车 按此按钮�{}点击一辆在车库内或外�的汽车��{}Ctrl+�击 �以�时共享调度计划
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}�制船�，按此按钮�点击一个在船�内或外�的船���。Ctrl+�击�以�时共享调度计划。
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK} �制飞机 按此按钮� {}点击一个在机库内或外�的飞机��{}Ctrl+�击 �以�时共享调度计划
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}�制列车 按此按钮�{}点击一辆在车库内或外�的列车��{}Ctrl+�击 �以�时共享调度计划
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}�制汽车 按此按钮�{}点击一辆在车库内或外�的汽车��{}Ctrl+�击 �以�时共享调度计划
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}�制船�，按此按钮�点击一个在船�内或外�的船���。Ctrl+�击�以�时共享调度计划。
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK} �制飞机 按此按钮� {}点击一个在机库内或外�的飞机��{}Ctrl+�击 �以�时共享调度计划
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}将�幕中心移动到列车库所在的�置
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}将�幕中心移动到车库所在的�置
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}将�幕中心移动到当�船�的�置
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}将�幕中心移动到当�机库的�置
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}显示所有调度计划中�有此车库的列车
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}显示所有调度计划中�有此车库的汽车
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}显示所有调度计划中�有此船�的船�
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}显示所有调度计划中�有此机库的飞机
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}显示所有调度计划中�有此车库的列车
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}显示所有调度计划中�有此车库的汽车
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}显示所有调度计划中�有此船�的船�
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}显示所有调度计划中�有此机库的飞机
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}点击这里�以�止车库的所有列车
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}点击这里�以�止车库的所有汽车
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}点击这里�以�止船�的所有船�
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}点击这里�以�止机库的所有飞机
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}点击这里�以�止车库的所有列车
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}点击这里�以�止车库的所有汽车
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}点击这里�以�止船�的所有船�
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}点击这里�以�止机库的所有飞机
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}点击这里�以�动车库的所有列车
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}点击这里�以�动车库的所有汽车
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}点击这里�以�动船�的所有船�
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}点击这里�以�动机库的所有飞机
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}点击这里�以�动车库的所有列车
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}点击这里�以�动车库的所有汽车
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}点击这里�以�动船�的所有船�
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}点击这里�以�动机库的所有飞机
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}你将�出售车库中的所有车辆，确定�？
 
@@ -2752,38 +2752,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :船�
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :�轨机车
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :�悬浮机车
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}售价：{CURRENCY} ��：{WEIGHT_S}{}速度：{VELOCITY}  功率：{POWER}{}�行费用：{CURRENCY}/年{}�载能力： {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}售价：{CURRENCY} 最大速度：{VELOCITY}{}�载能力：{CARGO}, {CARGO}{}�行�本：{CURRENCY} /年
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}售价：{CURRENCY} 最大速度：{VELOCITY}{}�载能力：{CARGO}{}�行�本：{CURRENCY} /年
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}售价：{CURRENCY} ��：{WEIGHT_S}{}速度：{VELOCITY}  功率：{POWER}{}�行费用：{CURRENCY}/年{}�载能力： {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}售价：{CURRENCY} 最大速度：{VELOCITY}{}�载能力：{CARGO}, {CARGO}{}�行�本：{CURRENCY} /年
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}售价：{CURRENCY} 最大速度：{VELOCITY}{}�载能力：{CARGO}{}�行�本：{CURRENCY} /年
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}æ›´æ–° {STRING}
-STR_VEHICLE_TRAIN                                               :�车
-STR_VEHICLE_ROAD_VEHICLE                                        :汽车
-STR_VEHICLE_SHIP                                                :船�
-STR_VEHICLE_AIRCRAFT                                            :飞机
+STR_REPLACE_VEHICLE_TRAIN                                       :�车
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :汽车
+STR_REPLACE_VEHICLE_SHIP                                        :船�
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :飞机
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}选择�更新的车辆类型
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}选择用�替�左侧指定车辆的新车辆
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}开始更新
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}点击这里开始根�选定的车辆进行更新
-STR_NOT_REPLACING                                               :{BLACK}没有更新
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}请选择�更新的对象
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}没有更新
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}请选择�更新的对象
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}�止更新
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}点击这里�以�止继续更新车辆
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}替�项目： {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}�以切� 机车/挂车 替�项目
-STR_ENGINES                                                     :机车
-STR_WAGONS                                                      :挂车
+STR_REPLACE_ENGINES                                             :机车
+STR_REPLACE_WAGONS                                              :挂车
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}选择�更新的车辆对应的�路类型
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}显示用�替�左侧被选定车辆的新车辆
-STR_RAIL_VEHICLES                                               :普通列车
-STR_ELRAIL_VEHICLES                                             :电力机车
-STR_MONORAIL_VEHICLES                                           :�轨列车
-STR_MAGLEV_VEHICLES                                             :�悬浮列车
+STR_REPLACE_RAIL_VEHICLES                                       :普通列车
+STR_REPLACE_ELRAIL_VEHICLES                                     :电力机车
+STR_REPLACE_MONORAIL_VEHICLES                                   :�轨列车
+STR_REPLACE_MAGLEV_VEHICLES                                     :�悬浮列车
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}清�挂车：{ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}当车辆�级�能造�列车�长时{}自动去掉若干挂车以��列车长度��
@@ -2801,10 +2801,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}命令æ±
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}命令船��往船�{}Ctrl+�击 时船��进行�养
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}命令飞机�往机库{}Ctrl+�击 时飞机�进行�养
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}�制这列�车{}Ctrl+�击 �以�时共享调度计划
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}�制这辆汽车{}Ctrl+�击 �以�时共享调度计划
-STR_CLONE_SHIP_INFO                                             :{BLACK}�制当�选定的船�{}Ctrl+�击 �以�时共享调度计划
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}�制当�选定的飞机{}Ctrl+�击 �以�时共享调度计划
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}�制这列�车{}Ctrl+�击 �以�时共享调度计划
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}�制这辆汽车{}Ctrl+�击 �以�时共享调度计划
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}�制当�选定的船�{}Ctrl+�击 �以�时共享调度计划
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}�制当�选定的飞机{}Ctrl+�击 �以�时共享调度计划
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}命令列车强行通过信�
 
@@ -2837,36 +2837,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}�车
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}撞�!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}抛锚
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}��
-STR_TRAIN_STOPPING                                              :{RED}正在�止
-STR_TRAIN_STOPPING_VEL                                          :{RED}正在�止，{VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}没有电力
-STR_TRAIN_STUCK                                                 :{ORANGE}等待空余轨�
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}正在�往 {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}正在�往 {STATION}，{VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}没有目标
-STR_NO_ORDERS_VEL                                               :{LTBLUE}没有目标，{VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}正在�往{WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}正在�往{WAYPOINT}，{VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}正在�往 {TOWN} 车库
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}正在�往 {TOWN} 车库，{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}正在�往 {TOWN} 车库
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}正在�往 {TOWN} 车库，{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}正在�往 {TOWN} 船�
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正在�往 {TOWN} 船�，{VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}正在�往 {STATION} 的机库
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}正在�往 {STATION} 的机库，{VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}在 {TOWN} 车库�养
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}在 {TOWN} 车库�养，{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}正在 {TOWN} 车库�养
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}正在 {TOWN} 车库�养，{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船��养
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船��养，{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}正在 {STATION} 的机库�养
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}正在 {STATION} 的机库�养，{VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}正在�止
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}正在�止，{VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}没有电力
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}等待空余轨�
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}正在�往 {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}正在�往 {STATION}，{VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}没有目标
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}没有目标，{VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}正在�往{WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}正在�往{WAYPOINT}，{VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}正在�往 {TOWN} 车库
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}正在�往 {TOWN} 车库，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}正在�往 {TOWN} 车库
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}正在�往 {TOWN} 车库，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}正在�往 {TOWN} 船�
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}正在�往 {TOWN} 船�，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}正在�往 {STATION} 的机库
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}正在�往 {STATION} 的机库，{VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}在 {TOWN} 车库�养
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}在 {TOWN} 车库�养，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}正在 {TOWN} 车库�养
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}正在 {TOWN} 车库�养，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}正在 {TOWN} 船��养
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}正在 {TOWN} 船��养，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}正在 {STATION} 的机库�养
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}正在 {STATION} 的机库�养，{VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (详细信�)
@@ -2879,8 +2879,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}命å��é£
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}年龄：{LTBLUE}{STRING}{BLACK}   �行�本：{LTBLUE}{CURRENCY} /年
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} å¹´ ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} å¹´ ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} å¹´ ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} å¹´ ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}最大速度：{LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}��：{LTBLUE}{WEIGHT_S} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 最大速度：{LTBLUE}{VELOCITY}
@@ -2894,7 +2894,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}è¿�è½½èƒ
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}�载能力：{LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}�载能力：{LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}转��本： {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}转��本： {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}�养周期：{LTBLUE}{COMMA}天{BLACK}   上次�养：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}�养周期：{LTBLUE}{COMMA}%{BLACK}   上次�养：{LTBLUE}{DATE_LONG}
@@ -2910,9 +2910,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}命å��é£
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   建造年份：{LTBLUE}{NUM}{BLACK} 价值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   价值：{LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}全车的装载能力为：
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}全车的装载能力为：
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}空
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} (�自 {STATION})
@@ -2927,7 +2927,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}显示åˆ
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}全部货物
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}根���的挂车�类显示相应的总�力
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}�力： {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}�力： {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (改装)
@@ -2951,15 +2951,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}改装é£
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (调度计划)
-STR_TIMETABLE_VIEW                                              :{BLACK}时间表
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}切�到时间表视图
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}时间表
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}切�到时间表视图
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}调度列表{}�击一个调度指令�以使之高亮化{}CTRL + �击{}�以将视点移动到相应的车站
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}-- 调度计划结� --
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共享调度计划结� - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - 共享调度计划结� - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}��车
@@ -2983,14 +2983,14 @@ STR_ORDER_DROP_TRANSFER                                         :��
 STR_ORDER_DROP_NO_UNLOADING                                     :��载
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}改�当�选中车站�载时的执行动作
 
-STR_REFIT                                                       :{BLACK}改装
-STR_REFIT_TIP                                                   :{BLACK}选择�在调度计划中改装的货物类型{}CTRL+�击 �以去掉改装计划
+STR_ORDER_REFIT                                                 :{BLACK}改装
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}选择�在调度计划中改装的货物类型{}CTRL+�击 �以去掉改装计划
 
-STR_SERVICE                                                     :{BLACK}�养
+STR_ORDER_SERVICE                                               :{BLACK}�养
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :一直�进
 STR_ORDER_DROP_SERVICE_DEPOT                                    :若需�则维护
 STR_ORDER_DROP_HALT_DEPOT                                       :�留
-STR_SERVICE_HINT                                                :{BLACK}除�需�在此处�养，�则跳过这一项目
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}除�需�在此处�养，�则跳过这一项目
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}跳过所需的车辆数�值
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :装载进度
@@ -3011,7 +3011,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :为是
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :为�
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}�比较车辆的数�值
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}请输入�比较的值
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳过
@@ -3025,13 +3025,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :�往最近的
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :�往最近的机库
 STR_ORDER_CONDITIONAL                                           :�件性命令跳过
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}在调度列表的结尾或高亮显示项目��{}增加一�新指令
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}�入高级指令
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}�入高级指令
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}显示所有共享此调度计划的{}车辆/船�/飞机
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}显示所有共享此调度计划的{}车辆/船�/飞机
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :�过 {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :�过(��) {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :�过 {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :�过(��) {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :维修在
 STR_ORDER_SERVICE_NON_STOP_AT                                   :维修,���于
@@ -3041,15 +3041,15 @@ STR_ORDER_NEAREST_HANGAR                                        :最近的机库
 STR_ORDER_TRAIN_DEPOT                                           :�车车库
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :汽车车库
 STR_ORDER_SHIP_DEPOT                                            :船�
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING}  {STATION}  机库
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING}  {STATION}  机库
 
-STR_REFIT_ORDER                                                 :(改装为 {STRING})
-STR_REFIT_STOP_ORDER                                            :(改装为{STRING}并�留)
-STR_STOP_ORDER                                                  :(�留)
+STR_ORDER_REFIT_ORDER                                           :(改装为 {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(改装为{STRING}并�留)
+STR_ORDER_STOP_ORDER                                            :(�留)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :（装满全部货物）
 STR_ORDER_FULL_LOAD_ANY                                         :（装满任�货物�离开）
@@ -3070,16 +3070,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[月�近端]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[月�中间]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[月�远端]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :跳至 {COMMA}
-STR_CONDITIONAL_NUM                                             :跳至 {COMMA} [ 当 {STRING} {STRING} {COMMA} ]
-STR_CONDITIONAL_TRUE_FALSE                                      :跳至 {COMMA} [ 当 {STRING} {STRING}]
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :跳至 {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :跳至 {COMMA} [ 当 {STRING} {STRING} {COMMA} ]
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :跳至 {COMMA} [ 当 {STRING} {STRING}]
 
 STR_INVALID_ORDER                                               :{RED} (�法的调度计划)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (时间表)
-STR_ORDER_VIEW                                                  :{BLACK}命令
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}切�到调度计划视图
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}命令
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}切�到调度计划视图
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}时间表 - �击一个命令�以使其高亮。
 
@@ -3101,10 +3101,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}该车è¾
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}改�时间
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}改�高亮选择的命令执行的时间
 
-STR_CLEAR_TIME                                                  :{BLACK}清除时间
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}清除时间
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}清除高亮选择的命令的执行时间
 
-STR_RESET_LATENESS                                              :{BLACK}清除晚点计数器
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}清除晚点计数器
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}�置晚点计数器，从而使车辆准时到达
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}自动填充
@@ -3112,42 +3112,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}æ ¹æ�®ä¸
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}AI 调试
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}AI�称
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}AI�称
 STR_AI_DEBUG_RELOAD                                             :{BLACK}�载 AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}关闭AI并��AI
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}关闭AI并��AI
 
-STR_AI_NO_AI_FOUND                                              :找�到�使用的AI。这个AI�是一个演示而�会有任何动作，{}您�以通过“在线查找扩展包�功能下载AI程�。
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}一个�行中的 AI 崩溃了。请附上一张 AI 调试窗�的截图，将此错误通报 AI 作者。
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI调试窗��对�务器�用
+STR_ERROR_AI_NO_AI_FOUND                                        :找�到�使用的AI。这个AI�是一个演示而�会有任何动作，{}您�以通过“在线查找扩展包�功能下载AI程�。
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}一个�行中的 AI 崩溃了。请附上一张 AI 调试窗�的截图，将此错误通报 AI 作者。
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI调试窗��对�务器�用
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI 设置
-STR_AI_LIST_TIP                                                 :{BLACK}所有 AI 将会在下一局游�中载入。
-STR_AI_HUMAN_PLAYER                                             :玩家
-STR_AI_RANDOM_AI                                                :�机 AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}所有 AI 将会在下一局游�中载入。
+STR_AI_CONFIG_HUMAN_PLAYER                                      :玩家
+STR_AI_CONFIG_RANDOM_AI                                         :�机 AI
 
-STR_AI_CHANGE                                                   :{BLACK}选择 AI
-STR_AI_CHANGE_TIP                                               :{BLACK}装载�一个AI
-STR_AI_CONFIGURE                                                :{BLACK}设定
-STR_AI_CONFIGURE_TIP                                            :{BLACK}设定AI特�
+STR_AI_CONFIG_CHANGE                                            :{BLACK}选择 AI
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}装载�一个AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}设定
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}设定AI特�
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}�用 AI
-STR_AI_AILIST_TIP                                               :{BLACK}点击选择 AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}点击选择 AI
 
-STR_AI_AUTHOR                                                   :{BLACK}作者: {STRING}
-STR_AI_VERSION                                                  :{BLACK}版本: {NUM}
-STR_AI_URL                                                      :{BLACK}URL： {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}作者: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}版本: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL： {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}接�
-STR_AI_ACCEPT_TIP                                               :{BLACK}选择高亮的 AI
-STR_AI_CANCEL                                                   :{BLACK}�消
-STR_AI_CANCEL_TIP                                               :{BLACK}�修改本 AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}接�
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}选择高亮的 AI
+STR_AI_LIST_CANCEL                                              :{BLACK}�消
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�修改本 AI
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI 特�
-STR_AI_CLOSE                                                    :{BLACK}关闭
-STR_AI_RESET                                                    :{BLACK}�设
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}关闭
+STR_AI_SETTINGS_RESET                                           :{BLACK}�设
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3168,8 +3168,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}预计è´
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}预计收入：{CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}�存�在继续{}请�心等待……
-STR_AUTOSAVE_FAILED                                             :{WHITE}自动�存失败
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}�存�在继续{}请�心等待……
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}自动�存失败
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}�能读�驱动器
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}�存游�失败{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}�能删除文件
@@ -3180,22 +3180,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :该存档是新
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :文件无法读�
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :文件无法写入
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :数�完整性检查失败
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}游�已�存为无电车版。所有电车已被去除。
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}游�已�存为无电车版。所有电车已被去除。
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}生�场景失败�无�适地点建设城镇。
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}当�场景中没有城镇……
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}生�场景失败�无�适地点建设城镇。
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}当�场景中没有城镇……
 
-STR_PNGMAP_ERROR                                                :{WHITE}无法从 PNG 文件中读�场景……
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}文件未找到。
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}�能转�图�格�{}请使用 8 �或 24 � PNG 图片
-STR_PNGMAP_ERR_MISC                                             :{WHITE}似乎出现了一些错误{}(如��的文件等)
+STR_ERROR_PNGMAP                                                :{WHITE}无法从 PNG 文件中读�场景……
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}文件未找到。
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}�能转�图�格�{}请使用 8 �或 24 � PNG 图片
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}似乎出现了一些错误{}(如��的文件等)
 
-STR_BMPMAP_ERROR                                                :{WHITE}无法从 BMP 文件中读�场景……
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}�能转�图�格�。
+STR_ERROR_BMPMAP                                                :{WHITE}无法从 BMP 文件中读�场景……
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}�能转�图�格�。
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}缩放警告
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}�推�将�图片过度放缩，是�继续生�？
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}缩放警告
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}�推�将�图片过度放缩，是�继续生�？
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}�幕截图已�被�功�存为{} '{STRING}'
@@ -3218,15 +3218,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}地点ä¸
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}已�建好了……
 STR_ERROR_OWNED_BY                                              :{WHITE}归 {STRING} 所有
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}此区域由�一公�所有……
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}�称��!请�新命�.
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}目标�置有 {STRING}
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}�称��!请�新命�.
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}目标�置有 {STRING}
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} 地方政府�批准此�作……
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN}地方政府{}���在本市范围内�兴建一座机场
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} 考虑到噪音控制，地方当局拒�修建机场。
-STR_BRIBE_FAILED                                                :{WHITE}你试图行贿地方官员已�
-STR_BRIBE_FAILED_2                                              :{WHITE}被当地检察机关�现了�
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} 考虑到噪音控制，地方当局拒�修建机场。
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}你试图行贿地方官员已�
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}被当地检察机关�现了�
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}�能�高这里的地�……
@@ -3235,7 +3235,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}无法åœ
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}挖掘将破�隧�
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}已�是海平�了
 STR_ERROR_TOO_HIGH                                              :{WHITE}太高了
-STR_ALREADY_LEVELLED                                            :{WHITE}... 已�平了
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... 已�平了
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}�能为公�更�……
@@ -3246,29 +3246,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}ä¸�能å†
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}没有��还的贷款了
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}需�{CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}�能�还贷款……
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}�能将银行的贷款�给别人……
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}�能将银行的贷款�给别人……
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}�能收购公�……
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}�能设置公�总部
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}�能购买此公�的股份……
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}�能出售此公�的股份……
-STR_PROTECTED                                                   :{WHITE}这个公�刚刚开业，还�能进行股�交易……
+STR_ERROR_PROTECTED                                             :{WHITE}这个公�刚刚开业，还�能进行股�交易……
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�能建设任何城镇
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�能建设任何城镇
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}�能�命�城镇……
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}�能在这里建设城镇……
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}太�近地图边缘了
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}太�近�一个城镇了
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}城镇太多了
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}地图上没有多余的地方了
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}这个城镇�能建造�路{}你�以在"高级设置->�济->城镇"处{}设置�许城镇建设�路
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}正在进行�路工程
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}地图上没有多余的地方了
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}这个城镇�能建造�路{}你�以在"高级设置->�济->城镇"处{}设置�许城镇建设�路
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}正在进行�路工程
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}�能生�工业设施……
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}�能生�工业设施……
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}�能在这里建设 {STRING} ……
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}�能在此处建设这�类型的工业设施……
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}�离�一工业设施过近……
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}�离�一工业设施过近……
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}必须先建设一个城镇……
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}�个城镇�能建设一个……
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}�能在人�超过 1200 的城镇建造……
@@ -3289,7 +3289,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}ä¸�能åœ
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}与�一车站相连
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}站区太大了……
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}已�用了异形站�……
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}已�用了异形站�……
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}车站过多
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}分体站�太多
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}公共汽车站过多
@@ -3299,12 +3299,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}è·�离å�
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}�离�一�头过近
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}�离�一机场过近
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}�能�命�车站
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}这是一�城镇所属的�路
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}�路方��对
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}这是一�城镇所属的�路
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}�路方��对
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}�能拆除站�的一部分……
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}请先拆除�车站
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}�能拆除站�的一部分……
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}请先拆除�车站
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}�能移除公共汽车站……
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}�能移除汽车货场
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}无法移除客�电车车站...
@@ -3322,14 +3322,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}您必é¡
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}�离�一路点过近
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}�离�一路点过近
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}�能在这里设置路点……
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}�能在这里设置路点……
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}�能将浮标放置在这里。
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}�能更改路点�称……
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}�能更改路点�称……
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}�能从这里拆除路点……
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}必须先拆除�路路点
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}�能从这里拆除路点……
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}必须先拆除�路路点
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}指定的�置有浮标……
-STR_BUOY_IS_IN_USE                                              :{WHITE}浮标正在被使用……
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}浮标正在被使用……
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}�能在这里建设列车车库……
@@ -3346,14 +3346,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}å�ªæœ‰åˆ
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}列车过长
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}无法调转车辆方�...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}�能命令多节的汽车掉头
-STR_INCOMPATIBLE_RAIL_TYPES                                     :�路类型�匹�
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :�路类型�匹�
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}�能移动这项调度计划……
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}尾部的列车机车必须和头部的一起�作……
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}找�到附近的车库……
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}在附近找�到车库
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :车库类型错误
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :车库类型错误
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE}在更新�总长会过长
@@ -3364,14 +3364,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(现金�够)
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}��能的�轨组�
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}没有�适的�轨
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}必须先拆除�轨
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}这是�行�或这�路被堵死了
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}这是�行�或这�路被堵死了
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}�能在这里设置信��……
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}�能在这里铺设�轨……
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}�能从这里拆除�轨……
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}�能从这里拆除信��……
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}无法转�此处的信��…
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}无法转�此处的信��…
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}�能转��路的类型……
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}�能转��路的类型……
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}必须先拆除公路
@@ -3382,13 +3382,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}ä¸�能æ‹
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}无法移除此处的电车�...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}�能在这里兴建�河……
-STR_CANT_BUILD_LOCKS                                            :{WHITE}�能在这里兴建船闸……
-STR_CANT_PLACE_RIVERS                                           :{WHITE}�能在这里加设河�...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}�能在这里兴建�河……
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}�能在这里兴建船闸……
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}�能在这里加设河�...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}必须在水上建造……
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}�能在水上建造……
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}请先移除�河
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}无法在此建设水渠……
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}请先移除�河
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}无法在此建设水渠……
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}……此处已�有树木了
@@ -3397,9 +3397,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}ä¸�能åœ
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}�能在这里架设桥�
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}必须先拆除桥�
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}起止点�能相�
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}桥�起止点�在�一水平高度
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}桥�对于现有地形�说�置太低了
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}起止点�能相�
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}桥�起止点�在�一水平高度
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}桥�对于现有地形�说�置太低了
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}起止两端必须在一�线上
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}桥的两端必须都�于地�上
 
@@ -3408,7 +3408,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}ä¸�能åœ
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}此处�适�作为隧�入�
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}必须先拆除隧�
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}规划�置中有�一�隧�
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}隧�出�将超出地图边界
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}隧�出�将超出地图边界
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}隧�出�的地形无法处�
 
 # Unmovable related errors
@@ -3418,12 +3418,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}ä¸�能è´
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}它已�是你的了�
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}无法新建分组……
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}无法删除分组……
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}无法�命�分组……
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}无法从该组移除所有交通工具
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}无法添加交通工具到该组……
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}无法添加共享交通工具到该组……
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}无法新建分组……
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}无法删除分组……
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}无法�命�分组……
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}无法从该组移除所有交通工具
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}无法添加交通工具到该组……
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}无法添加共享交通工具到该组……
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}指定�置有列车
@@ -3466,21 +3466,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}ä¸�能å‡
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}�能出售船�……
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}�能出售飞机……
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}列车��用
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}车辆��用
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}船���用
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}飞机��用
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}列车��用
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}车辆��用
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}船���用
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}飞机��用
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}游�中的车辆过多
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}�能改��养周期……
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}无法出售��的列车……
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}无法调整��的列车
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}无法出售��的列车……
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}无法调整��的列车
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}�能让列车冒险通过信�...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}�能命令列车调头...
-STR_TRAIN_START_NO_CATENARY                                     :这�是电气化�路，电力机车�能�动
+STR_ERROR_TRAIN_START_NO_CATENARY                               :这�是电气化�路，电力机车�能�动
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}车辆无法调头...
 
@@ -3499,14 +3499,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}车辆æ—
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}车辆无法到达那个车站
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}一个共享此调度计划的载具无法到达那个车站
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}�能共享调度计划……
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}�能�制调度计划……
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}�能共享调度计划……
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}�能�制调度计划……
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}……�离�一目的地太远
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}�能给车辆编制时间表…
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}车辆�能在站内等候。
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}此车辆将�在本站��。
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}�能给车辆编制时间表…
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}车辆�能在站内等候。
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}此车辆将�在本站��。
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}……标志太多了
@@ -3896,35 +3896,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} 浮标
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} 浮标 #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} 浮标
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} 浮标 #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(公� {COMMA})
 STR_FORMAT_GROUP_NAME                                           :组 {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_WAYPOINTNAME_CITY                                           :{TOWN} 路点
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} 路点 #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} 路点
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} 路点 #{COMMA}
 
 STR_UNKNOWN_STATION                                             :未知车站（目的地）
-STR_SIGN_DEFAULT                                                :标志
+STR_DEFAULT_SIGN_NAME                                           :标志
 STR_COMPANY_SOMEONE                                             :�人{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :观众, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :观众, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3942,7 +3942,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3956,25 +3956,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt
index 74d62d0a3..95836c94a 100644
--- a/src/lang/slovak.txt
+++ b/src/lang/slovak.txt
@@ -222,7 +222,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Mapa - {
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Nastavenia hry
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Správa
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Správa od {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Upozornenie!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Upozornenie!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Nie je možné vykonat ...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Oblast nie je možné vycistit ...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Povodný copyright: {COPYRIGHT} 1995 Chris Sawyer, vsetky prava vyhradene
@@ -230,9 +230,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 team OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Koniec
-STR_YES                                                         :{BLACK}�no
-STR_NO                                                          :{BLACK}Nie
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Si si istý že chces ukoncit hru a vrátit sa do {STRING}?
+STR_QUIT_YES                                                    :{BLACK}�no
+STR_QUIT_NO                                                     :{BLACK}Nie
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Si si istý že chces ukoncit hru a vrátit sa do {STRING}?
 
 STR_JUST_NOTHING                                                :Nic
 STR_COLOUR_DARK_BLUE                                            :Tmavomodrá
@@ -296,11 +296,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Púšt
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sneh
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Správa
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Standardné
-STR_QUERY_CANCEL                                                :{BLACK}Zrušit
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Premenovat
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Standardné
+STR_BUTTON_CANCEL                                               :{BLACK}Zrušit
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Premenovat
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -317,16 +317,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Náklad
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informácie
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapacita
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Celkový náklad
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Celkový náklad (kapacita) tohto vlaku:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Celkový náklad (kapacita) tohto vlaku:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nová hra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Nahrat hru
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Viacero hrácov
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Editor scenárov
 
-STR_MAPSIZE                                                     :{BLACK}Velkost mapy:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Velkost mapy:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Nastavenia hry
 
 STR_COMPANY_SOMEONE                                             :niekto{SKIP}{SKIP}
@@ -375,10 +375,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Ukoncit hru
 STR_FILE_MENU_EXIT                                              :Ukoncit OpenTTD
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Si si isty ze chces ukoncit tuto hru ?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Ukoncit hru
-STR_SORT_ORDER_TIP                                              :{BLACK}Vyber sposob triedenia (zostupny/vzostupny)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Vyber kriterium triedenia
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Vybrať kritériá filtrovania
-STR_SORT_BY                                                     :{BLACK}Usporiadat
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Vyber sposob triedenia (zostupny/vzostupny)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Vyber kriterium triedenia
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Vybrať kritériá filtrovania
+STR_BUTTON_SORT_BY                                              :{BLACK}Usporiadat
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Populacia
@@ -410,24 +410,24 @@ STR_SORT_BY_RUNNING_COST                                        :Náklady na pre
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Výkon/Náklady na prevádzku
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapacita nákladu
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Necaka ziadny typ nakladu
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Oznacit vsetky moznosti
-STR_SELECT_ALL_TYPES                                            :{BLACK}Oznacit vsetky druhy nakladu (vratane druhu, kt. necaka na prepravu)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Zobrazit zoznam dostupných dizajnov rušňov pre tento typ.
-STR_MANAGE_LIST                                                 :{BLACK}Možnosti
-STR_MANAGE_LIST_TIP                                             :{BLACK}Zadat príkazy všetkým vozidlám v zozname
-STR_REPLACE_VEHICLES                                            :Vymena vozidiel
-STR_SEND_FOR_SERVICING                                          :Vykonat servis
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Dostupné vlaky
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Dostupné vozidlá
-STR_AVAILABLE_SHIPS                                             :{BLACK}Dostupné lode
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Dostupné lietadlá
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Poslat do depa
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Poslat do garáže
-STR_SEND_SHIP_TO_DEPOT                                          :Poslat do lodenice
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Poslat do hangáru
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Necaka ziadny typ nakladu
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Oznacit vsetky moznosti
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Oznacit vsetky druhy nakladu (vratane druhu, kt. necaka na prepravu)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Zobrazit zoznam dostupných dizajnov rušňov pre tento typ.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Možnosti
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Zadat príkazy všetkým vozidlám v zozname
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Vymena vozidiel
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Vykonat servis
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Dostupné vlaky
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Dostupné vozidlá
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Dostupné lode
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Dostupné lietadlá
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Poslat do depa
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Poslat do garáže
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Poslat do lodenice
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Poslat do hangáru
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -457,12 +457,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Nastaven
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Nie je možné zmenit servisný interval ...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zavriet okno
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Nadpis okna - potiahni pre posun okna
-STR_STICKY_BUTTON                                               :{BLACK}Oznacit toto okno, aby sa nedalo zatvorit klavesou 'Zavri vsetky okna'
-STR_RESIZE_BUTTON                                               :{BLACK}Uchop a tahaj pre zmenu velkosti okna
+STR_TOOLTIP_STICKY                                              :{BLACK}Oznacit toto okno, aby sa nedalo zatvorit klavesou 'Zavri vsetky okna'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Uchop a tahaj pre zmenu velkosti okna
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Kliknutim sem sa presuniete do sucasneho vychodzieho adresara pre ukladanie
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demolácia budov, úprava terénu, ...
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Znížit roh terénu
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Zvýšit roh terénu
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Znížit roh terénu
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvýšit roh terénu
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Navigacná lišta
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Navigacna lista - posuva vypis dolava/doprava
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Zobrazit vrstevnice na mape
@@ -475,21 +475,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Zapnút
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Zisk tento rok: {CURRENCY} (posledný rok: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} rok{P "" y ov} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} rok{P "" y ov} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} rok{P "" y ov} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} rok{P "" y ov} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :{G=m}Vlak
-STR_VEHICLE_ROAD_VEHICLE                                        :{G=m}Automobil
-STR_VEHICLE_SHIP                                                :{G=z}Lod
-STR_VEHICLE_AIRCRAFT                                            :{G=s}Lietadlo
+STR_REPLACE_VEHICLE_TRAIN                                       :{G=m}Vlak
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :{G=m}Automobil
+STR_REPLACE_VEHICLE_SHIP                                        :{G=z}Lod
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :{G=s}Lietadlo
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} zastaralo
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} je veľmi zastaralé
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} je veľmi zastaralé a urgentne potrebuje výmenu
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informácie o pozemku
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Náklady na odstránenie: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Náklady na odstránenie: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Zisk pri odstránení: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Zisk pri odstránení: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Neznáme
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Vlastník: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Vlastník cesty: {LTBLUE}{STRING}
@@ -498,7 +498,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Vlastní
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Miestna správa: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Neznáme
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Meno
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -610,7 +610,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Kliknut
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Kliknite na hudobnu stopu pre jej odstranenie z programu (len Vlastny1 alebo Vlastny2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Zapnut / Vypnut nahodny vyber
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Zobrazit okno pre vyber hudobnych stop
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Kliknut na trasu pre centrovanie pohladu na tovaren/mesto
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Kliknut na trasu pre centrovanie pohladu na tovaren/mesto
 STR_INTRO_DIFFICULTY                                            :{BLACK}Obtiažnost ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Zobrazit poslednu spravu
@@ -659,7 +659,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Pre zvys
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Vygenerovat nahodne uzemie
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Zresetovat uzemie
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Zresetovat Uzemie
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Odstránit všetok majetok vlastnený hrácom z mapy
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Odstránit všetok majetok vlastnený hrácom z mapy
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Naozaj odstránit všetok majetok vlastnený hrácom z mapy?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Vytvorenie uzemia
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Vytvorenie mesta
@@ -673,11 +673,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}... prí
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...prilis blizko ineho mesta
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...miesto je nepouzitelne
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...prilis vela miest
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Nie je mozne postavit viac miest
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}... nie je dalsie miesto na mape
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Nie je mozne postavit viac miest
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}... nie je dalsie miesto na mape
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Zvacsit velkost mesta
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Rozsirit
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Mesto nevybuduje cesty. Môžete povoliť budovanie ciest cez Pokro�ilé nasvavenia->Ekonomika->Mestá.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Mesto nevybuduje cesty. Môžete povoliť budovanie ciest cez Pokro�ilé nasvavenia->Ekonomika->Mestá.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Nahodne mesto
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Postavit mesto na nahodnej pozicii
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}{STRING} sa tu neda postavit...
@@ -691,13 +691,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Umiestni
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Umiestnit majak
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Umiestnit vysielac
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Vytvorit oblast puste.{}Drzanim CTRL ju odstranite
-STR_CREATE_LAKE                                                 :{BLACK}Definovat oblast vody.{}Vytvorí kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
-STR_CREATE_RIVER                                                :{BLACK}Vytvorit rieky.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definovat oblast vody.{}Vytvorí kanál, pri stlacení CTRL na úrovni mora zaplaví okolie
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Vytvorit rieky.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Vymazat
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Kompletne vymazat toto mesto
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Ulozit scenár
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Nahrat scenár
-STR_MENU_LOAD_HEIGHTMAP                                         :Nahrat výškovú mapu
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Nahrat výškovú mapu
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Ukoncit editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Ukoncit OpenTTD
@@ -707,7 +707,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Ulozit s
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Hrat scenár
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Hrat výškovú mapu
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Zacat novu hru s pouzitim vyskovej mapy ako krajiny
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Si si isty ze chces ukoncit tento scenar ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Si si isty ze chces ukoncit tento scenar ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...moze byt postavene v mestach z populaciou vacsou ako 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Posunut zaciatok o rok dozadu
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Posunut zaciatok o rok dopredu
@@ -715,21 +715,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...konce
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Male
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Stredne
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Velke
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Náhodný
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Náhodný
 STR_FOUND_TOWN_CITY                                             :{BLACK}Mesto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Veľkomestá sa rozrastajú rýchlejšie než oby�ajné mestá{}Záleží na nastaveniach, sú vä�šie ke� sú dotované
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Vyber velkost mesta
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Velkost mesta:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Návrh ciest mesta:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Vyberte návrh ciest mesta pre toto mesto
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Originál
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Lepšie cesty
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 mriežka
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 mriežka
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Náhodný
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Návrh ciest mesta:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Vyberte návrh ciest mesta pre toto mesto
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Originál
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Lepšie cesty
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 mriežka
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 mriežka
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Náhodný
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Zobrazit poslednu spravu alebo novinku
 STR_NEWS_MESSAGES_OFF                                           :Vypnute
 STR_NEWS_MESSAGES_SUMMARY                                       :Obsah
@@ -829,10 +829,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ZA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot bol ulozeny na disk ako '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ulozenie screeshotu zlyhalo!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Zakupit pozemok pre buduce pouzitie
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Zakupit pozemok pre buduce pouzitie
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOULOZENIE
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  HRA SA UKLADA  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Ukladanie hry este bezi,{}pockajte prosim na dokoncenie!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Vyber 'Ezy Street style music' program
 
 ############ start of townname region
@@ -895,7 +895,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Vyber ja
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Celá obrazovka
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Zaskrtnite, ak chcete hrat OpenTTD na celej obrazovke
-STR_FULLSCREEN_FAILED                                           :{WHITE}Zobrazovanie na celú obrazovku zlyhalo
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Zobrazovanie na celú obrazovku zlyhalo
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Rozlíšenie obrazovky
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Vyber rozlisenia obrazovky
@@ -908,12 +908,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Zvoľte
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} chýbajúci/poškodený súbor{P "" "y" "ov"}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodato�né informácie o základnom grafickom sete
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autoulozenie zlyhalo
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autoulozenie zlyhalo
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Smeruje do {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Smeruje do {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Bez urcenia
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Bez urcenia, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Smeruje do {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Smeruje do {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Bez urcenia
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Bez urcenia, {VELOCITY}
 
 STR_PASSENGERS                                                  :cestujucich
 STR_BAGS                                                        :vriec
@@ -924,9 +924,9 @@ STR_CRATES                                                      :debien
 STR_RES_OTHER                                                   :iné
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Nemozno zdielat zoznam smerov ...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Nemozno kopirovat zoznam prikazov ...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Koniec zdielanych prikazov - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Nemozno zdielat zoznam smerov ...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Nemozno kopirovat zoznam prikazov ...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Koniec zdielanych prikazov - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} nemôže nájsť cestu pre pokra�ovanie.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} sa stratilo.
@@ -1195,15 +1195,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-rozme
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :zakazane
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Zmenit hodnotu nastavenia
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Zmenit hodnotu nastavenia
 
-STR_TEMPERATE_LANDSCAPE                                         :krajina mierneho pasma
-STR_SUB_ARCTIC_LANDSCAPE                                        :subarkticka krajina
-STR_SUB_TROPICAL_LANDSCAPE                                      :subtropicka krajina
-STR_TOYLAND_LANDSCAPE                                           :krajina hraciek
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :krajina mierneho pasma
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :subarkticka krajina
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :subtropicka krajina
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :krajina hraciek
 
 STR_CHEATS                                                      :{WHITE}Cheaty
-STR_CHEATS_TIP                                                  :{BLACK}Checkbox indikuje opakovane pouzite cheatu
+STR_CHEATS_TOOLTIP                                              :{BLACK}Checkbox indikuje opakovane pouzite cheatu
 STR_CHEATS_WARNING                                              :{BLACK}Varovanie! Chcete podviest vasich protihracov. Tento podvod sa navzdy zapameta.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Zvysit hotovost o {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Hrať za spolo�nosť: {ORANGE}{COMMA}
@@ -1215,179 +1215,179 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Zmenit
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Zmenit datum: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Povolit zmenu objemu vyroby: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Smeruje do {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Smeruje do {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Smeruje do {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Smeruje do {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Chod cez {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Chod bez zastavky cez {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Chod cez {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Chod bez zastavky cez {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Smerovy bod {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Smerovy bod {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Bójka
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Bójka #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Smerovy bod
+STR_FORMAT_WAYPOINT_NAME                                        :Smerovy bod {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Smerovy bod {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Bójka
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bójka #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Smerovy bod
 
-STR_WAYPOINT                                                    :{WHITE}Smerovy bod
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Vyber typ kontrolneho bodu
+STR_WAYPOINT_CAPTION                                            :{WHITE}Smerovy bod
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vyber typ kontrolneho bodu
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Upravit nazvy smerovych bodov
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Nazov smeroveho bodu sa neda zmenit ...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Nazov smeroveho bodu sa neda zmenit ...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Konvertovat zeleznicu na smerove body
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Tu nie je mozne postavit zeleznicny smerovy bod ...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Tu nie je mozne odstranit zeleznicny smerovy bod ...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Tu nie je mozne postavit zeleznicny smerovy bod ...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Tu nie je mozne odstranit zeleznicny smerovy bod ...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Automaticka stavba zeleznicnych kolaji
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}... v tomto scenari nie je ziadne mesto
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generovanie mapy zrušené...{}...žiadne vyhovujúce lokácie miest
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}... v tomto scenari nie je ziadne mesto
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generovanie mapy zrušené...{}...žiadne vyhovujúce lokácie miest
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Vela nahodnych miest
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Pokryt mapu nahodne umiestnenymi mestami
-STR_MANY_RANDOM_INDUSTRIES                                      :Vela nahodneho priemyslu
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Pokryt mapu nahodne umiestnenym priemyslom
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Nemozno vygenerovat priemysel ...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Vela nahodnych miest
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Pokryt mapu nahodne umiestnenymi mestami
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Vela nahodneho priemyslu
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Pokryt mapu nahodne umiestnenym priemyslom
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Nemozno vygenerovat priemysel ...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Otvorit panel nastrojov pre upravy terenu, vysadbu stromov, ...
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Uprava terenu
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Vyrovnat teren
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Vyrovnat teren
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Nahodne stromy
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Umiestnit nahodne stromy
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umiestnit nahodne stromy
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Tu sa neda postavit prieplav ...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Tu sa neda postavit prieplav ...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Stavba kanálov.
-STR_LANDINFO_CANAL                                              :Prieplav
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Prieplav
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Tu sa neda postavit stavidlo ...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Tu sa neda postavit stavidlo ...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Postavit stavidla ...
-STR_LANDINFO_LOCK                                               :Stavidlo
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Stavidlo
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Tu nie je možné umiestnit rieku ...
-STR_LANDINFO_RIVER                                              :Rieka
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Tu nie je možné umiestnit rieku ...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Rieka
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... boja sa pouziva!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... boja sa pouziva!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Súradnice: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Súradnice: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Nemozno odstranit cast stanice ...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Tu nemozno zkonvertovat typ zeleznice ...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Nemozno odstranit cast stanice ...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Tu nemozno zkonvertovat typ zeleznice ...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Konvertovat/vylepsit typ zeleznice
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Presun lokomotivu sem, pre predaj celeho vlaku
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Presun lokomotivu sem, pre predaj celeho vlaku
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Automaticky
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Automaticky postavit stanicu podla oznaceneho bloku terenu
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Vyberte druh stanice pre zobrazenie
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Vyberte typ stanice pre vystavbu
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vyberte druh stanice pre zobrazenie
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vyberte typ stanice pre vystavbu
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Rychle posunutie hry do predu
 STR_MESSAGE_HISTORY                                             :{WHITE}Archiv sprav
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Zoznam poslednych sprav
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Zakazat vsetky
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Povolit vsetky
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Zoznam poslednych sprav
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Zakazat vsetky
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Povolit vsetky
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Priemysel
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prepravenych)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prepravenych)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Názvy priemyslu - klikni na meno pre vycentrovanie priemyslu na stred obrazovky
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Priemysel
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prepravenych)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prepravenych)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Názvy priemyslu - klikni na meno pre vycentrovanie priemyslu na stred obrazovky
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... prilis blizko ineho priemyslu
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... prilis blizko ineho priemyslu
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Zmenit produkciu
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Hra pre viac hrácov
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Meno hraca:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Toto je meno podla ktoreho vas ostatny identifikuju
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Zadajte vaše meno
-STR_NETWORK_CONNECTION                                          :{BLACK}Pripojenie:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Vyber si medzi hrou na internete alebo na lokalnej sieti
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Spustit server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Spustit vlastny server
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nazov
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nazov hry
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Jazyk, verzia serveru, atd.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Vyberte hru zo zoznamu
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}The server you joined last time:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Kliknite pre vyber servera na ktorom ste hrali naposledy
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Najst server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Hladat po sieti servery
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Pridat server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Prida server do zoznamu, v ktorom sa automaticky budu hladat beziacie hry.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Zadajte IP adresu serveru
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienti
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klientov online / klientov max{}Spolo�ností online / spolo�ností max
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Velkost mapy
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Velkost mapy v hre{}Kliknite pre triedenie podla rozlohy
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dátum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Aktuálny dátum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Roky
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Pocet rokov,{}kolko hra beží
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO O HRE
-STR_NETWORK_CLIENTS                                             :{SILVER}Klientov: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Jazyk: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Prostredie: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Velkost mapy: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Verzia servera: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Adresa servera: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Datum zaciatku:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Aktualny datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Heslo:
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER JE OFFLINE
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER JE PLNY
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}ROZNE VERZIE
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF Chyba
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Pripojit sa
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Zacat novu hru pre viac hracov
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nazov hry:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Nazov hry, ktory uvidia ostatni v zozname sietovych hier
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Zadajte názov sietovej hry
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Nastavit heslo
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Ochran hru heslom, ak nechcec aby sa pripajali ostatni ludia
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Vyber mapu:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Ktoru mapu chces hrat?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (oznamit)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i ov}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Maximálny pocet klientov:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Zvol maximalny pocet klientov. Moze sa ich pripojit aj menej.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} spolocnost{P "" i í}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max. pocet spolocnosti:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Obmedzi maximalny pocet spolocnosti na serveri
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} pozorovatel{P "" ia ov}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max. pocet divakov:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Omedzi maximalny pocet divakov na serveri
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Jazyk hracov:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Aby ostatni hraci vedeli, akym jazykom sa bude hovorit na serveri.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Spustit hru
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Zacat sietovu hru z nahodnej mapy alebo scenara
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Nahrat hru
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Pokracovat v ulozenej hre (uistite sa, ze sa pripojite ako spravny hrac)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Hra pre viac hrácov
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Meno hraca:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Toto je meno podla ktoreho vas ostatny identifikuju
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Zadajte vaše meno
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Pripojenie:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Vyber si medzi hrou na internete alebo na lokalnej sieti
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Spustit server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Spustit vlastny server
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nazov
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nazov hry
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Jazyk, verzia serveru, atd.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Vyberte hru zo zoznamu
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}The server you joined last time:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Kliknite pre vyber servera na ktorom ste hrali naposledy
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Najst server
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Hladat po sieti servery
+STR_NETWORK_SERVER_LIST_ADD_SERVER                              :{BLACK}Pridat server
+STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP                      :{BLACK}Prida server do zoznamu, v ktorom sa automaticky budu hladat beziacie hry.
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Zadajte IP adresu serveru
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klienti
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klientov online / klientov max{}Spolo�ností online / spolo�ností max
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Velkost mapy
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Velkost mapy v hre{}Kliknite pre triedenie podla rozlohy
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dátum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Aktuálny dátum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Roky
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Pocet rokov,{}kolko hra beží
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO O HRE
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klientov: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Jazyk: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Prostredie: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Velkost mapy: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Verzia servera: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Adresa servera: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Datum zaciatku:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Aktualny datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Heslo:
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER JE OFFLINE
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER JE PLNY
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}ROZNE VERZIE
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF Chyba
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pripojit sa
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Zacat novu hru pre viac hracov
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nazov hry:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Nazov hry, ktory uvidia ostatni v zozname sietovych hier
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Zadajte názov sietovej hry
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Nastavit heslo
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Ochran hru heslom, ak nechcec aby sa pripajali ostatni ludia
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Vyber mapu:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Ktoru mapu chces hrat?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (oznamit)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" i ov}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Maximálny pocet klientov:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Zvol maximalny pocet klientov. Moze sa ich pripojit aj menej.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} spolocnost{P "" i í}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max. pocet spolocnosti:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Obmedzi maximalny pocet spolocnosti na serveri
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} pozorovatel{P "" ia ov}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max. pocet divakov:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Omedzi maximalny pocet divakov na serveri
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Jazyk hracov:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Aby ostatni hraci vedeli, akym jazykom sa bude hovorit na serveri.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Spustit hru
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Zacat sietovu hru z nahodnej mapy alebo scenara
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Nahrat hru
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Pokracovat v ulozenej hre (uistite sa, ze sa pripojite ako spravny hrac)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Lubovolny
@@ -1428,33 +1428,33 @@ STR_NETWORK_LANG_GREEK                                          :Grécky
 STR_NETWORK_LANG_LATVIAN                                        :Litovsky
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Sietova hra - lobby
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Sietova hra - lobby
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Pripravuje sa k vstupu: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Aktualny zoznam spolocnosti v tejto hre. Bud mozes do jednej vstupit, alebo zalozit novu spolocnost.
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nová spolocnost
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Zalozit novu spolocnost
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Sledovat hru
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Sledovat hru len ako divak
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Vstupit do spolocnosti
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Pomoct viest tuto spolocnost
-STR_NETWORK_REFRESH                                             :{BLACK}Obnovit server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Obnovit info o serveri
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Pripravuje sa k vstupu: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Aktualny zoznam spolocnosti v tejto hre. Bud mozes do jednej vstupit, alebo zalozit novu spolocnost.
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nová spolocnost
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Zalozit novu spolocnost
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Sledovat hru
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Sledovat hru len ako divak
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Vstupit do spolocnosti
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Pomoct viest tuto spolocnost
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Obnovit server
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Obnovit info o serveri
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO O SPOLOCNOSTI
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO O SPOLOCNOSTI
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nazov spolocnosti: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Zalozene: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Hodnota spolocnosti: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Stav uctu: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Zisk v minulom roku: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Vykon: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nazov spolocnosti: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Zalozene: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Hodnota spolocnosti: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Stav uctu: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Zisk v minulom roku: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Vykon: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozidla: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Hraci: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vozidla: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stanice: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Hraci: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Pripajam sa ...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Pripajam sa ...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Pripajam sa ..
@@ -1470,49 +1470,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Prijem i
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" e i} pred nami
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} stiahnute
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Odpojit sa
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Odpojit sa
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vložte �iastku ktorú chcete dať
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server je chraneny. Zadaj heslo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Spolocnost je chranena. Zadaj heslo
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Zoznam klientov
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Zoznam klientov
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Pozorovať
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nová spolo�nosť
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Nie su ziadne sietove zariadenie alebo hra je kompilovana bez ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Nebola najdena ziadna sietova hra
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Server neodpoveda na ziadost
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Pripojenie zlyhalo kvoli nespravnemu NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Siet - Chyba synchronizacie hry
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Siet - Stratene spojenie
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Nedokazem nahrat hru zo servera
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Nemozem spustit server.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Nemozem sa pripojit.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Vyprsal casovy limit pre spojenie #{NUM}.
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Chyba vznikla v protokole a spojenie je zatvorene.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Revizia hry u tohto klienta nezodpoveda revizii hry na serveri.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Nespravne heslo.
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Server je plny
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Si zablokovany na tomto serveri
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Bol si vyhodeny z hry
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Cheatovanie nie je povolene na tomto serveri
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Nie su ziadne sietove zariadenie alebo hra je kompilovana bez ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Nebola najdena ziadna sietova hra
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Server neodpoveda na ziadost
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Pripojenie zlyhalo kvoli nespravnemu NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Siet - Chyba synchronizacie hry
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Siet - Stratene spojenie
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Nedokazem nahrat hru zo servera
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Nemozem spustit server.
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Nemozem sa pripojit.
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Vyprsal casovy limit pre spojenie #{NUM}.
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Chyba vznikla v protokole a spojenie je zatvorene.
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Revizia hry u tohto klienta nezodpoveda revizii hry na serveri.
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Nespravne heslo.
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Server je plny
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Si zablokovany na tomto serveri
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Bol si vyhodeny z hry
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Cheatovanie nie je povolene na tomto serveri
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :generalna chyba
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :chyba synchronizacie
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :neviem nahrat mapu
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :spojenie prerusene
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :chyba protokolu
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :Nespravne NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :overenie odmietnute
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :neplatny packet prijaty
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :chybna revizia hry
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :meno sa uz pouziva
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :nespravne heslo
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :zlá spolo�nosť-id in DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :vyhodeny zo servera
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :sa pokusal cheatovat
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :server je plny
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :generalna chyba
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :chyba synchronizacie
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :neviem nahrat mapu
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :spojenie prerusene
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :chyba protokolu
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :Nespravne NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :overenie odmietnute
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :neplatny packet prijaty
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :chybna revizia hry
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :meno sa uz pouziva
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :nespravne heslo
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :zlá spolo�nosť-id in DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :vyhodeny zo servera
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :sa pokusal cheatovat
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :server je plny
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1522,15 +1522,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Hra pozastavenÃ
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Hra spustená (klient sa pripojil)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Hra spustená (zlyhalo pripojenie klienta)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :odchádza
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} vstúpil do hry
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} sa pripojil do spolo�nosti #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} sa pripojil k pozorovateľom
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} založil novú spolo�nosť (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} opustil hru ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} zmenil jeho/jej meno na {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} dal ti spolo�nosť {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Dal si {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :odchádza
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} vstúpil do hry
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} sa pripojil do spolo�nosti #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} sa pripojil k pozorovateľom
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} založil novú spolo�nosť (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} opustil hru ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} zmenil jeho/jej meno na {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} dal ti spolo�nosť {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Dal si {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Tim] :
 STR_NETWORK_CHAT_COMPANY                                        :[Tim] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Tim] pre {STRING}: {WHITE}{STRING}
@@ -1540,8 +1540,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privatny] pre
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Všetkým] :
 STR_NETWORK_CHAT_ALL                                            :[Všetkým] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Zadajte text pre sietový chat
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Server ukoncil relaciu
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Server sa restartuje ...{}Cakajte prosim ...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Server ukoncil relaciu
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Server sa restartuje ...{}Cakajte prosim ...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
@@ -1555,19 +1555,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Napisat spolocn
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privatna sprava
 
 
-STR_NETWORK_SEND                                                :{BLACK}Poslat
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Poslat
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Nie je mozne nahrat povrch z PNG suboru ...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}... subor nenajdeny.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nie je mozne zkonvertovat format obrazku. Potrebne 8 alebo 24 bitove PNG.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}... neocakavana chyba (pravdepodobne poskodeny subor)
+STR_ERROR_PNGMAP                                                :{WHITE}Nie je mozne nahrat povrch z PNG suboru ...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}... subor nenajdeny.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nie je mozne zkonvertovat format obrazku. Potrebne 8 alebo 24 bitove PNG.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}... neocakavana chyba (pravdepodobne poskodeny subor)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Nie je možné nahrat povrch z BMP suboru ...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nie je mozne zkonvertovat format obrazku.
+STR_ERROR_BMPMAP                                                :{WHITE}Nie je možné nahrat povrch z BMP suboru ...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nie je mozne zkonvertovat format obrazku.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Cena: {CURRENCY}
@@ -1581,13 +1581,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Priblizn
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Tu nemozno zdvihnut teren ...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Tu nemozno znizit teren ...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Nemôžem tu upraviť terén...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Skaly
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Nerovny teren
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Holy teren
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Travnaty teren
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Polia
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Zasnezeny teren
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Pust
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Skaly
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Nerovny teren
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Holy teren
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Travnaty teren
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Polia
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Zasnezeny teren
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Pust
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Teren ma nevhodny sklon
@@ -1595,11 +1595,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Nemozna
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Vyhlbenie by poskodilo tunel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Na urovni mora
 STR_ERROR_TOO_HIGH                                              :{WHITE}Prilis vysoko
-STR_ALREADY_LEVELLED                                            :{WHITE}... už vyrovnané
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... už vyrovnané
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Ziadne pouzitelne zeleznicne kolaje
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}... uz bolo vytvorene
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Najskor treba odstranit zeleznicne kolaje
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Cesta je jednosmerná alebo blokovaná.
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Cesta je jednosmerná alebo blokovaná.
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Zeleznica
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrifikovana železnica
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Jednokolajka - Monorail
@@ -1623,44 +1623,44 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Postavit
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Postavit zeleznicny most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Postavit zeleznicny tunel
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Prepnut stavbu/odstranenie zeleznicnych kolaji a semaforov
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Vyber mostu - kliknut na vybrany most
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Vyber mostu - kliknut na vybrany most
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Vyber orientacie depa
-STR_RAILROAD_TRACK                                              :Zeleznicne kolaje
-STR_RAILROAD_TRAIN_DEPOT                                        :Zeleznicne depo
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Zeleznicne kolaje
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Zeleznicne depo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}... oblast vlastni ina spolocnost
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Zeleznicne kolaje so standartnym semaforom
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Zeleznicne kolaje s pre-signalmi
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Zeleznicne kolaje s exit-signalmi
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Zeleznicné kolaje s combo signálmi
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Kolajnice so semaformi pbs
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Železni�ná  trasa s jednosmernými signálmi
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Železnicné kolaje s normálnymi a pre-signálmi
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Železnicné kolaje s normálnymi a exit-signálmi
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Zeleznicné kolaje s normálnymi a combo signálmi
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Železni�ná trasa s blokovacími a obojstranými signálmi
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Železni�ná trasa s blokovacími a jednosmernými signálmi
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Železnicné kolaje s pre- a exit-signálmi
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Zeleznicné kolaje s pre- a combo signálmi
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Železni�ná trasa s pre-  a obojstranými signálmi
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Železni�ná trasa s pre- a jednosmernými signálmi
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Zeleznicné kolaje s exit- a combo signálmi
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Železni�ná trasa s kone�nými a obojstranými signálmi
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Železni�ná trasa s kone�nými a jednosmernými signálmi
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Železni�ná trasa s kombo a obojstranými signálmi
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Železni�ná trasa s kombo a jednosmernými signálmi
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Železni�ná trať s obojstrannými a jednosmernými signálmi
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Je potrebné najprv odstránit železnicnú stanicu
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Najprv musí byť odstránený železni�ný navádza�
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Postaviť oddelene stanicu
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Postaviť oddelený navádza�
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Spojiť stanicu
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Nasledovať navádza�
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Zeleznicne kolaje so standartnym semaforom
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Zeleznicne kolaje s pre-signalmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Zeleznicne kolaje s exit-signalmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Zeleznicné kolaje s combo signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Kolajnice so semaformi pbs
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Železni�ná  trasa s jednosmernými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Železnicné kolaje s normálnymi a pre-signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Železnicné kolaje s normálnymi a exit-signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Zeleznicné kolaje s normálnymi a combo signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Železni�ná trasa s blokovacími a obojstranými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Železni�ná trasa s blokovacími a jednosmernými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Železnicné kolaje s pre- a exit-signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Zeleznicné kolaje s pre- a combo signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Železni�ná trasa s pre-  a obojstranými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Železni�ná trasa s pre- a jednosmernými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Zeleznicné kolaje s exit- a combo signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Železni�ná trasa s kone�nými a obojstranými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Železni�ná trasa s kone�nými a jednosmernými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Železni�ná trasa s kombo a obojstranými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Železni�ná trasa s kombo a jednosmernými signálmi
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Železni�ná trať s obojstrannými a jednosmernými signálmi
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Je potrebné najprv odstránit železnicnú stanicu
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Najprv musí byť odstránený železni�ný navádza�
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Postaviť oddelene stanicu
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Postaviť oddelený navádza�
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Spojiť stanicu
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Nasledovať navádza�
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Cesta musi byt najskor odstranena
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Prebiehaju cestne prace
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Prebiehaju cestne prace
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba cesty
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Výstavba elektrickovej trate
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Vyber cestny most
@@ -1696,14 +1696,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Postavit
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Prepnút stavbu jednosmerných ciest
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Prepnut stavbu/odstranovanie cesty
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Prepnút stavbu/odstranovanie elektrickovej dráhy
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Vybrat orientaciu garaze
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Vybrat orientáciu elektrickového depa
-STR_ROAD_DESCRIPTION_ROAD                                       :Cesta
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Cesta s lampami
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Cesta v aleji
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garaz
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Zeleznicne priecestie
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Elektrickova dráha
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vybrat orientaciu garaze
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Vybrat orientáciu elektrickového depa
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Cesta
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Cesta s lampami
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Cesta v aleji
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garaz
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Zeleznicne priecestie
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Elektrickova dráha
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Nie je možné odstránit autobusovú stanicu ...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Nie je možné odstránit nakladaciu rampu ...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nie je možné odstránit osobnú elektrickovú stanicu ...
@@ -1711,12 +1711,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nie je m
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Mesta
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Budova sa musi zburat
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Mesto)
@@ -1729,9 +1729,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Pohlad n
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Zmenit nazov mesta
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Cestujuci posledny mesiac: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Posta posledny mesiac: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Tovar potrebný k rozrastu mesta:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} potrebný
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} doru�ené posledný mesiac
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Tovar potrebný k rozrastu mesta:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} potrebný
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} doru�ené posledný mesiac
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Administrativa
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kancelarie
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Maly bytovy blok
@@ -1768,7 +1768,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Dotacia udelena spolocnosti {STRING}!{}{}Preprava {STRING.g} z {STATION} do {STATION} bude buduci rok 3x vynosnejsia!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Dotacia udelena spolocnosti {STRING}!{}{}Preprava {STRING.g} z {STATION} do {STATION} bude buduci rok 4x vynosnejsia!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Miestna sprava {TOWN} odmietla stavbu letiska v tomto meste
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} miesná správa odmietla udelit povolenie pre letisko kôli hlu�nosti
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} miesná správa odmietla udelit povolenie pre letisko kôli hlu�nosti
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Chaty
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Domy
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Byty
@@ -1804,7 +1804,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}V meste {TOWN} zavladol dopravny chaos!{}{}Rekonstrukcia ciest financovana {STRING} prinesie 6 mesiacov utrpenia pre motoristov!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (vo výstavbe)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (vo výstavbe)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglu
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Vigvam
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Kaviaren
@@ -1817,17 +1817,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Umiestnenie pop
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Stromy
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}... strom tu uz je
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Tu sa strom neda zasadit ...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}... prilis vela popisov
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Tu sa neda dat popis ...
-STR_SIGN_DEFAULT                                                :Popis
+STR_DEFAULT_SIGN_NAME                                           :Popis
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Upravit text popisu
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Nemozno zmenit text popisu ...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nemôžem zmazať popis...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vybrat typ stromu pre sadenie
-STR_TREE_NAME_TREES                                             :Stromy
-STR_TREE_NAME_RAINFOREST                                        :Dazdovy prales
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusy
+STR_LAI_TREE_NAME_TREES                                         :Stromy
+STR_LAI_TREE_NAME_RAINFOREST                                    :Dazdovy prales
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusy
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Vyber zeleznicnej stanice
@@ -1849,7 +1849,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Zeleznic
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Prilis blizko ineho letiska
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Letisko sa musi najskor zburat
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Premenovat stanicu/vykladku
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Premenovat stanicu/vykladku
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Stanica sa neda premenovat ...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Hodnotenie
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prijima
@@ -1867,10 +1867,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Perfektne
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Zobrazit vsetky vlaky, ktore maju tuto stanicu v cestovnom poriadku
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Zobrazit vsetky auta, ktore maju tuto stanicu v cestovnom poriadku
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Zobrazit vsetky lietadla, ktore maju tuto stanicu v cestovnom poriadku
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Zobrazit vsetky lode, ktore maju tuto stanicu v cestovnom poriadku
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Zobrazit vsetky vlaky, ktore maju tuto stanicu v cestovnom poriadku
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Zobrazit vsetky auta, ktore maju tuto stanicu v cestovnom poriadku
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Zobrazit vsetky lietadla, ktore maju tuto stanicu v cestovnom poriadku
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Zobrazit vsetky lode, ktore maju tuto stanicu v cestovnom poriadku
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} uz neprijima {STRING}
@@ -1906,47 +1906,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Zmenit n
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Zobrazit zoznam prijimaneho nakladu
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Názvy staíic - kliknite pre pohlad na polohu stanice
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Vybrat velkost/typ letiska
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Zeleznicna stanica
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Letecky hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Letisko
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Vykladka
-STR_STATION_DESCRIPTION_BUS_STATION                             :Stanica
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Pristav
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Zeleznicna stanica
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Letecky hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Letisko
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Vykladka
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Stanica
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Pristav
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Zobrazit oblast pokrytia stavanej plochy
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nezobrazit oblast pokrytia stavanej plochy
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Ukazat oblast pokrytia
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Molo
-STR_STATION_DESCRIPTION_BUOY                                    :Boja
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boja
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... boja v ceste
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}... stanica je prilis velka
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}... roznorode stanice nie su povolene
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Podrzte CTRL pre vyber viacerych poloziek
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}... roznorode stanice nie su povolene
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Podrzte CTRL pre vyber viacerych poloziek
 
 STR_UNDEFINED                                                   :(nedefinovaný retezec)
-STR_STAT_CLASS_DFLT                                             :Pôvodná stanica
-STR_STAT_CLASS_WAYP                                             :Smerove body
+STR_STATION_CLASS_DFLT                                          :Pôvodná stanica
+STR_STATION_CLASS_WAYP                                          :Smerove body
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientacia lodenice
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}... musi byt postavene na vode
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Lodenica sa tu neda postavit
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Vyber orientaciu pristavu
-STR_WATER_DESCRIPTION_WATER                                     :Voda
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Pobrezie alebo nabrezie
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Lodenica
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvadukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Voda
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Pobrezie alebo nabrezie
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Lodenica
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvadukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}... nemoze byt postavene na vode
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Najprv sa musí zbúrat kanál
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Najprv sa musí zbúrat kanál
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Ulozit hru
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Nahrat hru
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Ulozit
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Vymazat
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Pozorovateľ, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Pozorovateľ, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} volnych
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Zariadenie je necitatelne
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Ulozenie hry zlyhalo{}{STRING}
@@ -1962,12 +1962,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Zoznam d
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Vybrany nazov pre ulozenie hry
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Vymazat vybranu ulozenu hru
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Ulozit aktualnu hru s pouzitim vybraneho mena
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Vygenerovat nahodnu novu hru
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Nahrat výškovú mapu
-STR_SAVE_OSKTITLE                                               :{BLACK}Zadajte názov pre uloženie hry
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Vygenerovat nahodnu novu hru
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Nahrat výškovú mapu
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Zadajte názov pre uloženie hry
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} v ceste
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} v ceste
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Uholna bana
 STR_INDUSTRY_NAME_POWER_STATION                                 :Elektraren
@@ -2025,7 +2025,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Vycentrovanie pohladu na poziciu tovarne
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}{STRING} sa zacina stavat nedaleko mesta {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}{STRING} sa vysadza nedaleko mesta {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cena: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cena: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Tento typ priemyslu sa tu neda postavit ...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... les sa moze sadit len pod ciarou snehu
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} oznamuje skore uzavretie!
@@ -2043,16 +2043,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Iny tunel v ceste
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunel kon�í za okrajom mapy
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunel kon�í za okrajom mapy
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nemozno zarovnat teren na druhej strane tunela
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Tunel musi byt najskor zburany
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Most musi byt najskor zburany
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Nemozno zacat a skoncit na tom istom mieste
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Konce mosta nie sú v rovnakej výške
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Most je príliš nízky pre tento terén
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Nemozno zacat a skoncit na tom istom mieste
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Konce mosta nie sú v rovnakej výške
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je príliš nízky pre tento terén
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Zaciatok a koniec musi byt v rovine
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}To miesto je nepouzitelne ako vstup do tunela
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Zavesny ocelovy
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Pilierovy ocelovy
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Visuty ocelovy
@@ -2063,30 +2063,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Kryty ocelovy
 STR_BRIDGE_TUBULAR_SILICON                                      :Kryty plastovy
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Tu sa neda postavit most ...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tu sa neda postavit tunel ...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Zeleznicny tunel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Cestny tunel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ocelovy zavesny zeleznicny most
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ocelovy pilierovy zeleznicny most
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ocelovy visuty zeleznicny most
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Vystuzeny zavesny betonovy zeleznicny most
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Dreveny zeleznicny most
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonovy zeleznicny most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ocelovy zavesny cestny most
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ocelovy pilierovy cestny most
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ocelovy visuty cestny most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Vystuzeny zavesny betonovy cestny most
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Dreveny cestny most
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonovy cestny most
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Kryty zeleznicny most
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Kryty cestny most
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Zeleznicny tunel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Cestny tunel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ocelovy zavesny zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ocelovy pilierovy zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ocelovy visuty zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Vystuzeny zavesny betonovy zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Dreveny zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonovy zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ocelovy zavesny cestny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ocelovy pilierovy cestny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ocelovy visuty cestny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Vystuzeny zavesny betonovy cestny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Dreveny cestny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonovy cestny most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Kryty zeleznicny most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Kryty cestny most
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}V ceste je prekazka
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Vysielac
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Maják
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sidlo firmy
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Vysielac
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Maják
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sidlo firmy
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}... sidlo firmy v ceste
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Spolocnostou vlastneny pozemok
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Spolocnostou vlastneny pozemok
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Tento pozemok nie je mozne kupit ...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}... uz to vlastnis!
 
@@ -2134,7 +2134,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Stanic
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Uroven obtiaznosti
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Ulozit
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Ulozit
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lahká
@@ -2207,8 +2207,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Farebna s
 STR_LIVERY_CAPTION                                              :{WHITE}Nová farebná schéma
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Nazov spolocnosti
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Meno prezidenta
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nazov spolocnosti
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Meno prezidenta
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nazov spolocnosti
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Meno prezidenta
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Nazov spolocnosti sa neda zmenit...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Meno prezidenta sa neda zmenit...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Financie {BLACK}{COMPANYNUM}
@@ -2232,11 +2232,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Spolu:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf príjmov
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf prevadzkoveho zisku
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Zostatok v banke
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Uver
-STR_MAX_LOAN                                                    :{WHITE}Uverovy limit:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Uverovy limit:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pozicat {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Splatit {SKIP}{SKIP}{CURRENCY}
@@ -2245,7 +2245,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Nemozno
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}... uver uz bol splateny
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... {CURRENCY} potrebne
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Uver sa neda splatit ...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Nie je mozne poskytnut peniaze, ktore su pozicane z banky ...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Nie je mozne poskytnut peniaze, ktore su pozicane z banky ...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Vybrat novu tvar prezidenta
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Zmenit vzhlad spolocnosti
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Zmenit meno prezidenta
@@ -2255,10 +2255,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Splatit
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Prezident)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Zvoleny: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Stroje:
-STR_TRAINS                                                      :{WHITE}{COMMA} vlak{P "" y ov}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} automobil{P "" y ov}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} lietad{P lo la iel}
-STR_SHIPS                                                       :{WHITE}{COMMA} lod{P "" e i}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" y ov}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} automobil{P "" y ov}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} lietad{P lo la iel}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lod{P "" e i}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ziadne
 STR_FACE_CAPTION                                                :{WHITE}Vyber tvare
 STR_FACE_MALE_BUTTON                                            :{BLACK}Muz
@@ -2271,9 +2271,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Vyber ze
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Nahodna nova tvar
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Vyb.
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Vybrat polozky na grafe
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Ukázať detailné hodnotenie výkonu
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Ukázať detailné hodnotenie výkonu
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Vyber poloziek na grafe
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Kliknut pre zobrazenie tejto polozky na grafe
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Kliknut pre zobrazenie tejto polozky na grafe
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Dopravenych jednotiek nakladu
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Hodnotenie produktivity spolocnosti (maximalna produktivita je 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Hodnota spolocnosti
@@ -2307,23 +2307,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Prezident
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Tycoon
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Postavit sidlo
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Postavit sidlo spolocnosti / pozriet sidlo spolocnosti
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Sidlo spolocnosti je mozne premiestnit za 1% hodnoty spolocnosti
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Sidlo spolocnosti je mozne premiestnit za 1% hodnoty spolocnosti
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Sidlo spolocnosti sa neda postavit ...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Pozriet sidlo
-STR_RELOCATE_HQ                                                 :{BLACK}Premiestnit sidlo
-STR_COMPANY_JOIN                                                :{BLACK}Pridať sa
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Pridať sa a hrať za túto spolo�nosť
-STR_COMPANY_PASSWORD                                            :{BLACK}Heslo
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Heslo-ochrana vasej spolocnosti proti neautorizovanemu pripojeniu hracov
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Nastavte heslo spolocnosti
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Premiestnit sidlo
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Pridať sa
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Pridať sa a hrať za túto spolo�nosť
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Heslo
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Heslo-ochrana vasej spolocnosti proti neautorizovanemu pripojeniu hracov
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Nastavte heslo spolocnosti
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Neukladat zadané heslo
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Nastavit spolocnosti nové heslo
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Heslo spolocnosti
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Standardné heslo spolocnosti
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Použit toto heslo ako štandardné heslo spolocnosti
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Standardné heslo spolocnosti
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Použit toto heslo ako štandardné heslo spolocnosti
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Svetova kriza!{}{}Financni experti maju obavy z prepadu ekonomiky!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Koniec krizy!{}{}Ocakava sa vzostup predaja a posilnenie ekonomiky!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Prepnut velkost okna
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Prepnut velkost okna
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Hodnota spolocnosti: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kupit 25% podiel v spolocnosti
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Predat 25% podiel v spolocnosti
@@ -2333,7 +2333,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}25% podi
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}25% podiel v tejto spolocnosti sa neda predat ...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% vlastnene {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} bola kupena spolocnostou {STRING}!
-STR_PROTECTED                                                   :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ...
+STR_ERROR_PROTECTED                                             :{WHITE}S akciami tejto spolocnosti nie je zatial mozne obchodovat ...
 
 STR_LIVERY_DEFAULT                                              :Standardna schema
 STR_LIVERY_STEAM                                                :Parny rusen
@@ -2359,14 +2359,14 @@ STR_LIVERY_LARGE_PLANE                                          :Velke lietadlo
 STR_LIVERY_PASSENGER_TRAM                                       :Osobná elektricka
 STR_LIVERY_FREIGHT_TRAM                                         :Nákladná elektricka
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Zobrazit všeobecné farebné schémy
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Zobrazit farebné schémy pre vlaky
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Zobrazit farebné schémy pre cestné vozidlá
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Zobrazit farebné schémy pre lode
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Zobrazit farebné schémy pre lietadlá
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Vyberte primárnu farbu pre vybranú farebnú schému
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Vybrat sekundárnu farbu pre vybranú farebnú schému
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Vybrat farebnú schému na zmenenie (pre viacero schém použite CTRL+klik). Kliknite na štvorec pre prepnutie používania schémy
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Zobrazit všeobecné farebné schémy
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Zobrazit farebné schémy pre vlaky
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Zobrazit farebné schémy pre cestné vozidlá
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Zobrazit farebné schémy pre lode
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Zobrazit farebné schémy pre lietadlá
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Vyberte primárnu farbu pre vybranú farebnú schému
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Vybrat sekundárnu farbu pre vybranú farebnú schému
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Vybrat farebnú schému na zmenenie (pre viacero schém použite CTRL+klik). Kliknite na štvorec pre prepnutie používania schémy
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Parny)
@@ -2674,9 +2674,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Nevykladaj a p
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Zmenit sposob zastavovania pre tento príkaz
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Zmenit sposob nakladania pre tento príkaz
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Zmenit sposob vykladania pre tento príkaz
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Vložit zložitejší príkaz
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Vložit zložitejší príkaz
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Cho� do najbližšieho depa
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Cho� do najbližšieho hangáru
 STR_ORDER_NEAREST_DEPOT                                         :najbližší
@@ -2686,9 +2686,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Servis non-stop
 STR_ORDER_TRAIN_DEPOT                                           :Depo
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Garáž
 STR_ORDER_SHIP_DEPOT                                            :Lodenica
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangár
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangár
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Vždy cho�
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servis, ak je potrebné
@@ -2713,10 +2713,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je viac ako
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je viac alebo rovné
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :je pravda
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :je nepravda
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Skok na príkaz {COMMA}
-STR_CONDITIONAL_NUM                                             :Skok na príkaz {COMMA} ak {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Skok na príkaz {COMMA} ak {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Skok na príkaz {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Skok na príkaz {COMMA} ak {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Skok na príkaz {COMMA} ak {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Necestuj
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Cesta (neurcený cas)
@@ -2739,18 +2739,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlaky sa
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Preskocit
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Vynechat
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Cho� do
-STR_REFIT                                                       :{BLACK}Prestavba
-STR_REFIT_TIP                                                   :{BLACK}Vyberte typ nákladu na prestavbu v tomto poradí. CTRL+klik na odstránenie príkazu prestavby
-STR_REFIT_ORDER                                                 :(Prestavba na {STRING})
-STR_REFIT_STOP_ORDER                                            :(Prestavať na {STRING} a zastaviť)
-STR_STOP_ORDER                                                  :(Zastaviť)
-STR_TIMETABLE_VIEW                                              :{BLACK}CP
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Prepnút na zobrazenie cestovného poriadku
-STR_ORDER_VIEW                                                  :{BLACK}Príkazy
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Prepnút na zobrazenie príkazov
+STR_ORDER_REFIT                                                 :{BLACK}Prestavba
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Vyberte typ nákladu na prestavbu v tomto poradí. CTRL+klik na odstránenie príkazu prestavby
+STR_ORDER_REFIT_ORDER                                           :(Prestavba na {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Prestavať na {STRING} a zastaviť)
+STR_ORDER_STOP_ORDER                                            :(Zastaviť)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}CP
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Prepnút na zobrazenie cestovného poriadku
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Príkazy
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Prepnút na zobrazenie príkazov
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Prikazy)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Koniec prikazov - -
-STR_SERVICE                                                     :{BLACK}Oprava
+STR_ORDER_SERVICE                                               :{BLACK}Oprava
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Vyrobene: {LTBLUE}{NUM}{BLACK} Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Hodnota: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2770,7 +2770,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vozidlo
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozidlo zdielajúce tento príkaz nemôže ísť do stanice
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Nemozno posuvat vozdlo ...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadný stroj vždy doprevádza svoj druhý stroj vpredu
-STR_CARGO_N_A                                                   :Nie je{SKIP}
+STR_QUANTITY_N_A                                                :Nie je{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Nemoze najst cestu do depa
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Servisny interval: {LTBLUE}{COMMA}dni{BLACK}   Posledny servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Servisny interval: {LTBLUE}{COMMA}%{BLACK}   Posledny servis: {LTBLUE}{DATE_LONG}
@@ -2790,10 +2790,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}CestovnÃ
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Zmenit dlžku trvania oznaceného príkazu
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Vymazat dlžku trvania oznaceného príkazu
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Resetnút pocítadlo meškania, takye vozidlo pojde presne
-STR_SERVICE_HINT                                                :{BLACK}Vynechat tento prikaz pokial nie je potrebna oprava
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rýchlost: {VELOCITY}  Výkon: {POWER}{}Náklady na prevádzku: {CURRENCY}/rok{}Kapacita: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cena: {CURRENCY} Max. Rýchlost: {VELOCITY}{}Kapacita: {CARGO}, {CARGO}{}Prevádzkové náklady: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cena: {CURRENCY} Max. Rýchlosť: {VELOCITY}{}Kapacita: {CARGO}{}Prevádzkové náklady: {CURRENCY}/yr
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Vynechat tento prikaz pokial nie je potrebna oprava
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY} Hmotnost: {WEIGHT_S}{}Rýchlost: {VELOCITY}  Výkon: {POWER}{}Náklady na prevádzku: {CURRENCY}/rok{}Kapacita: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cena: {CURRENCY} Max. Rýchlost: {VELOCITY}{}Kapacita: {CARGO}, {CARGO}{}Prevádzkové náklady: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cena: {CURRENCY} Max. Rýchlosť: {VELOCITY}{}Kapacita: {CARGO}{}Prevádzkové náklady: {CURRENCY}/yr
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Vek: {LTBLUE}{STRING}{BLACK}   Prevádzkové náklady: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. rýchlosť: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Hmotnosť: {LTBLUE}{WEIGHT_S} {BLACK}Sila: {LTBLUE}{POWER}{BLACK} Max. rýchlosť: {LTBLUE}{VELOCITY}
@@ -2813,28 +2813,28 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Nemozno zmenit smer vlaku ...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Nemôžem oto�iť vozidlo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Nie je mozne otacat vozidla zlozené z viacerych jednotiek
-STR_CLEAR_TIME                                                  :{BLACK}Vymazat cas
-STR_RESET_LATENESS                                              :{BLACK}Reset meskania
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Zmeniť meno smerového bodu
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Zmeniť meno bójky
-
-STR_TRAIN_STOPPING                                              :{RED}Zastavuje
-STR_TRAIN_STOPPING_VEL                                          :{RED}Zastavuje, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Nekompatibilne typy kolaji
-STR_TRAIN_NO_POWER                                              :{RED}Nie je prud
-STR_TRAIN_START_NO_CATENARY                                     :Vlak nemoze nastartovat, pretoze trat nie je pripojena
-STR_TRAIN_STUCK                                                 :{ORANGE}Čakám na uvoľnenie trate
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Vymazat cas
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Reset meskania
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Zmeniť meno smerového bodu
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Zmeniť meno bójky
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Zastavuje
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Zastavuje, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Nekompatibilne typy kolaji
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Nie je prud
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Vlak nemoze nastartovat, pretoze trat nie je pripojena
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Čakám na uvoľnenie trate
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Nové {STRING} dostupné!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Nové {STRING} dostupné!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Nie je možné predat znicené vozidlo ...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nie je možné prestavat znicené vozidlo ...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Nie je možné predat znicené vozidlo ...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nie je možné prestavat znicené vozidlo ...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Vozidlu nie je možné zadat cestovný poriadok ...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vozidlá možu cakat len v staniciach.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Toto vozidlo nezastavuje v tejto stanici.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Vozidlu nie je možné zadat cestovný poriadok ...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vozidlá možu cakat len v staniciach.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Toto vozidlo nezastavuje v tejto stanici.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Zmenit cas
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Toto vozidlo ide presne
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Toto vozidlo mešká {STRING}
@@ -2848,7 +2848,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Naplň Ä
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}... musi byt zastaveny v garazi
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Nemozno najst miestnu garaz
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Otocit vozidlo
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapacita: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacita: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozid{P lo lá iel}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2875,11 +2875,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavit boju pouzitelnu pre vyznacenie trasy
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Tu nemozno postavit boju ...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Postavit akvadukt
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Tu nie je možné postavit akvadukt ...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Tu nie je možné postavit akvadukt ...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prestavat)
 STR_REFIT_TITLE                                                 :{GOLD}Vyber typ nakladu:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nová kapacita: {GOLD}{CARGO}{}{BLACK}Cena prestavby: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(mozna prestavba)
+STR_PURCHASE_INFO_REFITTABLE                                    :(mozna prestavba)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Letiska
@@ -2892,7 +2892,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Postavit
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Mesto oslavuje . . .{}Prve lietadlo pristalo na {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Letecke nestastie!{}{COMMA} mrtv{P y i ych} po poziari na {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Letecke nestastie!{}Lietadlu doslo palivo, {COMMA} mrtvych pri poziari!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Cestovný poriadok)
 
@@ -2905,13 +2905,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Zaval v uholnej bani nedaleko mesta {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Povoden!{}Najmenej {COMMA} ludi je nezvestnych alebo mrtvych po obrovskych zaplavach!
 
-STR_BRIBE_FAILED                                                :{WHITE}Vas pokus o uplatok bol odhaleny
-STR_BRIBE_FAILED_2                                              :{WHITE}miestnym vysetrovatelom.
-STR_BUILD_DATE                                                  :{BLACK}Postavene: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Vas pokus o uplatok bol odhaleny
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}miestnym vysetrovatelom.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Postavene: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Trieda stanice: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Typ stanice: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Trieda stanice: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Typ stanice: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detailny rating vykonu
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Podrobne
@@ -2931,28 +2931,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Hotovost
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Uver:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Spolu:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Pocet vozidiel (automobilov, vlakov, lodi a lietadiel).
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Pocet casti stanic. Kazda cast stanice (napr. zeleznicna stanica, autobusova zastavka, letisko) je zapocitana, aj ked su spojene do jednej stanice.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Zisk vozidla s najnizsim prijmom (zo vsetkych vozidiel starsich ako 2 roky)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Mnozstvo penazi zarobenych v mesiaci s najmensim ziskom v poslednych 12 kvartaloch
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Mnozstvo penazi zarobenych v mesiaci s najvacsim ziskom v poslednych 12 kvartaloch
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Pocet jednotiek nakladu prepravenych v poslednych styroch kvartaloch.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Pocet druhov nakladu prepraveneho v poslednom kvartali.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Mnozstvo penazi k dispozicii
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Vyska uveru spolocnosti
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Celkove body z vsetkych moznych
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Pocet vozidiel (automobilov, vlakov, lodi a lietadiel).
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Pocet casti stanic. Kazda cast stanice (napr. zeleznicna stanica, autobusova zastavka, letisko) je zapocitana, aj ked su spojene do jednej stanice.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Zisk vozidla s najnizsim prijmom (zo vsetkych vozidiel starsich ako 2 roky)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Mnozstvo penazi zarobenych v mesiaci s najmensim ziskom v poslednych 12 kvartaloch
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Mnozstvo penazi zarobenych v mesiaci s najvacsim ziskom v poslednych 12 kvartaloch
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Pocet jednotiek nakladu prepravenych v poslednych styroch kvartaloch.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Pocet druhov nakladu prepraveneho v poslednom kvartali.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Mnozstvo penazi k dispozicii
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Vyska uveru spolocnosti
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Celkove body z vsetkych moznych
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavenia NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Zobraziť NewGRF nastavenia
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Nastavenie novych grafickych suborov
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Potvrdit zmeny
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Prepnúť paletu
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Prepnúť paletu na zvolené NewGRF.{}Vykonajte to ak grafika z tohoto NewGRF je v hre ružová
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Nastavit parametre
-STR_NEWGRF_FILENAME                                             :{BLACK}Názov súboru: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdit zmeny
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Prepnúť paletu
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Prepnúť paletu na zvolené NewGRF.{}Vykonajte to ak grafika z tohoto NewGRF je v hre ružová
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavit parametre
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Názov súboru: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Chystáte sa vykonat zmeny v spustenej hre, co može sposobit pád hry.{}Naozaj ich chcete vykonat?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2975,34 +2975,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Požiadavka na
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} obsahuje poškodenú sprite. Všetky poškodené sprites budú zobrazované ako �ervený otáznik (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje viacero akcií 8 položiek.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Nahrat vybraný zoznam
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Uložit zoznam
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Uložit aktuálne nastavenie ako zoznam
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Zadajte názov zoznamu
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Vymazat zoznam
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Vymazat vybraný zoznam
-STR_NEWGRF_ADD                                                  :{BLACK}Pridat
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Pridat NewGRF súbor do zoznamu
-STR_NEWGRF_REMOVE                                               :{BLACK}Odstránit
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstránit vybraný NewGRF súbor zo zoznamu
-STR_NEWGRF_MOVEUP                                               :{BLACK}Vyššie
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Posunút vybraný NewGRF súbor v zozname vyššie
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Nižšie
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Posunút vybraný NewGRF súbor v zozname nižšie
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Zoznam inštalovaných NewGRF súborov. Kliknite na súbor pre zmenu jeho parametrov.
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametre: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Zadajte NewGRF parametre
-STR_NEWGRF_NO_INFO                                              :{BLACK}Žiadne dostupné informácie
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Nahrat vybraný zoznam
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Uložit zoznam
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Uložit aktuálne nastavenie ako zoznam
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Zadajte názov zoznamu
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Vymazat zoznam
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Vymazat vybraný zoznam
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Pridat
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Pridat NewGRF súbor do zoznamu
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Odstránit
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Odstránit vybraný NewGRF súbor zo zoznamu
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Vyššie
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Posunút vybraný NewGRF súbor v zozname vyššie
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Nižšie
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Posunút vybraný NewGRF súbor v zozname nižšie
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Zoznam inštalovaných NewGRF súborov. Kliknite na súbor pre zmenu jeho parametrov.
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametre: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Zadajte NewGRF parametre
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Žiadne dostupné informácie
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Dostupné NewGRF súbory
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Pridat do výberu
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Pridat vybraný NewGRF súbor do konfigurácie
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Obnovit zoznam súborov
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Obnovit zoznam dostupných NewGRF súborov
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Pridat vybraný NewGRF súbor do konfigurácie
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Obnovit zoznam súborov
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Obnovit zoznam dostupných NewGRF súborov
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Nie je možné pridat súbor: duplicitné GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Príslušný súbor nenájdený
-STR_NEWGRF_DISABLED                                             :{RED}Nedostupný
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Príslušný súbor nenájdený
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Nedostupný
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Príslušný súbor nenájdený (použitý kompatibilný GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilné GRF použité namiesto chýbajúcich súborov
@@ -3018,7 +3018,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informácia o zmene nákladu pre'{1:ENGINE}' sa líši od kúpneho listu. Môže to spôsobiť, že nové vozidlá sa nebudú prerábať na ur�itý tovar korektne.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' spôsobilo nekone�nú slu�ku v spätnom odvolávaní produckie.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Hra bola uložená vo verzii bez elektriciek. Vsetky elektricky boli odstránené.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Hra bola uložená vo verzii bez elektriciek. Vsetky elektricky boli odstránené.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Vlastná mena
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kurz meny: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3029,16 +3029,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Prechod
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Prechod na Euro: {ORANGE}nikdy
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Nahlad: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zmenit parametre vlastnej meny
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Zníženie hodnoty vašej meny oproti jednej libre (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Zvýšenie hodnoty vašej meny oproti jednej libre (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Nastaviť kurz pre vašu menu oproti libre (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Nastaviť oddeľova� meny
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Nastavit prefix pre vašu menu
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Nastaviť suffix pre vašu menu
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Zmeniť skôr na Euro
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Zmeniť na Euro neskôr
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Nastaviť rok, kedy zmeniť menu na Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 libier (£) vo vašej mene
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zníženie hodnoty vašej meny oproti jednej libre (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zvýšenie hodnoty vašej meny oproti jednej libre (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Nastaviť kurz pre vašu menu oproti libre (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Nastaviť oddeľova� meny
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Nastavit prefix pre vašu menu
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Nastaviť suffix pre vašu menu
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Zmeniť skôr na Euro
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Zmeniť na Euro neskôr
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Nastaviť rok, kedy zmeniť menu na Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 libier (£) vo vašej mene
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3057,8 +3057,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lod{P "" e i}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Lietad{P lo la iel}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Zdielane prikazy  {COMMA} vozid{P la iel iel}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Zobrazit vsetky vozidla s rovnakym zoznamom prikazov
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Zdielane prikazy  {COMMA} vozid{P la iel iel}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Zobrazit vsetky vozidla s rovnakym zoznamom prikazov
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} �aká v depe
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} �aká v depe
@@ -3165,39 +3165,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Prestava
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Prestavat lod na iny typ nakladu
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Prestavat lietadlo na iny typ nakladu
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Smeruje do {TOWN} depa
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Smeruje do {TOWN} depa, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Smeruje do {TOWN} garaze
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}smeruje do {TOWN} garaze, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Smeruje do {TOWN} lodenice
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Smeruje do {TOWN} lodenice, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Smeruje do {STATION} hangaru
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Smeruje do {STATION} hangaru, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servis v depe {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servis v depe {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Servis v garazi {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servis v garazi {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servis v lodenici {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servis v lodenici {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Servis v hangari {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Servis v hangari {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klonovat vlak
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klonovat vozidlo
-STR_CLONE_SHIP                                                  :{BLACK}Klonovat lod
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klonovat lietadlo
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Vytvori kopiu vlaku vratane voznov. Stlacenim Control budu prikazy zdielane
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Vytvori kopiu cestneho vozidla. Stlacenim Control budu prikazy zdielane
-STR_CLONE_SHIP_INFO                                             :{BLACK}Vytvori kopiu lode. Stlacenim Control budu prikazy zdielane
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Vytvori kopiu lietadla. Stlacenim Control budu prikazy zdielane
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Vytvori kopiu vlaku vratane voznov. Klikni na toto tlacidlo a potom na vlak v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Vytvori kopiu cestneho vozidla. Klikni na toto tlacidlo a potom na vozidlo v garazi alebo mimo nej. Stlacenim Control budu prikazy zdielane
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Vytvori kopiu lode. Klikni na toto tlacidlo a potom na lod v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Vytvori kopiu lietadla. Klikni na toto tlacidlo a potom na lietadlo v hangari alebo mimo neho. Stlacenim Control budu prikazy zdielane
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Smeruje do {TOWN} depa
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Smeruje do {TOWN} depa, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Smeruje do {TOWN} garaze
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}smeruje do {TOWN} garaze, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Smeruje do {TOWN} lodenice
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Smeruje do {TOWN} lodenice, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Smeruje do {STATION} hangaru
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Smeruje do {STATION} hangaru, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servis v depe {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servis v depe {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Servis v garazi {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servis v garazi {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servis v lodenici {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servis v lodenici {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Servis v hangari {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Servis v hangari {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klonovat vlak
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klonovat vozidlo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonovat lod
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonovat lietadlo
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Vytvori kopiu vlaku vratane voznov. Stlacenim Control budu prikazy zdielane
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Vytvori kopiu cestneho vozidla. Stlacenim Control budu prikazy zdielane
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Vytvori kopiu lode. Stlacenim Control budu prikazy zdielane
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Vytvori kopiu lietadla. Stlacenim Control budu prikazy zdielane
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Vytvori kopiu vlaku vratane voznov. Klikni na toto tlacidlo a potom na vlak v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Vytvori kopiu cestneho vozidla. Klikni na toto tlacidlo a potom na vozidlo v garazi alebo mimo nej. Stlacenim Control budu prikazy zdielane
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Vytvori kopiu lode. Klikni na toto tlacidlo a potom na lod v depe alebo mimo neho. Stlacenim Control budu prikazy zdielane
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Vytvori kopiu lietadla. Klikni na toto tlacidlo a potom na lietadlo v hangari alebo mimo neho. Stlacenim Control budu prikazy zdielane
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nove vlaky
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nové elektrické lokomotívy a vagóny
@@ -3267,28 +3267,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Vycentro
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Chystáte sa predat všetky vozidlá v depe. Ste si isý?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Nesprávny typ depa
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Nesprávny typ depa
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Predat všetky vlaky v depe
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Predat všetky vozidlá v garáži
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Predat všetky lode v lodenici
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Predat všetky lietadlá v hangári
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Predat všetky vlaky v depe
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Predat všetky vozidlá v garáži
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Predat všetky lode v lodenici
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Predat všetky lietadlá v hangári
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Zobrazit zoznam všetkých vlakov, ktoré majú toto depo v zozname príkazov
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Zobrazit zoznam všetkých vozidiel, ktoré majú túto garáž v zozname príkazov
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Zobrazit zoznam všetkých lodí, ktoré majú túto lodenicu v zozname príkazov
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Zobrazit zoznam všetkých lietadiel, ktoré majú toto letisko v zozname príkazov
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Zobrazit zoznam všetkých vlakov, ktoré majú toto depo v zozname príkazov
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Zobrazit zoznam všetkých vozidiel, ktoré majú túto garáž v zozname príkazov
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Zobrazit zoznam všetkých lodí, ktoré majú túto lodenicu v zozname príkazov
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Zobrazit zoznam všetkých lietadiel, ktoré majú toto letisko v zozname príkazov
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Automaticky nahradit všetky vlaky v depe
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Automaticky nahradit všetky vozidlá v garáži
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Automaticky nahradit všetky lode v lodenici
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Automaticky nahradit všetky lietadlá v hangári
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Automaticky nahradit všetky vlaky v depe
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Automaticky nahradit všetky vozidlá v garáži
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Automaticky nahradit všetky lode v lodenici
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Automaticky nahradit všetky lietadlá v hangári
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vymena {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Zacat vymenu vozidiel
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Zastavit vymenu vozidiel
-STR_NOT_REPLACING                                               :{BLACK}Nevymiena sa
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Nie je oznacene vozidlo
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Nevymiena sa
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Nie je oznacene vozidlo
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Vyber typ lokomotivy na vymenu
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Vyber typ novej lokomotivy, ktoru chces pouzit namiesto typu v zozname nalavo
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Stlac toto tlacidlo, ak nechces vymienat typ lokomotivy vybrany v lavom zozname
@@ -3300,26 +3300,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkcia
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Vymena: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Prepne medzi oknami na vymenu lokomotiv a vagonov
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozidlo nie je dostupné
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozidlo nie je dostupné
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Lod nie je dostupná
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Lietadlo nie je dostupné
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozidlo nie je dostupné
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozidlo nie je dostupné
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Lod nie je dostupná
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Lietadlo nie je dostupné
 
-STR_ENGINES                                                     :Lokomotívy
-STR_WAGONS                                                      :Vagonov
+STR_REPLACE_ENGINES                                             :Lokomotívy
+STR_REPLACE_WAGONS                                              :Vagonov
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Kliknite pre zastavenie všetkých vlakov v depe
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Kliknite pre zastavenie všetkých vozidiel v garáži
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Kliknite pre zastavenie všetkých lodí v lodenici
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Kliknite pre zastavenie všetkých lietadiel v hangári
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Kliknite pre zastavenie všetkých vlakov v depe
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Kliknite pre zastavenie všetkých vozidiel v garáži
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Kliknite pre zastavenie všetkých lodí v lodenici
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Kliknite pre zastavenie všetkých lietadiel v hangári
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Kliknite pre spustenie všetkých vlakov v depe
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Kliknite pre spustenie všetkých vozidiel v garáži
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Kliknite pre spustenie všetkých lodí v lodenici
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Kliknite pre spustenie všetkých lietadiel v hangári
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Kliknite pre spustenie všetkých vlakov v depe
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Kliknite pre spustenie všetkých vozidiel v garáži
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Kliknite pre spustenie všetkých lodí v lodenici
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Kliknite pre spustenie všetkých lietadiel v hangári
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Kliknite pre zastavenie všetkých vozidiel v zozname
-STR_MASS_START_LIST_TIP                                         :{BLACK}Kliknite pre spustenie všetkých vozidiel v zozname
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Kliknite pre zastavenie všetkých vozidiel v zozname
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Kliknite pre spustenie všetkých vozidiel v zozname
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Zoznam popisov - {COMMA} popis{P "" y ov}
@@ -3328,14 +3328,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Príkaz
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Lokomotiva pre zeleznicu
-STR_ELRAIL_VEHICLES                                             :Elektrické lokomotívy
-STR_MONORAIL_VEHICLES                                           :Lokomotiva pre jednokolajovku
-STR_MAGLEV_VEHICLES                                             :Lokomotiva pre magneticku drahu
+STR_REPLACE_RAIL_VEHICLES                                       :Lokomotiva pre zeleznicu
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrické lokomotívy
+STR_REPLACE_MONORAIL_VEHICLES                                   :Lokomotiva pre jednokolajovku
+STR_REPLACE_MAGLEV_VEHICLES                                     :Lokomotiva pre magneticku drahu
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Hmotnost: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Rychlost: {GOLD}{VELOCITY}{BLACK}   Vykon: {GOLD}{POWER}
@@ -3362,70 +3362,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Vytvorit
-STR_RANDOM                                                      :{BLACK}Nový kód
-STR_RANDOM_HELP                                                 :{BLACK}Zmenit nahodny kod pre generovanie terenu
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Vytvorenie krajiny
-STR_RANDOM_SEED                                                 :{BLACK}Náhodný kód:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Kliknite pre zadanie nahodneho kodu
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Zadajte náhodný kód
-STR_LAND_GENERATOR                                              :{BLACK}Generátor krajiny:
-STR_TREE_PLACER                                                 :{BLACK}Generátor stromov:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Orientacia vyskovej mapy:
-STR_TERRAIN_TYPE                                                :{BLACK}Typ terénu:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Rozloha mora:
-STR_SMOOTHNESS                                                  :{BLACK}Clenitost:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Vyska linie snehu:
-STR_DATE                                                        :{BLACK}Rok:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Pocet miest:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Pocet priemyslu:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Zvysit vysku snehovej ciary o jedno
-STR_SNOW_LINE_DOWN                                              :{BLACK}Znizit vysku snehovej ciary o jedno
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Zmenit vysku snehovej ciary
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Zmenit rok zaciatku hry
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Upozornenie na stupnicu
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Prilis velka zmena velkosti zdrojovej mapy sa neodporuca. Pokracovat s generovanim?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nazov vyskovej mapy:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Velkost: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Vytvorit
+STR_MAPGEN_RANDOM                                               :{BLACK}Nový kód
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Zmenit nahodny kod pre generovanie terenu
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Vytvorenie krajiny
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Náhodný kód:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Kliknite pre zadanie nahodneho kodu
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Zadajte náhodný kód
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generátor krajiny:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Generátor stromov:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Orientacia vyskovej mapy:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Typ terénu:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Rozloha mora:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Clenitost:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Vyska linie snehu:
+STR_MAPGEN_DATE                                                 :{BLACK}Rok:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Pocet miest:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Pocet priemyslu:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Zvysit vysku snehovej ciary o jedno
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Znizit vysku snehovej ciary o jedno
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Zmenit vysku snehovej ciary
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Zmenit rok zaciatku hry
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Upozornenie na stupnicu
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Prilis velka zmena velkosti zdrojovej mapy sa neodporuca. Pokracovat s generovanim?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nazov vyskovej mapy:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Velkost: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Generujem  krajinu ...
 STR_GENERATION_ABORT                                            :{BLACK}Ukoncit
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Ukoncit generovanie krajiny
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Skutocne chcete ukoncit generovanie?
-STR_PROGRESS                                                    :{WHITE}{NUM}% hotovych
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Vytvorenie krajiny
-STR_TREE_GENERATION                                             :{BLACK}Generovanie stromov
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Nepohyblive generovanie
-STR_CLEARING_TILES                                              :{BLACK}Generovanie nerovnosti a skal
-STR_SETTINGUP_GAME                                              :{BLACK}Nastavovanie hry
-STR_PREPARING_TILELOOP                                          :{BLACK}Spustam tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Priprava hry
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Obtiažnost sa zmenila na vlastnú
-STR_SE_FLAT_WORLD                                               :{WHITE}Rovna krajina
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generovat rovnu krajinu
-STR_SE_RANDOM_LAND                                              :{WHITE}Nahodna krajina
-STR_SE_NEW_WORLD                                                :{BLACK}Vytvorit novy scenar
-STR_SE_CAPTION                                                  :{WHITE}Typ scenara
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Znizit vysku rovnej krajiny o jedno
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Zvysit vysku rovnej krajiny o jedno
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Zmenit vysku rovnej krajiny
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Vyska rovnej krajiny:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% hotovych
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Vytvorenie krajiny
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generovanie stromov
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Nepohyblive generovanie
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generovanie nerovnosti a skal
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Nastavovanie hry
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Spustam tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Priprava hry
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Obtiažnost sa zmenila na vlastnú
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Rovna krajina
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generovat rovnu krajinu
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Nahodna krajina
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Vytvorit novy scenar
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Typ scenara
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Znizit vysku rovnej krajiny o jedno
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Zvysit vysku rovnej krajiny o jedno
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Zmenit vysku rovnej krajiny
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Vyska rovnej krajiny:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Vycentrovat malu mapu na aktualnu poziciu
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Okraje mapy:
-STR_NORTHWEST                                                   :{BLACK}Severo-západ
-STR_NORTHEAST                                                   :{BLACK}Severo-východ
-STR_SOUTHEAST                                                   :{BLACK}Juho-východ
-STR_SOUTHWEST                                                   :{BLACK}Juho-západ
-STR_BORDER_FREEFORM                                             :{BLACK}Voľné tvarovanie
-STR_BORDER_WATER                                                :{BLACK}Voda
-STR_BORDER_RANDOM                                               :{BLACK}Náhodný
-STR_BORDER_RANDOMIZE                                            :{BLACK}Náhodný
-STR_BORDER_MANUAL                                               :{BLACK}Manuál
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Okraje mapy:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Severo-západ
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Severo-východ
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Juho-východ
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Juho-západ
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Voľné tvarovanie
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Voda
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Náhodný
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Náhodný
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuál
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Male
@@ -3450,21 +3450,21 @@ STR_MEASURE_AREA                                                :{BLACK}Plocha:
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dlžka: {NUM}{}Výškový rozdiel: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Plocha: {NUM} x {NUM}{}Výškový rozdiel: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transfer kredity: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}... cesta vlastnená mestom
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}... nesprávna orientácia cesty
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Nastavenia priehladnosti
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Prepnút priehladnost názvov staníc
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Prepnút priehladnost stromov
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Prepnút priehladnost domov
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Prepnút priehladnost priemyslu
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Prepnút priehladnost staníc, garáží, tratí, ...
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Prepnút priehladnost mostov
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Prepnút priehladnost objektov ako sú majáky a antény
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Prepnút priehladnost pre trakcné vedenie. CTRL+klik pre uzamknutie.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Prepnút priehladnost pre ukazovatele nakladania a vykladania
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Nastavit objekty neviditelné namiesto priehladných
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transfer kredity: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}... cesta vlastnená mestom
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}... nesprávna orientácia cesty
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Nastavenia priehladnosti
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Prepnút priehladnost názvov staníc
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Prepnút priehladnost stromov
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Prepnút priehladnost domov
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Prepnút priehladnost priemyslu
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Prepnút priehladnost staníc, garáží, tratí, ...
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Prepnút priehladnost mostov
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Prepnút priehladnost objektov ako sú majáky a antény
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Prepnút priehladnost pre trakcné vedenie. CTRL+klik pre uzamknutie.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Prepnút priehladnost pre ukazovatele nakladania a vykladania
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Nastavit objekty neviditelné namiesto priehladných
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3474,7 +3474,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :VÅ¡etky vlaky
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Všetky cestné vozidlá
 STR_GROUP_ALL_SHIPS                                             :VÅ¡etky lode
@@ -3483,24 +3483,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Nezaradené vla
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Nezaradené vozidlá
 STR_GROUP_DEFAULT_SHIPS                                         :Nezaradené lode
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Nezaradené lietadlá
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Pridat zdielané vozidlá
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Odstránit všetky vozidlá
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Premenovat skupinu
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nie je možné vytvorit skupinu ...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nie je možné zrušit túto skupinu ...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nie je možné premenovat skupinu ...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nie je možné odstránit všetky vozdilá z tejto skupiny ...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nie je možné pridat vozidlo do tejto skupiny
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nie je možné pridat zdielané vozidlo do skupiny
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nie je možné vytvorit skupinu ...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nie je možné zrušit túto skupinu ...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nie je možné premenovat skupinu ...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nie je možné odstránit všetky vozdilá z tejto skupiny ...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nie je možné pridat vozidlo do tejto skupiny
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nie je možné pridat zdielané vozidlo do skupiny
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Skupiny  - kliknite na skupinu pre zobrazenie všetkých vozidiel skupiny
-STR_GROUP_CREATE_TIP                                            :{BLACK}Kliknite pre vytvorenie skupiny
-STR_GROUP_DELETE_TIP                                            :{BLACK}Zrušit vybranú skupinu
-STR_GROUP_RENAME_TIP                                            :{BLACK}Premenovat vybranú skupinu
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Kliknite pre znemoznenie automatického nahradzovania v skupine
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Skupiny  - kliknite na skupinu pre zobrazenie všetkých vozidiel skupiny
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Kliknite pre vytvorenie skupiny
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Zrušit vybranú skupinu
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Premenovat vybranú skupinu
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Kliknite pre znemoznenie automatického nahradzovania v skupine
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3561,35 +3561,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Meno musí byt jedinecné
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Meno musí byt jedinecné
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Prejst na dalsiu znacku
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Prejst na predchádzajúcu znacku
-STR_SIGN_OSKTITLE                                               :{BLACK}Zadajte názov pre popis
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Prejst na dalsiu znacku
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Prejst na predchádzajúcu znacku
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Zadajte názov pre popis
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Založit
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Vyhladat
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Postavit
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Vyberte vhodný typ priemyslu zo zoznamu
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Založit
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Vyhladat
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Postavit
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Vyberte vhodný typ priemyslu zo zoznamu
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Rozšírený
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Rozšírený výber tváre.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Rozšírený výber tváre.
 STR_FACE_SIMPLE                                                 :{BLACK}Jednoduchý
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Jednoduchý výber tváre.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Jednoduchý výber tváre.
 STR_FACE_LOAD                                                   :{BLACK}Nahrat
-STR_FACE_LOAD_TIP                                               :{BLACK}Nahrat oblúbenú tvár
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Nahrat oblúbenú tvár
 STR_FACE_LOAD_DONE                                              :{WHITE}Vaša oblúbená tvár bola nahratá z kofiguracného súboru.
 STR_FACE_FACECODE                                               :{BLACK}Kód tváre
-STR_FACE_FACECODE_TIP                                           :{BLACK}Zobrazit/nastavit kód tváre
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Zobrazit/nastavit kód tváre
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Zobrazit/nastavit kód tváre
 STR_FACE_FACECODE_SET                                           :{WHITE}Nový kód tváre bol nastavený.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Nie je možné nastavit kód tváre - povolené je �íslo od 0 do 4 294 967 295!
 STR_FACE_SAVE                                                   :{BLACK}Uložit
-STR_FACE_SAVE_TIP                                               :{BLACK}Uložit oblúbenú tvár
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Uložit oblúbenú tvár
 STR_FACE_SAVE_DONE                                              :{WHITE}Táto tvár bude uložená ako oblúbená do konfiguracného súboru.
 STR_FACE_EUROPEAN                                               :{BLACK}Európan
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Vybrat európske tváre
@@ -3597,51 +3597,51 @@ STR_FACE_AFRICAN                                                :{BLACK}African
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Vybrat africké tváre
 STR_FACE_YES                                                    :áno
 STR_FACE_NO                                                     :nie
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Povolit fúzy alebo náušnicu
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Povolit fúzy alebo náušnicu
 STR_FACE_HAIR                                                   :Vlasy:
-STR_FACE_HAIR_TIP                                               :{BLACK}Zmenit vlasy
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Zmenit vlasy
 STR_FACE_EYEBROWS                                               :Obocie:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Zmenit obocie
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Zmenit obocie
 STR_FACE_EYECOLOUR                                              :Farba ocí:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Zmenit farbu ocí
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Zmenit farbu ocí
 STR_FACE_GLASSES                                                :Okuliare:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Povolit okuliare
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Zmenit okuliare
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Povolit okuliare
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Zmenit okuliare
 STR_FACE_NOSE                                                   :Nos:
-STR_FACE_NOSE_TIP                                               :{BLACK}Zmenit nos
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Zmenit nos
 STR_FACE_LIPS                                                   :Pery:
 STR_FACE_MOUSTACHE                                              :Fúzy:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Zmenit pery alebo fúzy
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Zmenit pery alebo fúzy
 STR_FACE_CHIN                                                   :Brada:
-STR_FACE_CHIN_TIP                                               :{BLACK}Zmenit bradu
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Zmenit bradu
 STR_FACE_JACKET                                                 :Sako
-STR_FACE_JACKET_TIP                                             :{BLACK}Zmenit sako
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Zmenit sako
 STR_FACE_COLLAR                                                 :Golier:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Zmenit golier
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Zmenit golier
 STR_FACE_TIE                                                    :Kravata:
 STR_FACE_EARRING                                                :Náušnica:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Zmenit kravatu alebo náušnicu
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Zmenit kravatu alebo náušnicu
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Výber signálu
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Nie je možné zmenit typ signálov ...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standardný signál (semafór){}Signály sú nevyhnutné pre zabránenie zrážke v železnicnej sieti s viac ako 1 vlakom.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Vstupný signál (semafór){}Zelený ak je na danom úseku trate 1 alebo viac zelených výstupných signálov, inak je cervený.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Výstupný signál (semafór){}Funguje rovnako ako štandardný signál, avšak je nevyhnutný pre urcenie správnej farby na na vstupných a kombinovaných signáloch.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinovaný signál (semafór){}Funguje jednoducho ako vstupný a výstupný signál zároven, co umožnuje budovat "stromové" štruktúry.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Obojstranné signály (semaphore){}Obojstranné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Obojstranné signály umožňujú vlakom prechádzať trať z oboch strán.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Jednosmerné signály (semaphore){}Jednosmerné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Jednosmerné signály umožňujú vlakom prechádzať trať iba z jednej strany.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standardný signál (elektrický){}Signály sú nevyhnutné pre zabránenie zrážke v železnicnej sieti s viac ako 1 vlakom.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Vstupný signál (elektrický){}Zelený ak je na danom úseku trate 1 alebo viac zelených výstupných signálov, inak je cervený.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Výstupný signál (elektrický){}Funguje rovnako ako štandardný signál, avšak je nevyhnutný pre urcenie správnej farby na na vstupných a kombinovaných signáloch.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinovaný signál (elektrický){}Funguje jednoducho ako vstupný a výstupný signál zároven, co umožnuje budovat "stromové" štruktúry.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Obojstranné signály (electric){}Obojstranné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Obojstranné signály umožňujú vlakom prechádzať trať z oboch strán.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Jednosmerné signály (electric){}Jednosmerné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Jednosmerné signály umožňujú vlakom prechádzať trať iba z jednej strany.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Konverzia signálu{}Pri vybraní, kliknutie na existujúci signál ho zmení na vybraný typ a variant, CTRL+klik prepne existujúci variant.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Hustota signálov pri stavbe tahaním
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Znižit hustotu signálov
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Zvýšit hustotu signálov
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Výber signálu
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Nie je možné zmenit typ signálov ...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standardný signál (semafór){}Signály sú nevyhnutné pre zabránenie zrážke v železnicnej sieti s viac ako 1 vlakom.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Vstupný signál (semafór){}Zelený ak je na danom úseku trate 1 alebo viac zelených výstupných signálov, inak je cervený.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Výstupný signál (semafór){}Funguje rovnako ako štandardný signál, avšak je nevyhnutný pre urcenie správnej farby na na vstupných a kombinovaných signáloch.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinovaný signál (semafór){}Funguje jednoducho ako vstupný a výstupný signál zároven, co umožnuje budovat "stromové" štruktúry.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Obojstranné signály (semaphore){}Obojstranné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Obojstranné signály umožňujú vlakom prechádzať trať z oboch strán.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Jednosmerné signály (semaphore){}Jednosmerné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Jednosmerné signály umožňujú vlakom prechádzať trať iba z jednej strany.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standardný signál (elektrický){}Signály sú nevyhnutné pre zabránenie zrážke v železnicnej sieti s viac ako 1 vlakom.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Vstupný signál (elektrický){}Zelený ak je na danom úseku trate 1 alebo viac zelených výstupných signálov, inak je cervený.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Výstupný signál (elektrický){}Funguje rovnako ako štandardný signál, avšak je nevyhnutný pre urcenie správnej farby na na vstupných a kombinovaných signáloch.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinovaný signál (elektrický){}Funguje jednoducho ako vstupný a výstupný signál zároven, co umožnuje budovat "stromové" štruktúry.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Obojstranné signály (electric){}Obojstranné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Obojstranné signály umožňujú vlakom prechádzať trať z oboch strán.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Jednosmerné signály (electric){}Jednosmerné signály umožnujú vstúpiť viacerým vlakom na trať sú�asne, iba ak vlak dokáže zastaviť pred brzdiacim bodom. Jednosmerné signály umožňujú vlakom prechádzať trať iba z jednej strany.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konverzia signálu{}Pri vybraní, kliknutie na existujúci signál ho zmení na vybraný typ a variant, CTRL+klik prepne existujúci variant.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Hustota signálov pri stavbe tahaním
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Znižit hustotu signálov
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Zvýšit hustotu signálov
 ########
 
 ############ on screen keyboard
@@ -3653,37 +3653,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI nastavenia
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Zobraziť AI nastavenia
 STR_AI_DEBUG                                                    :{WHITE}AI debugovanie
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Meno AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Meno AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Znovu na�ítať AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Zrušiť AI, znovu na�ítať skript, a reštartovať AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI Debug okno je dostupné len pre server
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Zrušiť AI, znovu na�ítať skript, a reštartovať AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI Debug okno je dostupné len pre server
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI konfigurácia
-STR_AI_CHANGE                                                   :{BLACK}Ozna�iť AI
-STR_AI_CONFIGURE                                                :{BLACK}Nastaviť
-STR_AI_CHANGE_TIP                                               :{BLACK}Na�ítať �aľšiu AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Nastaviť parametre AI
-STR_AI_LIST_TIP                                                 :{BLACK}Všetky AI budú na�ítané v nasledujúcej hre
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Ozna�iť AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Nastaviť
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Na�ítať �aľšiu AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Nastaviť parametre AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Všetky AI budú na�ítané v nasledujúcej hre
 STR_AI_LIST_CAPTION                                             :{WHITE}Dostupné AI
-STR_AI_AILIST_TIP                                               :{BLACK}Klikni pre výber AI
-STR_AI_ACCEPT                                                   :{BLACK}Potvrdiť
-STR_AI_ACCEPT_TIP                                               :{BLACK}Vybrať vyzna�ené AI
-STR_AI_CANCEL                                                   :{BLACK}Zrušiť
-STR_AI_CANCEL_TIP                                               :{BLACK}Nemeniť AI
-STR_AI_CLOSE                                                    :{BLACK}Zavrieť
-STR_AI_RESET                                                    :{BLACK}Resetovať
-STR_AI_HUMAN_PLAYER                                             :ÄŒlovek
-STR_AI_RANDOM_AI                                                :Náhodná AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikni pre výber AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Potvrdiť
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrať vyzna�ené AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Zrušiť
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Nemeniť AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zavrieť
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetovať
+STR_AI_CONFIG_HUMAN_PLAYER                                      :ÄŒlovek
+STR_AI_CONFIG_RANDOM_AI                                         :Náhodná AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parametre AI
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Verzia: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Jedna z AI padla. Prosím nahláste to autorovi AI a priložte screenshot Debugovacej obrazovky AI.
-STR_AI_NO_AI_FOUND                                              :Nebolo nájdená žiadne použitelné AI.{}Toto AI je hlúpe a nebude ni� robiť.{}Môžete si stiahnúť niekoľko AI cez 'Online Obsah' systém.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Verzia: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna z AI padla. Prosím nahláste to autorovi AI a priložte screenshot Debugovacej obrazovky AI.
+STR_ERROR_AI_NO_AI_FOUND                                        :Nebolo nájdená žiadne použitelné AI.{}Toto AI je hlúpe a nebude ni� robiť.{}Môžete si stiahnúť niekoľko AI cez 'Online Obsah' systém.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Hlukový limit v meste: {ORANGE}{COMMA}{BLACK}  max.: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Vytváraný hluk: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Hlukový limit v meste: {ORANGE}{COMMA}{BLACK}  max.: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Vytváraný hluk: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3697,21 +3697,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Mapa
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Výšková mapa
 STR_CONTENT_TITLE                                               :{WHITE}SÅ¥ahovanie obsahu
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Typ
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Typ obsahu
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Typ obsahu
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Meno
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Meno obsahu
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Kliknite na riadok pre zobrazenie detailov{}Kliknite na zaštravacie pole pre stiahnutie
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Meno obsahu
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Kliknite na riadok pre zobrazenie detailov{}Kliknite na zaštravacie pole pre stiahnutie
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Ozna�iť všetko
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Ozna�iť všetok obsah pre stiahnutie
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Ozna�iť všetok obsah pre stiahnutie
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Ozna�iť aktualizácie
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Ozna�iť všetok obsah obsahujúci aktualizáciu, ktorý sa má stiahnuť
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Ozna�iť všetok obsah obsahujúci aktualizáciu, ktorý sa má stiahnuť
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Odzna�iť všetko
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Ozna�iť všetok obsah ktorý nemá byť stiahnutý
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Ozna�iť všetok obsah ktorý nemá byť stiahnutý
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Vložiť filtrovací reťazec
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Vložiť kľú�ové slovo pre filtrovanie zoznamu
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Vložiť kľú�ové slovo pre filtrovanie zoznamu
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Tag/meno filtru:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}SÅ¥ahovanie
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Za�ať sťahovanie oza�eného obsahu
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Za�ať sťahovanie oza�eného obsahu
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Celková veľkosť stiahnutých súborov: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFO O OBSAHU
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Neozna�ili ste toto pre stiahnutie
@@ -3744,6 +3744,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Nemôže
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Skontrolovať online obsah
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Skontrolovať nový a aktualizovaný obsah pre stiahnutie
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Nájsť chýbajúci obsah online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Skontrolovať �i chýbajúci obsah je dostupný online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Nájsť chýbajúci obsah online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Skontrolovať �i chýbajúci obsah je dostupný online
 ########
diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt
index 55660b6a8..b4aecc5cc 100644
--- a/src/lang/slovenian.txt
+++ b/src/lang/slovenian.txt
@@ -200,7 +200,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Zemljevi
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Možnosti Igre
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Sporo�ilo
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Sporo�ilo od/iz {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Pozor!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Pozor!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Ni izvedljivo ...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Nemogo�e �iš�enje tega podro�ja ...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Prvotne avtorske pravice {COPYRIGHT} 1995 Chris Sawyer, vse pravice pridržane
@@ -208,9 +208,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 ekipa OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Izhod
-STR_YES                                                         :{BLACK}Da
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Zagotovo želiš zapustiti igro in se vrniti v {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Da
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Zagotovo želiš zapustiti igro in se vrniti v {STRING}?
 
 STR_JUST_NOTHING                                                :Ni�
 STR_COLOUR_DARK_BLUE                                            :Temno modra
@@ -271,11 +271,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Puš�ava
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Sneg
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Sporo�ilo
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Privzeto
-STR_QUERY_CANCEL                                                :{BLACK}Prekli�i
-STR_QUERY_OK                                                    :{BLACK}Potrdi
-STR_QUERY_RENAME                                                :{BLACK}Preimenuj
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Privzeto
+STR_BUTTON_CANCEL                                               :{BLACK}Prekli�i
+STR_BUTTON_OK                                                   :{BLACK}Potrdi
+STR_BUTTON_RENAME                                               :{BLACK}Preimenuj
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -292,16 +292,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Tovor
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Informacije
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Zmogljivosti
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Skupni tovor
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Skupna tovorna zmogljivost tega vlaka:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Skupna tovorna zmogljivost tega vlaka:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Nova igra
 STR_INTRO_LOAD_GAME                                             :{BLACK}Naloži igro
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Ve� igralcev
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Urejevalnik ozemlja
 
-STR_MAPSIZE                                                     :{BLACK}Velikost ozemlja:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Velikost ozemlja:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Možnosti
 
 STR_COMPANY_SOMEONE                                             :nekdo{SKIP}{SKIP}
@@ -350,10 +350,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Zapusti igro
 STR_FILE_MENU_EXIT                                              :Izhod
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Zagotovo želiš zapustiti igro?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Zapusti igro
-STR_SORT_ORDER_TIP                                              :{BLACK}Izberi nacin sortiranja (padajo�e/naraš�ajoce)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Izberi kriterij za sortiranje
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Izberi na�in filtriranja
-STR_SORT_BY                                                     :{BLACK}Sortiraj po
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Izberi nacin sortiranja (padajo�e/naraš�ajoce)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Izberi kriterij za sortiranje
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Izberi na�in filtriranja
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortiraj po
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Prebivalstvo
@@ -385,24 +385,24 @@ STR_SORT_BY_RUNNING_COST                                        :Cena delovanja
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Mo�/Cena delovanja
 STR_SORT_BY_CARGO_CAPACITY                                      :Zmogljivost tovora
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Noben tovor ne �aka
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Izberi vse pripomo�ke
-STR_SELECT_ALL_TYPES                                            :{BLACK}Izberi vse vrste tovora (vklju�no s tovorom, ki ne �aka)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Prikaži seznam motorjev na voljo za ta tip vozila.
-STR_MANAGE_LIST                                                 :{BLACK}Uredi seznam
-STR_MANAGE_LIST_TIP                                             :{BLACK}Pošlji navodila vsem vozilom na seznamu
-STR_REPLACE_VEHICLES                                            :Zamenjaj vozila
-STR_SEND_FOR_SERVICING                                          :Pošlji na servisiranje
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Vlaki na voljo
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vozila na voljo
-STR_AVAILABLE_SHIPS                                             :{BLACK}Ladje na voljo
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Letala na voljo
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Pošlji v garažo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Pošlji v garažo
-STR_SEND_SHIP_TO_DEPOT                                          :Pošlji v garažo
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Pošlji v hangar
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Noben tovor ne �aka
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Izberi vse pripomo�ke
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Izberi vse vrste tovora (vklju�no s tovorom, ki ne �aka)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Prikaži seznam motorjev na voljo za ta tip vozila.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Uredi seznam
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Pošlji navodila vsem vozilom na seznamu
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Zamenjaj vozila
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Pošlji na servisiranje
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Vlaki na voljo
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Vozila na voljo
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Ladje na voljo
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Letala na voljo
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Pošlji v garažo
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Pošlji v garažo
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Pošlji v garažo
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Pošlji v hangar
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -432,12 +432,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Možnost
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Ni mogo�a sprememba obdobja servisiranja ...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Zapri okno
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Naslov okna - primi in vleci za premik okna
-STR_STICKY_BUTTON                                               :{BLACK}Ozna�i to okno za nezapirljivo z 'Zapri vsa okna' tipko
-STR_RESIZE_BUTTON                                               :{BLACK}Klikni in vleci to, da zmanjšaš okno
+STR_TOOLTIP_STICKY                                              :{BLACK}Ozna�i to okno za nezapirljivo z 'Zapri vsa okna' tipko
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klikni in vleci to, da zmanjšaš okno
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klikni tukaj za skok v mapo shrani/naloži
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Poruši zgradbe itd. na kvadratku zemlje
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Znižaj rob terena
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Zvišaj rob terena
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Znižaj rob terena
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Zvišaj rob terena
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Drsnik - premakne seznam gor/dol
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Drsni trak - premika seznam levo/desno
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Pokaži na�rt terena na zemljevidu
@@ -450,21 +450,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Vklju�i
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Dobi�ek letos: {CURRENCY} (lani: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} let{P o i a ""} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} let{P o i a ""} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} let{P o i a ""} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} let{P o i a ""} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Vlak
-STR_VEHICLE_ROAD_VEHICLE                                        :Cestno vozilo
-STR_VEHICLE_SHIP                                                :Ladja
-STR_VEHICLE_AIRCRAFT                                            :Letalo
+STR_REPLACE_VEHICLE_TRAIN                                       :Vlak
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Cestno vozilo
+STR_REPLACE_VEHICLE_SHIP                                        :Ladja
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Letalo
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} se stara
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} podlega iztrošenosti
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} nima ve� zanesljivosti in nujno potrebuje zamenjavo
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Informacije o zemljiš�u
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Cena za �iš�enje: {LTBLUE}Ni na voljo
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Cena za �iš�enje: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Dohodek ob �iš�enju: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Dohodek ob �iš�enju: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Ni na voljo
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Lastnik: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Lastnik ceste: {LTBLUE}{STRING}
@@ -473,7 +473,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Lastnik
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokalna oblast: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Brez
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ime
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1.
@@ -585,7 +585,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klikni n
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Klikni na skladbo, �e jo želiš odstraniti iz programa (samo Poljubno1 ali Poljubno2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Preklapljaj mešan program vklju�eno/izklju�eno
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Pokaži okno z izborom glasbe
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klikni na storitev za pogled na industrijo/mesto
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klikni na storitev za pogled na industrijo/mesto
 STR_INTRO_DIFFICULTY                                            :{BLACK}Težavnost ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Zadnje sporo�ilo/novica
@@ -634,7 +634,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Zmanjša
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Ustvari naklju�ni teren
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Zbriši pokrajino
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Zbriši pokrajino
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Odstrani vso igral�evo lastnino z ozemlja
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Odstrani vso igral�evo lastnino z ozemlja
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Zagotovo želiš odstraniti vso igral�evo lastnino?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Generator pokrajine
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Generator mest
@@ -648,11 +648,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE} ... pre
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE} ... preblizu drugemu mestu
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE} ... neprimerna lokacija
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE} ... preveliko Å¡tevilo mest
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Ni mogo�e zgraditi mest
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE} ... ni ve� prostora na zemljevidu
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Ni mogo�e zgraditi mest
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE} ... ni ve� prostora na zemljevidu
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Pove�aj velikost mesta
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Razširi
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Mesta ne bodo gradila cest. Lahko omogo�iš gradnjo cest v Napredne nastavitve->Ekonomija->Mesta.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Mesta ne bodo gradila cest. Lahko omogo�iš gradnjo cest v Napredne nastavitve->Ekonomija->Mesta.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Naklju�no mesto
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Zgradi mesto na naklju�ni lokaciji
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Tukaj ni možno zgraditi {STRING}
@@ -666,13 +666,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Ustvari
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Postavi svetilnik
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Postavi oddajnik
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Dolo�i obmo�ja puš�ave.{}Pritisni in drži CTRL za odstranitev
-STR_CREATE_LAKE                                                 :{BLACK}Dolo�i podro�je vode.{}Naredi kanal, razen �e je pritisnjen CTRL na morski gladini, ko bo poplavilo okolico.
-STR_CREATE_RIVER                                                :{BLACK}Položi reke.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Dolo�i podro�je vode.{}Naredi kanal, razen �e je pritisnjen CTRL na morski gladini, ko bo poplavilo okolico.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Položi reke.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Izbriši
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Popolnoma izbriši mesto
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Shrani scenarij
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Naloži scenarij
-STR_MENU_LOAD_HEIGHTMAP                                         :Naloži višinsko karto
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Naloži višinsko karto
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Izhod iz urejevalnika
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Izhod
@@ -682,7 +682,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Shrani s
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Igraj scenarij
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Igraj višinsko karto
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Za�ni novo igro z uporabo višinske karte za pokrajino
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Zagotovo želiš zapustiti ta scenarij?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Zagotovo želiš zapustiti ta scenarij?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE} ... gradnja mogo�a samo v mestih z vsaj 1200 ali ve� ljudi
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Premakni za�etni datum za 1 leto nazaj
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Premakni za�etni datum za 1 leto naprej
@@ -690,21 +690,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE} ... oba
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Majhno
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Srednje
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Veliko
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Naklju�no
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Naklju�no
 STR_FOUND_TOWN_CITY                                             :{BLACK}Mesto
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Mesta rastejo hitreje kot navadna naselja{}Odvisno od nastavitev, so ve�ja, ko so ustanovljena
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Izberi velikost mesta
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Velikost mesta:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Oblika mestnih cest:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Izberi obliko cest za to mesto
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Boljše ceste
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 mreža
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 mreža
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Naklju�no
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Oblika mestnih cest:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Izberi obliko cest za to mesto
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Boljše ceste
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 mreža
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 mreža
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Naklju�no
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Prikaži zadnje sporo�ilo ali novico
 STR_NEWS_MESSAGES_OFF                                           :Izklju�eno
 STR_NEWS_MESSAGES_SUMMARY                                       :Povzetek
@@ -804,10 +804,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Slika je uspešno zajeta kot {} '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Zajemanje slike ni uspelo!!!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Kupi zemljiš�e za prihodnjo rabo
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Kupi zemljiš�e za prihodnjo rabo
 STR_STATUSBAR_AUTOSAVE                                          :{RED}Samodejno shranjevanje
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SHRANJEVANJE  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Shranjevanje poteka,{}Prosim po�akaj, da se zaklju�i!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Shranjevanje poteka,{}Prosim po�akaj, da se zaklju�i!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Izberi 'Pouli�ni' glasbeni program
 
 ############ start of townname region
@@ -870,7 +870,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Izberi j
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Cel zaslon
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Ozna�i to okno za igro v celozaslonskem na�inu
-STR_FULLSCREEN_FAILED                                           :{WHITE}Celozaslonski na�in spodletel
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Celozaslonski na�in spodletel
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Lo�ljivost
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Izberi lo�ljivost zaslona
@@ -883,12 +883,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Izberi o
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} manjkajo�{P a i e e} /okvarjen{P a i e e} datotek{P a i e e}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Dodatne informacije o osnovnem kompletu grafik
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Samodejno shranjevanje spodletelo
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Samodejno shranjevanje spodletelo
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Pelje proti {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Pelje proti {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Brez ukazov
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Brez ukazov, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Pelje proti {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Pelje proti {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Brez ukazov
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Brez ukazov, {VELOCITY}
 
 STR_PASSENGERS                                                  :potniki
 STR_BAGS                                                        :vre�
@@ -899,9 +899,9 @@ STR_CRATES                                                      :palet
 STR_RES_OTHER                                                   :drugo
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Ni mogo�e deliti navodil ...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Ni mogo�e skopirati urnika ...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Konec ukazov v skupni rabi - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Ni mogo�e deliti navodil ...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Ni mogo�e skopirati urnika ...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Konec ukazov v skupni rabi - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ne najde poti za nadaljevanje.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} je izgubljen.
@@ -1170,15 +1170,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-velik
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :onemogo�eno
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Spremeni vrednost
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Spremeni vrednost
 
-STR_TEMPERATE_LANDSCAPE                                         :Zmerno podnebje
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub arkti�no podnebje
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub tropsko podnebje
-STR_TOYLAND_LANDSCAPE                                           :Pokrajina v deželi igra�
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Zmerno podnebje
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub arkti�no podnebje
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub tropsko podnebje
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Pokrajina v deželi igra�
 
 STR_CHEATS                                                      :{WHITE}Goljufije
-STR_CHEATS_TIP                                                  :{BLACK}Kljukice kažejo, �e so bile goljufije že kdaj uporabljene
+STR_CHEATS_TOOLTIP                                              :{BLACK}Kljukice kažejo, �e so bile goljufije že kdaj uporabljene
 STR_CHEATS_WARNING                                              :{BLACK}Pozor! Nameravaš izdati svoje tekmece. Tako sramotno dejanje bo zabeleženo za vselej.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Pove�aj denar za {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Igra kot podjetje: {ORANGE}{COMMA}
@@ -1190,177 +1190,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Spremem
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Spremeni datum: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Omogo�i spreminjanje proizvodnih vrednosti: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Pelje proti {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Pelje proti {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Pelje proti {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Pelje proti {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Pojdi skozi {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Pojdi non-stop skozi {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Pojdi skozi {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Pojdi non-stop skozi {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :To�ka poti {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :To�ka poti {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :To�ka poti
+STR_FORMAT_WAYPOINT_NAME                                        :To�ka poti {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :To�ka poti {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :To�ka poti
 
-STR_WAYPOINT                                                    :{WHITE}To�ka poti
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Izberi vrsto to�ke poti
+STR_WAYPOINT_CAPTION                                            :{WHITE}To�ka poti
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Izberi vrsto to�ke poti
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Uredi ime to�ke poti
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Ni mogo�e preimenovati to�ke poti ...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Ni mogo�e preimenovati to�ke poti ...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Pretvori tire v to�ko poti
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Ni mogo�e postaviti to�ke poti tukaj ...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Ni mogo�e odstraniti to�ke poti tukaj ...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Ni mogo�e postaviti to�ke poti tukaj ...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Ni mogo�e odstraniti to�ke poti tukaj ...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Gradi tire s pomo�jo Samodejne gradnje
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...ni mest na ozemlju
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Ustvarjanje ozemlja prekinjeno...{}...ni primernih lokacij za mesta
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...ni mest na ozemlju
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Ustvarjanje ozemlja prekinjeno...{}...ni primernih lokacij za mesta
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Ve� naklju�nih mest
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Postavi na ozemlje naklju�na mesta
-STR_MANY_RANDOM_INDUSTRIES                                      :Ve� naklju�nih industrij
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Postavi na ozemlje naklju�no industrijo
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Ni mogo�e zgraditi industrij ...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Ve� naklju�nih mest
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Postavi na ozemlje naklju�na mesta
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Ve� naklju�nih industrij
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Postavi na ozemlje naklju�no industrijo
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Ni mogo�e zgraditi industrij ...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Odpre orodje za teren in sajenje dreves, itd.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Izdelava terena
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Zravnaj zemljo
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Zravnaj zemljo
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Drevesa naklju�ne vrste
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Postavi drevesa naklju�ne vrste
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Postavi drevesa naklju�ne vrste
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Ni mogo�e zgraditi kanalov tukaj ...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Ni mogo�e zgraditi kanalov tukaj ...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Zgradi kanale.
-STR_LANDINFO_CANAL                                              :Kanal
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Ni mogo�e zgraditi zapornic tukaj ...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Ni mogo�e zgraditi zapornic tukaj ...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Gradnja zapornic
-STR_LANDINFO_LOCK                                               :Zapornica
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Zapornica
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Ni mogo�a postavitev rek tukaj...
-STR_LANDINFO_RIVER                                              :reka
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Ni mogo�a postavitev rek tukaj...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :reka
 
-STR_BUOY_IS_IN_USE                                              :{WHITE} ... boja v uporabi!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE} ... boja v uporabi!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinate: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Ni mogo�e odstraniti dela postaje ...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Ni mogo�e spremeniti tipa železnice tukaj ...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Ni mogo�e odstraniti dela postaje ...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Ni mogo�e spremeniti tipa železnice tukaj ...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Pretvori/nadgradi tip tirov
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Potegni lokomotivo sem za prodajo celotnega vlaka
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Potegni lokomotivo sem za prodajo celotnega vlaka
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Vleci in spusti
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Zgradi postajo s povleci in spusti
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Izberi vrsto postaje za prikaz
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Izberi vrsto postaje za gradnjo
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Izberi vrsto postaje za prikaz
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Izberi vrsto postaje za gradnjo
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Hitro naprej
 STR_MESSAGE_HISTORY                                             :{WHITE}Arhiv sporo�il
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Seznam zadnjih novic
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Onemogo�i vse
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Omogo�i vse
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Seznam zadnjih novic
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Onemogo�i vse
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Omogo�i vse
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrije
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prepeljano)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prepeljano)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Imena industrij - klikni na ime za pogled na industrijo
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrije
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% prepeljano)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% prepeljano)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Imena industrij - klikni na ime za pogled na industrijo
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...preblizu drugi industriji
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...preblizu drugi industriji
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Spremeni proizvodnjo
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Ve� igralcev
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ime igralca:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}To je ime, po katerem te prepoznajo drugi igralci
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Vpiši tvoje ime
-STR_NETWORK_CONNECTION                                          :{BLACK}Povezava:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Izberi med internetom ali lokalno mrezo (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Poženi strežnik
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Poženi lasten streznik
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Ime
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Ime igre
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Jezik, razli�ica strežnika, itd.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klikni na igro v seznamu, da jo izbereš
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Zadnji� obiskani strežnik:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Klikni za izbiro zadnji� obiskanega strežnika
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Najdi strežnik
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Poiš�i strežnik na mreži
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Dodaj strežnik
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Doda strežnik na seznam, ki bo vedno preverjen za pognane igre.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Vnesi naslov gostitelja
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Gosti
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Gosti na zvezi / najve� gostov{}Podjetja na zvezi / najve� podjetij
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Velikost ozemlja
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Velikost ozemlja igre{}Klikni za sortiranje po obmo�ju
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Teko�i datum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Leta
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Število let {}kar te�e igra
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}IGRA - INFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Gosti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Jezik:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Nabor ploš�ic:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Velikost ozemlja:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Razli�ica strežnika:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Naslov strežnika:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Za�etni datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Teko�i datum:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Zaš�iten z geslom!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}STREŽNIK IZKLJUČEN
-STR_NETWORK_SERVER_FULL                                         :{SILVER}STREŽNIK POLN
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}NESKLADJE RAZLIÄŒIC
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NESKLADJE GRAFIK
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Pridruži se igri
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Poženi novo igro za ve� igralcev
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Ime igre:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Ime bo prikazano drugim igralcem na ve�igralskem seznamu
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Vpiši ime za mrežno igro
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Nastavi geslo
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Zaš�iti igro z geslom, �e želiš prepre�iti dostop nepovabljenim
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Izberi ozemlje:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Kateri zemljevid želiš igrati?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Lokalno omrežje
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :Lokalno omrežje / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (oglašuj)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} gost{P "" a i ov}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Dovoljeno Å¡tevilo gostov:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Izberite najve�je število gostov. Ni potrebno, da so vsi prisotni
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} podjet{P je ji ja ij}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Dovoljeno Å¡tevilo podjetij:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Omeji strežnik na dolo�eno število podjetij
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} opazoval{P ec ca ci cev}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Najve�je število opazovalcev:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Omeji strežnik na dolo�eno število opazovalcev
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Govorni jezik:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Drugi igralci bodo lahko vedeli, kateri jezik se govori na strežniku
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Za�ni igro
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Poženi novo ve�igralsko igro na naklju�nem ozemlju
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Naloži igro
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Nadaljuj prej shranjeno ve�igralsko igro (pazi, da se povežeš kot pravilen igralec)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Ve� igralcev
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Vpiši tvoje ime
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Povezava:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Izberi med internetom ali lokalno mrezo (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Poženi strežnik
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Poženi lasten streznik
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Ime
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Ime igre
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Jezik, razli�ica strežnika, itd.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klikni na igro v seznamu, da jo izbereš
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Zadnji� obiskani strežnik:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Klikni za izbiro zadnji� obiskanega 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_ENTER_IP                                :{BLACK}Vnesi naslov gostitelja
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Gosti
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Gosti na zvezi / najve� gostov{}Podjetja na zvezi / najve� podjetij
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Velikost ozemlja
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Velikost ozemlja igre{}Klikni za sortiranje po obmo�ju
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Teko�i datum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Leta
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Število let {}kar te�e igra
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}IGRA - INFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Gosti:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Jezik:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Nabor ploš�ic:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Velikost ozemlja:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Razli�ica strežnika:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Naslov strežnika:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Za�etni datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Teko�i datum:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Zaš�iten z geslom!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}STREŽNIK IZKLJUČEN
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}STREŽNIK POLN
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}NESKLADJE RAZLIÄŒIC
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NESKLADJE GRAFIK
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Pridruži se igri
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Poženi novo igro za ve� igralcev
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Ime igre:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Ime bo prikazano drugim igralcem na ve�igralskem seznamu
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Vpiši ime za mrežno igro
+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_SELECT_MAP                             :{BLACK}Izberi ozemlje:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Kateri zemljevid želiš igrati?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Lokalno omrežje
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Lokalno omrežje / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (oglašuj)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} gost{P "" a i ov}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Dovoljeno Å¡tevilo gostov:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Izberite najve�je število gostov. Ni potrebno, da so vsi prisotni
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} podjet{P je ji ja ij}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Dovoljeno Å¡tevilo podjetij:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Omeji strežnik na dolo�eno število podjetij
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} opazoval{P ec ca ci cev}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Najve�je število opazovalcev:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Omeji strežnik na dolo�eno število opazovalcev
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Govorni jezik:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Drugi igralci bodo lahko vedeli, kateri jezik se govori na strežniku
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Za�ni igro
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Poženi novo ve�igralsko igro na naklju�nem ozemlju
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Naloži igro
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Nadaljuj prej shranjeno ve�igralsko igro (pazi, da se povežeš kot pravilen igralec)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Kakršen koli
@@ -1401,33 +1401,33 @@ STR_NETWORK_LANG_GREEK                                          :Grški
 STR_NETWORK_LANG_LATVIAN                                        :Latvijski
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Seje ve�igralskih iger
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Seje ve�igralskih iger
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Priprava na vstop:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Seznam podjetij trenutno v tej igri. Lahko se pridružiš eni ali poženeš novo, �e je kako mesto za podjetje prosto
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Novo podjetje
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Ustvari novo podjetje
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Ogled igre
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Sodeluj kot gledalec
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Pridruži se podjetju
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Pomagaj upravljati podjetje
-STR_NETWORK_REFRESH                                             :{BLACK}Osveži strežnik
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Osveži informacije strežnika
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Priprava na vstop:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Seznam podjetij trenutno v tej igri. Lahko se pridružiš eni ali poženeš novo, �e je kako mesto za podjetje prosto
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Novo podjetje
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Ustvari novo podjetje
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Ogled igre
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Sodeluj kot gledalec
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Pridruži se podjetju
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Pomagaj upravljati podjetje
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Osveži strežnik
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Osveži informacije strežnika
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}PODATKI O PODJETJU
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}PODATKI O PODJETJU
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Ime podjetja:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Ustanovljeno:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Vrednost podjetja:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Trenutno stanje:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Lanski dohodek:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Ocene:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Ime podjetja:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Ustanovljeno:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Vrednost podjetja:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Trenutno stanje:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Lanski dohodek:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Ocene:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Vozila:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Postaje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Igralci:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vozila:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Postaje:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Igralci:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Povezujem...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Povezujem...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Povezujem..
@@ -1443,49 +1443,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Iš�em
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} gost{P "" a i ov} je pred tabo
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} prenesenih
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Odklopi
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Odklopi
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vpiši znesek denarja za darovanje
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Strežnik je zaš�iten.Vnesi geslo
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Podjetje je zaš�iteno. Vnesi geslo
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Seznam gostov
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Seznam gostov
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Opazuj
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Novo podjetje
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ni najdenih mrežnih naprav ali ni aktiviran ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Ni mogo�e najti mrežnih iger
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Strežnik ni odgovoril zahtevi
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Nemogo�a povezava zaradi neskladja datotek NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Sinhronizacija mrežne igre ni uspela
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Povezava mrežne igre je padla
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Ni mogo�e naložiti shranjene igre
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Nemogo� zagon strežnika
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Nemogo�a povezava
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Povezava #{NUM} je potekla
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Narejena je bila napaka protokola in povezava je bila prekinjena
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Razli�ica tega gosta je neskladna s strežnikovo razlicico
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Napa�no geslo
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Strežnik je zaseden
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Izvrzen/a si iz tega streznika
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Brcnjen/a si bil/a iz igre
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Goljufanje ni dovoljeno na tem strežniku
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Ni najdenih mrežnih naprav ali ni aktiviran ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Ni mogo�e najti mrežnih iger
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Strežnik ni odgovoril zahtevi
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Nemogo�a povezava zaradi neskladja datotek NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Sinhronizacija mrežne igre ni uspela
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Povezava mrežne igre je padla
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Ni mogo�e naložiti shranjene igre
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Nemogo� zagon strežnika
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Nemogo�a povezava
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Povezava #{NUM} je potekla
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Narejena je bila napaka protokola in povezava je bila prekinjena
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Razli�ica tega gosta je neskladna s strežnikovo razlicico
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Napa�no geslo
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Strežnik je zaseden
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Izvrzen/a si iz tega streznika
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Brcnjen/a si bil/a iz igre
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Goljufanje ni dovoljeno na tem strežniku
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :splošna napaka
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desinhronizacijska napaka
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :nemogo�e nalaganje zemljevida
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :povezava prekinjena
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :napaka protokola
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF neskladje
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :nepooblaš�en
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :sprejet je bil �uden paket
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :napa�na razli�ica
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :ime je že v uporabi
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :napa�no geslo
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :napa�na oznaka podjetja v DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :brcnjen od gostitelja
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :je poskusil/a uporabiti goljufanje
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :gostitelj zaseden
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :splošna napaka
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desinhronizacijska napaka
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :nemogo�e nalaganje zemljevida
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :povezava prekinjena
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :napaka protokola
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF neskladje
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :nepooblaš�en
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :sprejet je bil �uden paket
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :napa�na razli�ica
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :ime je že v uporabi
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :napa�no geslo
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :napa�na oznaka podjetja v DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :brcnjen od gostitelja
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :je poskusil/a uporabiti goljufanje
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :gostitelj zaseden
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1495,15 +1495,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Igra v pavzi (p
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Igra obnovljena (gost povezan)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Igra obnovljena (gost se ni uspel priklju�iti)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :zapuš�a
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} pristopa k igri
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} se pridružuje podjetju #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} se pridružuje opazovalcem
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} na novo ustvarja podjetje (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} odstopa od igre ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} je opravil/a spremembo imena v {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} je podarilo tvojemu podjetju {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Podjetju {1:STRING} je bil podarjen znesek {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :zapuš�a
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} pristopa k igri
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} se pridružuje podjetju #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} se pridružuje opazovalcem
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} na novo ustvarja podjetje (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} odstopa od igre ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} je opravil/a spremembo imena v {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} je podarilo tvojemu podjetju {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Podjetju {1:STRING} je bil podarjen znesek {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Skupina] :
 STR_NETWORK_CHAT_COMPANY                                        :[Skupina] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Skupina] Za {STRING}: {WHITE}{STRING}
@@ -1513,8 +1513,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privatno] Za {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Vsi] :
 STR_NETWORK_CHAT_ALL                                            :[Vsi] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Vpiši tekst za mrežni pogovor
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Strežnik je zaprl sejo
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Strežnik se zaganja...{}Prosim po�akaj...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Strežnik je zaprl sejo
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Strežnik se zaganja...{}Prosim po�akaj...
 
 STR_NETWORK_SERVER                                              :Strežnik
 STR_NETWORK_CLIENT                                              :Gost
@@ -1528,19 +1528,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Pogovor podjetj
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privatno sporo�ilo
 
 
-STR_NETWORK_SEND                                                :{BLACK}Pošlji
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Pošlji
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Ni mogo�e naložiti ozemlja iz PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...datoteke ni.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nemogo�a pretvorba vrste slike. Potrebuješ 8 ali 24-bit PNG sliko.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...nekaj je narobe. (najbrž nepopolna datoteka)
+STR_ERROR_PNGMAP                                                :{WHITE}Ni mogo�e naložiti ozemlja iz PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...datoteke ni.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nemogo�a pretvorba vrste slike. Potrebuješ 8 ali 24-bit PNG sliko.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...nekaj je narobe. (najbrž nepopolna datoteka)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Ni mogo�e naložiti pokrajine iz formata BMP ...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE} ... ni mogo�e spremeniti tipa slike.
+STR_ERROR_BMPMAP                                                :{WHITE}Ni mogo�e naložiti pokrajine iz formata BMP ...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE} ... ni mogo�e spremeniti tipa slike.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Cena: {CURRENCY}
@@ -1554,13 +1554,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Predvide
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Tukaj ni možen dvig terena ...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Tukaj ni možno nižanje terena ...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Nemogo�a izravnava zemlje tukaj...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Kamenje
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Neravna tla
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Gola tla
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Trava
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Polja
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Zasnežen teren
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Puš�ava
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kamenje
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Neravna tla
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Gola tla
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Trava
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Polja
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Zasnežen teren
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Puš�ava
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Teren nagnjen v napa�no smer
@@ -1568,11 +1568,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Nemogo�
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Izkop bi lahko poškodoval predor...
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Že na morski gladini
 STR_ERROR_TOO_HIGH                                              :{WHITE}Previsoko
-STR_ALREADY_LEVELLED                                            :{WHITE}... je že zravnana
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... je že zravnana
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Ni primernih tra�nic
 STR_ERROR_ALREADY_BUILT                                         :{WHITE} ... že zgrajeno
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Najprej odstrani tra�nice
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Cesta je enosmerna ali blokirana
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Cesta je enosmerna ali blokirana
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Gradnja železnice
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrificirana Železnica
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Gradnja enotirne železnice
@@ -1596,41 +1596,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Zgradi Å
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Zgradi žel. most
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Zgradi žel. predor
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Preklopi gradnja/rušenje železniških semaforjev
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Izbira mostu - klikni na željeni most za izgradnjo
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Izbira mostu - klikni na željeni most za izgradnjo
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Izberi smer železniške garaže
-STR_RAILROAD_TRACK                                              :Železniška proga
-STR_RAILROAD_TRAIN_DEPOT                                        :Železniška garaža
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Železniška proga
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Železniška garaža
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE} ... zemljiš�e je last drugega podjetja
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Železniški tiri z normalnimi signali
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Železniški tiri s pred-signali
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Železniški tiri z izhodnimi signali
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Železniški tiri s kombiniranimi signali
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Železnica z naprednimi signali
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Železnica z enosmernimi signali
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Tiri z normalnimi in uvodnimi signali
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Tiri z normalnimi in izhodnimi signali
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Železniški tiri z normalnimi in kombiniranimi signali
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Železnica z navadnimi in naprednimi signali
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Železnica z navadnimi in enosmernimi naprednimi signali
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Tiri z uvodnimi in izhodnimi signali
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Železniški tiri s pred- in kombiniranimi signali
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Železnica s pred- in naprednimi signali
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Železnica s pred- in enosmernimi naprednimi signali
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Železniški tiri z izhodnimi in kombiniranimi signali
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Železnica z izhodnimi in naprednimi signali
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Železnica z izhodnimi in enosmernimi naprednimi signali
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Železnica s kombiniranimi in naprednimi signali
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Železnica s kombiniranimi in enosmernimi naprednimi signali
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Železnica z naprednimi in enosmernimi naprednimi signali
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Najprej moraš odstraniti železniško postajo
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Izgradnja lo�ene postaje
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Združi postaje
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Železniški tiri z normalnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Železniški tiri s pred-signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Železniški tiri z izhodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Železniški tiri s kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Železnica z naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Železnica z enosmernimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Tiri z normalnimi in uvodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Tiri z normalnimi in izhodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Železniški tiri z normalnimi in kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Železnica z navadnimi in naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Železnica z navadnimi in enosmernimi naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Tiri z uvodnimi in izhodnimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Železniški tiri s pred- in kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Železnica s pred- in naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Železnica s pred- in enosmernimi naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Železniški tiri z izhodnimi in kombiniranimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Železnica z izhodnimi in naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Železnica z izhodnimi in enosmernimi naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Železnica s kombiniranimi in naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Železnica s kombiniranimi in enosmernimi naprednimi signali
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Železnica z naprednimi in enosmernimi naprednimi signali
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Najprej moraš odstraniti železniško postajo
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Izgradnja lo�ene postaje
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Združi postaje
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Najprej odstrani cesto
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Cestna dela napredujejo
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Cestna dela napredujejo
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Cestne gradnje
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Gradnja tramvaj proge
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Izberi cestni most
@@ -1666,14 +1666,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Zgradi p
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Omogo�i/onemogo�i enosmerne ceste
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Preklopi gradnja/rušenje cestnih konstrukcij
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Preklop gradi/odstrani za tramvaj progo
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Izberi smer garaže
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Izberi orijentacijo tramvaj garaže
-STR_ROAD_DESCRIPTION_ROAD                                       :Cesta
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Cesta z razsvetljavo
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Drevored
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Garaža
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Cestno/železniško križiš�e
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :tramvaj
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Izberi smer garaže
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Izberi orijentacijo tramvaj garaže
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Cesta
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Cesta z razsvetljavo
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Drevored
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Garaža
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Cestno/železniško križiš�e
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :tramvaj
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Ni mogo�a odstranitev avtobusne postaje...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Ni mogo�a odstranitev tovorne postaje...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Nemogo�a odstranitev potniške tramvaj postaje...
@@ -1681,12 +1681,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Nemogo�
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Mesta
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Najprej mora biti stavba porušena
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Mesto)
@@ -1699,9 +1699,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Premakni
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Spremeni ime mesta
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Potnikov prejšnji mesec: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Pošte prejšnji mesec: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Koli�ina potrebnega tovora za rast mesta:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} potrebno
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} podeljeno zadnji mesec
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Koli�ina potrebnega tovora za rast mesta:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} potrebno
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} podeljeno zadnji mesec
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Visok pisarniški blok
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Pisarniški blok
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Majhen blok
@@ -1738,7 +1738,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Subvencija odobrena podjetju {STRING}!{}{}Prevoz {STRING.r} od {STATION} do {STATION} bo prinesel trikratni prihodek{}za naslednje leto!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Subvencija podeljena podjetju{STRING}!{}{}Prevoz {STRING.r} od {STATION} do {STATION} bo prinesel Å¡tirikratni prihodek{}za naslednje leto!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} mestni svet prepoveduje gradnjo še enega letališ�a v tem mestu
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :Lokalne oblasti mesta {WHITE}{TOWN}  ne dovolijo gradnje letališ�a zaradi hrupa
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :Lokalne oblasti mesta {WHITE}{TOWN}  ne dovolijo gradnje letališ�a zaradi hrupa
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Ko�e
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Hiše
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Stanovanja
@@ -1774,7 +1774,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Prometni kaos v mestu {TOWN}!{}{}Obnovitvena dela, ki jih financira podjetje {STRING},{}bodo prinesla 6 mesecev nevše�nosti{}voznikom motornih vozil!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (v izgradnji)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (v izgradnji)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglu
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipiji
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Čajnik-hiša
@@ -1788,17 +1788,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Postavi znak
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Drevesa
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE} ... drevo je že posajeno
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Ne moreš posaditi drevesa tukaj ...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE} ... preve� znakov
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Ne moreš postaviti znaka tukaj
-STR_SIGN_DEFAULT                                                :Znak
+STR_DEFAULT_SIGN_NAME                                           :Znak
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Uredi znak
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Ne moreš spremeniti imena znaka ...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Nemogo�e brisanje znaka...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Izberi vrsto drevesa za sajenje
-STR_TREE_NAME_TREES                                             :Drevesa
-STR_TREE_NAME_RAINFOREST                                        :Deževni gozd
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusi
+STR_LAI_TREE_NAME_TREES                                         :Drevesa
+STR_LAI_TREE_NAME_RAINFOREST                                    :Deževni gozd
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusi
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Izbira železniške postaje
@@ -1818,7 +1818,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Najprej
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Preblizu sosednjemu letališ�u
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Najprej je potrebno porušiti letališ�e
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Preimenuj postajo
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Preimenuj postajo
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Ni mogo�e preimenovati postaje
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ocene
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Sprejema
@@ -1836,10 +1836,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Sijajno
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Prikaz vsah vlakov, ki imajo to postajo na urniku
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Prikaz vseh cestnih vozil, ki imajo to postajo na urniku
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Prikaz vseh letal, ki imajo to postajo na urniku
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Prikaz vseh ladij, ki imajo to postajo na urniku
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Prikaz vsah vlakov, ki imajo to postajo na urniku
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Prikaz vseh cestnih vozil, ki imajo to postajo na urniku
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Prikaz vseh letal, ki imajo to postajo na urniku
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Prikaz vseh ladij, ki imajo to postajo na urniku
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} ne sprejema ve� {STRING.r}
@@ -1872,47 +1872,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Spremeni
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Prikaži seznam sprejetega tovora
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Imena postaj - klikni na ime za pogled na postajo
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Izbira velikosti/tipa letališ�a
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Železniška postaja
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Letališ�e
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Tovorna postaja
-STR_STATION_DESCRIPTION_BUS_STATION                             :Avtobusna postaja
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Pristaniš�e
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Železniška postaja
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Letališ�e
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Tovorna postaja
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Avtobusna postaja
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Pristaniš�e
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Osvetli zajemno obmo�je predvidene lokacije
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Ne osvetli zajemnega obmo�ja predvidene lokacije
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Osvetlitev obmo�ja zajema
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Pristaniš�e
-STR_STATION_DESCRIPTION_BUOY                                    :Boja
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boja
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE} ... boja na poti
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE} ... postaja preve� razširjena
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE} ... nehomogene postaje izklopljene
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Drži CTRL za izbor ve� stvari
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE} ... nehomogene postaje izklopljene
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Drži CTRL za izbor ve� stvari
 
 STR_UNDEFINED                                                   :(nedefinirana vrstica)
-STR_STAT_CLASS_DFLT                                             :Privzeta postaja
-STR_STAT_CLASS_WAYP                                             :To�ke poti
+STR_STATION_CLASS_DFLT                                          :Privzeta postaja
+STR_STATION_CLASS_WAYP                                          :To�ke poti
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientacija ladjedelnice
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE} ...mora biti zgrajeno na vodi
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Nemogo�a gradnja ladjedelnice tukaj ...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Izberi orientacijo ladjedelnice
-STR_WATER_DESCRIPTION_WATER                                     :Voda
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Obala ali nabrežje
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Ladjedelnica
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :vodovod
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Voda
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Obala ali nabrežje
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Ladjedelnica
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :vodovod
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE} ... Nemogo�a gradnja na vodi
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Najprej moraš porušiti kanal
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Najprej moraš porušiti kanal
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Shrani igro
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Naloži igro
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Shrani
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Izbriši
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Gledalec, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Gledalec, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} prosto
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Nemogo�e branje pogona
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Shranjevanje igre ni uspelo{}{STRING}
@@ -1928,12 +1928,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Seznam p
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Trenutno izbrano ime za shranjevanje
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Izbriši trenutno izbrano shranjeno igro
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Shrani trenutno igro z izbranim imenom
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Ustvari naklju�no novo igro
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Naloži višinsko karto
-STR_SAVE_OSKTITLE                                               :{BLACK}Vpiši ime za shranjeno igro
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Ustvari naklju�no novo igro
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Naloži višinsko karto
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Vpiši ime za shranjeno igro
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} na poti
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} na poti
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Premogovnik
 STR_INDUSTRY_NAME_COAL_MINE.r                                   :Premogovnika
@@ -2028,7 +2028,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Pogled na industrijo
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Na novo se gradi {STRING} blizu mesta {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}Postavlja se {STRING} blizu mesta {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Cena: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Cena: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Nemogo�a gradnja tega tipa industrije tukaj...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE} ... gozd je mogo�e posaditi samo nad nivojem snežne odeje
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} napoveduje prete�e zapiranje!
@@ -2046,16 +2046,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Obstoje�i predor v napoto
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Predor se kon�a izven ozemlja
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Predor se kon�a izven ozemlja
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Nemogo� izkop zaklju�ka predora na drugi strani
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Najprej moraš porušiti predor
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Najprej moraš porušiti most
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Ni mogo�e za�eti in kon�ati v isti to�ki
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Priklju�ki mosta niso na enaki višini
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Most je prenizek za teren
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Ni mogo�e za�eti in kon�ati v isti to�ki
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Priklju�ki mosta niso na enaki višini
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Most je prenizek za teren
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Za�etek in konec morata biti na isti višini
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Lokacija neprimerna za vhod v predor
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Vise�, Jeklen
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Nosilni, Jeklen
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Nosilni križi, Jeklen
@@ -2066,30 +2066,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Cevast, Jeklen
 STR_BRIDGE_TUBULAR_SILICON                                      :Cevast, Silicijev
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Tukaj ni mogo�e zgraditi mostu ...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Tukaj ni mogo�e zgraditi predora ...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Železniški predor
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Cestni predor
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Vise� jeklen železniški most
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Železniški most z jeklenimi križi
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Železniški most z jeklenim obokom
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Oja�an vise� betonski železniški most
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Lesen železniški most
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonski železniški most
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Vise� jeklen cestni most
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Cestni most z jeklenimi križi
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Cestni most z jeklenim obokom
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Oja�an vise� betonski cestni most
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Lesen cestni most
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonski cestni most
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Cevast železniški most
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Cevast cestni most
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Železniški predor
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Cestni predor
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Vise� jeklen železniški most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Železniški most z jeklenimi križi
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Železniški most z jeklenim obokom
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Oja�an vise� betonski železniški most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Lesen železniški most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonski železniški most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Vise� jeklen cestni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Cestni most z jeklenimi križi
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Cestni most z jeklenim obokom
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Oja�an vise� betonski cestni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Lesen cestni most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonski cestni most
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Cevast železniški most
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Cevast cestni most
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Ovira na poti
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Oddajnik
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Svetilnik
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sedež podjetja
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Oddajnik
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Svetilnik
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sedež podjetja
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE} ... sedež podjetja na poti
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Ozemlje v lasti podjetja
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Ozemlje v lasti podjetja
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Nemogo� nakup tega zemljiš�a ...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE} ... imaš ga že v lasti!
 
@@ -2135,7 +2135,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Postaj
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Težavnostna stopnja
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Shrani
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Shrani
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Preprosto
@@ -2208,8 +2208,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Barvna sh
 STR_LIVERY_CAPTION                                              :{WHITE}Nova barvna shema
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Ime podjetja
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Ime lastnika
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Ime podjetja
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Ime lastnika
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Ime podjetja
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Ime lastnika
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Ni mogo�e spremeniti imena podjetja ...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Ni mogo�e spremeniti imena lastnika ...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finance {BLACK}{COMPANYNUM}
@@ -2233,11 +2233,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Skupaj:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graf prihodkov
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graf �istega dobi�ka
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Ban�no stanje
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Posojilo
-STR_MAX_LOAN                                                    :{WHITE}Meja posojila:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Meja posojila:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Izposoja {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Vra�ilo {SKIP}{SKIP}{CURRENCY}
@@ -2246,7 +2246,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Ni mogoÄ
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE} ... ni posojila za odpla�ati
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}... potrebuješ {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Ni mogo�e odpla�ati posojila ...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Ni mogo�a oddaja denarja, ki je izposojen od banke...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Ni mogo�a oddaja denarja, ki je izposojen od banke...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Izberi nov obraz za lastnika
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Spremeni barvo vozil podjetja
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Spremeni ime lastnika
@@ -2256,10 +2256,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Odpla�a
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Lastnik)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Ustanovljeno: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vozila:
-STR_TRAINS                                                      :{WHITE}{COMMA} vlak{P "" a i ov}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} cestn{P o i a ih} vozil{P o i a ""}
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} letalo
-STR_SHIPS                                                       :{WHITE}{COMMA} lad{P ja ji je ij}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} vlak{P "" a i ov}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} cestn{P o i a ih} vozil{P o i a ""}
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} letalo
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} lad{P ja ji je ij}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Brez
 STR_FACE_CAPTION                                                :{WHITE}Izbira obraza
 STR_FACE_MALE_BUTTON                                            :{BLACK}Moški
@@ -2272,9 +2272,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Izberi Å
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Naredi naklju�no novo sliko
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Klju�
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Prikaži klju�e grafov
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Prikaz detajliranih ocen uspeha
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Prikaz detajliranih ocen uspeha
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Klju�i grafov podjetij
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klikni sem za vklop/izklop prikaza grafov podjetja
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klikni sem za vklop/izklop prikaza grafov podjetja
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Enot dostavljenega tovora
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Ocene uspeha podjetja (max=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Vrednosti podjetij
@@ -2308,23 +2308,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Predsednik
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Velekapitalist
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Zgradi sedež podjetja
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Zgradi sedež podjetja / poglej sedež podjetja
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Preseli sedež podjetja drugam za ceno 1% vrednosti podjetja
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Preseli sedež podjetja drugam za ceno 1% vrednosti podjetja
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Nemogo�a gradnja sedeža podjetja
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Poglej sedež podjetja
-STR_RELOCATE_HQ                                                 :{BLACK}Preseli sedež
-STR_COMPANY_JOIN                                                :{BLACK}Pridruži se
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Pridruži se in igraj kot to podjetje
-STR_COMPANY_PASSWORD                                            :{BLACK}Geslo
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Zaš�iti svoje podjetje z geslom, da prepre�iš priklju�itev drugih uporabnikov k podjetju.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Nastavi geslo podjetja
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Preseli sedež
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Pridruži se
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Pridruži se in igraj kot to podjetje
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Geslo
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Zaš�iti svoje podjetje z geslom, da prepre�iš priklju�itev drugih uporabnikov k podjetju.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Nastavi geslo podjetja
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Ne shrani vnešenega gesla
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Dodeli družbi novo geslo
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Geslo družbe
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Privzeto geslo družbe
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Uporabi geslo te družbe kot privzeto za nove družbe
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Privzeto geslo družbe
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Uporabi geslo te družbe kot privzeto za nove družbe
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Svetovna recesija!{}{}Ekonomisti se bojijo najhujšega ob trenutnem poteku dogodkov!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Konec recesije!{}{}Izboljšanje trgovanja pove�uje zaupanje doma�e industrije, gospodarstvo napreduje!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Preklopi veliko/majhno velikost okna
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Preklopi veliko/majhno velikost okna
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Vrednost podjetja: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Kupi 25% delnic podjetja
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Prodaj 25% delnic podjetja
@@ -2334,7 +2334,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Ni mogoÄ
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Ni mogo�e prodati 25% delnic tega podjetja ...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% v lasti podjetja {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :Podjetje {BLACK}{BIGFONT}{STRING} je bilo prevzeto s strani podjetja {STRING}!
-STR_PROTECTED                                                   :{WHITE}Podjetje Å¡e ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ...
+STR_ERROR_PROTECTED                                             :{WHITE}Podjetje Å¡e ni dovolj staro, da bi lahko trgovalo z lastnimi delnicami ...
 
 STR_LIVERY_DEFAULT                                              :Standardni pogon
 STR_LIVERY_STEAM                                                :Parna lokomotiva
@@ -2360,14 +2360,14 @@ STR_LIVERY_LARGE_PLANE                                          :Veliko letalo
 STR_LIVERY_PASSENGER_TRAM                                       :Potniški tramvaj
 STR_LIVERY_FREIGHT_TRAM                                         :Tovorni tramvaj
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Prikaz glavnih barvnih shem
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Prikaz barvnih shem vlakov
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Prikaz barvnih shem cestnih vozil
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Prikaz barvnih shem ladij
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Prikaz barvnih shem letal
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Izberi glavno barvo za izbrano shemo
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Izberi drugo barvo za izbrano shemo
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Izberi barvno shemo za zamenjati ali ve� shem s CTRL+klik. Klikni na okno za preklop sheme
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Prikaz glavnih barvnih shem
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Prikaz barvnih shem vlakov
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Prikaz barvnih shem cestnih vozil
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Prikaz barvnih shem ladij
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Prikaz barvnih shem letal
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Izberi glavno barvo za izbrano shemo
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Izberi drugo barvo za izbrano shemo
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Izberi barvno shemo za zamenjati ali ve� shem s CTRL+klik. Klikni na okno za preklop sheme
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Parna)
@@ -2675,9 +2675,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ne razloži in
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Spremeni na�in ustavljanja za ozna�en ukaz
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Spremeni na�in polnjenja ozna�enega ukaza
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Spremeni na�in praznjenja ozna�enega ukaza
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Vstavi napreden ukaz
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Vstavi napreden ukaz
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Pojdi v najbližjo garažo
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Pojdi v najbližji hangar
 STR_ORDER_NEAREST_DEPOT                                         :najbližjo
@@ -2687,9 +2687,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Na servis non-s
 STR_ORDER_TRAIN_DEPOT                                           :Železniška garaža
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Cestna garaža
 STR_ORDER_SHIP_DEPOT                                            :Ladijska garaža
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Vedno pojdi
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servisiraj po potrebi
@@ -2714,10 +2714,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :je ve�ja kot
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :je ve�ja ali enaka kot
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :dejavno
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :nedejavno
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Sko�i na ukaz {COMMA}
-STR_CONDITIONAL_NUM                                             :Sko�i na ukaz {COMMA}, ko je {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Sko�i na ukaz {COMMA}, ko je {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Sko�i na ukaz {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Sko�i na ukaz {COMMA}, ko je {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Sko�i na ukaz {COMMA}, ko je {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Brez potovanja
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Potovanje (brez �asovnih tabel)
@@ -2740,18 +2740,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Vlaki so
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Presko�i
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Izbriši
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Pojdi do
-STR_REFIT                                                       :{BLACK}Predelaj
-STR_REFIT_TIP                                                   :{BLACK}Izberi predelavo za vrsto tovora, ki ga želiš. CTRL + klik za odstranitev ukaza predelave
-STR_REFIT_ORDER                                                 :(Predelaj za {STRING})
-STR_REFIT_STOP_ORDER                                            :(Predelava v {STRING} in zaustavitev)
-STR_STOP_ORDER                                                  :(Stop)
-STR_TIMETABLE_VIEW                                              :{BLACK}ÄŒasovna tabela
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Preklop na pogled �asovnih tabel
-STR_ORDER_VIEW                                                  :{BLACK}Ukazi
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Preklop na pogled ukazov
+STR_ORDER_REFIT                                                 :{BLACK}Predelaj
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Izberi predelavo za vrsto tovora, ki ga želiš. CTRL + klik za odstranitev ukaza predelave
+STR_ORDER_REFIT_ORDER                                           :(Predelaj za {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Predelava v {STRING} in zaustavitev)
+STR_ORDER_STOP_ORDER                                            :(Stop)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}ÄŒasovna tabela
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Preklop na pogled �asovnih tabel
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ukazi
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Preklop na pogled ukazov
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Ukazi)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Konec ukazov - -
-STR_SERVICE                                                     :{BLACK}Servis
+STR_ORDER_SERVICE                                               :{BLACK}Servis
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Zgrajeno: {LTBLUE}{NUM}{BLACK} Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Vrednost: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2771,7 +2771,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vozilo n
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}vozilo, ki ima skupni ukaz, ne more do tiste postaje
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Ni mogo�e premakniti vozila ...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Zadnja lokomotiva vedno sledi prvi
-STR_CARGO_N_A                                                   :Ni na voljo{SKIP}
+STR_QUANTITY_N_A                                                :Ni na voljo{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Ni mogo�e najti poti do najbližje garaže
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}IObdobje servisiranja: {LTBLUE}{COMMA}dni{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Obdobje servisiranja: {LTBLUE}{COMMA}%{BLACK}   Zadnji servis: {LTBLUE}{DATE_LONG}
@@ -2791,10 +2791,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}ÄŒasovna
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Spremeni �as, ki naj bi ga ozna�eni ukaz porabil
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Po�isti �as za ozna�en ukaz
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Resetiraj števec zamud, da bodo vozila to�na
-STR_SERVICE_HINT                                                :{BLACK}Presko�i ta ukaz, razen �e je potreben servis
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Cena: {CURRENCY} Teža: {WEIGHT_S}{}Hitrost: {VELOCITY}  Mo�: {POWER}{}Cena delovanja: {CURRENCY}/leto{}Zmogljivost: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Cena: {CURRENCY} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO}, {CARGO}{}Cena delovanja: {CURRENCY}/leto
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Cena: {CURRENCY} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO}{}Cena delovanja: {CURRENCY}/leto
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Presko�i ta ukaz, razen �e je potreben servis
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {CURRENCY} Teža: {WEIGHT_S}{}Hitrost: {VELOCITY}  Mo�: {POWER}{}Cena delovanja: {CURRENCY}/leto{}Zmogljivost: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cena: {CURRENCY} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO}, {CARGO}{}Cena delovanja: {CURRENCY}/leto
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cena: {CURRENCY} Max. hitrost: {VELOCITY}{}Zmogljivost: {CARGO}{}Cena delovanja: {CURRENCY}/leto
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Starost: {LTBLUE}{STRING}{BLACK}   Cena delovanja: {LTBLUE}{CURRENCY}/leto
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. hitrost: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Teža: {LTBLUE}{WEIGHT_S} {BLACK}Mo�: {LTBLUE}{POWER}{BLACK} Max. hitrost: {LTBLUE}{VELOCITY}
@@ -2813,27 +2813,27 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Uni�en!
 STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK}Železniška nesre�a!{}{COMMA} ponesre�en{P ec ca ci cev} {P je sta so je} umrl{P "" a i o} v plamenih po trku
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Ni mogo�e spremeniti smeri vlaka ...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Ni mo� obrniti vozil, sestavljenih iz ve�ih enot
-STR_CLEAR_TIME                                                  :{BLACK}Po�isti �as
-STR_RESET_LATENESS                                              :{BLACK}Resetiraj  Late Counter
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Spremeni ime to�ke poti
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Po�isti �as
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Resetiraj  Late Counter
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Spremeni ime to�ke poti
 
-STR_TRAIN_STOPPING                                              :{RED}Se ustavlja
-STR_TRAIN_STOPPING_VEL                                          :{RED}Se ustavlja, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Nezdružljiv tip tirov
-STR_TRAIN_NO_POWER                                              :{RED}Ni napetosti
-STR_TRAIN_START_NO_CATENARY                                     :Ta proga nima napetostnih vodov, zato vlak ne more z mesta
-STR_TRAIN_STUCK                                                 :{ORANGE}ÄŒaka na prosto pot
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Se ustavlja
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Se ustavlja, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Nezdružljiv tip tirov
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ni napetosti
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Ta proga nima napetostnih vodov, zato vlak ne more z mesta
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}ÄŒaka na prosto pot
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Novo! {STRING} sedaj na razpolago!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Novo! {STRING} sedaj na razpolago!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Ni mogo�a prodaja uni�enega vozila...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Nemogo�a predelava uni�enega vozila...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Ni mogo�a prodaja uni�enega vozila...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Nemogo�a predelava uni�enega vozila...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Nemogo�e dolo�iti �asa vozilu...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Vozila lahko �akajo le na postajah.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}To vozilo se ne ustavlja na tej postaji.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Nemogo�e dolo�iti �asa vozilu...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Vozila lahko �akajo le na postajah.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}To vozilo se ne ustavlja na tej postaji.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Spremeni �as
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}To vozilo trenutno vozi po to�nem �asu
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}To vozilo zamuja za  {STRING} .
@@ -2847,7 +2847,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Avtomats
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE} ... mora biti ustavljen v garaži
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Ni mogo�e najti najbližje garaže
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Prisilno obrni vozilo
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Zmogljivost: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Zmogljivost: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} vozil{P o i a ""}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2873,11 +2873,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Postavi bojo, ki je lahko uporabljena kot to�ka poti
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Ni mogo�e postaviti boje tukaj ...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Gradnja vodovoda
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Ni mogo�a gradnja vodovoda tukaj...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Ni mogo�a gradnja vodovoda tukaj...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Predelaj)
 STR_REFIT_TITLE                                                 :{GOLD}Izberi tip tovora:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova zmogljivost: {GOLD}{CARGO}{}{BLACK}Cena predelave: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(spremenljivo)
+STR_PURCHASE_INFO_REFITTABLE                                    :(spremenljivo)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Letališ�a
@@ -2890,7 +2890,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Zgradi l
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Prebivalci praznujejo . . .{}Prvo letalo pristalo na letališ�u {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Letalska nesre�a!{}{COMMA} mrt{P ev va vi vih} v plamenih na letališ�u {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Letalska nesre�a!{}Letalu je zmanjkalo goriva, v strmoglavljenju {COMMA} mrt {P ev va vi vih}l!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (ÄŒasovna tabela)
 
@@ -2903,13 +2903,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Rudnik premoga puš�a opustošenje v okolici mesta {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Poplave!{}Vsaj {COMMA} pogrešanih, najverjetneje mrtvih ob mo�nih neurjih!
 
-STR_BRIBE_FAILED                                                :{WHITE}Tvoj poskus podkupovanja je bil
-STR_BRIBE_FAILED_2                                              :{WHITE}odkrit s strani regionalnih preiskovalcev
-STR_BUILD_DATE                                                  :{BLACK}Zgrajeno: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Tvoj poskus podkupovanja je bil
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}odkrit s strani regionalnih preiskovalcev
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Zgrajeno: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Razred postaje: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Vrsta postaje: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Razred postaje: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Vrsta postaje: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Detajlirana ocena uspeha
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Detajl
@@ -2929,28 +2929,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Denar:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Posojilo:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Skupaj:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Število vozil: všteta so cestna vozila, vlaki, ladje, letala
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Število delov postaj. Vsak del postaje (avtobusna, letališ�e) je štet, tudi �e so povezani v eno
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Dobi�ek vozila z najnižjim prihodkom (vsa starejša vozila od 2 let)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Mese�ni znesek denarja z najnižjim dobi�kom od zadnjih 12 �etrtin
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Mese�ni znesek denarja z najvišjim dobi�kom zadnjih 12 �etrtin
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Enote tovora, dostavljene v zadnjih 4 �etrtinah
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Število tipov tovora dostavljenega v zadnji �etrtini
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Znesek denarja podjetja na banki
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Znesek posojila podjetja
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Skupno to�k od vseh možnih
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Število vozil: všteta so cestna vozila, vlaki, ladje, letala
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Število delov postaj. Vsak del postaje (avtobusna, letališ�e) je štet, tudi �e so povezani v eno
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Dobi�ek vozila z najnižjim prihodkom (vsa starejša vozila od 2 let)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Mese�ni znesek denarja z najnižjim dobi�kom od zadnjih 12 �etrtin
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Mese�ni znesek denarja z najvišjim dobi�kom zadnjih 12 �etrtin
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Enote tovora, dostavljene v zadnjih 4 �etrtinah
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Število tipov tovora dostavljenega v zadnji �etrtini
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Znesek denarja podjetja na banki
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Znesek posojila podjetja
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Skupno to�k od vseh možnih
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF nastavitve
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži nastavitve NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF nastavitve
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Potrdi spremembe
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Preklop palete
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Preklopi paleto izbranega NewGRF.{}To je potrebno storiti, �e grafike iz NewGRF dobijo rožnato barvo
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Nastavi parametre
-STR_NEWGRF_FILENAME                                             :{BLACK}Ime datoteke: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potrdi spremembe
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Preklop palete
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Preklopi paleto izbranega NewGRF.{}To je potrebno storiti, �e grafike iz NewGRF dobijo rožnato barvo
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavi parametre
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Ime datoteke: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Pripravljaš se narediti spremembe na zagnani igri; to lahko sesuje OpenTTD.{}Si zagotovo želiš tega?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2973,34 +2973,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Poskus uporabe
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} vsebuje eno poškodovano sli�ico. Vse poškodovane sli�ice se bodo prikazale kot rde�i vprašaji (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Vsebuje ve�kratne Action 8 vnose.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Naloži izbrano prednastavitev
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Shrani prednastavitev
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Shrani teko�i seznam kot prednastavitev
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Vpisi ime za prednastavitev
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Izbriši prednastavitev
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Brisanje trenutno izbrane prednastavitve
-STR_NEWGRF_ADD                                                  :{BLACK}Dodaj
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Dodaj NewGRF datoteko na seznam
-STR_NEWGRF_REMOVE                                               :{BLACK}Odstrani
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Odstrani izbrano NewGRF datoteko iz seznama
-STR_NEWGRF_MOVEUP                                               :{BLACK}Premakni gor
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Premakne izbrano NewGRF gor po seznamu
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Premakni dol
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Premakne izbrano NewGRF dol po seznamu
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Seznam nameš�enih NewGRF datotek. Klikni datoteko za spremembo parametrov
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametri: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Vnesi NewGRF parametre
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ni informacij
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Naloži izbrano prednastavitev
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Shrani prednastavitev
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Shrani teko�i seznam kot prednastavitev
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Vpisi ime za prednastavitev
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Izbriši prednastavitev
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Brisanje trenutno izbrane prednastavitve
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Dodaj
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Dodaj NewGRF datoteko na seznam
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Odstrani
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Odstrani izbrano NewGRF datoteko iz seznama
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Premakni gor
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Premakne izbrano NewGRF gor po seznamu
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Premakni dol
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Premakne izbrano NewGRF dol po seznamu
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Seznam nameš�enih NewGRF datotek. Klikni datoteko za spremembo parametrov
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametri: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Vnesi NewGRF parametre
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ni informacij
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}NewGRF datoteke na voljo
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Dodaj izboru
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Doda izbrano NewGRF datoteko tvoji konfiguraciji
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Ponovno preiš�i
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Posodobi seznam moznih NewGRF datotek
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Doda izbrano NewGRF datoteko tvoji konfiguraciji
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Ponovno preiš�i
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Posodobi seznam moznih NewGRF datotek
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Ne morem dodati datoteke: podvojen GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ni ujemajo�e datoteke
-STR_NEWGRF_DISABLED                                             :{RED}Onemogo�eno
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ni ujemajo�e datoteke
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Onemogo�eno
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ustrezna datoteka ni najdena (naložen je kompatibilni GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibilni GRF-ji so naloženi namesto manjkajo�ih datotek
@@ -3016,7 +3016,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Informacija o predelavi tovornih zmogljivosti za '{1:ENGINE}' je razli�na od seznama nakupa po konstrukciji. To lahko povzro�i, da bi samoobnova ne uspela pravilno.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' hroš� je povzro�il neskon�en povratni ciklus proizvodnje.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Igra je bila shranjena brez podpore za tramvaj. Vsi tramvaji so bili odstranjeni.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Igra je bila shranjena brez podpore za tramvaj. Vsi tramvaji so bili odstranjeni.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Valuta po meri
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Menjalni te�aj: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3027,16 +3027,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Preklop
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Preklop na Euro: {ORANGE}nikoli
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Predogled: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Zamenjaj parameter valute po meri
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Zmanjšaj koli�ino svojega denarja za en funt (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Pove�aj koli�ino svojega denarja za en funt (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Nastavi te�aj menjave svoje valute za en funt (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Nastavi lo�ilno oznako za svojo valuto
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Nastavi oznako za svojo valuto
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Nastavi pripono svoje valute
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Preklopi na euro prej
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Preklopi na euro pozneje
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Nastavi leto preklopa na euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 funtov (£) v tvoji valuti
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Zmanjšaj koli�ino svojega denarja za en funt (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Pove�aj koli�ino svojega denarja za en funt (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Nastavi te�aj menjave svoje valute za en funt (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Nastavi lo�ilno oznako za svojo valuto
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Nastavi oznako za svojo valuto
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Nastavi pripono svoje valute
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Preklopi na euro prej
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Preklopi na euro pozneje
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Nastavi leto preklopa na euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 funtov (£) v tvoji valuti
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3055,8 +3055,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Lad{P ja ji je ij}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Letal{P o i a ""}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Skupni ukazi za {COMMA} vozil{P o i a ""}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Prikaz vseh vozil, ki si delijo ta urnik
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Skupni ukazi za {COMMA} vozil{P o i a ""}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Prikaz vseh vozil, ki si delijo ta urnik
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} �aka v garaži
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} �aka v garaži
@@ -3163,39 +3163,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Predelaj
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Predelaj ladjo, da bo lahko sprejela drug tovor
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Predelaj tovorni prostor letala za druga�en tovor
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Pelje v {TOWN} železniško garažo
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Pelje v {TOWN} železniško garažo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Pelje v {TOWN} cestno garažo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Pelje v {TOWN} cestno garažo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Pelje v {TOWN} ladijsko garažo
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Pelje v {TOWN} ladijsko garažo, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Na poti v {STATION} hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Na poti v {STATION} hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Na servis v {TOWN} železniško garažo
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Na servis v {TOWN} železniško garažo, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Na servisiranje v {TOWN} cestno garažo
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Na servisiranje v {TOWN} cestno garažo, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Gre na servis v {STATION} hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Gre na servis v {STATION} hangar, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Kloniraj vlak
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Kloniraj vozilo
-STR_CLONE_SHIP                                                  :{BLACK}Kloniraj ladjo
-STR_CLONE_AIRCRAFT                                              :{BLACK}Kloniraj letalo
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}To bo zgradilo kopijo vlaka vklju�no z vsemi vagoni. CTRL+klik skopira tudi navodila
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}To bo zgradilo kopijo vozila. CTRL+klik skopira tudi navodila
-STR_CLONE_SHIP_INFO                                             :{BLACK}To bo zgradilo kopijo ladje. CTRL+klik skopira tudi navodila
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}To bo zgradilo kopijo letala. CTRL+klik skopira tudi navodila
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}To bo zgradilo kopijo vlaka vklju�no z vsemi vagoni. Klikni na ta gumb in nato na vlak v ali zunaj garaže. CTRL+klik skopira tudi navodila
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}To bo zgradilo kopijo vozila. Klikni na ta gumb in nato na vozilo v ali zunaj garaže. CTRL+klik skopira tudi ukaze
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}To bo zgradilo kopijo ladje. Klikni na ta gumb in nato na ladjo v ali zunaj ladjedelnice. CTRL+klik skopira tudi ukaze
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}To bo zgradilo kopijo letala. Klikni na ta gumb in nato na letalo v ali zunaj hangarja. CTRL+klik skopira tudi ukaze
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Pelje v {TOWN} železniško garažo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Pelje v {TOWN} železniško garažo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Pelje v {TOWN} cestno garažo
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Pelje v {TOWN} cestno garažo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Pelje v {TOWN} ladijsko garažo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Pelje v {TOWN} ladijsko garažo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Na poti v {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Na poti v {STATION} hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Na servis v {TOWN} železniško garažo
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Na servis v {TOWN} železniško garažo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Na servisiranje v {TOWN} cestno garažo
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Na servisiranje v {TOWN} cestno garažo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Gre na servis v {TOWN} ladijsko garažo, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Gre na servis v {STATION} hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Gre na servis v {STATION} hangar, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Kloniraj vlak
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Kloniraj vozilo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Kloniraj ladjo
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Kloniraj letalo
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}To bo zgradilo kopijo vlaka vklju�no z vsemi vagoni. CTRL+klik skopira tudi navodila
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}To bo zgradilo kopijo vozila. CTRL+klik skopira tudi navodila
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}To bo zgradilo kopijo ladje. CTRL+klik skopira tudi navodila
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}To bo zgradilo kopijo letala. CTRL+klik skopira tudi navodila
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}To bo zgradilo kopijo vlaka vklju�no z vsemi vagoni. Klikni na ta gumb in nato na vlak v ali zunaj garaže. CTRL+klik skopira tudi navodila
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}To bo zgradilo kopijo vozila. Klikni na ta gumb in nato na vozilo v ali zunaj garaže. CTRL+klik skopira tudi ukaze
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}To bo zgradilo kopijo ladje. Klikni na ta gumb in nato na ladjo v ali zunaj ladjedelnice. CTRL+klik skopira tudi ukaze
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}To bo zgradilo kopijo letala. Klikni na ta gumb in nato na letalo v ali zunaj hangarja. CTRL+klik skopira tudi ukaze
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nova železniška vozila
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nova elektri�na tirna vozila
@@ -3265,28 +3265,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Pogled n
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Pripravljaš se na prodajo vseh vozil v garaži. Zagotovo?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Napa�na vrsta garaže
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Napa�na vrsta garaže
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Prodaj vse vlake v garaži
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Prodaj vsa vestna vozila v garaži
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Prodaj vse ladje v garaži
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Prodaj vsa letala v hangarju
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Prodaj vse vlake v garaži
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Prodaj vsa vestna vozila v garaži
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Prodaj vse ladje v garaži
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Prodaj vsa letala v hangarju
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Prikaz seznama vlakov s to garažo na urniku
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Prikaz seznama vseh cestnih vozil s to garažo na urniku
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Prikaz seznama vseh ladij s to garažo na urniku
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Prikaz seznama vseh letal s to garažo na urniku
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Prikaz seznama vlakov s to garažo na urniku
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Prikaz seznama vseh cestnih vozil s to garažo na urniku
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Prikaz seznama vseh ladij s to garažo na urniku
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Prikaz seznama vseh letal s to garažo na urniku
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Avtomatsko zamenjaj vse vlake v garaži
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Avtomatsko zamenjaj vsa cestna vozila v garaži
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Avtomatsko zamenjaj vse ladje v garaži
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Samozamenjaj vsa letala v hangarju
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Avtomatsko zamenjaj vse vlake v garaži
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Avtomatsko zamenjaj vsa cestna vozila v garaži
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Avtomatsko zamenjaj vse ladje v garaži
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Samozamenjaj vsa letala v hangarju
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamenjaj {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Za�ni menjavo vozil
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Ustavi menjavo vozil
-STR_NOT_REPLACING                                               :{BLACK}Ni menjave
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Ni izbranih vozil
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ni menjave
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Ni izbranih vozil
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Izberi tip lokomotive za zamenjati
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Izberi vrsto lokomotive, ki jo ho�eš prestaviti na levo ozna�eno mesto
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Pritisni za zaustavitev zamenjave na levi izbranega tipa lokomotive
@@ -3298,26 +3298,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Dovoli s
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Zamenjuje: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Preklop med okni za menjavo lokomotiv in vagonov
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo ni na voljo
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vozilo ni na voljo
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Ladja ni na voljo
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Letalo ni na voljo
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozilo ni na voljo
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vozilo ni na voljo
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Ladja ni na voljo
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Letalo ni na voljo
 
-STR_ENGINES                                                     :Lokomotive
-STR_WAGONS                                                      :Vagoni
+STR_REPLACE_ENGINES                                             :Lokomotive
+STR_REPLACE_WAGONS                                              :Vagoni
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klikni za ustaviti vse vlake v garaži
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klikni za ustaviti vsa cestna vozila v garaži
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klikni za ustaviti vse ladje v garaži
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klikni za ustaviti vsa letala v hangarju
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klikni za ustaviti vse vlake v garaži
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klikni za ustaviti vsa cestna vozila v garaži
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klikni za ustaviti vse ladje v garaži
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klikni za ustaviti vsa letala v hangarju
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klikni za zagon vseh vlakov v garaži
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klikni za zagon vseh cestnih vozil v garaži
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klikni za zagon vseh ladij v garaži
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klikni za zagon vseh letal v hangarju
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klikni za zagon vseh vlakov v garaži
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klikni za zagon vseh cestnih vozil v garaži
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klikni za zagon vseh ladij v garaži
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klikni za zagon vseh letal v hangarju
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klikni za zaustavitev vseh vozil na seznamu
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klikni za zagon vseh vozil na seznamu
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klikni za zaustavitev vseh vozil na seznamu
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klikni za zagon vseh vozil na seznamu
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Seznam oznak - {COMMA} oznak{P a i e ""}
@@ -3326,14 +3326,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Neuspeli
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Tirna vozila
-STR_ELRAIL_VEHICLES                                             :Elektri�na tirna vozila
-STR_MONORAIL_VEHICLES                                           :Enotirna vozila
-STR_MAGLEV_VEHICLES                                             :Magnetna tirna vozila
+STR_REPLACE_RAIL_VEHICLES                                       :Tirna vozila
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektri�na tirna vozila
+STR_REPLACE_MONORAIL_VEHICLES                                   :Enotirna vozila
+STR_REPLACE_MAGLEV_VEHICLES                                     :Magnetna tirna vozila
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Cena: {GOLD}{CURRENCY}{BLACK} Teža: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hitrost: {GOLD}{VELOCITY}{BLACK}   Mo�: {GOLD}{POWER}
@@ -3360,70 +3360,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Ustvari
-STR_RANDOM                                                      :{BLACK}Naklju�no
-STR_RANDOM_HELP                                                 :{BLACK}Spremeni naklju�no seme za ustvarjanje terena
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Ustvarjanje sveta
-STR_RANDOM_SEED                                                 :{BLACK}Naklju�no seme:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klikni za vnos naklju�nega semena
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Vpiši naklju�no seme
-STR_LAND_GENERATOR                                              :{BLACK}Ustvarjalec terena:
-STR_TREE_PLACER                                                 :{BLACK}Algoritem dreves:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Zasuk višinskega zemljevida:
-STR_TERRAIN_TYPE                                                :{BLACK}Tip terena:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Morska gladina:
-STR_SMOOTHNESS                                                  :{BLACK}Glajenje:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Višina snežne meje:
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Å tevilo mest:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Å tevilo industrij:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Premik snežne meje eno enoto višje
-STR_SNOW_LINE_DOWN                                              :{BLACK}Premik snežne meje eno enoto nižje
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Spremeni višino snežne meje
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Spremeni za�etno leto
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Opozorilo za merilo
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Prevelika sprememba velikosti ozemlja ni priporo�ena. Nadaljujem?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Ime višinskega zemljevida:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Velikost: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Ustvari
+STR_MAPGEN_RANDOM                                               :{BLACK}Naklju�no
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Spremeni naklju�no seme za ustvarjanje terena
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Ustvarjanje sveta
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Naklju�no seme:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klikni za vnos naklju�nega semena
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Vpiši naklju�no seme
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Ustvarjalec terena:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritem dreves:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Zasuk višinskega zemljevida:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tip terena:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Morska gladina:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Glajenje:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Višina snežne meje:
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Å tevilo mest:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Å tevilo industrij:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Premik snežne meje eno enoto višje
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Premik snežne meje eno enoto nižje
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Spremeni višino snežne meje
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Spremeni za�etno leto
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Opozorilo za merilo
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Prevelika sprememba velikosti ozemlja ni priporo�ena. Nadaljujem?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Ime višinskega zemljevida:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Velikost: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Ustvarjanje sveta...
 STR_GENERATION_ABORT                                            :{BLACK}Opusti
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Opusti ustvarjanje sveta
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Zares zapuš�aš ustvarjanje?
-STR_PROGRESS                                                    :{WHITE}{NUM}% narejeno
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Ustvarjanje sveta
-STR_TREE_GENERATION                                             :{BLACK}Ustvarjanje dreves
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Nepremi�no ustvarjanje
-STR_CLEARING_TILES                                              :{BLACK}Generiranje grobih in skalnatih tal
-STR_SETTINGUP_GAME                                              :{BLACK}Nastavljanje igre
-STR_PREPARING_TILELOOP                                          :{BLACK}Zagnano ponavljanje kvadratkov
-STR_PREPARING_GAME                                              :{BLACK}Priprave igre
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Zamenjava stopnje na na�in "po meri"
-STR_SE_FLAT_WORLD                                               :{WHITE}Raven teren
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Ustvari raven teren
-STR_SE_RANDOM_LAND                                              :{WHITE}Naklju�ni teren
-STR_SE_NEW_WORLD                                                :{BLACK}Ustvari novo ozemlje
-STR_SE_CAPTION                                                  :{WHITE}Tip ozemlja
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Premik višine ravnega terena eno enoto nižje
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Premik višine ravnega terena eno enoto višje
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Spremeni višino ravnega terena
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Višina ravnega terena:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% narejeno
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Ustvarjanje sveta
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Ustvarjanje dreves
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Nepremi�no ustvarjanje
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generiranje grobih in skalnatih tal
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Nastavljanje igre
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Zagnano ponavljanje kvadratkov
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Priprave igre
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Zamenjava stopnje na na�in "po meri"
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Raven teren
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Ustvari raven teren
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Naklju�ni teren
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Ustvari novo ozemlje
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tip ozemlja
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Premik višine ravnega terena eno enoto nižje
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Premik višine ravnega terena eno enoto višje
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Spremeni višino ravnega terena
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Višina ravnega terena:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrira majhen zemljevid na trenutno to�ko
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Robovi ozemlja:
-STR_NORTHWEST                                                   :{BLACK}Severozahod
-STR_NORTHEAST                                                   :{BLACK}Severovzhod
-STR_SOUTHEAST                                                   :{BLACK}Jugovzhod
-STR_SOUTHWEST                                                   :{BLACK}Jugozahod
-STR_BORDER_FREEFORM                                             :{BLACK}Poljubno
-STR_BORDER_WATER                                                :{BLACK}Voda
-STR_BORDER_RANDOM                                               :{BLACK}Naklju�no
-STR_BORDER_RANDOMIZE                                            :{BLACK}Naklju�no
-STR_BORDER_MANUAL                                               :{BLACK}Ro�no
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Robovi ozemlja:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Severozahod
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Severovzhod
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Jugovzhod
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Jugozahod
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Poljubno
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Voda
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Naklju�no
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Naklju�no
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Ro�no
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Majno letališ�e
@@ -3448,21 +3448,21 @@ STR_MEASURE_AREA                                                :{BLACK}Obmo�je
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Dolžina: {NUM}{}Višinska razlika: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Obmo�je: {NUM} x {NUM}{}Višinska razlika: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Prenesi kredite: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ta cesta je last mesta
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...cesta je obrnjena napa�no
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Nastavitve prozornega pogleda
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Prozoren ali poln pogled imen postaj
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Prozoren ali poln pogled dreves
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Prozoren ali navaden pogled hiš
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Prozoren ali navaden pogled industrij
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Prozoren ali navaden pogled ostalih objektov kot so postaje, garaže...
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Prozoren ali navaden pogled mostov
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Prozoren ali navaden pogled struktur kot so antene, svetilniki...
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Preklop prosojnosti za pogone. CTRL+klik za zaklepanje.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Preklop na prosojnost za prikaz polnenja
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Nastavi predmete nevidne namesto prosojne
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Prenesi kredite: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ta cesta je last mesta
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...cesta je obrnjena napa�no
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Nastavitve prozornega pogleda
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Prozoren ali poln pogled imen postaj
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Prozoren ali poln pogled dreves
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Prozoren ali navaden pogled hiš
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Prozoren ali navaden pogled industrij
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Prozoren ali navaden pogled ostalih objektov kot so postaje, garaže...
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Prozoren ali navaden pogled mostov
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Prozoren ali navaden pogled struktur kot so antene, svetilniki...
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Preklop prosojnosti za pogone. CTRL+klik za zaklepanje.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Preklop na prosojnost za prikaz polnenja
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Nastavi predmete nevidne namesto prosojne
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3472,7 +3472,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Vsi vlaki
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Vsa cestna vozila
 STR_GROUP_ALL_SHIPS                                             :Vse ladje
@@ -3481,24 +3481,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Vlaki brez skup
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Cestna vozila brez skupine
 STR_GROUP_DEFAULT_SHIPS                                         :Ladje brez skupine
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Letala brez skupine
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Vsa izmenljiva vozila
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Odstrani vsa vozila
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Preimenuj eno skupino
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Nemogo�e ustvariti skupino...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Nemogo�e brisanje te skupine...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Nemogo�e preimenovanje skupine...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Nemogo�a odstranitev vseh vozil iz te skupine...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Nemogo�e dodati vozilo v to skupino...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Nemogo�e dodati izmenljivo vozilo v to skupino...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Nemogo�e ustvariti skupino...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Nemogo�e brisanje te skupine...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Nemogo�e preimenovanje skupine...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Nemogo�a odstranitev vseh vozil iz te skupine...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Nemogo�e dodati vozilo v to skupino...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Nemogo�e dodati izmenljivo vozilo v to skupino...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Skupine - Klikni na skupino za seznam vseh vozil v skupini
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klikni za ustvarit skupino
-STR_GROUP_DELETE_TIP                                            :{BLACK}Izbriši izbrano skupino
-STR_GROUP_RENAME_TIP                                            :{BLACK}Preimenuj izbrano skupino
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klikni za zaš�ito skupine pred splošno samoobnovo
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Skupine - Klikni na skupino za seznam vseh vozil v skupini
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klikni za ustvarit skupino
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Izbriši izbrano skupino
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Preimenuj izbrano skupino
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klikni za zaš�ito skupine pred splošno samoobnovo
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3559,35 +3559,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Ime mora biti edinstveno
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Ime mora biti edinstveno
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Pojdi na naslednjo oznako
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Pojdi na  predhodno oznako
-STR_SIGN_OSKTITLE                                               :{BLACK}Vpiši ime za znak
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Pojdi na naslednjo oznako
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Pojdi na  predhodno oznako
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Vpiši ime za znak
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Ustanovi
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Obetajo�a
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Zgradi
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Izberi primerno industrijo iz tega seznama
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Ustanovi
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Obetajo�a
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Zgradi
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Izberi primerno industrijo iz tega seznama
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Napredno
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Napredna izbira obraza.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Napredna izbira obraza.
 STR_FACE_SIMPLE                                                 :{BLACK}Enostavno
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Enostavna izbira obraza.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Enostavna izbira obraza.
 STR_FACE_LOAD                                                   :{BLACK}Naloži
-STR_FACE_LOAD_TIP                                               :{BLACK}Naloži piljubljen obraz
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Naloži piljubljen obraz
 STR_FACE_LOAD_DONE                                              :{WHITE}Tvoj priljubljen obraz je bil naložen iz OpenTTD konfiguracije.
 STR_FACE_FACECODE                                               :{BLACK}Obraz igralca Å¡t.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Prikaži in/ali nastavi številko obraza igralca
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Prikaži in/ali nastavi številko obraza igralca
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Prikaži in/ali nastavi številko obraza igralca
 STR_FACE_FACECODE_SET                                           :{WHITE}Nova koda Å¡tevilke obraza je nastavljena.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Nemogo�a nastavitev številke obraza igralca - izbor mogo� med 0 in 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Shrani
-STR_FACE_SAVE_TIP                                               :{BLACK}Shrani priljubljen obraz
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Shrani priljubljen obraz
 STR_FACE_SAVE_DONE                                              :{WHITE}Ta obraz bo shranjen kot tvoj priljubljen v konfiguracijo OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Evropski
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Izbor evropskih obrazov
@@ -3595,51 +3595,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Afriški
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Izbor afriških obrazov
 STR_FACE_YES                                                    :Da
 STR_FACE_NO                                                     :Ne
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Vklop brk ali uhanov
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Vklop brk ali uhanov
 STR_FACE_HAIR                                                   :Lasje:
-STR_FACE_HAIR_TIP                                               :{BLACK}Spremeni lase
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Spremeni lase
 STR_FACE_EYEBROWS                                               :Obrvi:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Spremeni obrvi
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Spremeni obrvi
 STR_FACE_EYECOLOUR                                              :Barva o�i:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Spremeni barvo o�i
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Spremeni barvo o�i
 STR_FACE_GLASSES                                                :O�ala:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Vklopi o�ala
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Spremeni o�ala
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Vklopi o�ala
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Spremeni o�ala
 STR_FACE_NOSE                                                   :Nos:
-STR_FACE_NOSE_TIP                                               :{BLACK}Spremeni nos
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Spremeni nos
 STR_FACE_LIPS                                                   :Ustnice:
 STR_FACE_MOUSTACHE                                              :Brke:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Spremeni ustnice ali brke
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Spremeni ustnice ali brke
 STR_FACE_CHIN                                                   :Brada:
-STR_FACE_CHIN_TIP                                               :{BLACK}Spremeni brado
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Spremeni brado
 STR_FACE_JACKET                                                 :Jakna:
-STR_FACE_JACKET_TIP                                             :{BLACK}Spremeni jakno
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Spremeni jakno
 STR_FACE_COLLAR                                                 :Ovratnik:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Spremeni ovratnik
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Spremeni ovratnik
 STR_FACE_TIE                                                    :Kravata:
 STR_FACE_EARRING                                                :Uhani:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Spremeni kravato ali uhane
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Spremeni kravato ali uhane
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Izbor signalov
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Nemogo�a sprememba vrste signalov tukaj...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standardni signal (semafor){}Signali so potrebni, da prepre�ijo vlaku tr�enje na progi z ve� vlaki.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Vhodni signal (semafor){}Zelen v kolikor je vsaj en ali ve�  izhodnih signalov v nadaljevanju proge. Če ne, je rde�.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Izhodni signal (semafor){}Deluje kot normalen semafor, le da mora biti povezan z ustreznim vhodnim ali kombiniranim signalom.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinirani signal (semafor){}Kombinirani signal deluje kot vhodni in izhodni. To omogo�a gradnjo velikih vej signalizacije.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Napredni signal (semafor){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Napredni enosmerni signal (semafor){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Standardni signal (elektri�ni){}Signali so potrebni, da prepre�ijo vlaku tr�enje na progi z ve� vlaki.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Vhodni signal (elektri�ni){}Zelen v kolikor je vsaj en ali ve�  izhodnih signalov v nadaljevanju proge. Če ne, je rde�.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Izhodni signal (elektri�ni){}Deluje kot normalen semafor, le da mora biti povezan z ustreznim vhodnim ali kombiniranim signalom.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinirani signal (elektri�ni){}Kombinirani signal deluje kot vhodni in izhodni. To omogo�a gradnjo velikih vej signalizacije.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Napredni signal (elektri�ni){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Napredni enosmerni signal (elektri�ni){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Zamenjava signala{}Ko je možnost izbrana, se ob kliku na obstoje�i signal le ta spremeni v izbrano vrsto. CTRL-klik preklaplja obstoje�o vrsto.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Gostota vle�nih signalov
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Zmanjšaj gostoto signala za vle�enje
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Pove�aj gostoto signala za vle�enjeIncrease dragging signal density
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Izbor signalov
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Nemogo�a sprememba vrste signalov tukaj...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standardni signal (semafor){}Signali so potrebni, da prepre�ijo vlaku tr�enje na progi z ve� vlaki.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Vhodni signal (semafor){}Zelen v kolikor je vsaj en ali ve�  izhodnih signalov v nadaljevanju proge. Če ne, je rde�.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Izhodni signal (semafor){}Deluje kot normalen semafor, le da mora biti povezan z ustreznim vhodnim ali kombiniranim signalom.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinirani signal (semafor){}Kombinirani signal deluje kot vhodni in izhodni. To omogo�a gradnjo velikih vej signalizacije.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Napredni signal (semafor){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Napredni enosmerni signal (semafor){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Standardni signal (elektri�ni){}Signali so potrebni, da prepre�ijo vlaku tr�enje na progi z ve� vlaki.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Vhodni signal (elektri�ni){}Zelen v kolikor je vsaj en ali ve�  izhodnih signalov v nadaljevanju proge. Če ne, je rde�.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Izhodni signal (elektri�ni){}Deluje kot normalen semafor, le da mora biti povezan z ustreznim vhodnim ali kombiniranim signalom.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinirani signal (elektri�ni){}Kombinirani signal deluje kot vhodni in izhodni. To omogo�a gradnjo velikih vej signalizacije.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Napredni signal (elektri�ni){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Napredni enosmerni signal (elektri�ni){}Napredni signal omogo�a vstop ve� kot enemu vlaku v odsek proge, �e ima na voljo prostor za varno ustavitev. Napredni signali se lahko prevozijo s hrbtne strani.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Zamenjava signala{}Ko je možnost izbrana, se ob kliku na obstoje�i signal le ta spremeni v izbrano vrsto. CTRL-klik preklaplja obstoje�o vrsto.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Gostota vle�nih signalov
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Zmanjšaj gostoto signala za vle�enje
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Pove�aj gostoto signala za vle�enjeIncrease dragging signal density
 ########
 
 ############ on screen keyboard
@@ -3651,36 +3651,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Nastavitve UI
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Prikaži nastavitve UI
 STR_AI_DEBUG                                                    :{WHITE}UI Čiš�enje
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Ime UI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Ime UI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Ponovno naloži UI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Uni�i UI, ponovno naloži skripto in ponovno zaženi UI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}okno UI �iš�enja je na voljo samo za strežnik
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Uni�i UI, ponovno naloži skripto in ponovno zaženi UI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}okno UI �iš�enja je na voljo samo za strežnik
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Nastavljanje UI
-STR_AI_CHANGE                                                   :{BLACK}Izberi UI
-STR_AI_CONFIGURE                                                :{BLACK}Nastavi
-STR_AI_CHANGE_TIP                                               :{BLACK}Naloži drugi UI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Nastavi parametre UI
-STR_AI_LIST_TIP                                                 :{BLACK}Vse UI bodo naložene v naslednji igri
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Izberi UI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Nastavi
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Naloži drugi UI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Nastavi parametre UI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Vse UI bodo naložene v naslednji igri
 STR_AI_LIST_CAPTION                                             :{WHITE}UI na razpolago
-STR_AI_AILIST_TIP                                               :{BLACK}Klikni za izbor ene UI
-STR_AI_ACCEPT                                                   :{BLACK}Potrdi
-STR_AI_ACCEPT_TIP                                               :{BLACK}Izbere ozna�eno UI
-STR_AI_CANCEL                                                   :{BLACK}Prekli�i
-STR_AI_CANCEL_TIP                                               :{BLACK}Ne spremeni UI
-STR_AI_CLOSE                                                    :{BLACK}Zapri
-STR_AI_RESET                                                    :{BLACK}Resetiraj
-STR_AI_HUMAN_PLAYER                                             :Igralec
-STR_AI_RANDOM_AI                                                :Naklju�ni UI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikni za izbor ene UI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Potrdi
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Izbere ozna�eno UI
+STR_AI_LIST_CANCEL                                              :{BLACK}Prekli�i
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ne spremeni UI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zapri
+STR_AI_SETTINGS_RESET                                           :{BLACK}Resetiraj
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Igralec
+STR_AI_CONFIG_RANDOM_AI                                         :Naklju�ni UI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}UI parametri
-STR_AI_AUTHOR                                                   :{BLACK}Avtor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Verzija: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Ena izmed zagnanih UI se je sesula. Prosim, javi to avtorju UI s priloženo sliko zaslona v orodju za �iš�enje UI.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Avtor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Verzija: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Ena izmed zagnanih UI se je sesula. Prosim, javi to avtorju UI s priloženo sliko zaslona v orodju za �iš�enje UI.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Meja hrupa v mestu: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Efektivni hrup: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Meja hrupa v mestu: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Efektivni hrup: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3694,21 +3694,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenarij
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Višinska karta
 STR_CONTENT_TITLE                                               :{WHITE}Prenos vsebin
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Vrsta
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Vrsta vsebine
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Vrsta vsebine
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Ime
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Ime vsebine
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klikni na vrstico za detajle.{}Klikni na okence, de je izbereš za prenos
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Ime vsebine
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klikni na vrstico za detajle.{}Klikni na okence, de je izbereš za prenos
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Izberi vse
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Ozna�i vse vsebine za prenos
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Ozna�i vse vsebine za prenos
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Izberi nadgradnje
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Ozna�i vse nadgradne vsebine za obstoje�e vsebine prenosa
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Ozna�i vse nadgradne vsebine za obstoje�e vsebine prenosa
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Nobena
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Ozna�i vse, da ne bo prenešeno
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Ozna�i vse, da ne bo prenešeno
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Vnesi vrstico za filtriranje
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Vnesi besedni klju�, po katerem se bo filtriral seznam
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Vnesi besedni klju�, po katerem se bo filtriral seznam
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Oznaka/ime filtra:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Prenesi
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Požene prenos izbranih vsebin
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Požene prenos izbranih vsebin
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Skupna velikost prenosa: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}VSEBINA PRENOSA
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}To ni izbrano za prenos
@@ -3741,6 +3741,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No mogoÄ
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Preveri razpoložljive vsebine
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Preveri posodobljene vsebine na strežniku,{} ki so na voljo za prenos
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Najdi manjkajo�e vsebine
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Preveri manjkajo�e vsebine, �e so dosegljive na strežniku
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Najdi manjkajo�e vsebine
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Preveri manjkajo�e vsebine, �e so dosegljive na strežniku
 ########
diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt
index 90f090d1f..ad98411f7 100644
--- a/src/lang/spanish.txt
+++ b/src/lang/spanish.txt
@@ -119,7 +119,7 @@ STR_QUANTITY_TOFFEE                                             :{WEIGHT} de car
 STR_QUANTITY_BATTERIES                                          :{COMMA} pila{P "" s}
 STR_QUANTITY_PLASTIC                                            :{VOLUME} de plástico
 STR_QUANTITY_FIZZY_DRINKS                                       :{COMMA} refresco{P "" s}
-STR_CARGO_N_A                                                   :N/D{SKIP}
+STR_QUANTITY_N_A                                                :N/D{SKIP}
 
 # Two letter abbreviation of cargo name
 STR_ABBREV_NOTHING                                              :
@@ -209,26 +209,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Seleccione ordenación (descendiente/ascendinte)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Seleccione criterio de orden
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selecciona criterio de filtro
-STR_SORT_BY                                                     :{BLACK}Ordenar por
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Seleccione ordenación (descendiente/ascendinte)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Seleccione criterio de orden
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selecciona criterio de filtro
+STR_BUTTON_SORT_BY                                              :{BLACK}Ordenar por
 STR_BUTTON_LOCATION                                             :{BLACK}Sitio
-STR_QUERY_RENAME                                                :{BLACK}Renombrar
+STR_BUTTON_RENAME                                               :{BLACK}Renombrar
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Cerrar ventana
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Título de la ventana - arrastrelo para moverla
-STR_STICKY_BUTTON                                               :{BLACK}Marcar esta ventana como no borrable para el comando de 'Cerrar Todas las Ventanas'
-STR_RESIZE_BUTTON                                               :{BLACK}Pulse y arrastre para redimensionar la ventana
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Cambiar entre tamaño de ventana grande/pequeño
+STR_TOOLTIP_STICKY                                              :{BLACK}Marcar esta ventana como no borrable para el comando de 'Cerrar Todas las Ventanas'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Pulse y arrastre para redimensionar la ventana
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Cambiar entre tamaño de ventana grande/pequeño
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de scroll - mueve la lista arriba/abajo
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Barra de scroll - mueve la lista izquierda/derecha
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Demoler edificios, etc. en un bloque de terreno
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Por defecto
-STR_QUERY_CANCEL                                                :{BLACK}Cancelar
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Por defecto
+STR_BUTTON_CANCEL                                               :{BLACK}Cancelar
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -317,7 +317,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Colocar
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Guardar escenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Cargar escenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Cargar mapa de alturas
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Cargar mapa de alturas
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Salir del editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Salir
@@ -505,11 +505,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Intercambiar gráfico para tipo de carga
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Mostrar detalles de rendimiento
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Mostrar detalles de rendimiento
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Clave de los gráficos
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Click aquí para intercambiar la entrada de la compañía
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Click aquí para intercambiar la entrada de la compañía
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Ranking de Empresas
@@ -544,16 +544,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Dinero:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Préstamo:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Cantidad de vehículos. Incluye vehículos de carretera, trenes, barcos y aeroplanos.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Cantidad de segmentos de estaciones. Cada segmento de una estación (ej. estaciones de tren, paradas de autobús, aeropuertos, etc) es contabilizado, incluso si está conectado a una estación.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}El beneficio del vehículo con menores ingresos (de todos los vehículos mayores de 2 años)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Cantidad de dinero ganado en un mes con el beneficio más bajo en los pasados 12 cuartos
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Cantidad de dinero ganado en un mes con el beneficio más alto en los pasados 12 cuartos
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Unidades de carga entregadas en los pasados cuatro cuartos.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Tipos de carga entregada en el último cuarto.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Cantidad de dinero en mano
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Cantidad de dinero que esta compañía ha recibido como préstamo
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Total de puntos ganados del máximo posible
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Cantidad de vehículos. Incluye vehículos de carretera, trenes, barcos y aeroplanos.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Cantidad de segmentos de estaciones. Cada segmento de una estación (ej. estaciones de tren, paradas de autobús, aeropuertos, etc) es contabilizado, incluso si está conectado a una estación.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}El beneficio del vehículo con menores ingresos (de todos los vehículos mayores de 2 años)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Cantidad de dinero ganado en un mes con el beneficio más bajo en los pasados 12 cuartos
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Cantidad de dinero ganado en un mes con el beneficio más alto en los pasados 12 cuartos
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Unidades de carga entregadas en los pasados cuatro cuartos.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Tipos de carga entregada en el último cuarto.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Cantidad de dinero en mano
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Cantidad de dinero que esta compañía ha recibido como préstamo
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Total de puntos ganados del máximo posible
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Selección de Jazz
@@ -671,8 +671,8 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Poner/qu
 STR_SMALLMAP_CENTER                                             :{BLACK}Centrar el mapa pequeño a la posición actual
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Desactivar todo
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Activar todo
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Desactivar todo
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Activar todo
 
 # Status bar messages
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Mostrar último mensaje/noticia
@@ -683,8 +683,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  GUAR
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Historial de mensajes
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Listado de los mensajes más recientes
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Listado de los mensajes más recientes
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mensaje
@@ -918,32 +918,32 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Seleccio
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fichero perdido/corrupto{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Información adicional acerca de este fichero de gráficos
 
-STR_FULLSCREEN_FAILED                                           :{WHITE}El modo de pantalla completa ha fallado
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}El modo de pantalla completa ha fallado
 
 # Custom currency window
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Moneda personalizada
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Tasa de cambio: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Decrementa la cantidad de tu moneda en una Libra (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Incrementa la cantidad de tu moneda en una Libra (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Configura el valor de cambio de tu moneda por una Libra (£)
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Decrementa la cantidad de tu moneda en una Libra (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Incrementa la cantidad de tu moneda en una Libra (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Configura el valor de cambio de tu moneda por una Libra (£)
 
 STR_CURRENCY_SEPARATOR                                          :{LTBLUE}Separador: {ORANGE}{2:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Configura el separador de tu moneda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Configura el separador de tu moneda
 
 STR_CURRENCY_PREFIX                                             :{LTBLUE}Prefijo: {ORANGE}{3:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Configura el prefijo de tu moneda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Configura el prefijo de tu moneda
 STR_CURRENCY_SUFFIX                                             :{LTBLUE}Sufijo: {ORANGE}{4:STRING}
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Configura el sufijo de tu moneda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Configura el sufijo de tu moneda
 
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Cambio al Euro: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Cambio al Euro: {ORANGE}nunca
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Configurar el año del cambio al Euro
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Cambiar al Euro antes
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Cambiar al Euro después
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Configurar el año del cambio al Euro
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Cambiar al Euro antes
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Cambiar al Euro después
 
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Previa: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Libras(£) en tu moneda
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Libras(£) en tu moneda
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Cambiar parámetro de moneda personalizada
 
 # Difficulty level window
@@ -957,7 +957,7 @@ STR_DIFFICULTY_LEVEL_CUSTOM                                     :{BLACK}Personal
 ############ range for difficulty levels ends
 
 STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON                          :{BLACK}Ver gráfica de altas puntuaciones
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Guardar
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Guardar
 
 ############ range for difficulty settings starts
 STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS             :{LTBLUE}Nº Máximo de jugadores: {ORANGE}{COMMA}
@@ -1023,7 +1023,7 @@ STR_CITY_APPROVAL_PERMISSIVE                                    :Permisiva
 STR_CITY_APPROVAL_TOLERANT                                      :Tolerante
 STR_CITY_APPROVAL_HOSTILE                                       :Hostil
 
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Esta acción cambia el nivel de dificultad a personalizado
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Esta acción cambia el nivel de dificultad a personalizado
 
 # Advanced settings window
 STR_CONFIG_SETTING_CAPTION                                      :{WHITE}Opciones avanzadas
@@ -1272,7 +1272,7 @@ STR_CONFIG_SETTING_PATHFINDER_FOR_SHIPS_YAPF                    :YAPF {RED}(No r
 STR_CONFIG_SETTING_MAP_X                                        :{LTBLUE}Tamaño X del mapa: {ORANGE}{STRING}
 STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Tamaño Y del mapa: {ORANGE}{STRING}
 
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Cambiar valor de la opción
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Cambiar valor de la opción
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1314,9 +1314,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Salir de
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Salir
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}¿Está seguro de abandonar y regresar a {STRING}?
-STR_YES                                                         :{BLACK}Si
-STR_NO                                                          :{BLACK}No
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}¿Está seguro de abandonar y regresar a {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Si
+STR_QUIT_NO                                                     :{BLACK}No
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -1332,11 +1332,11 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Abandonar Juego
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}¿Estás seguro que deseas abandonar este juego?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}¿Está seguro de que desea salir de este escenario?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}¿Está seguro de que desea salir de este escenario?
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Trucos
-STR_CHEATS_TIP                                                  :{BLACK}Las casillas indican si ha usado este truco antes
+STR_CHEATS_TOOLTIP                                              :{BLACK}Las casillas indican si ha usado este truco antes
 STR_CHEATS_WARNING                                              :{BLACK}Atención! Usted está a punto de traicionar a sus competidores. Tenga presente que tal deshonra será recordada para toda la eternidad.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Incrementar dinero en {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Jugando como la empresa: {ORANGE}{COMMA}
@@ -1345,24 +1345,24 @@ STR_CHEAT_CROSSINGTUNNELS                                       :{LTBLUE}Los tú
 STR_CHEAT_BUILD_IN_PAUSE                                        :{LTBLUE}Construir mientras se está en pausa: {ORANGE}{STRING}
 STR_CHEAT_NO_JETCRASH                                           :{LTBLUE}Jets se estrellan menos en aeropuertos pequeños: {ORANGE} {STRING}
 STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Cambiar clima: {ORANGE} {STRING}
-STR_TEMPERATE_LANDSCAPE                                         :Paisaje templado
-STR_SUB_ARCTIC_LANDSCAPE                                        :Paisaje subártico
-STR_SUB_TROPICAL_LANDSCAPE                                      :Paisaje subtropical
-STR_TOYLAND_LANDSCAPE                                           :Paisaje fantasía
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Paisaje templado
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Paisaje subártico
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Paisaje subtropical
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Paisaje fantasía
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Cambiar fecha: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Activar modificación de los valores de producción: {ORANGE}{STRING}
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nuevo Esquema de Color
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Mostrar esquema de colores general
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Ver esquema de color de los trenes
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Ver esquema de color de los vehículos de carretera
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Ver esquema de color de los barcos
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Mostrar esquema de color de aeronaves
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Selecciona el color primario para el esquema seleccionado
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Selecciona el color secundario para el esquema seleccionado
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Selecciona un esquema de color a modificar, o selecciona varios pulsando Ctrl+Click. Pulsa en la caja para cambiar el uso del esquema
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Mostrar esquema de colores general
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Ver esquema de color de los trenes
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Ver esquema de color de los vehículos de carretera
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Ver esquema de color de los barcos
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Mostrar esquema de color de aeronaves
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Selecciona el color primario para el esquema seleccionado
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Selecciona el color secundario para el esquema seleccionado
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Selecciona un esquema de color a modificar, o selecciona varios pulsando Ctrl+Click. Pulsa en la caja para cambiar el uso del esquema
 
 STR_LIVERY_DEFAULT                                              :Estación normal
 STR_LIVERY_STEAM                                                :Locomotora a Vapor
@@ -1400,19 +1400,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Seleccio
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Cara Nueva
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Generar cara al azar
 STR_FACE_ADVANCED                                               :{BLACK}Avanzado
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Selección avanzada de caras.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Selección avanzada de caras.
 STR_FACE_SIMPLE                                                 :{BLACK}Simple
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Selección simple de caras.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Selección simple de caras.
 STR_FACE_LOAD                                                   :{BLACK}Cargar
-STR_FACE_LOAD_TIP                                               :{BLACK}Cargar cara favorita
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Cargar cara favorita
 STR_FACE_LOAD_DONE                                              :{WHITE}Tu cara favorita ha sido cargada del fichero de configuración de OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Cara del jugador no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Ver y/o asignar número de cara del jugador
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Ver y/o asignar número de cara del jugador
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Ver y/o asignar número de cara del jugador
 STR_FACE_FACECODE_SET                                           :{WHITE}Nuevo código de cara ha sido asignado.
 STR_FACE_FACECODE_ERR                                           :{WHITE}No se puede asignar código de cara - debe ser un valor numérico de 0 a 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Guardar
-STR_FACE_SAVE_TIP                                               :{BLACK}Guardar cara favorita
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Guardar cara favorita
 STR_FACE_SAVE_DONE                                              :{WHITE}Esta cara ha sido guardada como tu favorita en el fichero de configuración.
 STR_FACE_EUROPEAN                                               :{BLACK}Europea
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Selecciona caras europeas
@@ -1420,120 +1420,120 @@ STR_FACE_AFRICAN                                                :{BLACK}Africana
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Selecciona caras africanas
 STR_FACE_YES                                                    :Si
 STR_FACE_NO                                                     :No
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Activar bigotes o pendientes
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Activar bigotes o pendientes
 STR_FACE_HAIR                                                   :Pelo:
-STR_FACE_HAIR_TIP                                               :{BLACK}Cambiar pelo
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Cambiar pelo
 STR_FACE_EYEBROWS                                               :Cejas:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Cambiar cejas
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Cambiar cejas
 STR_FACE_EYECOLOUR                                              :Color ojos:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Cambiar color de ojos
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Cambiar color de ojos
 STR_FACE_GLASSES                                                :Gafas:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Activar gafas
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Cambiar gafas
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Activar gafas
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Cambiar gafas
 STR_FACE_NOSE                                                   :Nariz:
-STR_FACE_NOSE_TIP                                               :{BLACK}Cambiar nariz
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Cambiar nariz
 STR_FACE_LIPS                                                   :Labios:
 STR_FACE_MOUSTACHE                                              :Bigote:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Cambiar labios o bigote
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Cambiar labios o bigote
 STR_FACE_CHIN                                                   :Barbilla:
-STR_FACE_CHIN_TIP                                               :{BLACK}Cambiar barbilla
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Cambiar barbilla
 STR_FACE_JACKET                                                 :Chaqueta:
-STR_FACE_JACKET_TIP                                             :{BLACK}Cambiar chaqueta
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Cambiar chaqueta
 STR_FACE_COLLAR                                                 :Cuello:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Cambiar cuello
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Cambiar cuello
 STR_FACE_TIE                                                    :Corbata:
 STR_FACE_EARRING                                                :Pendientes:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Cambiar corbata o pendientes
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Cambiar corbata o pendientes
 
 # Network server list
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Multijugador
-STR_NETWORK_CONNECTION                                          :{BLACK}Conexión:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Seleccione entre un juego en Internet o en una Red de �rea Local
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Nombre del Jugador:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Este es el nombre con el que otros jugadores le identificarán
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Nombre
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Nombre del juego
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Clientes
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Clientes online / máx clientes{}Compañías online / máximo compañías
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Tamaño del mapa
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Tamaño del mapa del juego{}Pulsa para ordenar por area
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Fecha
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Fecha actual
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Años
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Número de años{}que el juego está ejecutado
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Idioma, versión del servidor, etc.
-
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Pulse en un juego de la lista para seleccionarlo
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}El servidor al que has estado conectado la última vez:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Pulsa para seleccionar el servidor al que has jugado la última vez
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}INFO JUEGO
-STR_NETWORK_CLIENTS                                             :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Idioma: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Escenario: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Tamaño Mapa: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versión servidor: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Dirección servidor: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Fecha inicio: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Fecha actual: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}¡Protegido por contraseña!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVIDOR APAGADO
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVIDOR LLENO
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}INCOMPATIBILIDAD DE VERSIONES
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}PROBLEMA CON NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Unirme al juego
-STR_NETWORK_REFRESH                                             :{BLACK}Recargar servidor
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Recargar información del servidor
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Buscar servidor
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Buscar en la red servidores
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Añadir servidor
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Añade un servidor a la lista que será siempre consultada para ver juegos en ejecución.
-STR_NETWORK_START_SERVER                                        :{BLACK}Comenzar servidor
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Comenzar un nuevo servidor
-
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Introduce tu nombre
-STR_NETWORK_ENTER_IP                                            :{BLACK}Introduce la dirección IP del servidor
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Multijugador
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Conexión:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Seleccione entre un juego en Internet o en una Red de �rea Local
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+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
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Nombre
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Nombre del juego
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Clientes
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Clientes online / máx clientes{}Compañías online / máximo compañías
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Tamaño del mapa
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Tamaño del mapa del juego{}Pulsa para ordenar por area
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Fecha
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Fecha actual
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Años
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Número de años{}que el juego está ejecutado
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Idioma, versión del servidor, etc.
+
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Pulse en un juego de la lista para seleccionarlo
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}El servidor al que has estado conectado la última vez:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Pulsa para seleccionar el servidor al que has jugado la última vez
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}INFO JUEGO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Clientes: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Idioma: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Escenario: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Tamaño Mapa: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versión servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Dirección servidor: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Fecha inicio: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Fecha actual: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}¡Protegido por contraseña!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVIDOR APAGADO
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVIDOR LLENO
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}INCOMPATIBILIDAD DE VERSIONES
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}PROBLEMA CON NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Unirme al juego
+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 un servidor a la lista que será siempre consultada para ver juegos en ejecución.
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Comenzar servidor
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Comenzar un nuevo servidor
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Introduce tu nombre
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Introduce la dirección IP del servidor
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Empezar nuevo juego multijugador
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Nombre del juego:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}El nombre del juego será mostrado a otros jugadores en el menu de selección de juego multijugador
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Establecer contraseña
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Proteje tu juego con una contraseña si no quieres que otras personas se unan a él
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selecciona mapa:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}¿En qué mapa desea jugar?
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Generar juego nuevo al azar
-
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (anuncio)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Máx clientes:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Seleccione un número máximo de clientes. No todos los slots serán ocupados.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compañia{P y s}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Máximo compañías:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Limitar el servidor a un cierto número de compañías
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Espectadores máximos
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Limitar el servidor a un cierto número de espectadores
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Idioma hablado:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Otros jugadores sabrán cual es el idioma hablado en este servidor.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-
-STR_NETWORK_START_GAME                                          :{BLACK}Empezar Juego
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Empezar un nuevo juego en red desde un mapa al azar o escenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Cargar Juego
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Continúa un juego multijugador guardado (asegúrese de conectar con el jugador correcto)
-
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Introduce un nombre para el juego en red
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Empezar nuevo juego multijugador
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Nombre del juego:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}El nombre del juego será mostrado a otros jugadores en el menu de selección de juego multijugador
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Establecer contraseña
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Proteje tu juego con una contraseña si no quieres que otras personas se unan a él
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Selecciona mapa:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}¿En qué mapa desea jugar?
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Generar juego nuevo al azar
+
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (anuncio)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} cliente{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Máx clientes:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Seleccione un número máximo de clientes. No todos los slots serán ocupados.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} compañia{P y s}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Máximo compañías:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Limitar el servidor a un cierto número de compañías
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} espectador{P "" es}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Espectadores máximos
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Limitar el servidor a un cierto número de espectadores
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Idioma hablado:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Otros jugadores sabrán cual es el idioma hablado en este servidor.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Empezar Juego
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Empezar un nuevo juego en red desde un mapa al azar o escenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Cargar Juego
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Continúa un juego multijugador guardado (asegúrese de conectar con el jugador correcto)
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Introduce un nombre para el juego en red
 
 # Network game languages
 ############ Leave those lines in this order!!
@@ -1576,32 +1576,32 @@ STR_NETWORK_LANG_LATVIAN                                        :Letón
 ############ End of leave-in-this-order
 
 # Network game lobby
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Sala de estar del juego multijugador
-
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Preparándose para unirse: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Un listado de empresas actualmente en el juego. Puede unirse a una o emprezarla.
-
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}INFO EMPRESA
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nombre empresa: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguración: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Valor empresa: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Balance actual: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Ingresos último año: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Rendimiento: {WHITE}{NUM}
-
-STR_NETWORK_VEHICLES                                            :{SILVER}Vehículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Estaciones: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Jugadores: {WHITE}{STRING}
-
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nueva empresa
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Crear nueva empresa
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Observar juego
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Observar un juego como espectador
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Unirse a empresa
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Ayudar a dirigir esta empresa
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Sala de estar del juego multijugador
+
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Preparándose para unirse: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Un listado de empresas actualmente en el juego. Puede unirse a una o emprezarla.
+
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}INFO EMPRESA
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nombre empresa: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguración: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Valor empresa: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Balance actual: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Ingresos último año: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Rendimiento: {WHITE}{NUM}
+
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Vehículos: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Estaciones: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Jugadores: {WHITE}{STRING}
+
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nueva empresa
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Crear nueva empresa
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Observar juego
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Observar un juego como espectador
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Unirse a empresa
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Ayudar a dirigir esta empresa
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Conectando...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Conectando...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Conectando..
@@ -1617,13 +1617,13 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Recibien
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cliente{P "" s} delante de usted
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} descargados
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Desconectado
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Desconectado
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servidor protegido. Teclee la contraseña
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Empresa protegida. Introduce contraseña
 
 # Network company list added strings
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Lista de clientes
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Lista de clientes
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Presenciar
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nueva compañía
 
@@ -1645,18 +1645,18 @@ STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Introduc
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}No grabar la contraseña introducida
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Asignar a la empresa una nueva contraseña
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Contraseña de la empresa
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Contraseña por defecto de la empresa
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Usa la contraseña de esta empresa para el resto de nuevas empresas
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Contraseña por defecto de la empresa
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Usa la contraseña de esta empresa para el resto de nuevas empresas
 
 # Network company info join/password
-STR_COMPANY_JOIN                                                :{BLACK}Unirse
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Unirse y jugar como esta compañía
-STR_COMPANY_PASSWORD                                            :{BLACK}Contraseña
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Protege por contraseña tu compañía para prevenir que usuarios no autorizados se unan a ella.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Configurar contraseña de empresa
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Unirse
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Unirse y jugar como esta compañía
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Contraseña
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Protege por contraseña tu compañía para prevenir que usuarios no autorizados se unan a ella.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Configurar contraseña de empresa
 
 # Network chat
-STR_NETWORK_SEND                                                :{BLACK}Enviar
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Enviar
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Equipo] :
 STR_NETWORK_CHAT_CLIENT_CAPTION                                 :[Privado] :
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Todos] :
@@ -1669,40 +1669,40 @@ STR_NETWORK_CHAT_ALL                                            :[Todos] {STRING
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Introduce el texto para el chat en red
 
 # Network messages
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}No se han encontrado dispositivos de red o juego compilado sin ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}No se pudo encontrar ningún juego en red
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}El servidor no responde a la petición
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}No se pudo conectar debido a incompatibilidad de NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}La sincronización del juego en red ha fallado
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}La conexión con el juego en red se ha perdido
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}No se pudo cargar partida
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}No se pudo iniciar servidor
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}No se pudo conectar
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Tiempo de espera agotado en conexión #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Se ha producido un error de protocolo y la conexión ha sido cerrada
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}La versión de este cliente no corresponde con la versión del servidor
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Contraseña incorrecta
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}El servidor está completo
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Se ha prohibido tu acceso al servidor
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Has sido expulsado del servidor
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}No se permiten trucos en este servidor
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}No se han encontrado dispositivos de red o juego compilado sin ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}No se pudo encontrar ningún juego en red
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}El servidor no responde a la petición
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}No se pudo conectar debido a incompatibilidad de NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}La sincronización del juego en red ha fallado
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}La conexión con el juego en red se ha perdido
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}No se pudo cargar partida
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}No se pudo iniciar servidor
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}No se pudo conectar
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Tiempo de espera agotado en conexión #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Se ha producido un error de protocolo y la conexión ha sido cerrada
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}La versión de este cliente no corresponde con la versión del servidor
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Contraseña incorrecta
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}El servidor está completo
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Se ha prohibido tu acceso al servidor
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Has sido expulsado del servidor
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}No se permiten trucos en este servidor
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :error general
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :error de desync
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :no se puede cargar el mapa
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :conexión perdida
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :error protocolo
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF erroneo
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :no autorizado
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :recibido paquete extraño
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :versión incorrecta
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :este nombre ya está en uso
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :contraseña incorrecta
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :error en el id de la empresa en el DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :expulsado por el servidor
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :ha intentado usar un truco
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servidor lleno
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :error general
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :error de desync
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :no se puede cargar el mapa
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :conexión perdida
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :error protocolo
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF erroneo
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :no autorizado
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :recibido paquete extraño
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :versión incorrecta
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :este nombre ya está en uso
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :contraseña incorrecta
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :error en el id de la empresa en el DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :expulsado por el servidor
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :ha intentado usar un truco
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor lleno
 ############ End of leave-in-this-order
 
 # Network related errors
@@ -1714,36 +1714,36 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Juego detenido
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Juego en marcha (cliente conectado)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Juego en marcha (cliente falló la conexión)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :abandonando
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} se ha unido al juego
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} ha entrado en al compañía #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} ha entrado como espectador
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ha comenzado una nueva compañía (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} ha abandonado el juego ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} ha cambiado su nombre a {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} da a tu compañia {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Entregas {1:STRING} {2:CURRENCY}
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} El servidor ha cerrado la sesión
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Se está reiniciando el servidor...{}Espere por favor...
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :abandonando
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} se ha unido al juego
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} ha entrado en al compañía #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} ha entrado como espectador
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ha comenzado una nueva compañía (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} ha abandonado el juego ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} ha cambiado su nombre a {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} da a tu compañia {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Entregas {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} El servidor ha cerrado la sesión
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Se está reiniciando el servidor...{}Espere por favor...
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Descarga de contenido
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tipo
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Tipo de contenido
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Tipo de contenido
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Nombre
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Nombre del contenido
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Pincha en una línea para ver los detalles{}Pincha en los cajetines para seleccionar las descargas
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Nombre del contenido
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Pincha en una línea para ver los detalles{}Pincha en los cajetines para seleccionar las descargas
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Seleccionar todas
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marca todo el contenido para descarga
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marca todo el contenido para descarga
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Seleccionar acts.
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marca para descargar todo el contenido existente que ha sido actualizado
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marca para descargar todo el contenido existente que ha sido actualizado
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Desmarcar todas
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Marca todo el contenido para no ser descargado
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marca todo el contenido para no ser descargado
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Escribe patrón de filtrado
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Introduce una palabra clave para filtrar la lista
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Introduce una palabra clave para filtrar la lista
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Etiqueta/nombre del filtro
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Descargar
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Comenzar a descargar el contenido seleccionado
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Comenzar a descargar el contenido seleccionado
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Tamaño total de la descarga: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INFORMACIÓN DEL CONTENIDO
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}No has seleccionado esto para ser descargado
@@ -1787,17 +1787,17 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... no s
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No ha sido posible descomprimir el fichero descargado
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Opciones de Transparencia
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Ajustar transparencia para carteles de estaciones. Ctrl+Click para bloquear.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Ajustar transparencia para árboles. Ctrl+Click para bloquear.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Ajustar transparencia para casas. Ctrl+Click para bloquear.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Ajustar transparencia para industrias. Ctrl+Click para bloquear.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Ajustar transparencia para construcciones como estaciones, depósitos o puntos de ruta. Ctrl+Click para bloquear.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Ajustar transparencia para puentes. Ctrl+Click para bloquear.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Ajustar transparencia para estructuras como faros, antenas, etc. Ctrl+Click para bloquear.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Ajustar transparencia para catenaria. Ctrl+Click para bloquear.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Ajustar transparencia para los indicadores de carga. Ctrl+Click para bloquear.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Poner objetos invisibles en vez de transparentes
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opciones de Transparencia
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Ajustar transparencia para carteles de estaciones. Ctrl+Click para bloquear.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Ajustar transparencia para árboles. Ctrl+Click para bloquear.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Ajustar transparencia para casas. Ctrl+Click para bloquear.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Ajustar transparencia para industrias. Ctrl+Click para bloquear.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Ajustar transparencia para construcciones como estaciones, depósitos o puntos de ruta. Ctrl+Click para bloquear.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Ajustar transparencia para puentes. Ctrl+Click para bloquear.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Ajustar transparencia para estructuras como faros, antenas, etc. Ctrl+Click para bloquear.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Ajustar transparencia para catenaria. Ctrl+Click para bloquear.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Ajustar transparencia para los indicadores de carga. Ctrl+Click para bloquear.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Poner objetos invisibles en vez de transparentes
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Iluminar área de alcance
@@ -1809,11 +1809,11 @@ STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Acepta:
 STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Provisiones: {GOLD}
 
 # Join station window
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Unir estación
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Construir una estación separada
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Unir estación
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Construir una estación separada
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Unir punto de ruta
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Construir un punto de ruta separado
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Unir punto de ruta
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Construir un punto de ruta separado
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Construcción de ferrocarril
@@ -1837,8 +1837,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Orientac
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Seleccione la orientación del depósito de trenes
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Punto de ruta
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Seleccione tipo de punto de ruta
+STR_WAYPOINT_CAPTION                                            :{WHITE}Punto de ruta
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Seleccione tipo de punto de ruta
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Selección de estación de tren
@@ -1851,36 +1851,36 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Elige lo
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Arrastrar y soltar
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Construir una estación con arrastrar & soltar
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Selecciona el tipo de estación a mostrar
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Selecciona el tipo de estación a construir
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Selecciona el tipo de estación a mostrar
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Selecciona el tipo de estación a construir
 
-STR_STAT_CLASS_DFLT                                             :Estación por defecto
-STR_STAT_CLASS_WAYP                                             :Puntos de ruta
+STR_STATION_CLASS_DFLT                                          :Estación por defecto
+STR_STATION_CLASS_WAYP                                          :Puntos de ruta
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Selección de Señales
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Señal de bloque (semáforo){}Este es el tipo de señal mas básico, que permite a un único tren estar a la vez en el mismo bloque.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Señal de entrada (semáforo){}Verde si existen una o más señales de salida en el tramo en verde, de lo contrario estará en rojo
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Señal de salida (semáforo){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Señal combo (semáforo){}La señal combo actua como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Señal de ruta (semáforo){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Señal de ruta de un sentido (semáforo){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Señal de bloque (eléctrica){}Es el tipo de señal mas básico, que permite a un único tren estar a la vez en el mismo bloque.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Señal de entrada (eléctrica){}Verde si existen una o más señales verdes en el siguiente segmento de vía, de lo contrario estará en rojo
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Señal de salida (eléctrica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Señal combo (eléctrica){}La señal combo actua como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Señal de ruta de un sentido (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Convertir señal{}Cuando es seleccionado, pulsar sobre una señal existente la convierte en el tipo y variante indicados. Pulsar Ctrl+Click permite cambiar de variante
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Arrastrar densidad de señales
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Decrementar arrastre de intensidad de señales
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Incrementar arrastre de intensidad de señales
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Selección de Señales
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Señal de bloque (semáforo){}Este es el tipo de señal mas básico, que permite a un único tren estar a la vez en el mismo bloque.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Señal de entrada (semáforo){}Verde si existen una o más señales de salida en el tramo en verde, de lo contrario estará en rojo
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Señal de salida (semáforo){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Señal combo (semáforo){}La señal combo actua como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Señal de ruta (semáforo){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Señal de ruta de un sentido (semáforo){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Señal de bloque (eléctrica){}Es el tipo de señal mas básico, que permite a un único tren estar a la vez en el mismo bloque.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Señal de entrada (eléctrica){}Verde si existen una o más señales verdes en el siguiente segmento de vía, de lo contrario estará en rojo
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Señal de salida (eléctrica){}Se comporta de la misma manera que una señal de bloque, pero es necesaria para activar el color correcto en las señales de entrada y combo.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Señal combo (eléctrica){}La señal combo actua como señal de entrada y salida a la vez. Esto permite construir grandes "árboles" de señales condicionales.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Señal de ruta (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. Pueden ser traspasadas desde atrás.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Señal de ruta de un sentido (eléctrica){}Una señal de ruta permite a más de un tren entrar a un bloque de señales a la vez, si el tren puede reservar una ruta hasta un lugar seguro. No pueden ser traspasadas desde atrás.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Convertir señal{}Cuando es seleccionado, pulsar sobre una señal existente la convierte en el tipo y variante indicados. Pulsar Ctrl+Click permite cambiar de variante
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Arrastrar densidad de señales
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Decrementar arrastre de intensidad de señales
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Incrementar arrastre de intensidad de señales
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Seleccione puente de raíl
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Elige puente de carretera
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Selección de puente - click en el puente elegido para construirlo
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Selección de puente - click en el puente elegido para construirlo
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Suspensión, Acero
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Tirantes, Acero
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Colgante, Acero
@@ -1914,9 +1914,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Activar
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Orientación del depósito
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Elegir orientación del depósito de carretera
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Elegir orientación del depósito de carretera
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Orientación del depósito de tranvía
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Seleccione orientación del depósito de tranvías
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Seleccione orientación del depósito de tranvías
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Or. estación de autobús
@@ -1937,8 +1937,8 @@ STR_WATERWAYS_TOOLBAR_BUILD_DEPOT_TOOLTIP                       :{BLACK}Construi
 STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP                        :{BLACK}Construir muelles
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Colocar boya que puede ser usada como punto de ruta
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Construir acueducto
-STR_CREATE_LAKE                                                 :{BLACK}Definir área de agua.{}Crea un canal, a menos que se pulse Ctrl al nivel del mar, en cuyo caso se inundarán los alrededores
-STR_CREATE_RIVER                                                :{BLACK}Colocar rios.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definir área de agua.{}Crea un canal, a menos que se pulse Ctrl al nivel del mar, en cuyo caso se inundarán los alrededores
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Colocar rios.
 
 # Ship depot construction window
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Orientación del astillero
@@ -1970,20 +1970,20 @@ STR_STATION_BUILD_AIRPORT_LARGE_AIRPORTS                        :{BLACK}Aeropuer
 STR_STATION_BUILD_AIRPORT_HUB_AIRPORTS                          :{BLACK}Centro del aeropuerto
 STR_STATION_BUILD_AIRPORT_HELIPORTS                             :{BLACK}Aeropuerto helicopteros
 
-STR_STATION_NOISE                                               :{BLACK}Ruido generado: {GOLD}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Ruido generado: {GOLD}{COMMA}
 
 # Landscaping toolbar
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Paisaje
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Bajar una esquina del terreno
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Subir una esquina del terreno
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Nivelar terreno
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Comprar tierra para usos futuros
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Bajar una esquina del terreno
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Subir una esquina del terreno
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Nivelar terreno
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Comprar tierra para usos futuros
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}�rboles
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Seleccione el tipo de árboles a plantar
 STR_TREES_RANDOM_TYPE                                           :{BLACK}�rboles al azar
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Colocar distintos árboles al azar
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Colocar distintos árboles al azar
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}�rboles al azar
 STR_TREES_RANDOM_TREES_TOOLTIP                                  :{BLACK}Planta árboles al azar sobre el paisaje
 
@@ -1996,9 +1996,9 @@ STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Colocar
 STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Aumentar el tamaño del bloque de terreno a bajar/subir
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Reducir tamaño del bloque de terreno a bajar/subir
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generar terreno al azar
-STR_SE_NEW_WORLD                                                :{BLACK}Crear nuevo escenario
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Crear nuevo escenario
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Hacer reset del paisaje
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Eliminar todas las propiedades de jugadores del mapa
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Eliminar todas las propiedades de jugadores del mapa
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Hacer reset del paisaje
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}¿Estás seguro de querer eliminar todas las propiedades de jugadores?
@@ -2009,41 +2009,41 @@ STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Nuevo Pu
 STR_FOUND_TOWN_NEW_TOWN_TOOLTIP                                 :{BLACK}Construir nuevo pueblo
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Pueblo al Azar
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Construir pueblo en sitio aleatorio
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Varios pueblos al azar
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Cubre el mapa con pueblos colocados al azar
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Varios pueblos al azar
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Cubre el mapa con pueblos colocados al azar
 
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Tamaño pueblo:
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Pequeña
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mediana
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grande
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Aleatorio
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Aleatorio
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selecciona el tamaño del pueblo
 STR_FOUND_TOWN_CITY                                             :{BLACK}Ciudad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Las ciudades crecen más rápido que los pueblos{}Dependiendo de los ajustes, son mayores al ser fundadas
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Patrón de carretera:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Seleccionar patrón de carreteras para este pueblo
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Mejorado
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Rejilla de 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Rejilla 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Aleatorio
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Patrón de carretera:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Seleccionar patrón de carreteras para este pueblo
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Mejorado
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Rejilla de 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Rejilla 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Aleatorio
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Fundar nueva industria
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Seleccione la industria apropiada de la lista
-STR_MANY_RANDOM_INDUSTRIES                                      :Varias industrias al azar
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Cubre el mapa con industrias colocadas al azar
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Coste: {YELLOW}{CURRENCY}
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Perspectiva
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Construir
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Fundar
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Seleccione la industria apropiada de la lista
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Varias industrias al azar
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Cubre el mapa con industrias colocadas al azar
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Coste: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Perspectiva
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Construir
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Fundar
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Información sobre el terreno
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Coste de desbroce: {LTBLUE}N/D
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Coste de desbroce: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Beneficio cuando es limpiado: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Beneficio cuando es limpiado: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/D
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Propietario: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Propietario de la carretera: {LTBLUE}{STRING}
@@ -2051,104 +2051,104 @@ STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Propieta
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Propietario de la vía del tren: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoridad local: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ninguna
-STR_LANDINFO_COORDS                                             :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
-STR_BUILD_DATE                                                  :{BLACK}Construido: {LTBLUE}{DATE_LONG}
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Clase de estación: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Tipo de estación: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordenadas: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construido: {LTBLUE}{DATE_LONG}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Clase de estación: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Tipo de estación: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Carga aceptada: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rocas
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Tierra árida
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Tierra desnuda
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Césped
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Campos
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Tierra cubierta por nieve
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Desierto
-
-STR_RAILROAD_TRACK                                              :Vía del tren
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Vía del tren con señales de bloque
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Vía del tren con señales de entrada
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Vía del tren con señales de salida
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Vía del tren con señales combo
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Vía del tren con señales de ruta
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Vía de tren con señales de ruta de un sentido
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Vía de tren con señales de bloque y señales de entrada
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Vía de tren con señales de bloque y de salida
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Vía de tren con señales combo y de bloque
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Vía de tren con señales de bloque y de ruta
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Vía de tren con señales de bloque y de ruta de un sentido
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Vía de tren con señales de entrada y señales de salida
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Vía de tren con señales de entrada y señales combo
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Vía de tren con señales de entrada y señales de ruta
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Vía de tren con señales de entrada y señales de ruta de un sentido
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Vía de tren con señales de salida y señales combo
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Vía de tren con señales de salida y de ruta
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Vía de tren con señales de salida y de ruta de un sentido
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Vía de tren con señales combo y de ruta
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Vía de tren con señales combo y de ruta de un sentido
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Vía de tren con señales de ruta y señales de ruta de un sentido
-STR_RAILROAD_TRAIN_DEPOT                                        :Depósito de trenes
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Road
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Carretera con farolas
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Carretera arbolada
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depósito de carretera
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Paso a nivel
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tranvía
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rocas
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Tierra árida
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Tierra desnuda
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Césped
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Campos
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Tierra cubierta por nieve
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Desierto
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Vía del tren
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Vía del tren con señales de bloque
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Vía del tren con señales de entrada
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Vía del tren con señales de salida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Vía del tren con señales combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Vía del tren con señales de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Vía de tren con señales de ruta de un sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Vía de tren con señales de bloque y señales de entrada
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Vía de tren con señales de bloque y de salida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Vía de tren con señales combo y de bloque
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Vía de tren con señales de bloque y de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Vía de tren con señales de bloque y de ruta de un sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Vía de tren con señales de entrada y señales de salida
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Vía de tren con señales de entrada y señales combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Vía de tren con señales de entrada y señales de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Vía de tren con señales de entrada y señales de ruta de un sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Vía de tren con señales de salida y señales combo
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Vía de tren con señales de salida y de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Vía de tren con señales de salida y de ruta de un sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Vía de tren con señales combo y de ruta
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Vía de tren con señales combo y de ruta de un sentido
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Vía de tren con señales de ruta y señales de ruta de un sentido
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depósito de trenes
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Road
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Carretera con farolas
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Carretera arbolada
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depósito de carretera
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Paso a nivel
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tranvía
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (bajo construcción)
-
-STR_TREE_NAME_TREES                                             :�rboles
-STR_TREE_NAME_RAINFOREST                                        :Selváticos
-STR_TREE_NAME_CACTUS_PLANTS                                     :Cactus
-
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Estación de tren
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar de aeroplanos
-STR_STATION_DESCRIPTION_AIRPORT                                 :Aeropuerto
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Zona de carga de camiones
-STR_STATION_DESCRIPTION_BUS_STATION                             :Estación de autobús
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Muelle
-STR_STATION_DESCRIPTION_BUOY                                    :Boya
-STR_LANDINFO_WAYPOINT                                           :Punto de ruta
-
-STR_WATER_DESCRIPTION_WATER                                     :Agua
-STR_LANDINFO_CANAL                                              :Canal
-STR_LANDINFO_LOCK                                               :Dársena
-STR_LANDINFO_RIVER                                              :Río
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Costa o rivera
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Astillero
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (bajo construcción)
+
+STR_LAI_TREE_NAME_TREES                                         :�rboles
+STR_LAI_TREE_NAME_RAINFOREST                                    :Selváticos
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Cactus
+
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Estación de tren
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar de aeroplanos
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Aeropuerto
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Zona de carga de camiones
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Estación de autobús
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Muelle
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boya
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Punto de ruta
+
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Agua
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Canal
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Dársena
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Río
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Costa o rivera
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Astillero
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Túnel de tren
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Túnel de carretera
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Túnel de tren
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Túnel de carretera
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Puente de tren de acero suspendido
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Puente de tren de acero con tirantes
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Puente de tren colgante de acero
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Puente de tren de hormigón suspendido reforzado
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Puente de tren de madera
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Puente de tren de hormigón
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Puente de tren tubular
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Puente de tren de acero suspendido
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Puente de tren de acero con tirantes
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Puente de tren colgante de acero
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Puente de tren de hormigón suspendido reforzado
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Puente de tren de madera
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Puente de tren de hormigón
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Puente de tren tubular
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Puente de carretera de acero suspendido
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Puente de carretera de acero con tirantes
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Puente de carretera colgante de acero
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Puente de carretera de hormigón suspendido reforzado
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Puente de carretera de madera
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Puente de carretera de hormigón
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Puente de carretera tubular
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Puente de carretera de acero suspendido
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Puente de carretera de acero con tirantes
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Puente de carretera colgante de acero
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Puente de carretera de hormigón suspendido reforzado
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Puente de carretera de madera
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Puente de carretera de hormigón
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Puente de carretera tubular
 
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Acueducto
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Acueducto
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Transmisor
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Faro
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Sede de la empresa
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Terreno propiedad de una empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Transmisor
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Faro
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Sede de la empresa
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Terreno propiedad de una empresa
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Acerca de OpenTTD
@@ -2161,7 +2161,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Guardar
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Cargar Juego
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Guardar Escenario
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Cargar Escenario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Cargar Mapas de altura
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Cargar Mapas de altura
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Pulsa aquí para ir al directorio por defecto de guardado
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} libres
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Listado de unidades, directorios y juegos guardados
@@ -2171,119 +2171,119 @@ STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Borrar e
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Guardar
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Guarda el juego actual, usando el nombre seleccionado
 
-STR_SAVE_OSKTITLE                                               :{BLACK}Introduce un nombre para el juego guardado
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Introduce un nombre para el juego guardado
 
 # World generation
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generación de mundo
-STR_MAPSIZE                                                     :{BLACK}Tamaño del mapa:
-STR_BY                                                          :{BLACK}*
-STR_NUMBER_OF_TOWNS                                             :{BLACK}No. de pueblos:
-STR_DATE                                                        :{BLACK}Fecha:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}No. de industrias:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Altura línea nieve:
-STR_SNOW_LINE_UP                                                :{BLACK}Mover la línea de nieve una arriba
-STR_SNOW_LINE_DOWN                                              :{BLACK}Mover la línea de nieve una abajo
-STR_RANDOM_SEED                                                 :{BLACK}Semilla Aleatoria:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Pulsa para introducir la semilla aleatoria
-STR_RANDOM                                                      :{BLACK}Aleatorio
-STR_RANDOM_HELP                                                 :{BLACK}Cambiar la semilla aleatoria usada por el Generador de Terrenos
-STR_LAND_GENERATOR                                              :{BLACK}Generador terreno:
-STR_TREE_PLACER                                                 :{BLACK}Algoritmo árboles:
-STR_TERRAIN_TYPE                                                :{BLACK}Tipo de terreno
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Nivel del mar:
-STR_SMOOTHNESS                                                  :{BLACK}Suavidad:
-STR_GENERATE                                                    :{WHITE}Generar
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generación de mundo
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Tamaño del mapa:
+STR_MAPGEN_BY                                                   :{BLACK}*
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}No. de pueblos:
+STR_MAPGEN_DATE                                                 :{BLACK}Fecha:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}No. de industrias:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Altura línea nieve:
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Mover la línea de nieve una arriba
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Mover la línea de nieve una abajo
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Semilla Aleatoria:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Pulsa para introducir la semilla aleatoria
+STR_MAPGEN_RANDOM                                               :{BLACK}Aleatorio
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Cambiar la semilla aleatoria usada por el Generador de Terrenos
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Generador terreno:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algoritmo árboles:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Tipo de terreno
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Nivel del mar:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Suavidad:
+STR_MAPGEN_GENERATE                                             :{WHITE}Generar
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Bordes del mapa:
-STR_NORTHWEST                                                   :{BLACK}Noroeste
-STR_NORTHEAST                                                   :{BLACK}Noreste
-STR_SOUTHEAST                                                   :{BLACK}Sureste
-STR_SOUTHWEST                                                   :{BLACK}Suroeste
-STR_BORDER_FREEFORM                                             :{BLACK}Forma libre
-STR_BORDER_WATER                                                :{BLACK}Agua
-STR_BORDER_RANDOM                                               :{BLACK}Aleatorio
-STR_BORDER_RANDOMIZE                                            :{BLACK}Aleatorio
-STR_BORDER_MANUAL                                               :{BLACK}Manual
-
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotación mapa de alturas:
-STR_HEIGHTMAP_NAME                                              :{BLACK}Nombre del mapa de alturas:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Tamaño: {ORANGE}{NUM} x {NUM}
-
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Introducir una semilla aleatoria
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Cambiar altura de la línea de nieve
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Cambiar año de inicio
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Bordes del mapa:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Noroeste
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Noreste
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sureste
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Suroeste
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Forma libre
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Agua
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Aleatorio
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Aleatorio
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manual
+
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotación mapa de alturas:
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Nombre del mapa de alturas:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Tamaño: {ORANGE}{NUM} x {NUM}
+
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Introducir una semilla aleatoria
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Cambiar altura de la línea de nieve
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Cambiar año de inicio
 
 # SE Map generation
-STR_SE_CAPTION                                                  :{WHITE}Tipo de escenario
-STR_SE_FLAT_WORLD                                               :{WHITE}Tierra llana
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generar una tierra llana
-STR_SE_RANDOM_LAND                                              :{WHITE}Tierra aleatoria
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Altura tierra llana:
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Mueve la altura de la tierra llana uno abajo
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Mueve la altura de la tierra llana uno arriba
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Tipo de escenario
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Tierra llana
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generar una tierra llana
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Tierra aleatoria
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Altura tierra llana:
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Mueve la altura de la tierra llana uno abajo
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Mueve la altura de la tierra llana uno arriba
 
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Cambia la altura de la tierra llana
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Cambia la altura de la tierra llana
 
 # Map generation progress
 STR_GENERATION_WORLD                                            :{WHITE}Generando mundo...
 STR_GENERATION_ABORT                                            :{BLACK}Abortar
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Abortar Generación del Mundo
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}¿Desea realmente abortar la generación?
-STR_PROGRESS                                                    :{WHITE}{NUM}% completado
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generación de mundo
-STR_TREE_GENERATION                                             :{BLACK}Generación de árboles
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Generación inamovible
-STR_CLEARING_TILES                                              :{BLACK}Generación de area áspera y rocosa
-STR_SETTINGUP_GAME                                              :{BLACK}Configurar juego
-STR_PREPARING_TILELOOP                                          :{BLACK}Ejecutar tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Preparando juego
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% completado
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generación de mundo
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generación de árboles
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Generación inamovible
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generación de area áspera y rocosa
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Configurar juego
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Ejecutar tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Preparando juego
 
 # NewGRF settings
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Configuración de Newgrf
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Cargar la programación seleccionada
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Grabar progra...
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Grabar lista actual como una programación
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Introduce nombre de la programación
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Borrar progr...
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Borrar la programación seleccionada
-STR_NEWGRF_ADD                                                  :{BLACK}Añadir
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Añadir un NewGRF a la lista
-STR_NEWGRF_REMOVE                                               :{BLACK}Retirar
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Retirar el NewGRF seleccionado de la lista
-STR_NEWGRF_MOVEUP                                               :{BLACK}Mover Arriba
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Mueve el NewGRF seleccionado arriba en la lista
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Mover Abajo
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Mueve el NewGRF seleccionado abajo en la lista
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Una lista de los NewGRF instalados. Pulsa en el fichero para cambiar sus parámetros
-
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Establecer parámetros
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Seleccionar paleta
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Seleccionar la paleta del NewGRF seleccionado.{}Hazlo cuando los gráficos de este NewGRF se vean rosa en el juego
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Aplicar cambios
-
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Encontrar contenido que falta en línea
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Comprobar si el contenido que falta puede ser encontrado en línea
-
-STR_NEWGRF_FILENAME                                             :{BLACK}Fichero: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}ID GRF: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Paleta: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER                                            :{BLACK}Parametros: {SILVER}{STRING}
-
-STR_NEWGRF_NO_INFO                                              :{BLACK}No tiene información disponible
-STR_NEWGRF_NOT_FOUND                                            :{RED}Fichero no encontrado
-STR_NEWGRF_DISABLED                                             :{RED}Desactivado
-
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Introduce los parámetros del NewGRF
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Cargar la programación seleccionada
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Grabar progra...
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Grabar lista actual como una programación
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Introduce nombre de la programación
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Borrar progr...
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Borrar la programación seleccionada
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Añadir
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Añadir un NewGRF a la lista
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Retirar
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Retirar el NewGRF seleccionado de la lista
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Mover Arriba
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Mueve el NewGRF seleccionado arriba en la lista
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Mover Abajo
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Mueve el NewGRF seleccionado abajo en la lista
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Una lista de los NewGRF instalados. Pulsa en el fichero para cambiar sus parámetros
+
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Establecer parámetros
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Seleccionar paleta
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Seleccionar la paleta del NewGRF seleccionado.{}Hazlo cuando los gráficos de este NewGRF se vean rosa en el juego
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar cambios
+
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Encontrar contenido que falta en línea
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Comprobar si el contenido que falta puede ser encontrado en línea
+
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Fichero: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}ID GRF: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Paleta: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Parametros: {SILVER}{STRING}
+
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}No tiene información disponible
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Fichero no encontrado
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Desactivado
+
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Introduce los parámetros del NewGRF
 
 # NewGRF add window
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Ficheros NewGRF disponibles
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Añadir a la selección
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Añade el NewGRF seleccionado a tu configuración
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Actualizar ficheros
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Actualiza la lista de ficheros NewGRF disponibles
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Añade el NewGRF seleccionado a tu configuración
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Actualizar ficheros
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Actualiza la lista de ficheros NewGRF disponibles
 
 # NewGRF (self) generated warnings/errors
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2307,7 +2307,7 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contiene múltiples entradas Action 8.
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Precaución!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Precaución!
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Se van a realizar cambios a un juego en ejecución; esto puede cerrar OpenTTD.{}¿Estás completamente seguro de realizar esto?
 
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}No se puede añadir: GRF ID duplicado
@@ -2332,10 +2332,10 @@ STR_SIGN_LIST_CAPTION                                           :{WHITE}Lista de
 
 # Sign window
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Editar texto del cartel
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Ir al siguiente cartel
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Ir al anterior cartel
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Ir al siguiente cartel
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Ir al anterior cartel
 
-STR_SIGN_OSKTITLE                                               :{BLACK}Introduce un nombre para el cartel
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Introduce un nombre para el cartel
 
 # Town directory window
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Pueblos
@@ -2349,10 +2349,10 @@ STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}Habitantes: {ORANGE}{COMMA}{BLACK}  Casas: {ORANGE}{COMMA}
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Pasajeros último mes: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Correo último mes: {ORANGE}{COMMA}{BLACK}  máx: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Carga necesaria para crecimiento del pueblo:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} requeridos
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} entregados último mes
-STR_NOISE_IN_TOWN                                               :{BLACK}Nivel de ruido en pueblo: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Carga necesaria para crecimiento del pueblo:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} requeridos
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} entregados último mes
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Nivel de ruido en pueblo: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar vista sobre el pueblo
 STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Autoridad local
 STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Mostrar información sobre autoridades locales
@@ -2399,18 +2399,18 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Ninguna
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Líneas ya subvencionadas:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} desde {STATION} a {STATION}{YELLOW} ({COMPANY}{YELLOW}, hasta {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Haga click sobre el servicio para centrar la vista en la industria/pueblo
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Haga click sobre el servicio para centrar la vista en la industria/pueblo
 
 # Station list window
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Nombres de estación - click en nombre para centrar vista en la estación
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Mantén pulsado Ctrl para seleccionar varios elementos
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Mantén pulsado Ctrl para seleccionar varios elementos
 STR_STATION_LIST_CAPTION                                        :{WHITE}{COMPANY} - {COMMA} Estaciones
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
 STR_STATION_LIST_WAYPOINT                                       :{YELLOW}{WAYPOINT}
 STR_STATION_LIST_NONE                                           :{YELLOW}- Ninguna -
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Seleccionar todas las facilidades
-STR_SELECT_ALL_TYPES                                            :{BLACK}Seleccionar todos los tipos de carga (incluidas las que no están en espera)
-STR_NO_WAITING_CARGO                                            :{BLACK}Ningún tipo de carga está esperando
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Seleccionar todas las facilidades
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Seleccionar todos los tipos de carga (incluidas las que no están en espera)
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Ningún tipo de carga está esperando
 
 # Station view window
 STR_STATION_VIEW_CAPTION                                        :{WHITE}{STATION} {STATIONFEATURES}
@@ -2441,18 +2441,18 @@ STR_CARGO_RATING_OUTSTANDING                                    :Excepcional
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Centrar vista en la posición de la estación
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Cambiar nombre de la estación
 
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Mostrar todos los vehículos de carretera que tienen esta estación en su horario
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Mostrar todos las aeronaves que tienen esta estación en su horario
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Mostrar todos los barcos que tienen esta estación en su horario
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Mostrar todos los trenes que tienen esta estación en su horario
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Mostrar todos los vehículos de carretera que tienen esta estación en su horario
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Mostrar todos las aeronaves que tienen esta estación en su horario
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Mostrar todos los barcos que tienen esta estación en su horario
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Renombrar estación/zona de carga
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Renombrar estación/zona de carga
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrar vista en posición del punto de ruta
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Cambiar nombre del punto de ruta
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Cambiar nombre del punto de ruta
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar vista en posición de la boya
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Cambiar nombre de boya
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Cambiar nombre de boya
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Editar nombre del punto de ruta
 
@@ -2478,7 +2478,7 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Total:
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Saldo en Banco
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Préstamo
-STR_MAX_LOAN                                                    :{WHITE}Préstamo Máx: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Préstamo Máx: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Pedir Préstamo {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_BORROW_TOOLTIP                                     :{BLACK}Incrementar préstamo. Ctrl+Click solicita todo el préstamo posible
@@ -2492,10 +2492,10 @@ STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDE
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Inaugurado: {WHITE}{NUM}
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Esquema de Color:
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Vehiculos:
-STR_TRAINS                                                      :{WHITE}{COMMA} tren{P "" es}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} veh{P "" s}. carret{P er ""}a
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} aeroplano{P "" s}
-STR_SHIPS                                                       :{WHITE}{COMMA} barco{P "" s}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren{P "" es}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} veh{P "" s}. carret{P er ""}a
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} aeroplano{P "" s}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} barco{P "" s}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ninguno
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor de la empresa: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propiedad de {COMPANY})
@@ -2503,8 +2503,8 @@ STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir Sede
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Ver Sede
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Construir sede de la empresa / ver sede de la empresa
-STR_RELOCATE_HQ                                                 :{BLACK}Reubicar Sede
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Reubica la sede de la empresa a cualquier otro lugar, con el coste del 1% del valor total de la empresa
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Reubicar Sede
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Reubica la sede de la empresa a cualquier otro lugar, con el coste del 1% del valor total de la empresa
 
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nueva Cara
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Selecciona nueva cara para el presidente
@@ -2520,17 +2520,17 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Vender 2
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Comprar 25% de acciones de esta empresa
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Vender 25% acciones de esta empresa
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Nombre Empresa
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Nombre del Presidente
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Nombre Empresa
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Nombre del Presidente
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Estamos buscando una empresa de transportes para adquirir la nuestra{}{}¿Deseas comprar {COMPANY} por {CURRENCY}?
 
 # Industry directory
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrias
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Nombre de industrias - pulse en el nombre para centrar la vista en él
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrias
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transportado)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Nombre de industrias - pulse en el nombre para centrar la vista en él
 
 # Industry view
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
@@ -2566,26 +2566,26 @@ STR_VEHICLE_LIST_AIRCRAFT_TOOLTIP                               :{BLACK}La aeron
 
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Beneficio este año: {CURRENCY} (año anterior: {CURRENCY})
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trenes disponibles
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Vehículos disponibles
-STR_AVAILABLE_SHIPS                                             :{BLACK}Barcos disponibles
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Aviones disponibles
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Ver la lista de los motores disponibles para este tipo de vehículo.
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trenes disponibles
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Vehículos disponibles
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Barcos disponibles
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Aviones disponibles
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Ver la lista de los motores disponibles para este tipo de vehículo.
 
-STR_MANAGE_LIST                                                 :{BLACK}Administrar lista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Enviar instrucciones a todos los vehículos de la lista
-STR_REPLACE_VEHICLES                                            :Reemplazar vehículos
-STR_SEND_FOR_SERVICING                                          :Enviar para Servicio
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Administrar lista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Enviar instrucciones a todos los vehículos de la lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Reemplazar vehículos
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Enviar para Servicio
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Enviar a Depósito
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Enviar a Depósito
-STR_SEND_SHIP_TO_DEPOT                                          :Enviar a Depósito
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Enviar al Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Enviar a Depósito
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Enviar a Depósito
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Enviar a Depósito
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Enviar al Hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Pulsa para parar todos los vehículos de la lista
-STR_MASS_START_LIST_TIP                                         :{BLACK}Pulsa para arrancar todos los vehículos de la lista
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Pulsa para parar todos los vehículos de la lista
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Pulsa para arrancar todos los vehículos de la lista
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Ordenes compartidas de  {COMMA} Vehículo{P "" s}
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Ordenes compartidas de  {COMMA} Vehículo{P "" s}
 
 # Group window
 STR_GROUP_ALL_TRAINS                                            :Todos los trenes
@@ -2598,11 +2598,11 @@ STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Vehículos de c
 STR_GROUP_DEFAULT_SHIPS                                         :Barcos sin agrupar
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Aeronaves sin agrupar
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupos - click en un grupo para ver la lista de sus vehículos
-STR_GROUP_CREATE_TIP                                            :{BLACK}Pulsa para crear un grupo
-STR_GROUP_DELETE_TIP                                            :{BLACK}Borrar el grupo seleccionado
-STR_GROUP_RENAME_TIP                                            :{BLACK}Renombrar el grupo seleccionado
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Pulsa para proteger este grupo del auto reemplazado global
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupos - click en un grupo para ver la lista de sus vehículos
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Pulsa para crear un grupo
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Borrar el grupo seleccionado
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Renombrar el grupo seleccionado
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Pulsa para proteger este grupo del auto reemplazado global
 
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Todos los vehículos compartidos
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Quitar todos los vehículos
@@ -2625,7 +2625,7 @@ STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Velocida
 STR_PURCHASE_INFO_SPEED                                         :{BLACK}Velocidad: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_RUNNINGCOST                                   :{BLACK}Coste de operación: {GOLD}{CURRENCY}/año
 STR_PURCHASE_INFO_CAPACITY                                      :{BLACK}Capacidad: {GOLD}{CARGO} {STRING}
-STR_REFITTABLE                                                  :(reformable)
+STR_PURCHASE_INFO_REFITTABLE                                    :(reformable)
 STR_PURCHASE_INFO_DESIGNED_LIFE                                 :{BLACK}Diseñado: {GOLD}{NUM}{BLACK} Vida: {GOLD}{COMMA} años
 STR_PURCHASE_INFO_RELIABILITY                                   :{BLACK}Fiabilidad máxima: {GOLD}{COMMA}%
 STR_PURCHASE_INFO_COST                                          :{BLACK}Coste: {GOLD}{CURRENCY}
@@ -2689,17 +2689,17 @@ STR_DEPOT_ROAD_VEHICLE_SELL_TOOLTIP                             :{BLACK}Arrastra
 STR_DEPOT_SHIP_SELL_TOOLTIP                                     :{BLACK}Arrastra barco aquí para venderlo
 STR_DEPOT_AIRCRAFT_SELL_TOOLTIP                                 :{BLACK}Arrastra aeronave aquí para venderla
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Arrastrar la locomotora aquí para vender el tren entero
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Arrastrar la locomotora aquí para vender el tren entero
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Vender todos los trenes del depósito
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Vender todos los vehículos del depósito
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Vender todos los barcos del depósito
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Vender todas las aeronaves del hangar
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Vender todos los trenes del depósito
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Vender todos los vehículos del depósito
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Vender todos los barcos del depósito
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Vender todas las aeronaves del hangar
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Cambia automáticamente todos los trenes del depósito
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Cambia automáticamente todos los vehículos del depósito
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Cambia automáticamente todos los barcos del depósito
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Cambia automáticamente todas las aeronaves del hangar
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Cambia automáticamente todos los trenes del depósito
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Cambia automáticamente todos los vehículos del depósito
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Cambia automáticamente todos los barcos del depósito
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Cambia automáticamente todas las aeronaves del hangar
 
 STR_DEPOT_TRAIN_NEW_VEHICLES_BUTTON                             :{BLACK}Nuevos Vehículos
 STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_BUTTON                      :{BLACK}Nuevos vehículos
@@ -2711,35 +2711,35 @@ STR_DEPOT_ROAD_VEHICLE_NEW_VEHICLES_TOOLTIP                     :{BLACK}Construi
 STR_DEPOT_SHIP_NEW_VEHICLES_TOOLTIP                             :{BLACK}Construir nuevo barco
 STR_DEPOT_AIRCRAFT_NEW_VEHICLES_TOOLTIP                         :{BLACK}Construir aeronave
 
-STR_CLONE_TRAIN                                                 :{BLACK}Clonar tren
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Clonar vehículo
-STR_CLONE_SHIP                                                  :{BLACK}Clonar barco
-STR_CLONE_AIRCRAFT                                              :{BLACK}Clonar aeronave
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Clonar tren
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Clonar vehículo
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Clonar barco
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Clonar aeronave
 
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Esto construirá una copia del tren incluyendo sus vagones. Pulse este botón y después en el tren dentro o fuera del depósito. Ctrl+Click compartirá las ordenes
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Esto construirá una copia del vehículo de carretera. Pulse este botón y después en el vehículo dentro o fuera del depósito. Ctrl+Click compartirá las ordenes
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Esto construirá una copia del barco. Pulse este botón y después el barco dentro o fuera del muelle. Ctrl+Click compartirá las ordenes
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Esto construirá una copia de la aeronave. Pulse este botón y después en la aeronave dentro o fuera del hangar. Ctrl+Click compartirá las ordenes
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Esto construirá una copia del tren incluyendo sus vagones. Pulse este botón y después en el tren dentro o fuera del depósito. Ctrl+Click compartirá las ordenes
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Esto construirá una copia del vehículo de carretera. Pulse este botón y después en el vehículo dentro o fuera del depósito. Ctrl+Click compartirá las ordenes
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Esto construirá una copia del barco. Pulse este botón y después el barco dentro o fuera del muelle. Ctrl+Click compartirá las ordenes
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Esto construirá una copia de la aeronave. Pulse este botón y después en la aeronave dentro o fuera del hangar. Ctrl+Click compartirá las ordenes
 
 STR_DEPOT_TRAIN_LOCATION_TOOLTIP                                :{BLACK}Centrar vista en posición del depósito
 STR_DEPOT_ROAD_VEHICLE_LOCATION_TOOLTIP                         :{BLACK}Centrar vista en posición del depósito
 STR_DEPOT_SHIP_LOCATION_TOOLTIP                                 :{BLACK}Centrar vista en posición del astillero
 STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrar vista en posición del hangar
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Obtener lista de todos los trenes de este depósito y sus ordenes
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Obtener lista de todos los vehículos del depósito actual y sus ordenes
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Obtener lista de todos los barcos de este depósito y sus ordenes
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Obtener lista de todas las aeronaves de cualquier hangar de este aeropuerto y sus ordenes
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Obtener lista de todos los trenes de este depósito y sus ordenes
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Obtener lista de todos los vehículos del depósito actual y sus ordenes
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Obtener lista de todos los barcos de este depósito y sus ordenes
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Obtener lista de todas las aeronaves de cualquier hangar de este aeropuerto y sus ordenes
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Pulsa para parar todos los trenes dentro del depósito
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Pulsa para parar todos los vehículos dentro del depósito
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Pulsa para parar todos los barcos dentro del depósito
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Pulsa para parar todas las aeronaves dentro del hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Pulsa para parar todos los trenes dentro del depósito
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Pulsa para parar todos los vehículos dentro del depósito
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Pulsa para parar todos los barcos dentro del depósito
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Pulsa para parar todas las aeronaves dentro del hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Pulsa para arrancar todos los trenes dentro del depósito
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Pulsa para arrancar todos los vehículos dentro del depósito
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Pulsa para arrancar todos los barcos dentro del depósito
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Pulsa para arrancar todas las aeronaves dentro del hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Pulsa para arrancar todos los trenes dentro del depósito
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Pulsa para arrancar todos los vehículos dentro del depósito
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Pulsa para arrancar todos los barcos dentro del depósito
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Pulsa para arrancar todas las aeronaves dentro del hangar
 
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Vas a vender todos los vehículos que tienes en el depósito.  ¿Estás seguro?
 
@@ -2753,38 +2753,38 @@ STR_ENGINE_PREVIEW_SHIP                                         :barco
 STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE                          :locomotora de monorraíl
 STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE                            :locomotora maglev
 
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Coste: {CURRENCY} Peso: {WEIGHT_S}{}Velocidad: {VELOCITY}  Potencia: {POWER}{}Coste Operativo: {CURRENCY}/año{}Capacidad: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Coste: {CURRENCY} Velocidad Max.: {VELOCITY}{}Capacidad: {CARGO}, {CARGO}{}Coste Mantenimiento: {CURRENCY}/año
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Coste: {CURRENCY} Velocidad Max.: {VELOCITY}{}Capacidad: {CARGO}{}Coste Mantenimiento: {CURRENCY}/año
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Coste: {CURRENCY} Peso: {WEIGHT_S}{}Velocidad: {VELOCITY}  Potencia: {POWER}{}Coste Operativo: {CURRENCY}/año{}Capacidad: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Coste: {CURRENCY} Velocidad Max.: {VELOCITY}{}Capacidad: {CARGO}, {CARGO}{}Coste Mantenimiento: {CURRENCY}/año
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Coste: {CURRENCY} Velocidad Max.: {VELOCITY}{}Capacidad: {CARGO}{}Coste Mantenimiento: {CURRENCY}/año
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Reemplazar {STRING}
-STR_VEHICLE_TRAIN                                               :Tren
-STR_VEHICLE_ROAD_VEHICLE                                        :Vehículo de carretera
-STR_VEHICLE_SHIP                                                :Barco
-STR_VEHICLE_AIRCRAFT                                            :Aeronave
+STR_REPLACE_VEHICLE_TRAIN                                       :Tren
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Vehículo de carretera
+STR_REPLACE_VEHICLE_SHIP                                        :Barco
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeronave
 
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Seleccione tipo de locomotora a reemplazar
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Seleccione nuevo tipo de locomotora a usar en vez de la locomotora seleccionada a la izquierda
 
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Empezar a reemplazar vehículos
 STR_REPLACE_HELP_START_BUTTON                                   :{BLACK}Presiona este botón si quieres reemplazar la locomotora seleccionada a la izquierda por la seleccionada en la derecha
-STR_NOT_REPLACING                                               :{BLACK}No reemplazar
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}No hay vehículos seleccionados
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}No reemplazar
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}No hay vehículos seleccionados
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Parar de reemplazar vehículos
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Presiona este botón si no quieres reemplazar la locomotora seleccionada en la izquierda
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Reemplazando: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Cambia entre las ventanas de cambio de vagón y locomotora
-STR_ENGINES                                                     :Motores
-STR_WAGONS                                                      :Vagones
+STR_REPLACE_ENGINES                                             :Motores
+STR_REPLACE_WAGONS                                              :Vagones
 
 STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Seleccione tipo de rail para seleccionar locomotoras para ese tipo
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Muestra que locomotora será reemplazada
-STR_RAIL_VEHICLES                                               :Vehículos de rail
-STR_ELRAIL_VEHICLES                                             :Vehículos de Rail Eléctrico
-STR_MONORAIL_VEHICLES                                           :Vehículos monorail
-STR_MAGLEV_VEHICLES                                             :Vehículos Maglev
+STR_REPLACE_RAIL_VEHICLES                                       :Vehículos de rail
+STR_REPLACE_ELRAIL_VEHICLES                                     :Vehículos de Rail Eléctrico
+STR_REPLACE_MONORAIL_VEHICLES                                   :Vehículos monorail
+STR_REPLACE_MAGLEV_VEHICLES                                     :Vehículos Maglev
 
 STR_REPLACE_REMOVE_WAGON                                        :{BLACK}Retirar vagón: {ORANGE}{SKIP}{STRING}
 STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Hacer que el cambio automático mantenga la longitud del tren quitando vagones (empezando por adelante), si el cambio de locomotora produce un tren más largo.
@@ -2802,10 +2802,10 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Mandar v
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Mandar barco al astillero
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Enviar aeronave al hangar
 
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Esto construirá una copia del tren incluyendo sus vagones. Ctrl+Click compartirá las ordenes
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Esto construirá una copia del vehículo. Ctrl+Click compartirá las órdenes
-STR_CLONE_SHIP_INFO                                             :{BLACK}Esto construirá una copia del barco. Ctrl+Click compartirá las órdenes
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Esto construirá una copia de la aeronave. Ctrl+Click compartirá las órdenes
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Esto construirá una copia del tren incluyendo sus vagones. Ctrl+Click compartirá las ordenes
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Esto construirá una copia del vehículo. Ctrl+Click compartirá las órdenes
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Esto construirá una copia del barco. Ctrl+Click compartirá las órdenes
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Esto construirá una copia de la aeronave. Ctrl+Click compartirá las órdenes
 
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}Forzar al tren a proceder sin esperar a la apertura de señal
 
@@ -2838,36 +2838,36 @@ STR_VEHICLE_STATUS_LEAVING                                      :{LTBLUE}Abandon
 STR_VEHICLE_STATUS_CRASHED                                      :{RED}¡Siniestrado!
 STR_VEHICLE_STATUS_BROKEN_DOWN                                  :{RED}Averiado
 STR_VEHICLE_STATUS_STOPPED                                      :{RED}Parado
-STR_TRAIN_STOPPING                                              :{RED}Parándose
-STR_TRAIN_STOPPING_VEL                                          :{RED}Parándose, {VELOCITY}
-STR_TRAIN_NO_POWER                                              :{RED}Sin potencia
-STR_TRAIN_STUCK                                                 :{ORANGE}Esperando vía libre
-
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Hacia {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Hacia {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Sin órdenes
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Sin órdenes, {VELOCITY}
-
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Hacia {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Hacia {WAYPOINT}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Hacia el depósito de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Hacia el depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Hacia el depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Hacia el depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Hacia el astillero de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Hacia el astillero de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Ir al hangar de {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Ir al hangar de {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Servicio en el depósito de trenes de {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Servicio en el depósito de trenes de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Dirigiendose al Depósito de {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Servicio en el depósito de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Servicio en el embarcadero de {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Servicio en el embarcadero de {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Dirigiendose al Hangar de {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Dirigiendose al Hangar de {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Parándose
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Parándose, {VELOCITY}
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Sin potencia
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Esperando vía libre
+
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Hacia {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Hacia {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Sin órdenes
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Sin órdenes, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Hacia {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Hacia {WAYPOINT}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Hacia el depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Hacia el depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Hacia el depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Hacia el depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Hacia el astillero de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Hacia el astillero de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Ir al hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Ir al hangar de {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Servicio en el depósito de trenes de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Servicio en el depósito de trenes de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Dirigiendose al Depósito de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Servicio en el depósito de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Servicio en el embarcadero de {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Servicio en el embarcadero de {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Dirigiendose al Hangar de {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Dirigiendose al Hangar de {STATION}, {VELOCITY}
 
 # Vehicle details
 STR_VEHICLE_DETAILS_CAPTION                                     :{WHITE}{VEHICLE} (Detalles)
@@ -2880,8 +2880,8 @@ STR_VEHICLE_DETAILS_AIRCRAFT_RENAME                             :{BLACK}Nombrar
 
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Edad: {LTBLUE}{STRING}{BLACK}   Coste Mantenimiento: {LTBLUE}{CURRENCY}/yr
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} año{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} año{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} año{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} año{P "" s} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Velocidad max.: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Peso: {LTBLUE}{WEIGHT_S} {BLACK}Potencia: {LTBLUE}{POWER}{BLACK} Velocidad max.: {LTBLUE}{VELOCITY}
@@ -2895,7 +2895,7 @@ STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacida
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacidad: {LTBLUE}{CARGO}{SKIP}{SKIP}{STRING} (x{NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacidad: {LTBLUE}{CARGO}, {CARGO}{STRING}
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Transferir Créditos: {LTBLUE}{CURRENCY}
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Transferir Créditos: {LTBLUE}{CURRENCY}
 
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA}días{BLACK}   Último servicio: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Intervalo de despacho: {LTBLUE}{COMMA}%{BLACK}   Último servicio: {LTBLUE}{DATE_LONG}
@@ -2911,9 +2911,9 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nombrar
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Construido: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Valor: {LTBLUE}{CURRENCY}
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Carga total (capacidad) de este tren:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Carga total (capacidad) de este tren:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 STR_VEHICLE_DETAILS_CARGO_EMPTY                                 :{LTBLUE}Vacío
 STR_VEHICLE_DETAILS_CARGO_FROM                                  :{LTBLUE}{CARGO} desde {STATION}
@@ -2928,7 +2928,7 @@ STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Mostrar
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Carga total
 STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP                   :{BLACK}Mostrar capacidad total del tren, dividida por tipo de carga
 
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Capacidad: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacidad: {LTBLUE}
 
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Reformar)
@@ -2952,15 +2952,15 @@ STR_REFIT_AIRCRAFT_REFIT_TOOLTIP                                :{BLACK}Reformar
 
 # Order view
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Órdenes)
-STR_TIMETABLE_VIEW                                              :{BLACK}Horarios
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Cambiar a la vista de horarios
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Horarios
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Cambiar a la vista de horarios
 
 STR_ORDERS_LIST_TOOLTIP                                         :{BLACK}Lista de órdenes - click en orden para resaltarla
 STR_ORDER                                                       :{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 STR_ORDER_SELECTED                                              :{RIGHTARROW}{SETX 10}{COMMA}: {SETX 30}{STRING} {STRING}
 
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Fin de pedidos - -
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Fin de órdenes compartidas - -
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Fin de órdenes compartidas - -
 
 # Order bottom buttons
 STR_ORDER_NON_STOP                                              :{BLACK}Sin paradas
@@ -2984,14 +2984,14 @@ STR_ORDER_DROP_TRANSFER                                         :Transferir
 STR_ORDER_DROP_NO_UNLOADING                                     :No descargar
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Cambiar el comportamiento de descarga en la orden seleccionada
 
-STR_REFIT                                                       :{BLACK}Reformar
-STR_REFIT_TIP                                                   :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Click para eliminar la orden de reforma
+STR_ORDER_REFIT                                                 :{BLACK}Reformar
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Selecciona el tipo de carga a reformar en esta orden. Ctrl+Click para eliminar la orden de reforma
 
-STR_SERVICE                                                     :{BLACK}Servicio
+STR_ORDER_SERVICE                                               :{BLACK}Servicio
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ir siempre
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Servicio si es necesario
 STR_ORDER_DROP_HALT_DEPOT                                       :Parar
-STR_SERVICE_HINT                                                :{BLACK}Saltar esta orden a menos que el servicio sea necesario
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Saltar esta orden a menos que el servicio sea necesario
 
 STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP                          :{BLACK}Datos del vehículo para saltarse
 STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE                           :Porcentaje de carga
@@ -3012,7 +3012,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :es verdadero
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :es falso
 
 STR_ORDER_CONDITIONAL_VALUE_TOOLTIP                             :{BLACK}El valor a comparar de los datos del vehículo contra
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 STR_ORDER_CONDITIONAL_VALUE_CAPT                                :{WHITE}Introduce el valor a comparar
 
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Saltarse
@@ -3026,13 +3026,13 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir al depósito
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir al hangar más cercano
 STR_ORDER_CONDITIONAL                                           :Salto de orden condicional
 STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Añadir nueva orden antes de la orden resaltada, o añadirla al final de la lista
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Introducir una orden avanzada
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Introducir una orden avanzada
 
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Ver todos los vehículos con el mismo calendario
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Ver todos los vehículos con el mismo calendario
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Ir vía {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Ir sin paradas via {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Ir vía {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Ir sin paradas via {WAYPOINT}
 
 STR_ORDER_SERVICE_AT                                            :Servicio en
 STR_ORDER_SERVICE_NON_STOP_AT                                   :Servicio sin parada en
@@ -3042,15 +3042,15 @@ STR_ORDER_NEAREST_HANGAR                                        :el hangar más
 STR_ORDER_TRAIN_DEPOT                                           :Depósito de tren
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depósito de vehículo de carretera
 STR_ORDER_SHIP_DEPOT                                            :Depósito de barcos
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
-STR_REFIT_ORDER                                                 :(Reformar en {STRING})
-STR_REFIT_STOP_ORDER                                            :(Reformar en {STRING} y parar)
-STR_STOP_ORDER                                                  :(Parar)
+STR_ORDER_REFIT_ORDER                                           :(Reformar en {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Reformar en {STRING} y parar)
+STR_ORDER_STOP_ORDER                                            :(Parar)
 
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
 STR_ORDER_FULL_LOAD                                             :(Carga completa)
 STR_ORDER_FULL_LOAD_ANY                                         :(Carga completa cualquier carga)
@@ -3071,16 +3071,16 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[cerca del fin]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[medio]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[lejos del fin]
 
-STR_CONDITIONAL_UNCONDITIONAL                                   :Saltar a orden {COMMA}
-STR_CONDITIONAL_NUM                                             :Saltar a orden {COMMA} cuando {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Saltar a orden{COMMA} cuando {STRING} {STRING}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Saltar a orden {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Saltar a orden {COMMA} cuando {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Saltar a orden{COMMA} cuando {STRING} {STRING}
 
 STR_INVALID_ORDER                                               :{RED} (Orden inválida)
 
 # Time table window
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Horarios)
-STR_ORDER_VIEW                                                  :{BLACK}Ordenes
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Cambiar a la vista de ordenes
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Ordenes
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Cambiar a la vista de ordenes
 
 STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horarios - pulse en una orden para marcarla.
 
@@ -3102,10 +3102,10 @@ STR_TIMETABLE_STATUS_EARLY                                      :{BLACK}Este veh
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Cambiar Horario
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Cambia la cantidad de tiempo que debe tomar una orden marcada
 
-STR_CLEAR_TIME                                                  :{BLACK}Limpiar Horario
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Limpiar Horario
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Limpiar la cantidad de tiempo para la orden seleccionada
 
-STR_RESET_LATENESS                                              :{BLACK}Resetear Retrasos
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Resetear Retrasos
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Reajustar el contador del retraso, así el vehículo estará en horario
 
 STR_TIMETABLE_AUTOFILL                                          :{BLACK}Automático
@@ -3113,42 +3113,42 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Rellena
 
 # AI debug window
 STR_AI_DEBUG                                                    :{WHITE}Depuración de la IA
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Nombre de la IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nombre de la IA
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recarga la IA
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Elimina la IA, recarga el código y reinicia la IA
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Elimina la IA, recarga el código y reinicia la IA
 
-STR_AI_NO_AI_FOUND                                              :No se encontró IA para cargar.{}Esta IA por defecto no hará nada.{}Puedes descargar nuevas IAs mediante el sistema de Contenido Online.
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Una de las AI ejecutadas ha fallado. Por favor, reporte el fallo al autor de la misma desde la ventana AI Debug.
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}La ventana de depuración de la IA solo está disponible para el servidor
+STR_ERROR_AI_NO_AI_FOUND                                        :No se encontró IA para cargar.{}Esta IA por defecto no hará nada.{}Puedes descargar nuevas IAs mediante el sistema de Contenido Online.
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Una de las AI ejecutadas ha fallado. Por favor, reporte el fallo al autor de la misma desde la ventana AI Debug.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}La ventana de depuración de la IA solo está disponible para el servidor
 
 # AI configuration window
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuración de la IA
-STR_AI_LIST_TIP                                                 :{BLACK}Todas las IAs que serán cargadas en la próxima partida
-STR_AI_HUMAN_PLAYER                                             :Jugador Humano
-STR_AI_RANDOM_AI                                                :IA aleatoria
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Todas las IAs que serán cargadas en la próxima partida
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Jugador Humano
+STR_AI_CONFIG_RANDOM_AI                                         :IA aleatoria
 
-STR_AI_CHANGE                                                   :{BLACK}Seleccionar IA
-STR_AI_CHANGE_TIP                                               :{BLACK}Cargar otra IA
-STR_AI_CONFIGURE                                                :{BLACK}Configurar
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Configura los parámetros de la IA
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Seleccionar IA
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Cargar otra IA
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura los parámetros de la IA
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}IAs disponibles
-STR_AI_AILIST_TIP                                               :{BLACK}Pincha para seleccionar la IA
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Pincha para seleccionar la IA
 
-STR_AI_AUTHOR                                                   :{BLACK}Autor: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versión: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versión: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Aceptar
-STR_AI_ACCEPT_TIP                                               :{BLACK}Seleccionar la IA resaltada
-STR_AI_CANCEL                                                   :{BLACK}Cancelar
-STR_AI_CANCEL_TIP                                               :{BLACK}No cambiar la IA
+STR_AI_LIST_ACCEPT                                              :{BLACK}Aceptar
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Seleccionar la IA resaltada
+STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No cambiar la IA
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Parámetros de la IA
-STR_AI_CLOSE                                                    :{BLACK}Cerrar
-STR_AI_RESET                                                    :{BLACK}Reiniciar
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Cerrar
+STR_AI_SETTINGS_RESET                                           :{BLACK}Reiniciar
 
 # Vehicle loading indicators
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
@@ -3169,8 +3169,8 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Coste es
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Ingreso estimado: {CURRENCY}
 
 # Saveload messages
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}El grabado está en progreso,{}por favor espere hasta que termine!
-STR_AUTOSAVE_FAILED                                             :{WHITE}Error en Autoguardado
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}El grabado está en progreso,{}por favor espere hasta que termine!
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Error en Autoguardado
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}No es posible leer la unidad
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Error guardando juego{}{STRING}
 STR_ERROR_UNABLE_TO_DELETE_FILE                                 :{WHITE}No es posible borrar el fichero
@@ -3181,22 +3181,22 @@ STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME                        :La partida guar
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE                       :No se puede leer fichero
 STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE                      :No se puede escribir en el fichero
 STR_GAME_SAVELOAD_ERROR_DATA_INTEGRITY_CHECK_FAILED             :Comprobación de integridad de los datos fallida.
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}El juego ha sido guardado en una versión sin soporte para tranvías. Todos los tranvías serán eliminados.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}El juego ha sido guardado en una versión sin soporte para tranvías. Todos los tranvías serán eliminados.
 
 # Map generation messages
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generación de mapa abortada...{}...no hay localizaciones apropiadas para pueblos
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...no hay pueblos en el escenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generación de mapa abortada...{}...no hay localizaciones apropiadas para pueblos
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...no hay pueblos en el escenario
 
-STR_PNGMAP_ERROR                                                :{WHITE}No se pudo cargar mapa de alturas PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...fichero no encontrado.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...no se pudo convertir tipo de imagen. Se requiere imagenes PNG de 8 o 24-bits.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...algo ha salido mal. Lo siento (posiblemente el fichero esté corrupto)
+STR_ERROR_PNGMAP                                                :{WHITE}No se pudo cargar mapa de alturas PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...fichero no encontrado.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...no se pudo convertir tipo de imagen. Se requiere imagenes PNG de 8 o 24-bits.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...algo ha salido mal. Lo siento (posiblemente el fichero esté corrupto)
 
-STR_BMPMAP_ERROR                                                :{WHITE}No se pudo cargar mapa de alturas BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...no se puede convertir el tipo de imagen.
+STR_ERROR_BMPMAP                                                :{WHITE}No se pudo cargar mapa de alturas BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...no se puede convertir el tipo de imagen.
 
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Alerta de escala
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Cambiar demasiado el tamaño del mapa de origen no está recomendado. ¿Desea continuar con la generación?
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Alerta de escala
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Cambiar demasiado el tamaño del mapa de origen no está recomendado. ¿Desea continuar con la generación?
 
 # Screenshot related messages
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Captura de pantalla realizada con éxito en '{STRING}'
@@ -3219,15 +3219,15 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...lugar
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...ya construído
 STR_ERROR_OWNED_BY                                              :{WHITE}...propiedad de {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...otra compañía posee el área
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}El nombre debe ser único
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} en medio
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}El nombre debe ser único
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} en medio
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}Las autoridades locales de {TOWN} rechazan esto
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} la autoridad local rechaza la construcción de otro aeropuerto en este pueblo
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}Las autoridades locales de {TOWN} rechazan el permiso para el aeropuerto debido al ruido
-STR_BRIBE_FAILED                                                :{WHITE}Su intento de soborno ha sido
-STR_BRIBE_FAILED_2                                              :{WHITE}descubierto por un investigador regional.
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}Las autoridades locales de {TOWN} rechazan el permiso para el aeropuerto debido al ruido
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Su intento de soborno ha sido
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}descubierto por un investigador regional.
 
 # Leveling errors
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}No se puede realzar tierra aquí...
@@ -3236,7 +3236,7 @@ STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}No se pu
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}La excavación dañaría el túnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Ya está al nivel del mar
 STR_ERROR_TOO_HIGH                                              :{WHITE}Demasiado alto
-STR_ALREADY_LEVELLED                                            :{WHITE}... ya está llano
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... ya está llano
 
 # Company related errors
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}No se puede cambiar el nombre de la empresa...
@@ -3247,29 +3247,29 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}No se pu
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...no hay préstamo que pagar
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} requerido
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}No es posible pagar préstamo...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}No se puede dar dinero que ha sido prestado de un banco...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}No se puede dar dinero que ha sido prestado de un banco...
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}No se puede comprar la empresa...
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}No se puede construir la sede de la empresa...
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}No se puede comprar el 25% de acciones...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}No se puede vender el 25% de acciones...
-STR_PROTECTED                                                   :{WHITE}Esta empresa todavía no dispone acciones a la venta...
+STR_ERROR_PROTECTED                                             :{WHITE}Esta empresa todavía no dispone acciones a la venta...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}No se puede construir ningún pueblo
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}No se puede construir ningún pueblo
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}No se puede renombrar pueblo...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}No se puede construir pueblo aquí...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...demasiado cercano al borde del mapa
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...demasiado cercano a otro pueblo
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...demasiados pueblos
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...no hay más espacio en el mapa
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}El pueblo no construirá carreteras. Puedes activar la función de construcción de carreteras en Opciones Avanzadas->Economía->Pueblos.
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Trabajos en la carretera en progreso
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...no hay más espacio en el mapa
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}El pueblo no construirá carreteras. Puedes activar la función de construcción de carreteras en Opciones Avanzadas->Economía->Pueblos.
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Trabajos en la carretera en progreso
 
 # Industry related errors
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}No se pueden crear industrias...
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}No se pueden crear industrias...
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}No se puede construir {STRING} aquí...
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}No se puede construir este tipo de industria aquí...
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...demasiado cercano a otra industria
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...demasiado cercano a otra industria
 STR_ERROR_MUST_BUILD_TOWN_FIRST                                 :{WHITE}...debe construirse el pueblo primero
 STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}...solo se permite uno por pueblo
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...solo puede ser construido en pueblos con una población superior a 1200
@@ -3290,7 +3290,7 @@ STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}No se pu
 
 STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING                        :{WHITE}Adjunta más de una estación/zona de carga existente
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...estación demasiado extendida
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...desactivada estaciones no uniformes
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...desactivada estaciones no uniformes
 STR_ERROR_TOO_MANY_STATIONS_LOADING                             :{WHITE}Demasiadas estaciones/zonas de carga
 STR_ERROR_TOO_MANY_STATION_SPECS                                :{WHITE}Demasiadas partes de estación de tren
 STR_ERROR_TOO_MANY_BUS_STOPS                                    :{WHITE}Demasiadas paradas de Autobús
@@ -3300,12 +3300,12 @@ STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION                          :{WHITE}Demasiad
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_DOCK                             :{WHITE}Demasiado cerca de otro muelle
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Demasiado cerca de otro aeropuerto
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}No se puede renombrar estación...
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...esta es una carretera propiedad de un pueblo
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...revestimientos del camino en la dirección incorrecta
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...esta es una carretera propiedad de un pueblo
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...revestimientos del camino en la dirección incorrecta
 
 # Station destruction related errors
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}No se puede retirar parte de la estación...
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Debes retirar la estación de tren primero
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}No se puede retirar parte de la estación...
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Debes retirar la estación de tren primero
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}No se puede retirar estación de bus...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}No se puede quitar la estación de camiones...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}No se puede quitar estación de tranvía de pasajeros...
@@ -3323,14 +3323,14 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Primero
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Une más de un punto de ruta existente
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Demasiado cerca de otro punto de ruta
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}No se puede construir punto de ruta para trenes aquí...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}No se puede construir punto de ruta para trenes aquí...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}No se puede colocar boya aquí...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}No se puede cambiar el nombre del punto de ruta...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}No se puede cambiar el nombre del punto de ruta...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}No se puede retirar punto de ruta aquí...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Primero se debe retirar punto de ruta para trenes
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}No se puede retirar punto de ruta aquí...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Primero se debe retirar punto de ruta para trenes
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boya en medio
-STR_BUOY_IS_IN_USE                                              :{WHITE}...boya en uso!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...boya en uso!
 
 # Depot related errors
 STR_ERROR_CAN_T_BUILD_TRAIN_DEPOT                               :{WHITE}No se puede construir depósito aquí...
@@ -3347,14 +3347,14 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Los tren
 STR_ERROR_TRAIN_TOO_LONG                                        :{WHITE}Tren demasiado largo
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}No se puede invertir dirección del vehículo...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}No se pude dar la vuelta a un vehículo compuesto por múltiples unidades
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Tipo de vía incompatible
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Tipo de vía incompatible
 
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}No se puede mover vehículo...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}El motor posterior seguirá siempre su contraparte delantera
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}No se puede encontrar ruta al depósito
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}No se puede encontrar ruta al depósito
 
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Tipo de depósito erroneo
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Tipo de depósito erroneo
 
 # Autoreplace related errors
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} es demasiado largo después del reemplazo
@@ -3365,14 +3365,14 @@ STR_ERROR_AUTOREPLACE_MONEY_LIMIT                               :(límite de din
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Combinación de tramos imposible
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Tramo de vía no apropiado
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Se debe retirar primero tramo de vía
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Carretera de un solo sentido o bloqueada
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Carretera de un solo sentido o bloqueada
 STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}No se pueden construir señales aquí...
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}No se pueden construir vías del tren aquí...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}No se pueden retirar vías del tren aquí...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}No se pueden retirar señales de aquí...
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}No se pueden convertir las señales aquí...
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}No se pueden convertir las señales aquí...
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}No se puede convertir tipo de raíl aquí...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}No se puede convertir tipo de raíl aquí...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Ha de retirar carretera primero
@@ -3383,13 +3383,13 @@ STR_ERROR_CAN_T_REMOVE_ROAD_FROM                                :{WHITE}No se pu
 STR_ERROR_CAN_T_REMOVE_TRAMWAY_FROM                             :{WHITE}No se puede quitar el tranvía de aquí...
 
 # Waterway construction errors
-STR_CANT_BUILD_CANALS                                           :{WHITE}No se pueden construir canales aquí...
-STR_CANT_BUILD_LOCKS                                            :{WHITE}No se pueden construir dársenas aquí...
-STR_CANT_PLACE_RIVERS                                           :{WHITE}No se pueden situar ríos aquí...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}No se pueden construir canales aquí...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}No se pueden construir dársenas aquí...
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}No se pueden situar ríos aquí...
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...debe ser construida sobre el agua
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...No se puede construir sobre el agua
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Debes demoler el canal primero
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}No se puede construir un acueducto aquí
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Debes demoler el canal primero
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}No se puede construir un acueducto aquí
 
 # Tree related errors
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...ya hay árboles aquí
@@ -3398,9 +3398,9 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}No se pu
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}No se puede construir puente aquí...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Primero debe demolerse el puente
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}No se puede comenzar y acabar en la misma posición
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Las cabeceras del puente no están al mismo nivel
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}El puente es demasiado bajo para el terreno
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}No se puede comenzar y acabar en la misma posición
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Las cabeceras del puente no están al mismo nivel
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}El puente es demasiado bajo para el terreno
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Comienzo y final deben estar en línea
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...los dos extremos de un puente han de estar sobre tierra
 
@@ -3409,7 +3409,7 @@ STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}No se pu
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Lugar inapropiado para entrada de túnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Primero debe demolerse el túnel
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Otro túnel en el camino
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}El túnel acabaría fuera del mapa
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}El túnel acabaría fuera del mapa
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}No se puede excavar en la tierra al otro lado del túnel
 
 # Unmovable related errors
@@ -3419,12 +3419,12 @@ STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}No es po
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...ya es de su propiedad!
 
 # Group related errors
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}No se puede crear grupo...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}No se puede borrar este grupo...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}No se puede renombrar grupo...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}No se pueden quitar todos los vehículos de este grupo...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}No se puede añadir el vehículo a este grupo...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}No se pueden añadir vehículos compartidos al grupo...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}No se puede crear grupo...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}No se puede borrar este grupo...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}No se puede renombrar grupo...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}No se pueden quitar todos los vehículos de este grupo...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}No se puede añadir el vehículo a este grupo...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}No se pueden añadir vehículos compartidos al grupo...
 
 # Generic vehicle errors
 STR_ERROR_TRAIN_IN_THE_WAY                                      :{WHITE}Tren en camino
@@ -3467,21 +3467,21 @@ STR_ERROR_CAN_T_SELL_ROAD_VEHICLE                               :{WHITE}No se pu
 STR_ERROR_CAN_T_SELL_SHIP                                       :{WHITE}No se puede vender barco...
 STR_ERROR_CAN_T_SELL_AIRCRAFT                                   :{WHITE}No se puede vender la aeronave...
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehículo no disponible
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Vehículo no disponible
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Barco no disponible
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Aeronave no disponible
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehículo no disponible
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Vehículo no disponible
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Barco no disponible
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Aeronave no disponible
 
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Demasiados vehículos en juego
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}No se puede cambiar el intervalo de mantenimiento
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}No se puede vender un vehículo destruido...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}No se puede rellenar un vehículo destruido...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}No se puede vender un vehículo destruido...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}No se puede rellenar un vehículo destruido...
 
 # Specific vehicle errors
 STR_ERROR_CAN_T_MAKE_TRAIN_PASS_SIGNAL                          :{WHITE}No se puede pasar la señal en peligro al tren...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}No se puede revertir la dirección...
-STR_TRAIN_START_NO_CATENARY                                     :Esta vía carece la catenaria, así que el tren no puede comenzar
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Esta vía carece la catenaria, así que el tren no puede comenzar
 
 STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}No se puede girar vehículo de carretera...
 
@@ -3500,14 +3500,14 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}vehícul
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}vehículo no puede ir a esta estación
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}un vehículo compartiendo esta orden no puede ir a esta estación
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}No se puede compartir la lista de órdenes...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}No se puede copiar la lista de órdenes...
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}No se puede compartir la lista de órdenes...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}No se puede copiar la lista de órdenes...
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...demasiado lejano del destino anterior
 
 # Timetable related errors
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}No se puede ajustar horarios al vehículo...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Los vehículos solo pueden esperar en las estaciones.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Este vehículo no está parando en esta estación.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}No se puede ajustar horarios al vehículo...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Los vehículos solo pueden esperar en las estaciones.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Este vehículo no está parando en esta estación.
 
 # Sign related errors
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...demasiados carteles
@@ -3897,35 +3897,35 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :Boya {TOWN}
-STR_BUOYNAME_CITY_SERIAL                                        :Boya {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :Boya {TOWN}
+STR_FORMAT_BUOY_NAME_SERIAL                                     :Boya {TOWN} #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Empresa {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Grupo {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN}, {STRING}
-STR_WAYPOINTNAME_CITY                                           :Punto de ruta {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Punto de ruta {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :Punto de ruta {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Punto de ruta {TOWN} #{COMMA}
 
 STR_UNKNOWN_STATION                                             :estación desconocida
-STR_SIGN_DEFAULT                                                :Cartel
+STR_DEFAULT_SIGN_NAME                                           :Cartel
 STR_COMPANY_SOMEONE                                             :alguien{SKIP}{SKIP}
 
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Espectador, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Espectador, {SKIP}{STRING}
 
 # Viewport strings
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3943,7 +3943,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3957,25 +3957,25 @@ STR_JUST_RAW_STRING                                             :{STRING}
 STR_BLACK_ARROW_DOWN                                            :{BLACK}{DOWNARROW}
 STR_BLACK_ARROW_UP                                              :{BLACK}{UPARROW}
 STR_BLACK_COMMA                                                 :{BLACK}{COMMA}
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY}
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
 STR_BLACK_CROSS                                                 :{BLACK}{CROSS}
 STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt
index 3f28659be..b98fe4dcf 100644
--- a/src/lang/swedish.txt
+++ b/src/lang/swedish.txt
@@ -453,11 +453,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Växla graf för godstyp av/på
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Visa detaljerad prestanda-ratings
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Visa detaljerad prestanda-ratings
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Nyckel till företagsgrafer
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klicka här för att visa/dölja företaget i grafen
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klicka här för att visa/dölja företaget i grafen
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Företagstabell
@@ -492,16 +492,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Pengar:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}LÃ¥n:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totalt:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Totalt antal fordon. Inkluderar vägfordon, tåg, skepp och flygplan.
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Antalet stationsdelar. Varje del av en station (ex: tågstation, bushållplats, flygplats) är räknad, även om dom är ihopkopplade till en station.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Vinsten för det fordon med lägst inkomst (av alla fordon äldre än 2 år).
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Mängden tjänade pengar den månad med lägst vinst de senaste 12 kvartalen.
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Mängden tjänade pengar den månad med högsta vinsten de senaste 12 kvartalen.
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Enheter av gods levererat de senaste fyra kvartalen.
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Typer av gods levererat det senaste kvartalet.
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Mängden pengar på hand
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Mängd pengar detta företag har lånat
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Totalt antal poäng utav möjligt antal poäng
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Totalt antal fordon. Inkluderar vägfordon, tåg, skepp och flygplan.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Antalet stationsdelar. Varje del av en station (ex: tågstation, bushållplats, flygplats) är räknad, även om dom är ihopkopplade till en station.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Vinsten för det fordon med lägst inkomst (av alla fordon äldre än 2 år).
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Mängden tjänade pengar den månad med lägst vinst de senaste 12 kvartalen.
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Mängden tjänade pengar den månad med högsta vinsten de senaste 12 kvartalen.
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Enheter av gods levererat de senaste fyra kvartalen.
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Typer av gods levererat det senaste kvartalet.
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Mängden pengar på hand
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Mängd pengar detta företag har lånat
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Totalt antal poäng utav möjligt antal poäng
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Jazz Jukebox
@@ -629,8 +629,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SPAR
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Meddelandehistorik
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En lista av dom senaste nyheterna
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}En lista av dom senaste nyheterna
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Meddelande
@@ -851,7 +851,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Välj sp
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Helskärm
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Kryssa i den här rutan för att spela OpenTTD i helskärmsläge
-STR_FULLSCREEN_FAILED                                           :{WHITE}Fullskärmsläge misslyckades
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Fullskärmsläge misslyckades
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Skärmupplösning
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Välj skärmupplösning att använda
@@ -904,7 +904,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Avsluta
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Fusk
-STR_CHEATS_TIP                                                  :{BLACK}Checkboxar indikerar om du använt det här fusket förut
+STR_CHEATS_TOOLTIP                                              :{BLACK}Checkboxar indikerar om du använt det här fusket förut
 STR_CHEATS_WARNING                                              :{BLACK}Varning! Du är på väg att förråda dina motståndare. Kom ihåg att detta inte kommer glömmas.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Öka pengar med {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Spelar som företag:: {ORANGE}{COMMA}
@@ -919,14 +919,14 @@ STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Aktiver
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nytt färgval
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Visa generellt färgschema
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Visa färgscheman för tåg
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Visa färgscheman för vägfordon
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Visa färgscheman för skepp
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Visa färgschema för flygplan
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Välj huvudfärg för det aktuella schemat
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Välj andravalsfärgen för det aktuella schemat
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Välj ett färgschema att ändra eller välj flera genom CTRL+klick. Bocka för rutan för att använda scheman
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Visa generellt färgschema
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Visa färgscheman för tåg
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Visa färgscheman för vägfordon
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Visa färgscheman för skepp
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Visa färgschema för flygplan
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Välj huvudfärg för det aktuella schemat
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Välj andravalsfärgen för det aktuella schemat
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Välj ett färgschema att ändra eller välj flera genom CTRL+klick. Bocka för rutan för att använda scheman
 
 STR_LIVERY_DEFAULT                                              :Normalt Färgschema
 STR_LIVERY_STEAM                                                :Ã…nglok
@@ -964,19 +964,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Välj kv
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nytt ansikte
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Slumpa fram nytt ansikte
 STR_FACE_ADVANCED                                               :{BLACK}Avancerad
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Avancerat ansiktsval.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Avancerat ansiktsval.
 STR_FACE_SIMPLE                                                 :{BLACK}Enkelt
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Enkelt ansiktsval.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Enkelt ansiktsval.
 STR_FACE_LOAD                                                   :{BLACK}Ladda
-STR_FACE_LOAD_TIP                                               :{BLACK}Ladda favoritansikte
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Ladda favoritansikte
 STR_FACE_LOAD_DONE                                              :{WHITE}Ditt favoritansikte har laddats från OpenTTDs konfigurationsfil.
 STR_FACE_FACECODE                                               :{BLACK}Spelaransikte nummer.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Visa och/eller välj ansiktsnummer
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Visa och/eller välj ansiktsnummer
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Visa och/eller välj ansiktsnummer
 STR_FACE_FACECODE_SET                                           :{WHITE}Nytt kod för ansiktsnumret har valts
 STR_FACE_FACECODE_ERR                                           :{WHITE}Kunde inte ange ansiktsnumret. Det måste vara en siffra mellan 0 och 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Spara
-STR_FACE_SAVE_TIP                                               :{BLACK}Spara favoritansikte
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Spara favoritansikte
 STR_FACE_SAVE_DONE                                              :{WHITE}Det här ansiktet kommer att sparas som ditt favoritansikte i OpenTTDs konfigurationsfil.
 STR_FACE_EUROPEAN                                               :{BLACK}Europeisk
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Välj europeiska ansikten
@@ -984,49 +984,49 @@ STR_FACE_AFRICAN                                                :{BLACK}Afrikans
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Välj afrikanska ansikten
 STR_FACE_YES                                                    :Ja
 STR_FACE_NO                                                     :Nej
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Aktivera mustasch eller örhänge
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Aktivera mustasch eller örhänge
 STR_FACE_HAIR                                                   :HÃ¥r:
-STR_FACE_HAIR_TIP                                               :{BLACK}Ändra hår
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Ändra hår
 STR_FACE_EYEBROWS                                               :Ögonbryn:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Ändra ögonbryn
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Ändra ögonbryn
 STR_FACE_EYECOLOUR                                              :Ögonfärg:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Ändra ögonfärg
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Ändra ögonfärg
 STR_FACE_GLASSES                                                :Glasögon:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Aktivera glasögon
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Ändra glasögon
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Aktivera glasögon
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Ändra glasögon
 STR_FACE_NOSE                                                   :Näsa:
-STR_FACE_NOSE_TIP                                               :{BLACK}Ändra näsa
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Ändra näsa
 STR_FACE_LIPS                                                   :Läppar:
 STR_FACE_MOUSTACHE                                              :Mustasch:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Ändra läppar eller mustasch
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Ändra läppar eller mustasch
 STR_FACE_CHIN                                                   :Haka:
-STR_FACE_CHIN_TIP                                               :{BLACK}Ändra haka
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Ändra haka
 STR_FACE_JACKET                                                 :Jacka:
-STR_FACE_JACKET_TIP                                             :{BLACK}Ändra jacka
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Ändra jacka
 STR_FACE_COLLAR                                                 :Krage:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Ändra krage
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Ändra krage
 STR_FACE_TIE                                                    :Slips:
 STR_FACE_EARRING                                                :Örhänge:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Ändra slips eller örhänge
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Ändra slips eller örhänge
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}Innehåll laddas hem
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Typ
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Typ av innehåll
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Typ av innehåll
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Namn
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Namn på innehållet
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Klicka på en av raderna för att se detaljer{}Klicka på kryssrutan för att välja att ladda ned det
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Namn på innehållet
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Klicka på en av raderna för att se detaljer{}Klicka på kryssrutan för att välja att ladda ned det
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Markera allt
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Markera allt innehåll för nedladdning
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Markera allt innehåll för nedladdning
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Välj uppgraderingar
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Markera allt innehåll som är en uppgradering på befintligt innehåll för nedladdning
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Markera allt innehåll som är en uppgradering på befintligt innehåll för nedladdning
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Avmarkera allt
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Markera att inte ladda hem någonting
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Markera att inte ladda hem någonting
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Skriv in sökfilter
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Skriv in ett sökord att filtrera listan efter
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Skriv in ett sökord att filtrera listan efter
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Filter för Tagg/namn:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Ladda ned
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Börja ladda hem valt innehåll
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Börja ladda hem valt innehåll
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Total storlek på nedladdning: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}INNEHÃ…LLSINFORMATION
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Du har _inte_ valt att ladda ned detta
@@ -1063,17 +1063,17 @@ STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Nedladdn
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{BYTES} av {BYTES} nedladdat ({NUM} %)
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Genomskinlighetsinställningar
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Växla genomskinlighet för stationsskyltar. Ctrl+klick för att låsa.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Växla genomskinlighet för träd. Ctrl+klick för att låsa.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Växla genomskinlighet för byggnader. Ctrl+klick för att låsa.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Växla genomskinlighet för industrier. Ctrl+klick för att låsa.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Växla genomskinlighet för byggnader såsom stationer, depåer, riktmärken eller kedjelinje. Ctrl+klick för att låsa.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Växla genomskinlighet för broar. Ctrl+klick för att låsa.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Växla genomskinlighet för byggnader såsom fyrar och antenner. Ctrl+klick för att låsa.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Växla genomskinlighet för kedjebro. CTRL+klick för att låsa.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Växla genomskinlighet för lastningsindikatörer. CTRL+klick för att låsa.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gör object osynliga istället för genomskinliga
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Genomskinlighetsinställningar
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Växla genomskinlighet för stationsskyltar. Ctrl+klick för att låsa.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Växla genomskinlighet för träd. Ctrl+klick för att låsa.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Växla genomskinlighet för byggnader. Ctrl+klick för att låsa.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Växla genomskinlighet för industrier. Ctrl+klick för att låsa.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Växla genomskinlighet för byggnader såsom stationer, depåer, riktmärken eller kedjelinje. Ctrl+klick för att låsa.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Växla genomskinlighet för broar. Ctrl+klick för att låsa.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Växla genomskinlighet för byggnader såsom fyrar och antenner. Ctrl+klick för att låsa.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Växla genomskinlighet för kedjebro. CTRL+klick för att låsa.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Växla genomskinlighet för lastningsindikatörer. CTRL+klick för att låsa.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Gör object osynliga istället för genomskinliga
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Markera täckande yta
@@ -1111,28 +1111,28 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Välj lÃ
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Drag & Släpp
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Bygg en station genom att dra & släppa
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Välj vilken stationsklass som ska visas
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Välj stationstyp att bygga
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Välj vilken stationsklass som ska visas
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Välj stationstyp att bygga
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Signalval
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Kan inte konvertera signaler här...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Standardsignal (semafor){}Detta är den enklaste typen av signal, som tillåter endast ett tåg per block vid samma tidpunkt.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}För-signal (semafor){}Grön så länge det finns en eller flera gröna utfarts-signaler på efterföljande bit av spår, annars visas rött.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Utfarts-signal (semafor){}Fungerar på samma sätt som en vanlig signal men behövs för att utlösa korrekt färg på In- eller kombinations-signaler.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Kombinationssignal (semafor){}Kombinationssignalen fungerar helt enkelt som både en För- och Utfarts-signal. Denna tillåter dig att bygga stora "träd" av För-signaler.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Avancerad signal (semafor){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade signaler kan passeras bakifrån.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Avancerad envägs-signal (semafor){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade signaler kan passeras bakifrån.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Normal signal (elektrisk){}Detta är den enklaste typen av signal, som tillåter endast ett tåg per block vid samma tidpunkt.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}För-signal (elektrisk){}Grön så länge det finns en eller flera gröna utfarts-signaler på efterföljande bit av spår, annars visas rött.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Utfarts-signal (elektrisk){}Fungerar på samma sätt som en vanlig signal men behövs för att utlösa korrekt färg på In- eller kombinations-signaler.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Kombinationssignal (elektrisk){}Kombinationssignalen fungerar helt enkelt som både en För- och Utfarts-signal. Denna tillåter dig att bygga stora "träd" av För-signaler.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Avancerad signal (elektrisk){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade signaler kan passeras bakifrån.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Avancerad envägs-signal (elektrisk){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade envägs-signaler kan inte passeras bakifrån.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Konvertera Signal{}När markerad, klicka på en existerande signal för att konvertera den till vald signal-typ och variant. CTRL-klick ändrar den existerande varianten
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Dragen signals täthet
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Minska dragen signals täthet
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Öka dragen signals täthet
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalval
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan inte konvertera signaler här...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Standardsignal (semafor){}Detta är den enklaste typen av signal, som tillåter endast ett tåg per block vid samma tidpunkt.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}För-signal (semafor){}Grön så länge det finns en eller flera gröna utfarts-signaler på efterföljande bit av spår, annars visas rött.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Utfarts-signal (semafor){}Fungerar på samma sätt som en vanlig signal men behövs för att utlösa korrekt färg på In- eller kombinations-signaler.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Kombinationssignal (semafor){}Kombinationssignalen fungerar helt enkelt som både en För- och Utfarts-signal. Denna tillåter dig att bygga stora "träd" av För-signaler.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Avancerad signal (semafor){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade signaler kan passeras bakifrån.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Avancerad envägs-signal (semafor){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade signaler kan passeras bakifrån.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Normal signal (elektrisk){}Detta är den enklaste typen av signal, som tillåter endast ett tåg per block vid samma tidpunkt.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}För-signal (elektrisk){}Grön så länge det finns en eller flera gröna utfarts-signaler på efterföljande bit av spår, annars visas rött.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Utfarts-signal (elektrisk){}Fungerar på samma sätt som en vanlig signal men behövs för att utlösa korrekt färg på In- eller kombinations-signaler.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Kombinationssignal (elektrisk){}Kombinationssignalen fungerar helt enkelt som både en För- och Utfarts-signal. Denna tillåter dig att bygga stora "träd" av För-signaler.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Avancerad signal (elektrisk){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade signaler kan passeras bakifrån.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Avancerad envägs-signal (elektrisk){}En avancerad signal tillåter flera fordon att befinna sig i ett signalblock samtidigt, om fordonet kan reservera en väg till en säker stopp-plats. Avancerade envägs-signaler kan inte passeras bakifrån.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Konvertera Signal{}När markerad, klicka på en existerande signal för att konvertera den till vald signal-typ och variant. CTRL-klick ändrar den existerande varianten
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dragen signals täthet
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Minska dragen signals täthet
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Öka dragen signals täthet
 
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Bygg väg
@@ -1157,9 +1157,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Växla b
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Riktning för bussgarage
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Välj riktning för bussgarage
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Välj riktning för bussgarage
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Spårvagnsdepåns orientering
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Välj spårvagnsdepåns orientering
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Välj spårvagnsdepåns orientering
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Busshållplatsriktning
@@ -1223,40 +1223,40 @@ STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} på väg från {STATION})
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepterar: {WHITE}
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Ingen sorts last väntar
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Markera alla inrättningar
-STR_SELECT_ALL_TYPES                                            :{BLACK}Välj alla last-typer (inklusive icke väntande last)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Se lista med tillgängliga motordesigner för denna fordonstyp
-STR_MANAGE_LIST                                                 :{BLACK}Behandlingslista
-STR_MANAGE_LIST_TIP                                             :{BLACK}Skicka instruktioner till alla fordon på denna lista
-STR_REPLACE_VEHICLES                                            :Byt ut fordon
-STR_SEND_FOR_SERVICING                                          :Skicka till Service
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Ingen sorts last väntar
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Markera alla inrättningar
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Välj alla last-typer (inklusive icke väntande last)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Se lista med tillgängliga motordesigner för denna fordonstyp
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Behandlingslista
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Skicka instruktioner till alla fordon på denna lista
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Byt ut fordon
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Skicka till Service
 
 STR_ERROR_OWNED_BY                                              :{WHITE}...ägs av {STRING}
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Gods
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Information
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapaciteter
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Gods Totalt
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}TÃ¥gets totala kapacitet:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}{CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}TÃ¥gets totala kapacitet:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}{CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
-STR_MAPSIZE                                                     :{BLACK}Kartstorlek:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kartstorlek:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 STR_COMPANY_SOMEONE                                             :någon{SKIP}{SKIP}
 
 STR_ABOUT_OPENTTD                                               :{WHITE}OpenTTD
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Vill du verkligen avsluta spelet?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Avsluta spelet
-STR_SORT_ORDER_TIP                                              :{BLACK}Välj sorteringsordning (fallande/stigande)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Välj sortering
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Angre kriterier för filtrering
-STR_SORT_BY                                                     :{BLACK}Sortera efter
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Välj sorteringsordning (fallande/stigande)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Välj sortering
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Angre kriterier för filtrering
+STR_BUTTON_SORT_BY                                              :{BLACK}Sortera efter
 
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Meddelande
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Meddelande från {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Varning!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varning!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Kan inte utföra detta...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Kan inte röja området...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Ursprunglig äganderätt {COPYRIGHT} 1995 Chris Sawyer, Alla rättigheter reserverade
@@ -1264,45 +1264,45 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD-teamet
 
 STR_QUIT_CAPTION                                                :{WHITE}Avsluta
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nej
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Vill du verkligen avsluta spelet och återvända till {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nej
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Vill du verkligen avsluta spelet och återvända till {STRING}?
 
 STR_JUST_NOTHING                                                :Inget
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}För många fordon i spelet
 STR_BUTTON_LOCATION                                             :{BLACK}Plats
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Standardinställning
-STR_QUERY_CANCEL                                                :{BLACK}Avbryt
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Byt namn
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Standardinställning
+STR_BUTTON_CANCEL                                               :{BLACK}Avbryt
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Byt namn
 
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Kan inte ändra service-intervall...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Stäng fönster
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Fönstertitel - dra för att flytta fönstret
-STR_STICKY_BUTTON                                               :{BLACK}Markera detta fönster så att det finns kvar även fast man använder 'Stäng alla fönster' knappen
-STR_RESIZE_BUTTON                                               :{BLACK}Klicka och dra för att förstora fönstret
+STR_TOOLTIP_STICKY                                              :{BLACK}Markera detta fönster så att det finns kvar även fast man använder 'Stäng alla fönster' knappen
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klicka och dra för att förstora fönstret
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Klicka här för att gå till standardkatalogen för spara/ladda.
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Riv ned byggnader etc. på en ruta mark
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Sänk ett hörn av marken
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Höj upp ett hörn av marken
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Sänk ett hörn av marken
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Höj upp ett hörn av marken
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Scrollbar - scrolla listan upp/ned
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rullningslist - rullar listan höger/vänster
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Vinst detta år: {CURRENCY} (förra året: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} år ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} år ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} år ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} år ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :TÃ¥g
-STR_VEHICLE_ROAD_VEHICLE                                        :Vägfordon
-STR_VEHICLE_SHIP                                                :Skepp
-STR_VEHICLE_AIRCRAFT                                            :Flygplan
+STR_REPLACE_VEHICLE_TRAIN                                       :TÃ¥g
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Vägfordon
+STR_REPLACE_VEHICLE_SHIP                                        :Skepp
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Flygplan
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Markinformation
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Kostnad att röja: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Kostnad att röja: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Inkomst vid rensning: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Inkomst vid rensning: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Otillgänglig
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Ägare: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Vägens ägare: {LTBLUE}{STRING}
@@ -1311,11 +1311,11 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Järnvä
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Lokala myndigheter: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Ingen
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namn
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Accepterat gods: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klicka för att centrera vyn ovanför industrin/staden
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klicka för att centrera vyn ovanför industrin/staden
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...för långt från föregående destination
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
@@ -1326,7 +1326,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Minska s
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Generera slumpmässig mark
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Återställ landskapet
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Återställ landskapet
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Ta bort alla spelarägda tillgångar från kartan
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Ta bort alla spelarägda tillgångar från kartan
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Är du säker på att du vill ta bort alla spelarägda tillgångar?
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Skapa städer
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Ny stad
@@ -1336,11 +1336,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...för
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...för nära en annan stad
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...platsen passar inte
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...för många städer
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kan inte bygga några städer.
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...det finns ingen plats kvar på kartan
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kan inte bygga några städer.
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...det finns ingen plats kvar på kartan
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Öka stadens storlek
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Utöka
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Staden kommer inte bygga vägar. Du kan tillåta att staden bygger vägar via Avanserade Inställningar  ->Ekonomi->Städer.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Staden kommer inte bygga vägar. Du kan tillåta att staden bygger vägar via Avanserade Inställningar  ->Ekonomi->Städer.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Slumpmässig stad
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Bygg stad på slumpmässig plats
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kan inte bygga {STRING} här...
@@ -1354,20 +1354,20 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Placera
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Placera fyrtorn
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Placera radiosändare
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Definiera ökenområde.{}Tryck och håll CTRL för att ta bort
-STR_CREATE_LAKE                                                 :{BLACK}Definiera vattenyta.{}Skapa en kanal, om inte CTRL är nedhållen vid havsnivå, då den kommer att översvämma närliggande områden istället
-STR_CREATE_RIVER                                                :{BLACK}Placera flod.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Definiera vattenyta.{}Skapa en kanal, om inte CTRL är nedhållen vid havsnivå, då den kommer att översvämma närliggande områden istället
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Placera flod.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Ta bort
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Ta bort staden helt och hållet
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Spara scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Öppna scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Ladda höjdkarta
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Ladda höjdkarta
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Avsluta editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Avsluta
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Spara scenario, öppna scenario, avbryt scenarioeditor, avsluta
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Öppna scenario
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Spara scenario
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Vill du verkligen avsluta detta scenario?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Vill du verkligen avsluta detta scenario?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...kan bara byggas i städer med minst 1200 invånare
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Flytta startdatumet 1 år bakåt
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Flytta startdatumet 1 år framåt
@@ -1375,19 +1375,19 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...brons
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Liten
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Mellan
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Stor
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Slumpa
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Slumpa
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stad
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Städer växer snabbare än vanliga städer{}Beroende på inställningarna så är dem större när de grundas
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Välj stadsstorlek
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Stadsstorlek:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Layout på stadens vägnät:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Välj vilken layout vägnätet ska ha i denna stad
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Original
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bättre vägar
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 rutnät
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 rutnät
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Slumpa
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Layout på stadens vägnät:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Välj vilken layout vägnätet ska ha i denna stad
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Original
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bättre vägar
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 rutnät
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 rutnät
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Slumpa
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Bekosta ny industri
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...kan bara byggas i regnskog
@@ -1396,15 +1396,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...kan b
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Screenshot sparades som '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Screenshot misslyckades!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Köp mark för framtida användning
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Sparar fortfarande,{}vänta tills det är slutfört!
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Köp mark för framtida användning
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Sparar fortfarande,{}vänta tills det är slutfört!
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Autosparning misslyckades
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Autosparning misslyckades
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}På väg mot {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}På väg mot {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Inga order
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Inga order, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}På väg mot {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}På väg mot {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Inga order
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Inga order, {VELOCITY}
 
 STR_PASSENGERS                                                  :passagerare
 STR_BAGS                                                        :väskor
@@ -1415,9 +1415,9 @@ STR_CRATES                                                      :lådor
 STR_RES_OTHER                                                   :annan
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Kan inte dela orderlistan...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Kan inte kopiera orderlistan...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Slut på delade order - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Kan inte dela orderlistan...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Kan inte kopiera orderlistan...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Slut på delade order - -
 
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} är för långt efter utbyte
 STR_ERROR_AUTOREPLACE_NOTHING_TO_DO                             :{WHITE}Förnyar ej fordon automatiskt
@@ -1670,170 +1670,170 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-storl
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :Avaktiverat
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ändra inställningsvärde
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Ändra inställningsvärde
 
-STR_TEMPERATE_LANDSCAPE                                         :Tempererat landskap
-STR_SUB_ARCTIC_LANDSCAPE                                        :Sub-arktiskt landskap
-STR_SUB_TROPICAL_LANDSCAPE                                      :Sub-tropiskt landskap
-STR_TOYLAND_LANDSCAPE                                           :Leksakslandskap
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Tempererat landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Sub-arktiskt landskap
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Sub-tropiskt landskap
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Leksakslandskap
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}På väg mot {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}På väg mot {WAYPOINT} i {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}På väg mot {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}På väg mot {WAYPOINT} i {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :GÃ¥ via {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :GÃ¥ via {WAYPOINT} utan att stanna
+STR_ORDER_GO_TO_WAYPOINT                                        :GÃ¥ via {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :GÃ¥ via {WAYPOINT} utan att stanna
 
-STR_WAYPOINTNAME_CITY                                           :Kontrollstation {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Kontrollstation {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Boj
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boj #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Kontrollpunkt
+STR_FORMAT_WAYPOINT_NAME                                        :Kontrollstation {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Kontrollstation {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Boj
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boj #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrollpunkt
 
-STR_WAYPOINT                                                    :{WHITE}Kontrollstation
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Välj kontrollstationstyp
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrollstation
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Välj kontrollstationstyp
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Ändra namn på kontrollstation
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kan inte ändra kontrollstationens namn...
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kan inte bygga tågkontrollstation här...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kan inte ta bort tågkontrollstation här...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan inte ändra kontrollstationens namn...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan inte bygga tågkontrollstation här...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan inte ta bort tågkontrollstation här...
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...det finns ingen stad i detta scenario
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Generering av kartan avbruten...{}...ingen lämplig plats för någon stad
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...det finns ingen stad i detta scenario
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Generering av kartan avbruten...{}...ingen lämplig plats för någon stad
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Många slumpmässiga städer
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Täck kartan med slumpmässigt placerade städer
-STR_MANY_RANDOM_INDUSTRIES                                      :Många slumpmässiga industrier
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Täck kartan med slumpmässigt placerade industrier
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Kan inte generera industrier...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Många slumpmässiga städer
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Täck kartan med slumpmässigt placerade städer
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Många slumpmässiga industrier
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Täck kartan med slumpmässigt placerade industrier
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Kan inte generera industrier...
 
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Landskapsarkitektur
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Utjämna land
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Utjämna land
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Träd av olika typ
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Placera träd av olika typ
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Placera träd av olika typ
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Kan inte bygga kanaler här...
-STR_LANDINFO_CANAL                                              :Kanal
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Kan inte bygga kanaler här...
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Kan inte bygga slussar här...
-STR_LANDINFO_LOCK                                               :Sluss
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Kan inte bygga slussar här...
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Sluss
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Kan inte placera flod här...
-STR_LANDINFO_RIVER                                              :Flod
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Kan inte placera flod här...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Flod
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}... bojen används!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bojen används!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinater: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Kan ej ta bort del av station...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Kan inte konvertera spårtyp här...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Kan ej ta bort del av station...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan inte konvertera spårtyp här...
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Drag loket här för att sälja hela tåget
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Drag loket här för att sälja hela tåget
 
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Deaktivera alla
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Aktivera alla
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Deaktivera alla
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Aktivera alla
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Industrier
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transporterat)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporterat)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Industrinamn - klicka på namnet för att centrera vyn över industrin
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Industrier
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% transporterat)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% transporterat)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Industrinamn - klicka på namnet för att centrera vyn över industrin
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}... för nära en annan industri
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}... för nära en annan industri
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ändra produktion
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Flera spelare
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Spelarnamn:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Namnet som andra spelare kommer se dej som
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Mata in ditt namn
-STR_NETWORK_CONNECTION                                          :{BLACK}Anslutning:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Välj mellan att spela över internet eller det lokala nätverket
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Starta server
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Starta en server för andra att ansluta till
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Namn
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Namn på nätverksspelet
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Språk, serverversion, mm
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Klicka på ett spel från listan för att välja det
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Servern du senast anslöt till:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Välj servern du senast spelade på
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Leta server
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Leta på nätverket efter en server
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Lägg till server
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Lägg till en server till listan som alltid kommer kontrolleras för aktiva spel.
-STR_NETWORK_ENTER_IP                                            :{BLACK}IP-adressen till servern
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Klienter
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Klienter online / klienter max{}Företag online / företag max
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Kartstorlek
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Kartstorlek av spelet{}Klicka för att sortera efter område
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Nuvarande datum
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Ã…r
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Antal år{}som spelet pågår
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}SPELINFO
-STR_NETWORK_CLIENTS                                             :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Språk: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Klimat: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Kartstorlek: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Serverversion: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Serveradress: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Startdatum: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Nuvarande datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Lösenordsskyddat!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER AVSTÄNGD
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SERVER FULL
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}VERSIONERNA MATCHAR EJ
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NewGRF Matchar Ej
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}GÃ¥ med i spelet
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Starta ett nytt multiplayer spel
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Namn:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Namnet på nätverksspelet kommer att synas för andra spelare i multiplayer menyn
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Mata in ett namn för nätverksspelet
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Bestäm lösenord
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Skydda spelet med ett lösenord så att inte andra än dom som har lösenordet kan gå med i spelet
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Välj karta:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Vilken karta vill du spela?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (publik)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" s}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Max antal tillåtna klienter:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Välj max antal tillåtna klienter. Alla platser måste inte fyllas.
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} företag{P y ies}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Max företag:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Begränsa antalet företag på servern
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} åskådare{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Max observatörer:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Begränsa antalet observatörer på servern
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Språk som talas:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Andra spelare kommer vara medvetna vilket språk som talas på servern.
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Starta spelet
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Starta ett nytt spel med en slumpmässig karta eller från ett scenario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Ladda spel
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Återuppta ett tidigare sparat spel för flera spelare (tänk på att välja rätt spelare vid start)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Flera spelare
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Spelarnamn:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Namnet som andra spelare kommer se dej som
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Mata in ditt namn
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Anslutning:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Välj mellan att spela över internet eller det lokala nätverket
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Starta server
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Starta en server för andra att ansluta till
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Namn
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Namn på nätverksspelet
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Språk, serverversion, mm
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Klicka på ett spel från listan för att välja det
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Servern du senast anslöt till:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Välj servern du senast spelade på
+
+STR_NETWORK_SERVER_LIST_FIND_SERVER                             :{BLACK}Leta server
+STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP                     :{BLACK}Leta på 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_ENTER_IP                                :{BLACK}IP-adressen till servern
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Klienter
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Klienter online / klienter max{}Företag online / företag max
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Kartstorlek
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Kartstorlek av spelet{}Klicka för att sortera efter område
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Nuvarande datum
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Ã…r
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Antal år{}som spelet pågår
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}SPELINFO
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Klienter: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Språk: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Klimat: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Kartstorlek: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Serverversion: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Serveradress: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Startdatum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Nuvarande datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Lösenordsskyddat!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER AVSTÄNGD
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SERVER FULL
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}VERSIONERNA MATCHAR EJ
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NewGRF Matchar Ej
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}GÃ¥ med i spelet
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Starta ett nytt multiplayer spel
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Namn:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Namnet på nätverksspelet kommer att synas för andra spelare i multiplayer menyn
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Mata in ett namn för nätverksspelet
+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 dom som har lösenordet kan gå med i spelet
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Välj karta:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Vilken karta vill du spela?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (publik)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} klient{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Max antal tillåtna klienter:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Välj max antal tillåtna klienter. Alla platser måste inte fyllas.
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} företag{P y ies}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Max företag:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Begränsa antalet företag på servern
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} åskådare{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Max observatörer:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Begränsa antalet observatörer på servern
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Språk som talas:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Andra spelare kommer vara medvetna vilket språk som talas på servern.
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Starta spelet
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Starta ett nytt spel med en slumpmässig karta eller från ett scenario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Ladda spel
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Återuppta ett tidigare sparat spel för flera spelare (tänk på att välja rätt spelare vid start)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Valfritt
@@ -1874,33 +1874,33 @@ STR_NETWORK_LANG_GREEK                                          :Grekiska
 STR_NETWORK_LANG_LATVIAN                                        :Lettiska
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Nätverksspel
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Nätverksspel
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Förbereder att ansluta: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}En lista på alla nuvarande företag som är i spelet. Du kan antingen ansluta till ett befintligt eller starta ett nytt på en ledig plats
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Nytt företag
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Starta ett nytt företag
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Titta på spelet
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Titta på spelet som en åskådare
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Anslut till företag
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Hjälp till att styra detta företag
-STR_NETWORK_REFRESH                                             :{BLACK}Uppdatera server
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Uppdatera server info
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Förbereder att ansluta: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}En lista på alla nuvarande företag som är i spelet. Du kan antingen ansluta till ett befintligt eller starta ett nytt på en ledig plats
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Nytt företag
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Starta ett nytt företag
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Titta på spelet
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Titta på spelet som en åskådare
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Anslut till företag
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Hjälp till att styra detta företag
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Uppdatera server
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Uppdatera server info
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}FÖRETAGSINFO
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}FÖRETAGSINFO
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Företagsnamn: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Etableringsår: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Företagsvärde: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Nuvarande saldo: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Förra årets inkomst: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestandabetyg: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Företagsnamn: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Etableringsår: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Företagsvärde: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Nuvarande saldo: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Förra årets inkomst: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Prestandabetyg: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Fordon: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spelare: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Fordon: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stationer: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spelare: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Ansluter...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Ansluter...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Ansluter..
@@ -1916,49 +1916,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Hämtar
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} klient{P "" er} före oss
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} nerladdat hittills
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Frånkopplad
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Frånkopplad
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Skriv in mängd pengar som du vill ge
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Servern är skyddad. Ange lösenord
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Företaget är skyddat. Ange lösenord
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Klientlista
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Klientlista
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Åskåda
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Nytt företag
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Inget nätverkskort funnet eller så är spelet kompilerat utan ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Kunde inte hitta några nätverksspel
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Servern svarade inte på förfrågan
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Kunde inte ansluta på grund av att NewGRF är omaka
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Synkronisering av nätverks-spel misslyckades
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Nätverk, koppling förlorad
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kunde inte ladda det sparade spelet
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Kunde inte starta servern.
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Kunde inte ansluta.
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Nätverkskoppling #{NUM} timeout
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Ett protokollfel uppstod och anslutningen stängdes.
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Servern har en annan version än denna klient.
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Fel lösenord
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Servern är full
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Du är bannlyst från den här servern
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Du blev utkastad från spelet
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Fusk är inte tillåtet på denna server
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Inget nätverkskort funnet eller så är spelet kompilerat utan ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Kunde inte hitta några nätverksspel
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Servern svarade inte på förfrågan
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Kunde inte ansluta på grund av att NewGRF är omaka
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Synkronisering av nätverks-spel misslyckades
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Nätverk, koppling förlorad
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Kunde inte ladda det sparade spelet
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Kunde inte starta servern.
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Kunde inte ansluta.
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Nätverkskoppling #{NUM} timeout
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Ett protokollfel uppstod och anslutningen stängdes.
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Servern har en annan version än denna klient.
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Fel lösenord
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Servern är full
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Du är bannlyst från den här servern
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Du blev utkastad från spelet
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Fusk är inte tillåtet på denna server
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :allmänt fel
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :synkroniseringsfel
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :kunde inte ladda kartan
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :anslutning förlorad
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokollfel
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF är omaka
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :inte godkänd
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :mottog konstigt paket
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :fel revision
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :namnet används redan
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :fel lösenord
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :fel företags-id i DoKommando
-STR_NETWORK_ERR_CLIENT_KICKED                                   :utkastad av servern
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :försökte fuska
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :servern är full
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :allmänt fel
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :synkroniseringsfel
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :kunde inte ladda kartan
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :anslutning förlorad
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokollfel
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF är omaka
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :inte godkänd
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :mottog konstigt paket
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :fel revision
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :namnet används redan
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :fel lösenord
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :fel företags-id i DoKommando
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :utkastad av servern
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :försökte fuska
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servern är full
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1968,15 +1968,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Spelet pausat (
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Spelet fortsätter (Spelare ansluten)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Spelet fortsätter (Misslyckat anslutningsförsök av en spelare)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :lämnar
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} har gått med i spelet
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} har gått med i företag #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} har gått med som åskådare
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} har startat ett nytt företag (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} har lämnat spelet ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} har ändrat hans/hennes namn till {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} gav ditt företag {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** You gave {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :lämnar
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} har gått med i spelet
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} har gått med i företag #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} har gått med som åskådare
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} har startat ett nytt företag (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} har lämnat spelet ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} har ändrat hans/hennes namn till {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} gav ditt företag {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** You gave {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Företaget] :
 STR_NETWORK_CHAT_COMPANY                                        :[Företaget] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Företaget] Till {STRING}: {WHITE}{STRING}
@@ -1986,8 +1986,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Privat] Till {
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Alla] :
 STR_NETWORK_CHAT_ALL                                            :[Alla] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Mata in text för nätverkschat
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Servern avslutade sessionen
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Servern startar om...{}Var vänlig vänta...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Servern avslutade sessionen
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Servern startar om...{}Var vänlig vänta...
 
 STR_NETWORK_SERVER                                              :Server
 STR_NETWORK_CLIENT                                              :Klient
@@ -2001,19 +2001,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Prata med alla
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Privat meddelande
 
 
-STR_NETWORK_SEND                                                :{BLACK}Skicka
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Skicka
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Kan inte ladda landskap från PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...hittar inte filen.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kunde inte konvertera bildtyp. 8 eller 24-bitars PNG-bild krävs.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...nånting gick fel. Ursäkta. (förmodligen korumperad fil)
+STR_ERROR_PNGMAP                                                :{WHITE}Kan inte ladda landskap från PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...hittar inte filen.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...kunde inte konvertera bildtyp. 8 eller 24-bitars PNG-bild krävs.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...nånting gick fel. Ursäkta. (förmodligen korumperad fil)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Kan inte ladda landskap från BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...kunde inte konvertera bildformat.
+STR_ERROR_BMPMAP                                                :{WHITE}Kan inte ladda landskap från BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...kunde inte konvertera bildformat.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Kostnad: {CURRENCY}
@@ -2027,13 +2027,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Uppskatt
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Kan inte höja marken här...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Kan inte sänka marken här...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Kan inte jämna ut land här...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Stenar
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Ojämn mark
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Barmark
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gräs
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Fält
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snötäckt land
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Öken
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Stenar
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Ojämn mark
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Barmark
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gräs
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Fält
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snötäckt land
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Öken
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Marken lutar åt fel håll
@@ -2041,11 +2041,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Omöjlig
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Utgrävning skulle förstöra tunnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Redan på havsnivå
 STR_ERROR_TOO_HIGH                                              :{WHITE}För hög
-STR_ALREADY_LEVELLED                                            :{WHITE}... redan platt
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... redan platt
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Inget passande järnvägsspår
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...redan byggd
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Måste ta bort järnväg först
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Vägen är enkelriktad eller blockerad
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Vägen är enkelriktad eller blockerad
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Bygg järnväg
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrifierad järnvägskonstruktion
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Bygg monorail
@@ -2057,43 +2057,43 @@ STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Kan inte
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Kan inte bygga järnvägsspår här...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Kan inte ta bort järnvägspår här...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Kan inte ta bort signaler här...
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Välj bro - klicka på önskad bro för att bygga den
-STR_RAILROAD_TRACK                                              :Järnvägsspår
-STR_RAILROAD_TRAIN_DEPOT                                        :Järnvägsdepå
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Välj bro - klicka på önskad bro för att bygga den
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Järnvägsspår
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Järnvägsdepå
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...området ägs av ett annat företag
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Järnväg med vanliga signaler
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Järnväg med för-signaler
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Järnväg med utgående signaler
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Tågspår med kombinationsignaler
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Järnväg med avancerade signaler
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Järnväg med avancerade envägs-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Järnväg med normala signaler och för-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Järnväg med normala signaler och utfarts-signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Järnväg med normal- och kombinationsignaler
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Järnväg med normala samt avancerade signaler
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Järnväg med normala signaler samt avancerade envägs-signaler
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Järnväg med för- och utfarts-signaler
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Järnväg med för- och kombinationsignaler
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Järnväg med för-signaler samt avancerade signaler
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Järnväg med för-signaler samt avancerade envägs-signaler
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Järnväg med utgångs- och kombinationsignaler
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Järnväg med utfarts-signaler samt avancerade signaler
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Järnväg med utfarts-signaler samt avancerade envägs-signaler
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Järnväg med kombinations-signaler samt avancerade signaler
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Järnväg med kombinations-signaler samt avancerade envägs-signaler
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Järnväg med avancerade samt avancerande envägs-signaler
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Måste ta bort tågstationen först
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Måste ta bort kontrollstationen först
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Bygg en separat station
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Bygg en separat kontrollstation
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Slå ihop stationer
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Slå ihop kontrollstationer
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Järnväg med vanliga signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Järnväg med för-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Järnväg med utgående signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Tågspår med kombinationsignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Järnväg med avancerade signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Järnväg med avancerade envägs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Järnväg med normala signaler och för-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Järnväg med normala signaler och utfarts-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Järnväg med normal- och kombinationsignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Järnväg med normala samt avancerade signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Järnväg med normala signaler samt avancerade envägs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Järnväg med för- och utfarts-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Järnväg med för- och kombinationsignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Järnväg med för-signaler samt avancerade signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Järnväg med för-signaler samt avancerade envägs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Järnväg med utgångs- och kombinationsignaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Järnväg med utfarts-signaler samt avancerade signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Järnväg med utfarts-signaler samt avancerade envägs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Järnväg med kombinations-signaler samt avancerade signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Järnväg med kombinations-signaler samt avancerade envägs-signaler
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Järnväg med avancerade samt avancerande envägs-signaler
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Måste ta bort tågstationen först
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Måste ta bort kontrollstationen först
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Bygg en separat station
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Bygg en separat kontrollstation
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Slå ihop stationer
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Slå ihop kontrollstationer
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Måste ta bort väg först
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Vägarbete pågår
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Vägarbete pågår
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Välj vägbro
 STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}... enkelriktade vägar kan inte ha korsningar
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Kan inte bygga väg här...
@@ -2106,12 +2106,12 @@ STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Kan inte
 STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Kan inte bygga lastbilsstation...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}Kan inte bygga passagerar-spårvagnsstation...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}Kan inte bygga frakt-spårvagnsstation...
-STR_ROAD_DESCRIPTION_ROAD                                       :Väg
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Väg med gatubelysning
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Väg med träd
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Bussgarage
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Väg-/Järnvägskorsning
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Spårväg
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Väg
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Väg med gatubelysning
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Väg med träd
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Bussgarage
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Väg-/Järnvägskorsning
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Spårväg
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Kan inte ta bort busstation...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kan inte ta bort lastbilsstation...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Kan inte ta bort passagerar-spårvagnsstation...
@@ -2119,12 +2119,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Kan inte
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Städer
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Byggnad måste rivas först
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Stad)
@@ -2137,9 +2137,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrera
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Byt namn på staden
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Passagerare förra månaden: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post förra månaden: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Fraktgods behövs för ortens tillväxt:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} nödvändlig
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} levererat den senaste månaden
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Fraktgods behövs för ortens tillväxt:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} nödvändlig
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} levererat den senaste månaden
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Högt kontor
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Kontor
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Små lägenheter
@@ -2169,7 +2169,7 @@ STR_SUBSIDIES_NONE                                              :{ORANGE}Inga
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Redan subventionerade rutter:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} från {STATION} till {STATION}{YELLOW} ({COMPANY}{YELLOW}, tills {DATE_SHORT})
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} de lokala myndigheterna tillåter inte att en ny flygplats byggs i staden
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN}'s lokala myndigheter vägrar tillåtelse att bygga en flygplats på grund av ljudproblem
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN}'s lokala myndigheter vägrar tillåtelse att bygga en flygplats på grund av ljudproblem
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Stuga
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Hus
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Lägenheter
@@ -2203,7 +2203,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{WHITE}{STRING}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{WHITE}{STRING}{}{YELLOW} Köp 1 års exklusiv transporträttighet i staden. Stadens myndigheter kommer bara tillåta passagerare och gods till användning för ditt företags stationer.{}Kostnad: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}{}{YELLOW} Muta de lokala myndigheterna för att öka din värdering, med risk för att få höga böter om du blir upptäckt.{} Kostnad: {CURRENCY}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (under byggnation)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (under byggnation)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Igloo
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :KÃ¥tor
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Tekanne-Hus
@@ -2213,17 +2213,17 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Spargris
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Träd
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...träd redan här
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kan inte plantera träd här...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...för många skyltar
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Kan inte placera skylt här...
-STR_SIGN_DEFAULT                                                :Skylt
+STR_DEFAULT_SIGN_NAME                                           :Skylt
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Ändra skylttext
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Kan inte ändra skyltnamn...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Kan inte ta bort skylt...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Välj trädtyp att plantera
-STR_TREE_NAME_TREES                                             :Träd
-STR_TREE_NAME_RAINFOREST                                        :Regnskog
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktusplantor
+STR_LAI_TREE_NAME_TREES                                         :Träd
+STR_LAI_TREE_NAME_RAINFOREST                                    :Regnskog
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktusplantor
 
 ##id 0x3000
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}För nära en annan järnvägsstation
@@ -2240,7 +2240,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}MÃ¥ste r
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}För nära en annan flygplats
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Måste riva flygplats först
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Byt namn på station
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Byt namn på station
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Kan inte byta namn på station...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Värderingar
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepterar
@@ -2258,10 +2258,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Enastående
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Visa alla tåg där denna station finns med i rutten
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Visa alla vägfordon där denna station finns med i rutten
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Visa alla flygplan där denna station finns med i rutten
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Visa alla skepp där denna station finns med i rutten
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Visa alla tåg där denna station finns med i rutten
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Visa alla vägfordon där denna station finns med i rutten
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Visa alla flygplan där denna station finns med i rutten
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Visa alla skepp där denna station finns med i rutten
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}Måste riva busshållplats först
@@ -2282,41 +2282,41 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Byt namn
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Visa lista av accepterat gods
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Stationsnamn - klicka på ett namn för att centrera vyn på stationen
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Välj storlek/typ av flygplats
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Järnvägsstation
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Flygplanshangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Flygplats
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Lastbrygga
-STR_STATION_DESCRIPTION_BUS_STATION                             :Busshållplats
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Hamn
-STR_STATION_DESCRIPTION_BUOY                                    :Boj
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Järnvägsstation
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Flygplanshangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Flygplats
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Lastbrygga
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Busshållplats
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Hamn
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boj
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boj i vägen
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...station för utspridd
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ej enhetliga stationer inaktiverade
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Håll nere CTRL för att markera mer än en sak
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...ej enhetliga stationer inaktiverade
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Håll nere CTRL för att markera mer än en sak
 
 STR_UNDEFINED                                                   :(oidentifierad sträng)
-STR_STAT_CLASS_DFLT                                             :Grundinställd station
-STR_STAT_CLASS_WAYP                                             :Vägpunkter
+STR_STATION_CLASS_DFLT                                          :Grundinställd station
+STR_STATION_CLASS_WAYP                                          :Vägpunkter
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...måste byggas på vatten
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Kan inte bygga skeppsdepå här...
-STR_WATER_DESCRIPTION_WATER                                     :Vatten
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Kust eller flodbank
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Skeppsdepå
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Akvedukt
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Vatten
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Kust eller flodbank
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Skeppsdepå
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Akvedukt
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Kan inte bygga på vatten
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Måste först ta bort kanalen
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Måste först ta bort kanalen
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spara spel
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Ladda spel
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Spara
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Ta bort
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Åskådare, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Åskådare, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} ledigt
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Kan inte läsa från disk
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Sparandet av spelet misslyckades{}{STRING}
@@ -2332,12 +2332,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Listar e
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Valt namn för spelet
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Ta bort markerat sparat spel
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Spara spelet med valt namn
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Skapa slumpmässigt nytt spel
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Läs höjdkarta
-STR_SAVE_OSKTITLE                                               :{BLACK}Mata in ett namn för detta sparade spel
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Skapa slumpmässigt nytt spel
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Läs höjdkarta
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Mata in ett namn för detta sparade spel
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} i vägen
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} i vägen
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kolgruva
 STR_INDUSTRY_NAME_POWER_STATION                                 :Kraftstation
@@ -2393,23 +2393,23 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Producer
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Produktion förra månaden:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} ({COMMA}% transporterat)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Centrera vyn ovanför industrin
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kostnad: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kostnad: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Kan inte bygga denna typ av industri här...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...skog kan bara planteras ovanför snölinjen
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...kan bara placeras nära kartans kant
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}En annan tunnel i vägen
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tunneln slutar utanför kartans gränser
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tunneln slutar utanför kartans gränser
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Kan inte gräva till marken på andra sidan av tunneln
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Måste riva tunnel först
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Måste riva bro först
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Kan inte börja och sluta på samma plats
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Broändar ej på samma höjd
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Bro är för låg för terrängen
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Kan inte börja och sluta på samma plats
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Broändar ej på samma höjd
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Bro är för låg för terrängen
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Start- och slutpunkt måste ligga i linje
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Platsen passar inte för tunnelentré
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Upphängd, Stål
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Balkbro, Stål
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Cantilever, Stål
@@ -2420,30 +2420,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Rör, Stål
 STR_BRIDGE_TUBULAR_SILICON                                      :Rör, Silikon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kan inte bygga bro här...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Kan inte bygga tunnel här...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Järnvägstunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Vägtunnel
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Upphängd järnvägsbro av stål
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Järnvägsbro med stålbalkar
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Järnvägsbro med utskjutande stålstöd
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Järnvägsbro med förstärkt betongupphängning
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Järnvägsbro av trä
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Järnvägsbro av betong
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Vägbro med stålupphängning
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Vägbro med stålbalkar
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Vägbro med utskjutande stålstöd
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Vägbro med förstärkt betongupphängning
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Vägbro av trä
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Vägbro av betong
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Järnvägsrörbro
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Rörbro
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Järnvägstunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Vägtunnel
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Upphängd järnvägsbro av stål
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Järnvägsbro med stålbalkar
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Järnvägsbro med utskjutande stålstöd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Järnvägsbro med förstärkt betongupphängning
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Järnvägsbro av trä
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Järnvägsbro av betong
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Vägbro med stålupphängning
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Vägbro med stålbalkar
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Vägbro med utskjutande stålstöd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Vägbro med förstärkt betongupphängning
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Vägbro av trä
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Vägbro av betong
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Järnvägsrörbro
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Rörbro
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Objekt i vägen
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Radiosändare
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fyrtorn
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Företagets huvudkontor
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Radiosändare
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fyrtorn
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Företagets huvudkontor
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...företagets huvudkontor i vägen
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Mark som ägs av företag
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Mark som ägs av företag
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Kan inte köpa denna mark...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...du äger den redan!
 
@@ -2491,7 +2491,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Statio
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Svårighetsgrad
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Spara
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Spara
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Lätt
@@ -2563,8 +2563,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Färgval
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Färgval:
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Företagsnamn
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Namn på VD
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Företagsnamn
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Namn på VD
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Företagsnamn
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Namn på VD
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Kan inte ändra företagsnamn...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Kan inte ändra namnet på VD:n...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Budget {BLACK}{COMPANYNUM}
@@ -2589,7 +2589,7 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Totalt:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Banksaldo
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}LÃ¥n
-STR_MAX_LOAN                                                    :{WHITE}Maxlån: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Maxlån: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}LÃ¥na {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Ã…terbetala {SKIP}{SKIP}{CURRENCY}
@@ -2598,7 +2598,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Kan inte
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...lånet redan återbetalt
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} krävs
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kan inte återbetala lånet...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Kan inte ge bort pengar som är lånade från banken...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Kan inte ge bort pengar som är lånade från banken...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Välj nytt ansikte på VD:n
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Byt färg på företaget
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Byt VD:ns namn
@@ -2608,31 +2608,31 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Ã…terbet
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(VD)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Etablerades: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Fordon:
-STR_TRAINS                                                      :{WHITE}{COMMA} tåg
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} vägfordon
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} flygplan
-STR_SHIPS                                                       :{WHITE}{COMMA} skepp
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tåg
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} vägfordon
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} flygplan
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} skepp
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Inga
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENTNAME}{}(VD)
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Vi letar efter någon som vill köpa och ta över vårt företag{}{}Vill du köpa {COMPANY} för {CURRENCY}?
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Kan inte köpa företag...
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bygg Högkvarter
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Bygg huvudkontor / visa företagets huvudkontor
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Bygg om högkvarter på annan plats (kostar 1% av företagets värde)
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Bygg om högkvarter på annan plats (kostar 1% av företagets värde)
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Kan inte bygga huvudkontor här...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Visa högkvarter
-STR_RELOCATE_HQ                                                 :{BLACK}Flytta högkvarter
-STR_COMPANY_JOIN                                                :{BLACK}GÃ¥ med
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Gå med och spela som detta företag
-STR_COMPANY_PASSWORD                                            :{BLACK}Lösenord
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Lösenordsskydda ditt företag för att förhindra att obehöriga spelare ansluter.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Ange företagets lösenord
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Flytta högkvarter
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}GÃ¥ med
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Gå med och spela som detta företag
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Lösenord
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Lösenordsskydda ditt företag för att förhindra att obehöriga spelare ansluter.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Ange företagets lösenord
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Spara inte det inmatade lösenordet
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Ge företaget det nya lösenordet
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Företagslösenord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Förvalt företagslösenord
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Använd detta företagslösenord som förval för nya företag
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Växla stor/liten fönsterstorlek
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Förvalt företagslösenord
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Använd detta företagslösenord som förval för nya företag
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Växla stor/liten fönsterstorlek
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Företagets värde: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Köp 25% andelar i företaget
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sälj 25% andelar i företaget
@@ -2641,7 +2641,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sälj 25
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kan inte köpa 25% andelar i detta företag...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kan inte sälja 25% andelar i detta företag...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% ägs av {COMPANY})
-STR_PROTECTED                                                   :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
+STR_ERROR_PROTECTED                                             :{WHITE}Det här företaget bedriver inte aktiehandel ännu....
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Ã…nga)
@@ -2948,9 +2948,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ladda ej av me
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Ändra stoppbeteende för markerad order
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Ändra lastningsbeteende för markerad order
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Ändra avlastningsbeteende på markerad order
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Lägg till avancerad order
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Lägg till avancerad order
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Åk till närmsta depå
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Åk till närmsta hangar
 STR_ORDER_NEAREST_DEPOT                                         :närmsta
@@ -2960,9 +2960,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Service non-sto
 STR_ORDER_TRAIN_DEPOT                                           :Tågdepå
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Vägfordonsdepå
 STR_ORDER_SHIP_DEPOT                                            :Skeppsdepå
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Ã…k alltid
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Service vid behov
@@ -2987,10 +2987,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :mer än
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :mer eller lika mycket som
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :sant
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :falskt
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Skippa till order {COMMA}
-STR_CONDITIONAL_NUM                                             :Skippa till order {COMMA} när {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Skippa till order {COMMA} när {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Skippa till order {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Skippa till order {COMMA} när {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Skippa till order {COMMA} när {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Ingen resa
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Avres (Inte tillagd i tidtabell)
@@ -3013,18 +3013,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}TÃ¥g kan
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Skippa
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Ta bort
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}GÃ¥ Till
-STR_REFIT                                                       :{BLACK}Anpassa
-STR_REFIT_TIP                                                   :{BLACK}Välj vilken godstyp anpassningen ska göras i denna order. Ctrl-klick för att ta bort anpassningsordern
-STR_REFIT_ORDER                                                 :(Anpassa för {STRING})
-STR_REFIT_STOP_ORDER                                            :(Anpassa för {STRING} och stanna)
-STR_STOP_ORDER                                                  :(Stanna)
-STR_TIMETABLE_VIEW                                              :{BLACK}Tidtabell
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Ändra till tidtabellsvy
-STR_ORDER_VIEW                                                  :{BLACK}Order
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Byt till  ordervyn
+STR_ORDER_REFIT                                                 :{BLACK}Anpassa
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Välj vilken godstyp anpassningen ska göras i denna order. Ctrl-klick för att ta bort anpassningsordern
+STR_ORDER_REFIT_ORDER                                           :(Anpassa för {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Anpassa för {STRING} och stanna)
+STR_ORDER_STOP_ORDER                                            :(Stanna)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Tidtabell
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Ändra till tidtabellsvy
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Order
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Byt till  ordervyn
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Order)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Slut på order - -
-STR_SERVICE                                                     :{BLACK}Servning
+STR_ORDER_SERVICE                                               :{BLACK}Servning
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Byggt: {LTBLUE}{NUM}{BLACK} Värde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Värde: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3044,7 +3044,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}fordonet
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}ett fordon som delar denna order kan inte komma till denna station
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Kan inte flytta fordon...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Det bakre loket kommer alltid följa med det tillhörande främre loket
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Kan inte hitta vägen till närmaste depå
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Serviceintervall: {LTBLUE}{COMMA}dagar{BLACK}   Senaste service: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Serviceintervall: {LTBLUE}{COMMA}%{BLACK}   Senaste service: {LTBLUE}{DATE_LONG}
@@ -3064,10 +3064,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Tidstabe
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ändra tid som den markerade ordern bör ta
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Rensa tiden för markerad order
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nollställ räknaren för sen ankomst så att fordonet kommer i tid
-STR_SERVICE_HINT                                                :{BLACK}Skippa den här ordern om inte servning behövs
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Kostnad: {CURRENCY} Vikt: {WEIGHT_S}{}Hastighet: {VELOCITY}  Kraft {POWER}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Kostnad: {CURRENCY} Maxhastiget: {VELOCITY}{}Kapacitet: {CARGO}, {CARGO}{}Körkostnad: {CURRENCY}/år
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Kostnad: {CURRENCY} Maxhastiget: {VELOCITY}{}Kapacitet: {CARGO}{}Körkostnad: {CURRENCY}/år
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Skippa den här ordern om inte servning behövs
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Kostnad: {CURRENCY} Vikt: {WEIGHT_S}{}Hastighet: {VELOCITY}  Kraft {POWER}{}Löpande kostnad: {CURRENCY}/år{}Kapacitet: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kostnad: {CURRENCY} Maxhastiget: {VELOCITY}{}Kapacitet: {CARGO}, {CARGO}{}Körkostnad: {CURRENCY}/år
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kostnad: {CURRENCY} Maxhastiget: {VELOCITY}{}Kapacitet: {CARGO}{}Körkostnad: {CURRENCY}/år
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Ålder: {LTBLUE}{STRING}{BLACK}   Körkostnad: {LTBLUE}{CURRENCY}/år
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Maxhastiget: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Vikt: {LTBLUE}{WEIGHT_S} {BLACK}Kraft: {LTBLUE}{POWER}{BLACK} Maxhastiget: {LTBLUE}{VELOCITY}
@@ -3086,24 +3086,24 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Kraschad!
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Kan inte byta tågets riktning...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Kan inte byta fordonets riktning...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Kan inte vända fordon bestående av flera delar
-STR_CLEAR_TIME                                                  :{BLACK}Rensa tid
-STR_RESET_LATENESS                                              :{BLACK}Rensa räknaren för sen ankomst
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Ändra namn på kontrollstation
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Ändra namn på boj
-
-STR_TRAIN_STOPPING                                              :{RED}Stannar
-STR_TRAIN_STOPPING_VEL                                          :{RED}Stannar, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Fel järnvägstyp
-STR_TRAIN_NO_POWER                                              :{RED}Ingen Kraft
-STR_TRAIN_START_NO_CATENARY                                     :Detta spår saknar kedjekurva, så tåget kan inte starta
-STR_TRAIN_STUCK                                                 :{ORANGE}Väntar på ledig väg
-
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Kan inte sälja förstört fordon...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Kan inte bygga om ett förstörd fordon...
-
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Kan inte lägga till fordonet i en tidtabell...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Fordon kan enbart vänta vid stationer.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Detta fordon stannar inte vid denna station.
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Rensa tid
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Rensa räknaren för sen ankomst
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Ändra namn på kontrollstation
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Ändra namn på boj
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Stannar
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Stannar, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Fel järnvägstyp
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Ingen Kraft
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Detta spår saknar kedjekurva, så tåget kan inte starta
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Väntar på ledig väg
+
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Kan inte sälja förstört fordon...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Kan inte bygga om ett förstörd fordon...
+
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Kan inte lägga till fordonet i en tidtabell...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Fordon kan enbart vänta vid stationer.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Detta fordon stannar inte vid denna station.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Ändra Tid
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Detta fordon kör enligt tidtabellen
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Detta fordon är för tillfället {STRING} sen
@@ -3117,7 +3117,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Fyll i t
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...måste stoppas inuti ett bussgarage
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Kan inte hitta till lokal depå
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Tvinga fordonet att vända om
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapacitet: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacitet: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} fordon{P "" s}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3130,39 +3130,39 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Kan inte
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Skepp måste vara stoppat i depå
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan inte placera boj här...
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Kan inte bygga akvedukt här...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Kan inte bygga akvedukt här...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Anpassa)
 STR_REFIT_TITLE                                                 :{GOLD}Välj godstyp att frakta:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapacitet: {GOLD}{CARGO}{}{BLACK}Anpassningens kostnad: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(anpassningsbart)
+STR_PURCHASE_INFO_REFITTABLE                                    :(anpassningsbart)
 
 ##id 0xA000
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Kan inte bygga flygplats här...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Flygplan är i luften
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Flygplan måste stoppas i hangar
 
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Tidtabell)
 
 ##id 0xB000
-STR_BRIBE_FAILED                                                :{WHITE}Ditt mutningsförsök har blivit
-STR_BRIBE_FAILED_2                                              :{WHITE}uppdagat av en regional utredare.
-STR_BUILD_DATE                                                  :{BLACK}Byggt: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Ditt mutningsförsök har blivit
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}uppdagat av en regional utredare.
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Byggt: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Stationsklass: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Stationstyp: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Stationsklass: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Stationstyp: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF-inställningar
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Spara ändringar
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Byt palett
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Ändra palett för markerad NewGRF.{}Gör detta när grafiken från denna NewGRF är rosa i spelet
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Parametrar
-STR_NEWGRF_FILENAME                                             :{BLACK}Filnamn: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palett: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Spara ändringar
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Byt palett
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Ändra palett för markerad NewGRF.{}Gör detta när grafiken från denna NewGRF är rosa i spelet
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parametrar
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Filnamn: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palett: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Du håller på att göra ändringar i ett spel som används; detta kan krascha OpenTTD.{}Är du helt säker på detta?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3185,34 +3185,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Försök att an
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} innehåller en skadad sprite. Alla korrupta sprites kommer att visas som ett rött frågetecken (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Innehåller mer än en Action 8 funktion.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Ladda markerad förinställning
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Spara förinställning
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Spara denna lista som en förinställning
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Namnge förinställningen
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Ta bort förinställningen
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Ta bort markerad förinställning
-STR_NEWGRF_ADD                                                  :{BLACK}Lägg till
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Lägg till en ny NewGRF-fil till listan
-STR_NEWGRF_REMOVE                                               :{BLACK}Ta bort
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Ta bort den markerade NewGRF-filen från listan
-STR_NEWGRF_MOVEUP                                               :{BLACK}Flytta upp
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Flytta upp den markerade NewGRF-filen i listan
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Flytta ned
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Flytta ner den markerade NewGRF-filen i listan
-STR_NEWGRF_FILE_TIP                                             :{BLACK}En lista med installerade NewGRF-filer . Välj en fil för att ändra dess parametrar
-STR_NEWGRF_PARAMETER                                            :{BLACK}Paramerar: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Skriv NewGRF parameterar
-STR_NEWGRF_NO_INFO                                              :{BLACK}Ingen information tillgänglig
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Ladda markerad förinställning
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Spara förinställning
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Spara denna lista som en förinställning
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Namnge förinställningen
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Ta bort förinställningen
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Ta bort markerad förinställning
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Lägg till
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Lägg till en ny NewGRF-fil till listan
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Ta bort
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Ta bort den markerade NewGRF-filen från listan
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Flytta upp
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Flytta upp den markerade NewGRF-filen i listan
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Flytta ned
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flytta ner den markerade NewGRF-filen i listan
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}En lista med installerade NewGRF-filer . Välj en fil för att ändra dess parametrar
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paramerar: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Skriv NewGRF parameterar
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Ingen information tillgänglig
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Tillgängliga NewGRF filer
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Lägg till markering
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Lägg till den markerade NewGRF-filen till din konfiguration
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Scanna om filer
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Uppdatera listan med tillgängliga NewGRF-filer
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Lägg till den markerade NewGRF-filen till din konfiguration
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Scanna om filer
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Uppdatera listan med tillgängliga NewGRF-filer
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Kan inte lägga till filen: redan existerande GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Matchande fil hittades ej
-STR_NEWGRF_DISABLED                                             :{RED}Avstängd
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Matchande fil hittades ej
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Avstängd
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Matchande fil saknas (kompatibel GRF laddad)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Kompatibel GRF laddad för saknade filer
@@ -3228,7 +3228,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NyGRF '{
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Last/återställnings information för '{1:ENGINE}' är skilld ifrån köp lista efter konstruktion. Detta kan leda till att den automatiska förnyelsen slår fel
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' skapade en ändlös loop i produktions-systemet
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Spelet sparades i en version som ej stöder spårvagn. Alla spårvagnar har tagits bort
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Spelet sparades i en version som ej stöder spårvagn. Alla spårvagnar har tagits bort
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Egen valuta
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Växlingskurs: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3239,16 +3239,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Går ö
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Går över till Euro: {ORANGE}aldrig
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Förhandsgranska: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Ändra valutaparametrar
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Minska värdet för din valuta med ett Pund (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Öka värdet för din valuta med ett Pund (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Sätt växelkursen för din valuta mot ett Pund (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Sätt separatorn för din valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Sätt prefix-sträng för din valuta
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Sätt suffix-sträng för din valuta
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Byt till Euro tidigare
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Byt till Euro senare
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Sätt år för byte till Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Pund (£) i din valuta
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Minska värdet för din valuta med ett Pund (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Öka värdet för din valuta med ett Pund (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Sätt växelkursen för din valuta mot ett Pund (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Sätt separatorn för din valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Sätt prefix-sträng för din valuta
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Sätt suffix-sträng för din valuta
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Byt till Euro tidigare
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Byt till Euro senare
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Sätt år för byte till Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Pund (£) i din valuta
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3267,8 +3267,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} skepp
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} flygplan
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Delade instruktioner med {COMMA} Fordon{P "" s}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Visa alla fordon som har samma schema
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Delade instruktioner med {COMMA} Fordon{P "" s}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Visa alla fordon som har samma schema
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Anpassa tåg
 STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Anpassa Vägfordon
@@ -3370,39 +3370,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Anpassa
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Anpassa godsskepp att frakta en annan godstyp
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Anpassa flygplan att frakta en annan godstyp
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}På väg mot {TOWN}s tågdepå
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}På väg mot {TOWN}s tågdepå, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}På väg mot {TOWN}s vägdepå
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}På väg mot {TOWN}s vägdepå i {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}På väg mot {TOWN}s Skeppsdepå
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}På väg mot {TOWN}s Skeppsdepå i {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}På väg mot {STATION}s hangar
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}På väg mot {STATION}s hangar, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Service vid {TOWN}s tågdepå
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Service vid {TOWN}s tågdepå, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Service vid {TOWN}s vägdepå
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Service vid {TOWN}s vägdepå i {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Service vid {TOWN}s skeppsdepå
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Service vid {TOWN}s skeppsdepå, i{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Service vid {STATION}s hangar
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Service vid {STATION}s hangar i {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Klona tåg
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Klona fordon
-STR_CLONE_SHIP                                                  :{BLACK}Klona skepp
-STR_CLONE_AIRCRAFT                                              :{BLACK}Klona flygplan
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Det här bygger en kopia av tåget inklusive alla vagnar. Ctrl-klick gör så att de delar order
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Det här bygger en kopia av fordonet. Ctrl-klick gör så att de delar order
-STR_CLONE_SHIP_INFO                                             :{BLACK}Det här bygger en kopia av skeppet. Ctrl-klick gör så att de delar order
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Det här bygger en kopia av flygplanet. Ctrl-klick gör så att de delar order
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Det här bygger en kopia av ett tåg inklusive alla vagnar. Tryck på den här knappen och sen på ett tåg inuti eller utanför depån. Ctrl-klick gör så att de delar order
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Det här bygger en kopia av ett fordon. Tryck på den här knappen och sen på ett vägfordon inuti eller utanför depån. Ctrl-klick gör så att de delar order
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Det här bygger en kopia av ett skepp. Tryck på den här och sedan på ett skepp inuti eller utanför depån. Ctrl-klick gör så att de delar order
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Det här bygger en kopia av ett flygplan. Tryck på den här knappen och sedan på ett flygplan inuti eller utanför hangaren. Ctrl-klick gör så att de delar order
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}På väg mot {TOWN}s tågdepå
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}På väg mot {TOWN}s tågdepå, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}På väg mot {TOWN}s vägdepå
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}På väg mot {TOWN}s vägdepå i {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}På väg mot {TOWN}s Skeppsdepå
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}På väg mot {TOWN}s Skeppsdepå i {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}På väg mot {STATION}s hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}På väg mot {STATION}s hangar, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Service vid {TOWN}s tågdepå
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Service vid {TOWN}s tågdepå, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Service vid {TOWN}s vägdepå
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Service vid {TOWN}s vägdepå i {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Service vid {TOWN}s skeppsdepå
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Service vid {TOWN}s skeppsdepå, i{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Service vid {STATION}s hangar
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Service vid {STATION}s hangar i {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Klona tåg
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Klona fordon
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klona skepp
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klona flygplan
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Det här bygger en kopia av tåget inklusive alla vagnar. Ctrl-klick gör så att de delar order
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Det här bygger en kopia av fordonet. Ctrl-klick gör så att de delar order
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Det här bygger en kopia av skeppet. Ctrl-klick gör så att de delar order
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Det här bygger en kopia av flygplanet. Ctrl-klick gör så att de delar order
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Det här bygger en kopia av ett tåg inklusive alla vagnar. Tryck på den här knappen och sen på ett tåg inuti eller utanför depån. Ctrl-klick gör så att de delar order
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Det här bygger en kopia av ett fordon. Tryck på den här knappen och sen på ett vägfordon inuti eller utanför depån. Ctrl-klick gör så att de delar order
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Det här bygger en kopia av ett skepp. Tryck på den här och sedan på ett skepp inuti eller utanför depån. Ctrl-klick gör så att de delar order
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Det här bygger en kopia av ett flygplan. Tryck på den här knappen och sedan på ett flygplan inuti eller utanför hangaren. Ctrl-klick gör så att de delar order
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Nytt tågfordon
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Nya elektriska järnvägsfordon
@@ -3472,38 +3472,38 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Centrera
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Du är på väg att sälja alla fordon i depån. Är du säker?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Felaktig depå-typ
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Felaktig depå-typ
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Sälj alla tåg i depån
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Sälj alla vägfordon i depån
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Sälj alla skepp i depån
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Sälj alla flygplan i hangaren
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Sälj alla tåg i depån
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Sälj alla vägfordon i depån
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Sälj alla skepp i depån
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Sälj alla flygplan i hangaren
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Ge en lista av alla tåg som har denna depå i dess körschema
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Ge en lista av alla fordon som har denna depå i dess körschema
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Ge en lista av alla fartyg som har denna depå i dess körschema
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Ge en lista av alla flygplan som har denna flygplats-hangar i dess körschema
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Ge en lista av alla tåg som har denna depå i dess körschema
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Ge en lista av alla fordon som har denna depå i dess körschema
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Ge en lista av alla fartyg som har denna depå i dess körschema
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Ge en lista av alla flygplan som har denna flygplats-hangar i dess körschema
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Byt ut alla tåg i depån
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Byt ut alla vägfordon i depån
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Byt ut alla skepp i depån
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Byt ut alla flygplan i hangaren
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Byt ut alla tåg i depån
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Byt ut alla vägfordon i depån
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Byt ut alla skepp i depån
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Byt ut alla flygplan i hangaren
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tillgängliga tåg
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Tillgängliga fordon
-STR_AVAILABLE_SHIPS                                             :{BLACK}Tillgängliga skepp
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Tillgängliga flyplan
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Tillgängliga tåg
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Tillgängliga fordon
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Tillgängliga skepp
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Tillgängliga flyplan
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Skicka till Depå
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Skicka till Depå
-STR_SEND_SHIP_TO_DEPOT                                          :Skicka till Depå
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Skicka till Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Skicka till Depå
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Skicka till Depå
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Skicka till Depå
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Skicka till Hangar
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Byt ut {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Börja byta ut fordon
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Sluta byta ut fordon
-STR_NOT_REPLACING                                               :{BLACK}Byter inte ut
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Inget fordon valt
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Byter inte ut
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Inget fordon valt
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Välj fordonstyp att byta ut
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Välj den nya fordonstyp du vill använda i stället för den till vänster valda typen
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Tryck för att sluta byta ut fordonstypen vald på vänster sida
@@ -3515,40 +3515,40 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Gör så
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Ersätter: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Välj mellan lok och vagn ersättnings-fönster
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Fordonet är ej tillgängligt
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Fordonet är ej tillgängligt
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Fartyget är ej tillgängligt
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Flygplanet är ej tillgängligt
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Fordonet är ej tillgängligt
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Fordonet är ej tillgängligt
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Fartyget är ej tillgängligt
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Flygplanet är ej tillgängligt
 
-STR_ENGINES                                                     :Lok
-STR_WAGONS                                                      :Vagnar
+STR_REPLACE_ENGINES                                             :Lok
+STR_REPLACE_WAGONS                                              :Vagnar
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klicka för att stanna alla tåg i depån
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klicka för att stanna alla fordon i depån
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klicka för att stanna alla skepp i depån
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klicka för att stanna alla flygplan i hangaren
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klicka för att stanna alla tåg i depån
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klicka för att stanna alla fordon i depån
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klicka för att stanna alla skepp i depån
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klicka för att stanna alla flygplan i hangaren
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klicka för att starta alla tåg i depån
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klicka för att starta alla fordon i depån
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klicka för att starta alla skepp i depån
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klicka för att starta alla skepp i depån
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klicka för att starta alla tåg i depån
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klicka för att starta alla fordon i depån
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klicka för att starta alla skepp i depån
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klicka för att starta alla skepp i depån
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klicka för att stoppa alla fordon i listan
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klicka för att starta alla fordon i listan
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klicka för att stoppa alla fordon i listan
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klicka för att starta alla fordon i listan
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Skyltlista - {COMMA} Skylt{P "" ar}
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Järnvägsfordon
-STR_ELRAIL_VEHICLES                                             :Elektriska järnvägsfordon
-STR_MONORAIL_VEHICLES                                           :Monorail-fordon
-STR_MAGLEV_VEHICLES                                             :Maglevfordon
+STR_REPLACE_RAIL_VEHICLES                                       :Järnvägsfordon
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektriska järnvägsfordon
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monorail-fordon
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglevfordon
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Kostnad: {GOLD}{CURRENCY}{BLACK} Vikt: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hastighet: {GOLD}{VELOCITY}{BLACK} Kraft: {GOLD}{POWER}
@@ -3575,67 +3575,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Generera
-STR_RANDOM                                                      :{BLACK}Slumpa
-STR_RANDOM_HELP                                                 :{BLACK}Ändra slump-nummer som används för terräng-generering
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Generera Värld
-STR_RANDOM_SEED                                                 :{BLACK}Slump-nummer:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Klicka för att mata in ett slump-nummer
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Mata in ett slumpmässigt frö
-STR_LAND_GENERATOR                                              :{BLACK}Landgenerator:
-STR_TREE_PLACER                                                 :{BLACK}Träd Algoritm:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Rotation på höjdkarta:
-STR_TERRAIN_TYPE                                                :{BLACK}Terrängtyp:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Havsnivå
-STR_SMOOTHNESS                                                  :{BLACK}Jämnhet:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Snölinjens höjd:
-STR_DATE                                                        :{BLACK}Datum:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Antal städer:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Antal industrier:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Höj snölinjens höjd ett upp
-STR_SNOW_LINE_DOWN                                              :{BLACK}Sänk snölinjens höjd ett ner
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Ändra snölinjens höjd
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Ändra Startår
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Skala-varning
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}För stora storleksändringar av källkarta är inte rekomenderat. Fortsätt med generering?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Namn på höjdkarta:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Storlek: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Generera
+STR_MAPGEN_RANDOM                                               :{BLACK}Slumpa
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Ändra slump-nummer som används för terräng-generering
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Generera Värld
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Slump-nummer:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Klicka för att mata in ett slump-nummer
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Mata in ett slumpmässigt frö
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Landgenerator:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Träd Algoritm:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Rotation på höjdkarta:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Terrängtyp:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Havsnivå
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Jämnhet:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Snölinjens höjd:
+STR_MAPGEN_DATE                                                 :{BLACK}Datum:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Antal städer:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Antal industrier:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Höj snölinjens höjd ett upp
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Sänk snölinjens höjd ett ner
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Ändra snölinjens höjd
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Ändra Startår
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Skala-varning
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}För stora storleksändringar av källkarta är inte rekomenderat. Fortsätt med generering?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Namn på höjdkarta:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Storlek: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Genererar värld...
 STR_GENERATION_ABORT                                            :{BLACK}Avbryt
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Avbryt generering av världen
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Vill du verkligen avbryta genereringen?
-STR_PROGRESS                                                    :{WHITE}{NUM}% färdigt
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Generera Värld
-STR_TREE_GENERATION                                             :{BLACK}Generera Träd
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Oflyttbar generera
-STR_CLEARING_TILES                                              :{BLACK}Svår och stenig markgenerering
-STR_SETTINGUP_GAME                                              :{BLACK}Ställer in spel
-STR_PREPARING_TILELOOP                                          :{BLACK}Kör tile-loop
-STR_PREPARING_GAME                                              :{BLACK}Förbereder spel
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Denna åtgärd ändrade svårighetsgraden till egen-inställd
-STR_SE_FLAT_WORLD                                               :{WHITE}Plant land
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Generera ett plant land
-STR_SE_RANDOM_LAND                                              :{WHITE}Slumpat land
-STR_SE_NEW_WORLD                                                :{BLACK}Skapa ett nytt scenario
-STR_SE_CAPTION                                                  :{WHITE}Scenarotyp
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Sänk höjden av platt land ett ner
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Öka höjden av platt land ett upp
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Ändra höjd av platt land
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Höjd av platt land:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% färdigt
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Generera Värld
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Generera Träd
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Oflyttbar generera
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Svår och stenig markgenerering
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Ställer in spel
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Kör tile-loop
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Förbereder spel
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Denna åtgärd ändrade svårighetsgraden till egen-inställd
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Plant land
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Generera ett plant land
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Slumpat land
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Skapa ett nytt scenario
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Scenarotyp
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Sänk höjden av platt land ett ner
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Öka höjden av platt land ett upp
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Ändra höjd av platt land
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Höjd av platt land:
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Kartgränser:
-STR_NORTHWEST                                                   :{BLACK}Nordväst
-STR_NORTHEAST                                                   :{BLACK}Nordost
-STR_SOUTHEAST                                                   :{BLACK}Sydost
-STR_SOUTHWEST                                                   :{BLACK}Sydväst
-STR_BORDER_FREEFORM                                             :{BLACK}Frihand
-STR_BORDER_WATER                                                :{BLACK}Vatten
-STR_BORDER_RANDOM                                               :{BLACK}På måfå
-STR_BORDER_RANDOMIZE                                            :{BLACK}På måfå
-STR_BORDER_MANUAL                                               :{BLACK}Manuell
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Kartgränser:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Nordväst
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Nordost
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Sydost
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Sydväst
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Frihand
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Vatten
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}På måfå
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}På måfå
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Manuell
 
 ############ Tooltip measurment
 
@@ -3644,9 +3644,9 @@ STR_MEASURE_AREA                                                :{BLACK}Yta: {NU
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Längd: {NUM}{}Höjdskillnad: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Yta: {NUM} x {NUM}{}Höjdskillnad: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK} Överför kredit: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...detta är en stadsägd väg
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...vägen pekar i fel riktning
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK} Överför kredit: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...detta är en stadsägd väg
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...vägen pekar i fel riktning
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3656,7 +3656,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Alla tåg
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Alla vägfordon
 STR_GROUP_ALL_SHIPS                                             :Alla skepp
@@ -3665,24 +3665,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ogrupperade tå
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Ogrupperade vägfordon
 STR_GROUP_DEFAULT_SHIPS                                         :Ogrupperade skepp
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Ogrupperade flygmaskiner
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Lägg till delade fordon
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Ta bort alla fordon
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Döp om en grupp
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Kan inte skapa grupp...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Kan inte ta bort denna grupp...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Kan inte döpa om grupp...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Kan inte ta bort alla fordon i denna grupp...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Kan inte lägga till fordon i denna grupp...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Kan inte lägga till delade fordon i denna grupp...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Kan inte skapa grupp...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Kan inte ta bort denna grupp...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Kan inte döpa om grupp...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Kan inte ta bort alla fordon i denna grupp...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Kan inte lägga till fordon i denna grupp...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Kan inte lägga till delade fordon i denna grupp...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grupper - klicka på en grupp för att lista alla fordon i gruppen
-STR_GROUP_CREATE_TIP                                            :{BLACK}Klicka för att skapa en grupp
-STR_GROUP_DELETE_TIP                                            :{BLACK}Ta bort vald grupp
-STR_GROUP_RENAME_TIP                                            :{BLACK}Byt namn på vald grupp
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Klicka för att skydda denna grupp mot allmän autoreplace
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grupper - klicka på en grupp för att lista alla fordon i gruppen
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Klicka för att skapa en grupp
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Ta bort vald grupp
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Byt namn på vald grupp
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Klicka för att skydda denna grupp mot allmän autoreplace
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3699,7 +3699,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3744,19 +3744,19 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Namnet måste vara unikt
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Namnet måste vara unikt
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Åk till nästa skylt
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Åk till föregående skylt
-STR_SIGN_OSKTITLE                                               :{BLACK}Mata in ett namn för skylten
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Åk till nästa skylt
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Åk till föregående skylt
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Mata in ett namn för skylten
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Grunda
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Prospektera
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Bygga
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Välj lämplig industri från denna lista
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Grunda
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Prospektera
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Bygga
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Välj lämplig industri från denna lista
 
 ############ on screen keyboard
 STR_OSK_KEYBOARD_LAYOUT                                         :`1234567890-=\qwertyuiop[]asdfghjkl;'  zxcvbnm,./ .
@@ -3765,37 +3765,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 
 ############ AI GUI
 STR_AI_DEBUG                                                    :{WHITE}Felsökning av datorspelare
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Namn på datorspelaren
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Namn på datorspelaren
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Ladda om datorspelaren
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Stoppa datorspelaren, ladda om scriptet och starta sedan om datorspelaren
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Felsökning av datorspelaren är bara tillgänglig för servern
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Stoppa datorspelaren, ladda om scriptet och starta sedan om datorspelaren
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Felsökning av datorspelaren är bara tillgänglig för servern
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguration av datorspelaren
-STR_AI_CHANGE                                                   :{BLACK}Välj datorspelare
-STR_AI_CONFIGURE                                                :{BLACK}Konfigurera
-STR_AI_CHANGE_TIP                                               :{BLACK}Ladda en annan datorspelare
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Konfigurera datorspelarens parametrar
-STR_AI_LIST_TIP                                                 :{BLACK}Alla datorspelare som kommer laddas nästa spelomgång
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Välj datorspelare
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurera
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Ladda en annan datorspelare
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigurera datorspelarens parametrar
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Alla datorspelare som kommer laddas nästa spelomgång
 STR_AI_LIST_CAPTION                                             :{WHITE}Tillgängliga datorspelare
-STR_AI_AILIST_TIP                                               :{BLACK}Klicka för att välja en datorspelare
-STR_AI_ACCEPT                                                   :{BLACK}Acceptera
-STR_AI_ACCEPT_TIP                                               :{BLACK}Välj markerad datorspelare
-STR_AI_CANCEL                                                   :{BLACK}Avbryt
-STR_AI_CANCEL_TIP                                               :{BLACK}Ändra inte datorspelare
-STR_AI_CLOSE                                                    :{BLACK}Stäng
-STR_AI_RESET                                                    :{BLACK}Återställ
-STR_AI_HUMAN_PLAYER                                             :Mänsklig spelare
-STR_AI_RANDOM_AI                                                :Slumpa datorspelare
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Klicka för att välja en datorspelare
+STR_AI_LIST_ACCEPT                                              :{BLACK}Acceptera
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Välj markerad datorspelare
+STR_AI_LIST_CANCEL                                              :{BLACK}Avbryt
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Ändra inte datorspelare
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Stäng
+STR_AI_SETTINGS_RESET                                           :{BLACK}Återställ
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Mänsklig spelare
+STR_AI_CONFIG_RANDOM_AI                                         :Slumpa datorspelare
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Datorspelarens parametrar
-STR_AI_AUTHOR                                                   :{BLACK}Upphovsman: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Version: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}En av AI'erna som körs har krachat. Vänligen raportera detta till AIs skapare med en screenshot på "AI Debug Fönsteret".
-STR_AI_NO_AI_FOUND                                              :Ingen passande AI hittades. {}Denna AI är en test-AI och kommer inte göra någonting.{}Du kan ladda ner nya AI genom spelets system 'Online-innehåll"
+STR_AI_LIST_AUTHOR                                              :{BLACK}Upphovsman: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En av AI'erna som körs har krachat. Vänligen raportera detta till AIs skapare med en screenshot på "AI Debug Fönsteret".
+STR_ERROR_AI_NO_AI_FOUND                                        :Ingen passande AI hittades. {}Denna AI är en test-AI och kommer inte göra någonting.{}Du kan ladda ner nya AI genom spelets system 'Online-innehåll"
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Bullernivågräns i stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Genererat buller: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Bullernivågräns i stad: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Genererat buller: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3805,6 +3805,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... ansl
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... kunde inte skriva till fil
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Kunde inte packa upp den nedladdade filen
 
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Hitta saknat innehåll online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Kontrollera om saknat innehåll kan hittas online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Hitta saknat innehåll online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Kontrollera om saknat innehåll kan hittas online
 ########
diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt
index b6b3bc847..2f1b7752c 100644
--- a/src/lang/traditional_chinese.txt
+++ b/src/lang/traditional_chinese.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}地圖 -
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}�戲�項
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}訊�
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}來自 {STRING} 的訊�
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}注��
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}注��
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}�能執行以下動作....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}�能清除這個地段....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}原著作權為 {COPYRIGHT} 1995 Chris Sawyer，�留所有權利
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD 開發�組
 
 STR_QUIT_CAPTION                                                :{WHITE}離開
-STR_YES                                                         :{BLACK}是
-STR_NO                                                          :{BLACK}�
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}您確定�放棄進行中的�戲{}返回 {STRING}？
+STR_QUIT_YES                                                    :{BLACK}是
+STR_QUIT_NO                                                     :{BLACK}�
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}您確定�放棄進行中的�戲{}返回 {STRING}？
 
 STR_JUST_NOTHING                                                :ç„¡
 STR_COLOUR_DARK_BLUE                                            :æš—è—�
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}沙漠
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}雪地
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}訊�
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}�設值
-STR_QUERY_CANCEL                                                :{BLACK}�消
-STR_QUERY_OK                                                    :{BLACK}確定
-STR_QUERY_RENAME                                                :{BLACK}更�
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}�設值
+STR_BUTTON_CANCEL                                               :{BLACK}�消
+STR_BUTTON_OK                                                   :{BLACK}確定
+STR_BUTTON_RENAME                                               :{BLACK}更�
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}貨物
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}資訊
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}容�
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}總貨物�
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}此列車的總容�：
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}此列車的總容�：
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}開新�戲
 STR_INTRO_LOAD_GAME                                             :{BLACK}載入�戲
 STR_INTRO_MULTIPLAYER                                           :{BLACK}多人�戲
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}場景編輯器
 
-STR_MAPSIZE                                                     :{BLACK}地圖大�：
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}地圖大�：
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}�戲�項
 
 STR_COMPANY_SOMEONE                                             :�人{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :放棄�戲
 STR_FILE_MENU_EXIT                                              :離開
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}你�放棄這個�戲嗎？
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}放棄�戲
-STR_SORT_ORDER_TIP                                              :{BLACK}�擇排� (逆��順�)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}�擇排�項目
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}�擇�濾�件
-STR_SORT_BY                                                     :{BLACK}排��照
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}�擇排� (逆��順�)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}�擇排�項目
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}�擇�濾�件
+STR_BUTTON_SORT_BY                                              :{BLACK}排��照
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}人�
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :營��本
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :功率�營��本
 STR_SORT_BY_CARGO_CAPACITY                                      :載貨�
 
-STR_NO_WAITING_CARGO                                            :{BLACK}無任何貨物等候��
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}�擇所有設施
-STR_SELECT_ALL_TYPES                                            :{BLACK}�擇所有貨物種類 (包�沒在等待的貨物)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}顯示此交通工具的所有設計
-STR_MANAGE_LIST                                                 :{BLACK}管��單
-STR_MANAGE_LIST_TIP                                             :{BLACK}�清單所有車輛發出指示
-STR_REPLACE_VEHICLES                                            :替�交通工具
-STR_SEND_FOR_SERVICING                                          :�去維護
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}�用列車
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}�用車輛
-STR_AVAILABLE_SHIPS                                             :{BLACK}�用船舶
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}�用飛機
-
-STR_SEND_TRAIN_TO_DEPOT                                         :�到機廠
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :�到車庫
-STR_SEND_SHIP_TO_DEPOT                                          :�到船塢
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :�到機棚
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}無任何貨物等候��
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}�擇所有設施
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}�擇所有貨物種類 (包�沒在等待的貨物)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}顯示此交通工具的所有設計
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}管��單
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}�清單所有車輛發出指示
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :替�交通工具
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :�去維護
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}�用列車
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}�用車輛
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}�用船舶
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}�用飛機
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :�到機廠
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :�到車庫
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :�到船塢
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :�到機棚
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}�項
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}�能更改檢修週期...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}關閉視窗
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}視窗標題 - 點此拖曳�移動視窗
-STR_STICKY_BUTTON                                               :{BLACK}「關閉所有視窗��會關閉本視窗
-STR_RESIZE_BUTTON                                               :{BLACK}點�並拖曳�縮放視窗大�
+STR_TOOLTIP_STICKY                                              :{BLACK}「關閉所有視窗��會關閉本視窗
+STR_TOOLTIP_RESIZE                                              :{BLACK}點�並拖曳�縮放視窗大�
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}點�這裡跳到�設儲存目錄
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}拆�一格中的建築物等
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}下�土地上的一角
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}上昇土地上的一角
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}下�土地上的一角
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}上昇土地上的一角
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}�軸 - 上下�動清單
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}�軸 - 左��動清單
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}於地圖上顯示地形輪廓
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}於地åœ
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}今年盈利：{CURRENCY} (去年盈利：{CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} å¹´ ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} å¹´ ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} å¹´ ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} å¹´ ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :列車
-STR_VEHICLE_ROAD_VEHICLE                                        :車輛
-STR_VEHICLE_SHIP                                                :船舶
-STR_VEHICLE_AIRCRAFT                                            :飛機
+STR_REPLACE_VEHICLE_TRAIN                                       :列車
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :車輛
+STR_REPLACE_VEHICLE_SHIP                                        :船舶
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :飛機
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} �將退役
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} 應當馬上退役
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} 應馬上退役並替�新車
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}土地資訊
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}整地花費：{LTBLUE}��用
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}整地花費：{RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}清除時確�收入： {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}清除時確�收入： {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :��用
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}所有人：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}�路所有者：{LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}é�µè·¯æ‰
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}地方政府：{LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :ç„¡
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}�稱
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}點擊éŸ
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}點�音樂從目�清單中移除 (僅�「自訂一�或「自訂二�
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}開關播放清單亂�播放
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}於�擇視窗顯示樂軌
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}點����務�將工業�市鎮置於畫�中央
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}點����務�將工業�市鎮置於畫�中央
 STR_INTRO_DIFFICULTY                                            :{BLACK}難易度 ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :上次訊��新�報告
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}減少åœ
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}產生隨機地形
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}�設地形
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}�設地形
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}移除全部玩家所有的設施
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}移除全部玩家所有的設施
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}你�移除全部玩家所有的設施？
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}產生地形
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}產生市鎮
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...太æŽ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...太接近�一個市鎮
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...地點���
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...已有太多市鎮
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�能建立市鎮
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...地圖沒有足夠空間
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�能建立市鎮
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...地圖沒有足夠空間
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}擴大市鎮大�
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}擴展
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}此市鎮�會自動興建�路。你�以到 [進階設定] -> [經濟] -> [市鎮] 中啟用 [市鎮�以興建�路] �項。
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}此市鎮�會自動興建�路。你�以到 [進階設定] -> [經濟] -> [市鎮] 中啟用 [市鎮�以興建�路] �項。
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}隨機市鎮
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}隨機��建立市鎮
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}�能在這裡建造 {STRING} ...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}在場æ™
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}放置燈塔
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}放置天線塔
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}定義沙漠�{}點擊並按� CTRL �以移除
-STR_CREATE_LAKE                                                 :{BLACK}劃出湖泊範�{}開鑿�河，在海平�上按 CTRL �則會淹沒週�土地
-STR_CREATE_RIVER                                                :{BLACK}劃出河�範�
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}劃出湖泊範�{}開鑿�河，在海平�上按 CTRL �則會淹沒週�土地
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}劃出河�範�
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}刪除
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}完全刪除這個市鎮
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :儲存場景
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :載入場景
-STR_MENU_LOAD_HEIGHTMAP                                         :載入高度圖
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :載入高度圖
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :離開編輯器
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :離開
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}儲存å 
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}以此場景開始
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}載入高度圖
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}以高度圖為地形開始新�戲
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}你確定�離開這個場景嗎？
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}你確定�離開這個場景嗎？
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...�能在市鎮人�超� 1200 人的地方建造
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}將開始時間往� 1 年
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}將開始時間往後 1 年
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...æ©‹æ¨
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}�型
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}中型
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}大型
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}隨機
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}隨機
 STR_FOUND_TOWN_CITY                                             :{BLACK}城市
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}城市比普通城鎮�長的更快{}你�以從進階設定中調整城市的�始�模
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}�擇市鎮大�
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}市鎮大�：
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}市鎮�路�置：
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}�擇這個市鎮使用的�路�置
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}原版
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}較佳�劃
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}２x２網格
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}３x３網格
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}隨機
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}市鎮�路�置：
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}�擇這個市鎮使用的�路�置
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}原版
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}較佳�劃
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}２x２網格
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}３x３網格
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}隨機
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}顯示上次訊��新�報告
 STR_NEWS_MESSAGES_OFF                                           :關閉
 STR_NEWS_MESSAGES_SUMMARY                                       :摘�
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  é�
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}畫�擷��功並存為「{STRING}�
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}畫�擷�失敗�
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}購買土地供將來使用
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}購買土地供將來使用
 STR_STATUSBAR_AUTOSAVE                                          :{RED}自動儲存
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  �戲儲存中 *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}�戲還在儲存中，{}請�候�
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}�戲還在儲存中，{}請�候�
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}�擇「街頭音樂�播放清單
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}é�¸æ“‡è¦
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}全螢幕
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}勾���在全螢幕下玩 OpenTTD
-STR_FULLSCREEN_FAILED                                           :{WHITE}無法切�全螢幕模�
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}無法切�全螢幕模�
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}螢幕解�度
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}�擇螢幕解�度
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}é�¸æ“‡ä½
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} 檔案�失��毀
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}關於基礎圖形集的�外資訊
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}自動儲存失敗
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}自動儲存失敗
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}正�往：{STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}正�往：{STATION}，{VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}沒有指令
-STR_NO_ORDERS_VEL                                               :{LTBLUE}沒有指令，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}正�往：{STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}正�往：{STATION}，{VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}沒有指令
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}沒有指令，{VELOCITY}
 
 STR_PASSENGERS                                                  :乘客
 STR_BAGS                                                        :包
@@ -857,9 +857,9 @@ STR_CRATES                                                      :ç®±
 STR_RES_OTHER                                                   :其它
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}無法共享指令清單...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}無法複製指令清單...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - 共享指令�� - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}無法共享指令清單...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}無法複製指令清單...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - 共享指令�� - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} 無法尋得路徑
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} 迷路了
@@ -1128,15 +1128,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}地圖
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :關閉
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}修改設定值
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}修改設定值
 
-STR_TEMPERATE_LANDSCAPE                                         :溫帶
-STR_SUB_ARCTIC_LANDSCAPE                                        :寒帶
-STR_SUB_TROPICAL_LANDSCAPE                                      :亞熱帶
-STR_TOYLAND_LANDSCAPE                                           :玩具世界
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :溫帶
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :寒帶
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :亞熱帶
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :玩具世界
 
 STR_CHEATS                                                      :{WHITE}作弊
-STR_CHEATS_TIP                                                  :{BLACK}方塊被勾�代表您用�這個密技
+STR_CHEATS_TOOLTIP                                              :{BLACK}方塊被勾�代表您用�這個密技
 STR_CHEATS_WARNING                                              :{BLACK}警告�您正準備背�您的競爭�手，請記�這種�辱將永傳�朽
 STR_CHEAT_MONEY                                                 :{LTBLUE}增加金錢：{CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}切�玩家�控的公�：{ORANGE}{COMMA}
@@ -1148,177 +1148,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}切æ�›å
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}修改日期：{ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}�許修改產�：{ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}正�往 {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}正�往 {WAYPOINT}，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}正�往 {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}正�往 {WAYPOINT}，{VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :�往 {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :�往 {WAYPOINT} ���
+STR_ORDER_GO_TO_WAYPOINT                                        :�往 {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :�往 {WAYPOINT} ���
 
-STR_WAYPOINTNAME_CITY                                           :{TOWN} 號誌站
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} 第 {COMMA} 號誌站
-STR_LANDINFO_WAYPOINT                                           :號誌站
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} 號誌站
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} 第 {COMMA} 號誌站
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :號誌站
 
-STR_WAYPOINT                                                    :{WHITE}號誌站
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}顯示號誌站種類
+STR_WAYPOINT_CAPTION                                            :{WHITE}號誌站
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}顯示號誌站種類
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}編輯號誌站�稱
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}無法修改號誌站�稱...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}無法修改號誌站�稱...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}將軌�轉�號誌站
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}無法在此興建列車號誌站...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}無法移除列車號誌站...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}無法在此興建列車號誌站...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}無法移除列車號誌站...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}以自動鋪軌模�建造�軌
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...這個地圖沒有市鎮
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}地圖產生失敗...{}...找�到��的市鎮��
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...這個地圖沒有市鎮
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}地圖產生失敗...{}...找�到��的市鎮��
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}許多隨機市鎮
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}以隨機分佈的市鎮佈滿地圖
-STR_MANY_RANDOM_INDUSTRIES                                      :隨機產生多個工業
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}以隨機分佈的工業佈滿地圖
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}無法產生工業...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}許多隨機市鎮
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}以隨機分佈的市鎮佈滿地圖
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :隨機產生多個工業
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}以隨機分佈的工業佈滿地圖
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}無法產生工業...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}打開地形工具列�����低地�� �樹等
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}地形
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}整平地�
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}整平地�
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}隨機種類樹木
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}種�隨機種類樹木
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}種�隨機種類樹木
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}無法在此興建�河...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}無法在此興建�河...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}建造�河，按� CTRL �在海�上建造 (僅�海平�)
-STR_LANDINFO_CANAL                                              :�河
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :�河
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}無法在此興建水閘...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}無法在此興建水閘...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}興建水閘
-STR_LANDINFO_LOCK                                               :æ°´é–˜
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :æ°´é–˜
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}無法在此開鑿河�...
-STR_LANDINFO_RIVER                                              :河�
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}無法在此開鑿河�...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :河�
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...浮標正在使用�
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...浮標正在使用�
 
-STR_LANDINFO_COORDS                                             :{BLACK}座標：{LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}座標：{LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}無法移除車站元件...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}無法轉�軌�種類...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}無法移除車站元件...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}無法轉�軌�種類...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}轉���級軌�種類
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}將車頭拖至此��出售整列車
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}將車頭拖至此��出售整列車
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}拖放
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}以拖曳方�興建車站
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}�擇�顯示的車站種類
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}�擇�興建的車站種類
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}�擇�顯示的車站種類
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}�擇�興建的車站種類
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}快轉�戲
 STR_MESSAGE_HISTORY                                             :{WHITE}訊�記錄
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}列出最近的新�內容
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}全部關閉
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}全部打開
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}列出最近的新�內容
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}全部關閉
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}全部打開
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}工業
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} (已�� {COMMA}%)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} (已�� {COMMA}%/{COMMA}%)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}工業�稱 - 點��稱�將工業置於畫�中央
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}工業
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} (已�� {COMMA}%)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} (已�� {COMMA}%/{COMMA}%)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}工業�稱 - 點��稱�將工業置於畫�中央
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...太接近�一個工業
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...太接近�一個工業
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}修改產�
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}多人�戲
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}玩家�稱：
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}這是其他玩家辨�您的�稱
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}輸入您的�稱
-STR_NETWORK_CONNECTION                                          :{BLACK}連線：
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}�擇網際網路 (Internet) 或�域網路 (LAN) �戲
-
-STR_NETWORK_START_SERVER                                        :{BLACK}起動伺�器
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}起動您自己的伺�器
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}�稱
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}�戲�稱
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}語言�伺�器版本等
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}點�清單内的�戲���擇
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}最後加入的伺�器：
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}點�您上次最後加入的伺�器
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}尋找伺�器
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}尋找網路上的伺�器
-STR_NETWORK_ADD_SERVER                                          :{BLACK}新增伺�器
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}在清單新增一定會檢查�戲的伺�器
-STR_NETWORK_ENTER_IP                                            :{BLACK}輸入主機��
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}用戶端
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}線上用戶端�用戶端上�{}線上公��公�上�
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}地圖大�
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}�戲的地圖大�{}點��以�大�排�
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}日期
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}目�日期
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}年份
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}�戲年份{}�戲正在進行中
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}�戲資訊
-STR_NETWORK_CLIENTS                                             :{SILVER}用戶端：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}語言：{WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}圖格組：{WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}地圖大�：{WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}伺�器版本：{WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}伺�器��：{WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}開始日期：{WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}目�日期：{WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}�密碼�護�
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}伺�器離線
-STR_NETWORK_SERVER_FULL                                         :{SILVER}伺�器已滿
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}版本�符
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF �符�
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}加入�戲
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}開始新的多人�戲
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}�戲�稱：
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}�戲�稱會顯示在其他玩家多人�戲 的�戲清單中
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}為連線�戲輸入一個�稱
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}設定密碼
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}如果您�想讓大眾連線的話，�以用 密碼�護�戲
-STR_NETWORK_SELECT_MAP                                          :{BLACK}�擇地圖：
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}您想玩哪個地圖？
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :�域網路 (LAN)
-STR_NETWORK_INTERNET                                            :網際網路 (Internet)
-STR_NETWORK_LAN_INTERNET                                        :�域網路�網際網路
-STR_NETWORK_INTERNET_ADVERTISE                                  :網際網路 (廣告)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} 玩家
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}用戶端上�：
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}�擇連線人數上�，但�是�個�� 都�有人連線
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} 公�
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}公�上�：
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}�制伺�器�以建立的公�數�
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}�觀者
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}�觀者上�：
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}�制�加入的�觀者數�
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}�通語言：
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}讓其他人知�這個伺�器使用的�通 語言
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}開始�戲
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}以隨機地圖或場景開始新的連線�戲
-STR_NETWORK_LOAD_GAME                                           :{BLACK}載入�戲
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}繼續先�儲存的多人�戲 (記得以正確的玩家身份連線)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}多人�戲
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}玩家�稱：
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}這是其他玩家辨�您的�稱
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}輸入您的�稱
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}連線：
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}�擇網際網路 (Internet) 或�域網路 (LAN) �戲
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}起動伺�器
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}起動您自己的伺�器
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}�稱
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}�戲�稱
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}語言�伺�器版本等
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}點�清單内的�戲���擇
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}最後加入的伺�器：
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}輸入主機��
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}用戶端
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}線上用戶端�用戶端上�{}線上公��公�上�
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}地圖大�
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}�戲的地圖大�{}點��以�大�排�
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}日期
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}目�日期
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}年份
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}�戲年份{}�戲正在進行中
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}�戲資訊
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}用戶端：{WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}語言：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}圖格組：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}地圖大�：{WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}伺�器版本：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}伺�器��：{WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}開始日期：{WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}目�日期：{WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}�密碼�護�
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}伺�器離線
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}伺�器已滿
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}版本�符
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF �符�
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}加入�戲
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}開始新的多人�戲
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}�戲�稱：
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}�戲�稱會顯示在其他玩家多人�戲 的�戲清單中
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}為連線�戲輸入一個�稱
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}設定密碼
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}如果您�想讓大眾連線的話，�以用 密碼�護�戲
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}�擇地圖：
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}您想玩哪個地圖？
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :�域網路 (LAN)
+STR_NETWORK_SERVER_LIST_INTERNET                                :網際網路 (Internet)
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :�域網路�網際網路
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :網際網路 (廣告)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} 玩家
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}用戶端上�：
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}�擇連線人數上�，但�是�個�� 都�有人連線
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} 公�
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}公�上�：
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}�制伺�器�以建立的公�數�
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM}�觀者
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}�觀者上�：
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}�制�加入的�觀者數�
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}�通語言：
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}讓其他人知�這個伺�器使用的�通 語言
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}開始�戲
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}以隨機地圖或場景開始新的連線�戲
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}載入�戲
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}繼續先�儲存的多人�戲 (記得以正確的玩家身份連線)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :��
@@ -1359,33 +1359,33 @@ STR_NETWORK_LANG_GREEK                                          :�代希臘語
 STR_NETWORK_LANG_LATVIAN                                        :拉脫維亞語
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}多人�戲大廳
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}多人�戲大廳
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}準備加入：{ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}列出�戲内所有公�。若公�還有 空�的話您�以加入�有公�，或是 創立新公�
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}新公�
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}建立新公�
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}�觀�戲
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}以�觀者身分�與�戲
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}加入公�
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}共�管�這間公�
-STR_NETWORK_REFRESH                                             :{BLACK}更新伺�器
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}更新伺�器資訊
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}準備加入：{ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}列出�戲内所有公�。若公�還有 空�的話您�以加入�有公�，或是 創立新公�
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}新公�
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}建立新公�
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}�觀�戲
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}以�觀者身分�與�戲
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}加入公�
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}共�管�這間公�
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}更新伺�器
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}更新伺�器資訊
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}公�資訊
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}公�資訊
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}公��稱：{WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}�立於：{WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}公�市值：{WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}目�餘�：{WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}去年收入：{WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}效率：{WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}公��稱：{WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}�立於：{WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}公�市值：{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}目�餘�：{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}去年收入：{WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}效率：{WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}交通工具：{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}車站：{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}玩家：{WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}交通工具：{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}車站：{WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}玩家：{WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}正在連線...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}正在連線...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) 連線中..
@@ -1401,49 +1401,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}正在å�
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}在您之�有 {NUM} 個用戶端
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} 已下載
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}æ–·ç·š
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}æ–·ç·š
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}請輸入你�付出多少資金
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}伺�器��護，輸入密碼
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}公���護，輸入密碼
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}用戶端清單
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}用戶端清單
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}�觀者
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}新公�
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}找�到網路�置，或未以 ENABLE_NETWORK 編譯
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}找�到任何網路�戲
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}伺�器沒有回應請求
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}因 NewGRF �符�而無法連線
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}網路�戲�步失敗
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}網路�戲失去連線
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}無法載入�戲
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}無法啟動伺�器
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}無法連線
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}連線 #{NUM} 逾時
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}通訊�定錯誤，連線已關閉
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}用戶端的版本與伺�器�符
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}密碼錯誤
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}伺�器已滿
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}您被伺�器�鎖了
-STR_NETWORK_ERR_KICKED                                          :{WHITE}您被踢出�戲
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}此伺�器��許作弊
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}找�到網路�置，或未以 ENABLE_NETWORK 編譯
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}找�到任何網路�戲
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}伺�器沒有回應請求
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}因 NewGRF �符�而無法連線
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}網路�戲�步失敗
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}網路�戲失去連線
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}無法載入�戲
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}無法啟動伺�器
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}無法連線
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}連線 #{NUM} 逾時
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}通訊�定錯誤，連線已關閉
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}用戶端的版本與伺�器�符
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}密碼錯誤
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}伺�器已滿
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}您被伺�器�鎖了
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}您被踢出�戲
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}此伺�器��許作弊
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :一般錯誤
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :失去�步
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :無法載入地圖
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :失去連線
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :通訊�定錯誤
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF �符�
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :未通��證
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :收到怪異�包
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :版本錯誤
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :已有人使用相��稱
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :密碼錯誤
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :DoCommand 內�錯誤的 company-id
-STR_NETWORK_ERR_CLIENT_KICKED                                   :被伺�器踢除
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :想試著作弊
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :伺�器已滿
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :一般錯誤
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :失去�步
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :無法載入地圖
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :失去連線
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :通訊�定錯誤
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF �符�
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :未通��證
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :收到怪異�包
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :版本錯誤
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :已有人使用相��稱
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :密碼錯誤
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :DoCommand 內�錯誤的 company-id
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :被伺�器踢除
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :想試著作弊
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :伺�器已滿
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1453,15 +1453,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :é�Šæˆ²æš«å�œ (é
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :�戲繼續 (客戶端�入�功)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :�戲繼續 (客戶端�入失敗)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :離開中
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} 已加入�戲
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} 已加入公� #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} 已加入為�觀者
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} 已建立新公� (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} 已離開�戲 ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} 已變更其�稱為 {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} 付給你的公� {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** 你付給 {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :離開中
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} 已加入�戲
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} 已加入公� #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} 已加入為�觀者
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} 已建立新公� (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} 已離開�戲 ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} 已變更其�稱為 {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} 付給你的公� {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** 你付給 {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[團隊]：
 STR_NETWORK_CHAT_COMPANY                                        :[團隊] {STRING}：{WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[團隊] 給 {STRING}：{WHITE}{STRING}
@@ -1471,8 +1471,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[�人] 給 {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[全員] ：
 STR_NETWORK_CHAT_ALL                                            :[全員] {STRING}：{WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}輸入��天的文字
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} 伺�器關閉連線
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} 伺�器正在�新啟動...{}請�候...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} 伺�器關閉連線
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} 伺�器正在�新啟動...{}請�候...
 
 STR_NETWORK_SERVER                                              :伺�器
 STR_NETWORK_CLIENT                                              :用戶端
@@ -1486,19 +1486,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :�公�說話
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :�人訊�
 
 
-STR_NETWORK_SEND                                                :{BLACK}傳�
+STR_NETWORK_CHAT_SEND                                           :{BLACK}傳�
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}無法從 PNG 檔載入地形...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...找�到檔案
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...無法轉�影�格�，需� 8 或 24-bit PNG 影�
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...出�一點狀�，抱歉 (或許是檔案�毀)
+STR_ERROR_PNGMAP                                                :{WHITE}無法從 PNG 檔載入地形...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...找�到檔案
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...無法轉�影�格�，需� 8 或 24-bit PNG 影�
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...出�一點狀�，抱歉 (或許是檔案�毀)
 
-STR_BMPMAP_ERROR                                                :{WHITE}無法從 BMP 檔載入地形...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...無法轉�影�格�
+STR_ERROR_BMPMAP                                                :{WHITE}無法從 BMP 檔載入地形...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...無法轉�影�格�
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}花費：{CURRENCY}
@@ -1512,13 +1512,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}é �ä¼°æ”
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}無法�昇土地...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}無法�低土地...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}無法變更此處地形...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :石頭
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :粗地
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :裸地
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :�地
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :農場
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :覆雪地
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :沙漠
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :石頭
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :粗地
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :裸地
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :�地
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :農場
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :覆雪地
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :沙漠
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}地�斜�方���
@@ -1526,11 +1526,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}ä¸�å�ˆç�
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}挖掘工作會摧毀隧�
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}已到海平�
 STR_ERROR_TOO_HIGH                                              :{WHITE}太高
-STR_ALREADY_LEVELLED                                            :{WHITE}... 已經平了
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... 已經平了
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}沒有��的�路軌�
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...已經建了
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}必須先移除�路
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}�路是單行�或已�閉
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}�路是單行�或已�閉
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}鋪設�路
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}鋪設電氣化�路
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}鋪設單軌
@@ -1554,41 +1554,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}興建é�
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}興建�路橋樑
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}挖掘�路隧�
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}切�建築�移除�軌與號誌
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}�擇橋樑 - 點�想建的橋樑��建造
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}�擇橋樑 - 點�想建的橋樑��建造
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}�擇�路機廠方�
-STR_RAILROAD_TRACK                                              :�軌
-STR_RAILROAD_TRAIN_DEPOT                                        :�路機廠
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :�軌
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :�路機廠
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...此�域屬於其它公�所有
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :有閉塞號誌的�軌
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :有入�號誌的�軌
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :有出�號誌的�軌
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :有組�號誌的�軌
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :有路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :有單�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :有閉塞�入�號誌的�軌
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :有閉塞�出�號誌的�軌
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :有閉塞�組�號誌的�軌
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :有閉塞�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :有閉塞�單�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :有入��出�號誌的�軌
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :有入��組�號誌的�軌
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :有�告�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :有入��單�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :有出��組�號誌的�軌
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :有出��路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :有出��單�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :有組��路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :有組��單�路徑號誌的�軌
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :有路徑�單�路徑號誌的�軌
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}必須先移除�車站
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}建造�立車站
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}�併車站
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :有閉塞號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :有入�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :有出�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :有組�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :有路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :有單�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :有閉塞�入�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :有閉塞�出�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :有閉塞�組�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :有閉塞�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :有閉塞�單�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :有入��出�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :有入��組�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :有�告�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :有入��單�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :有出��組�號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :有出��路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :有出��單�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :有組��路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :有組��單�路徑號誌的�軌
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :有路徑�單�路徑號誌的�軌
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}必須先移除�車站
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}建造�立車站
+STR_JOIN_STATION_CAPTION                                        :{BLACK}�併車站
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}必須先移除�路
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}�路施工中
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}�路施工中
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}鋪設�路
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}鋪設電車軌
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}�擇�路橋樑
@@ -1624,14 +1624,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}挖掘é›
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}切�單行��雙��
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}切�鋪設�移除公路
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}切�鋪設電車軌
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}�擇車庫方�
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}�擇電車維修廠方�
-STR_ROAD_DESCRIPTION_ROAD                                       :公路
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :有路燈的公路
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :有行�樹的公路
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :車庫
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :公路��路平交�
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :路�電車
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}�擇車庫方�
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}�擇電車維修廠方�
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :公路
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :有路燈的公路
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :有行�樹的公路
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :車庫
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :公路��路平交�
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :路�電車
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}無法移除公車站...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}無法移除貨�站...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}無法移除載客電車站...
@@ -1639,12 +1639,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}無法ç§
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}城市
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}必須先摧毀建築物
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (城市)
@@ -1657,9 +1657,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}將市éŽ
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}修改市鎮�稱
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}上月乘客：{ORANGE}{COMMA}{BLACK}  最多：{ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}上月郵件：{ORANGE}{COMMA}{BLACK}  最多：{ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}市鎮�長還需貨物：
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{BLACK}還需� {ORANGE}{STRING}
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{BLACK}上個月已�� {ORANGE}{CARGO}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}市鎮�長還需貨物：
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{BLACK}還需� {ORANGE}{STRING}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{BLACK}上個月已�� {ORANGE}{CARGO}
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :摩天辦公大樓
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :辦公大樓
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :�平房
@@ -1696,7 +1696,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}{STRING} �得補助�{}{}將 {STRING} 從 {STATION} �到 {STATION} 的�務�在往後一年收到三��費補助�
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}{STRING} �得補助�{}{}將 {STRING} 從 {STATION} �到 {STATION} 的�務�在往後一年收到四��費補助�
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} 地方政府拒絕在城內建造�一座機場
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} 地方政府因噪音�制拒絕建造新機場
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} 地方政府因噪音�制拒絕建造新機場
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :農�
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :�宅
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :平房
@@ -1732,7 +1732,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}{TOWN} 交通大亂�{}{}{STRING} 出資的�路�建計劃為用路人帶來六個月的惡夢�
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (建造中)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (建造中)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :圓頂房�
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :帳篷�屋
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :茶壺屋
@@ -1745,17 +1745,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :放置標誌
 STR_PLANT_TREE_CAPTION                                          :{WHITE}樹木
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...這邊已經有樹了
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}�能在這邊�樹...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...太多標誌了
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}�能在這邊放置標誌...
-STR_SIGN_DEFAULT                                                :標誌
+STR_DEFAULT_SIGN_NAME                                           :標誌
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}編輯標誌文字
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}�能修改標誌�稱...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}無法刪除標誌...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}�擇�種�的樹種
-STR_TREE_NAME_TREES                                             :樹木
-STR_TREE_NAME_RAINFOREST                                        :雨林
-STR_TREE_NAME_CACTUS_PLANTS                                     :仙人掌
+STR_LAI_TREE_NAME_TREES                                         :樹木
+STR_LAI_TREE_NAME_RAINFOREST                                    :雨林
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :仙人掌
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}�擇�車站
@@ -1775,7 +1775,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}å¿…é ˆå…
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}太�近�一個機場
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}必須先摧毀機場
 
-STR_QUERY_RENAME_STATION_CAPTION                                :修改車站�載貨��稱
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :修改車站�載貨��稱
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}�能修改車站�稱...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}評價
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}接�貨物
@@ -1793,10 +1793,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :傑出
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}顯示所有指令內包�這個車站的列車
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}顯示所有指令内包�這個車站的車輛
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}顯示所有指令内包�這座機場的飛機
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}顯示所有指令内包�這個碼頭的船舶
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}顯示所有指令內包�這個車站的列車
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}顯示所有指令内包�這個車站的車輛
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}顯示所有指令内包�這座機場的飛機
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}顯示所有指令内包�這個碼頭的船舶
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}：{YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} ��接� {STRING}
@@ -1829,47 +1829,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}變更è»
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}顯示接�的貨物種類
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}車站�稱 - 點��稱�將車站置於畫�中央
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}�擇機場大��類型
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :�車站
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :機棚
-STR_STATION_DESCRIPTION_AIRPORT                                 :æ©Ÿå ´
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :貨�載貨�
-STR_STATION_DESCRIPTION_BUS_STATION                             :公車站
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :船塢
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :�車站
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :機棚
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :æ©Ÿå ´
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :貨�載貨�
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :公車站
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :船塢
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}顯示設置地點的�輸涵蓋範�
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}�顯示設置地點的�輸涵蓋範�
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}顯示�輸涵蓋範�
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}碼頭
-STR_STATION_DESCRIPTION_BUOY                                    :浮標
+STR_LAI_STATION_DESCRIPTION_BUOY                                :浮標
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...被浮標擋�
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...車站範�太大
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...未開啟��則車站功能
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}按� CTRL �擇多個項目
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...未開啟��則車站功能
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}按� CTRL �擇多個項目
 
 STR_UNDEFINED                                                   :(未定義字串)
-STR_STAT_CLASS_DFLT                                             :�設車站
-STR_STAT_CLASS_WAYP                                             :號誌站
+STR_STATION_CLASS_DFLT                                          :�設車站
+STR_STATION_CLASS_WAYP                                          :號誌站
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}船塢方�
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...必須建在水域上
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}�能在此建造船塢...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}�擇船塢方�
-STR_WATER_DESCRIPTION_WATER                                     :æ°´
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :海岸或河邊
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :船塢
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :水�橋
+STR_LAI_WATER_DESCRIPTION_WATER                                 :æ°´
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :海岸或河邊
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :船塢
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :水�橋
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...�能建在水域上
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}必須先移除�河
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}必須先移除�河
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}儲存�戲
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}載入�戲
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}儲存
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}刪除
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :�觀者, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :�觀者, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}空間尚有 {BYTES}
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}無法讀��碟
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}�戲儲存失敗{}{STRING}
@@ -1885,12 +1885,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}列出ç£
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}目��定的存檔�稱
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}刪除目��定的存檔
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}以�定的�稱儲存目��戲
-STR_NETWORK_SERVER_RANDOM_GAME                                  :隨機產生新場景
-STR_LOAD_HEIGHTMAP                                              :{WHITE}載入高度圖
-STR_SAVE_OSKTITLE                                               :{BLACK}為存檔輸入一個�稱
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :隨機產生新場景
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}載入高度圖
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}為存檔輸入一個�稱
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}被 {STRING} 擋�
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}被 {STRING} 擋�
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :煤礦
 STR_INDUSTRY_NAME_POWER_STATION                                 :發電廠
@@ -1948,7 +1948,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}將工業置於畫�中央
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}新的 {STRING} 正在 {TOWN} 附近建造中�
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}新的 {STRING} 正在 {TOWN} 附近種�中�
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}費用：{YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}費用：{YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}無法在此新建這種工業...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...森林�能種在雪線以上
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} 宣佈立�關閉�
@@ -1966,16 +1966,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}被�一�隧�擋�
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}隧�出��能超�地圖邊緣
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}隧�出��能超�地圖邊緣
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}無法挖掘隧�出�
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}必須先摧毀隧�
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}必須先摧毀橋樑
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}開始與��的�置必須��
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}橋樑兩端�在�個海拔
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}橋樑太接近地�
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}開始與��的�置必須��
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}橋樑兩端�在�個海拔
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}橋樑太接近地�
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}開始與���置必須在�一直線上
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}隧�入�地點���
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING}，{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING}，{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :�橋，鋼製
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :�橋，鋼製
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :懸臂橋，鋼製
@@ -1986,30 +1986,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :管橋，鋼製
 STR_BRIDGE_TUBULAR_SILICON                                      :管橋，玻璃纖維製
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}無法在此建造橋樑...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}無法在此挖掘隧�...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :�路隧�
-STR_TUNNEL_DESCRIPTION_ROAD                                     :公路隧�
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :�路鋼�橋
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :�路鋼�橋
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :�路鋼懸臂橋
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :�路鋼筋混�土�橋
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :�路木橋
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :�路水泥橋
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :公路鋼�橋
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :公路鋼�橋
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :公路鋼懸臂橋
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :公路鋼筋混�土�橋
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :公路木橋
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :公路水泥橋
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :�路管橋
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :公路管橋
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :�路隧�
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :公路隧�
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :�路鋼�橋
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :�路鋼�橋
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :�路鋼懸臂橋
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :�路鋼筋混�土�橋
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :�路木橋
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :�路水泥橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :公路鋼�橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :公路鋼�橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :公路鋼懸臂橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :公路鋼筋混�土�橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :公路木橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :公路水泥橋
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :�路管橋
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :公路管橋
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}被�西擋�
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :天線塔
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :燈塔
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :公�總部
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :天線塔
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :燈塔
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :公�總部
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...被公�總部擋�
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :公�所有土地
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :公�所有土地
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}�能購買這塊土地...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...您已經�有了�
 
@@ -2055,7 +2055,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} 車站
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}難易度
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}儲存
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}儲存
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}ç°¡å–®
@@ -2128,8 +2128,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}�色：
 STR_LIVERY_CAPTION                                              :{WHITE}新�色
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}公��稱
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}經�姓�
-STR_QUERY_COMPANY_NAME_CAPTION                                  :公��稱
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :經�姓�
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :公��稱
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :經�姓�
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}無法修改公��稱...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}無法修改經��稱...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} 財務狀� {BLACK}{COMPANYNUM}
@@ -2153,11 +2153,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}總計：
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}收入圖表
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}營��益圖表
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}銀行餘�
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}貸款
-STR_MAX_LOAN                                                    :{WHITE}貸款上�：{BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}貸款上�：{BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}貸款 {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}å„Ÿé‚„ {SKIP}{SKIP}{CURRENCY}
@@ -2166,7 +2166,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}無法å†
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...�需償還貸款
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...需� {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}無法償還貸款...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}無法把貸款的錢�通出去...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}無法把貸款的錢�通出去...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}�擇經�的新臉孔
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}變更公�交通工具�色
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}變更經�姓�
@@ -2176,10 +2176,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}å„Ÿé‚„è²
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(經�)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}�立於：{WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}交通工具：
-STR_TRAINS                                                      :{WHITE}列車 {COMMA} 列
-STR_ROAD_VEHICLES                                               :{WHITE}車輛 {COMMA} 部
-STR_AIRCRAFT                                                    :{WHITE}飛機 {COMMA} 架
-STR_SHIPS                                                       :{WHITE}船舶 {COMMA} 艘
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}列車 {COMMA} 列
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}車輛 {COMMA} 部
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}飛機 {COMMA} 架
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}船舶 {COMMA} 艘
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}ç„¡
 STR_FACE_CAPTION                                                :{WHITE}�擇臉孔
 STR_FACE_MALE_BUTTON                                            :{BLACK}男性
@@ -2192,9 +2192,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}é�¸æ“‡å¥
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}隨機產生新臉孔
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}圖例
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}顯示圖例
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}顯示詳細營�評比
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}顯示詳細營�評比
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}顯示公�圖表的圖例
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}點�這裡開關圖表上的公�資料
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}點�這裡開關圖表上的公�資料
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}��貨物�
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}公�效率指標 (最高 1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}公�價值
@@ -2228,23 +2228,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :集團總�
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :�輸大亨
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}建造總部
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}建造�檢視公�總部
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}以公�總值的 1% 在其它地方建造新公�總部
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}以公�總值的 1% 在其它地方建造新公�總部
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}無法建造公�總部...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}檢視總部
-STR_RELOCATE_HQ                                                 :{BLACK}�移總部
-STR_COMPANY_JOIN                                                :{BLACK}加入
-STR_COMPANY_JOIN_TIP                                            :{BLACK}加入並�控此公�
-STR_COMPANY_PASSWORD                                            :{BLACK}密碼
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}以密碼�護您的公�，��其他玩家 隨�接手
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}設定公�密碼
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}�移總部
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}加入
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}加入並�控此公�
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}密碼
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}以密碼�護您的公�，��其他玩家 隨�接手
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}設定公�密碼
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}��儲存所輸入的密碼
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}為公�設定新的密碼
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}公�密碼
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}�設公�密碼
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}使用此密碼當作未來新公�的�設 密碼
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}�設公�密碼
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}使用此密碼當作未來新公�的�設 密碼
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}全�景氣低迷�{}{}財務專家�經濟蕭��出最壞打算�
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}景氣回��{}{}湧�的訂單讓工業界�經濟活絡充滿信心�
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}切�大��視窗
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}切�大��視窗
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}公�價值：{WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}購買 25% 公�股份
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}出售 25% 公�股份
@@ -2254,7 +2254,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}無法è³
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}無法出售這間公�的股份...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% 由 {COMPANY} �有)
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} 被 {STRING} 收購�
-STR_PROTECTED                                                   :{WHITE}這間公��剛�立，還�能交易股票...
+STR_ERROR_PROTECTED                                             :{WHITE}這間公��剛�立，還�能交易股票...
 
 STR_LIVERY_DEFAULT                                              :標準�色
 STR_LIVERY_STEAM                                                :蒸汽機車
@@ -2280,14 +2280,14 @@ STR_LIVERY_LARGE_PLANE                                          :大型飛機
 STR_LIVERY_PASSENGER_TRAM                                       :載客電車
 STR_LIVERY_FREIGHT_TRAM                                         :載貨電車
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}顯示通用�色
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}顯示列車�色
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}顯示車輛�色
-STR_LIVERY_SHIP_TIP                                             :{BLACK}顯示船舶�色
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}顯示飛機�色
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}�擇所��色的主色調
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}�擇所��色的副色調
-STR_LIVERY_PANEL_TIP                                            :{BLACK}�擇�修改的�色，按� CTRL ��時�擇多種�色，勾�方框� 切�是�使用�色
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}顯示通用�色
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}顯示列車�色
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}顯示車輛�色
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}顯示船舶�色
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}顯示飛機�色
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}�擇所��色的主色調
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}�擇所��色的副色調
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}�擇�修改的�色，按� CTRL ��時�擇多種�色，勾�方框� 切�是�使用�色
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (蒸氣)
@@ -2595,9 +2595,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(ä¸�å�¸è¼‰ä½†ç­
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}變更��指令的��行為
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}變更��指令的�載行為
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}變更��指令的�載行為
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}�入進階指令
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}�入進階指令
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :�往最近的機廠
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :�往最近的機棚
 STR_ORDER_NEAREST_DEPOT                                         :最近的
@@ -2607,9 +2607,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :直接�往維
 STR_ORDER_TRAIN_DEPOT                                           :æ©Ÿå» 
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :車庫
 STR_ORDER_SHIP_DEPOT                                            :船塢
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} 機棚
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} 機棚
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :總是進行
 STR_ORDER_DROP_SERVICE_DEPOT                                    :若需�則維護
@@ -2634,10 +2634,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :大於
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :大於或等於
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :為是
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :為�
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :跳到指令 {COMMA}
-STR_CONDITIONAL_NUM                                             :跳到指令 {COMMA} 當符� {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :跳到指令 {COMMA} 當符� {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :跳到指令 {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :跳到指令 {COMMA} 當符� {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :跳到指令 {COMMA} 當符� {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}原地待命
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}�行中 (未訂時刻表)
@@ -2660,18 +2660,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}列車å�
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}跳�
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}刪除
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}�往
-STR_REFIT                                                       :{BLACK}改�
-STR_REFIT_TIP                                                   :{BLACK}�擇這個指令�改�的貨物種類， 按� CTRL 點��移除改�指令
-STR_REFIT_ORDER                                                 :(改�� {STRING})
-STR_REFIT_STOP_ORDER                                            :（�載 {STRING} 並�止）
-STR_STOP_ORDER                                                  :(�止)
-STR_TIMETABLE_VIEW                                              :{BLACK}時刻表
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}切�至時刻表檢視模�
-STR_ORDER_VIEW                                                  :{BLACK}指令
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}切到指令列表
+STR_ORDER_REFIT                                                 :{BLACK}改�
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}�擇這個指令�改�的貨物種類， 按� CTRL 點��移除改�指令
+STR_ORDER_REFIT_ORDER                                           :(改�� {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :（�載 {STRING} 並�止）
+STR_ORDER_STOP_ORDER                                            :(�止)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}時刻表
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}切�至時刻表檢視模�
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}指令
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}切到指令列表
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (指令)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - 指令�� - -
-STR_SERVICE                                                     :{BLACK}維護
+STR_ORDER_SERVICE                                               :{BLACK}維護
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   購於：{LTBLUE}{NUM}{BLACK} 價值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   價值：{LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2691,7 +2691,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}交通å·
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}一個分享這個指令的車輛無法抵�車站
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}無法移動車輛...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}後端車頭一定�跟著�端車頭
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}找�到�往附近機廠的路徑
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}維護間隔：{LTBLUE}{COMMA} 天{BLACK}   上次維護：{LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}維護間隔：{LTBLUE}{COMMA}%{BLACK}   上次維護：{LTBLUE}{DATE_LONG}
@@ -2711,10 +2711,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}時刻è¡
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}改變目��定命令所需的時間
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}清除目��定命令所設定的時間
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}將誤點�慢分歸零，如此交通工具將會 準時抵�
-STR_SERVICE_HINT                                                :{BLACK}跳�這個指令，除�需�維護
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}費用：{CURRENCY} 載�：{WEIGHT_S}{}速度：{VELOCITY}  功率：{POWER}{}營��本：{CURRENCY} / 年{}容�：{CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}費用：{CURRENCY} 最高速度：{VELOCITY}{}容�：{CARGO}, {CARGO}{}營��本：{CURRENCY}/年
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}費用：{CURRENCY} 最高速度：{VELOCITY}{}容�：{CARGO}{}營��本：{CURRENCY}/年
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}跳�這個指令，除�需�維護
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}費用：{CURRENCY} 載�：{WEIGHT_S}{}速度：{VELOCITY}  功率：{POWER}{}營��本：{CURRENCY} / 年{}容�：{CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}費用：{CURRENCY} 最高速度：{VELOCITY}{}容�：{CARGO}, {CARGO}{}營��本：{CURRENCY}/年
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}費用：{CURRENCY} 最高速度：{VELOCITY}{}容�：{CARGO}{}營��本：{CURRENCY}/年
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}年齡：{LTBLUE}{STRING}{BLACK}   營��本：{LTBLUE}{CURRENCY}/年
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}最高速度：{LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}載�：{LTBLUE}{WEIGHT_S} {BLACK}功率：{LTBLUE}{POWER}{BLACK} 最高速度：{LTBLUE}{VELOCITY}
@@ -2734,27 +2734,27 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}無法倒轉列車方�...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}無法調轉車輛方�...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}無法迴轉由多節車廂組�的車輛
-STR_CLEAR_TIME                                                  :{BLACK}清除時刻表
-STR_RESET_LATENESS                                              :{BLACK}歸零誤點�慢分
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}修改號誌站�稱
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}清除時刻表
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}歸零誤點�慢分
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}修改號誌站�稱
 
-STR_TRAIN_STOPPING                                              :{RED}正在�止
-STR_TRAIN_STOPPING_VEL                                          :{RED}正在�止，{VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :軌�類型�相容
-STR_TRAIN_NO_POWER                                              :{RED}沒有電力
-STR_TRAIN_START_NO_CATENARY                                     :這個軌�沒有電氣化，所以列車無法起動
-STR_TRAIN_STUCK                                                 :{ORANGE}正在等候路徑開放
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}正在�止
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}正在�止，{VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :軌�類型�相容
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}沒有電力
+STR_ERROR_TRAIN_START_NO_CATENARY                               :這個軌�沒有電氣化，所以列車無法起動
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}正在等候路徑開放
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}{STRING} �世了�
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}{STRING} �世了� -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}�能出售�毀的交通工具...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}�能改造已撞毀的交通工具...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}�能出售�毀的交通工具...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}�能改造已撞毀的交通工具...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}無法為交通工具加入時刻表...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}交通工具�能於車站內待命
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}此交通工具將���此車站
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}無法為交通工具加入時刻表...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}交通工具�能於車站內待命
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}此交通工具將���此車站
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}變更時刻
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}此交通工具目�準點
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}此交通工具目�慢了 {STRING}
@@ -2768,7 +2768,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}自動ä»
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...必須�在車庫内
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}找�到附近的車庫
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}強制車輛掉頭
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}容�：{LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}容�：{LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}車輛 {NUM} 部 {STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2795,11 +2795,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}放置浮標，�用作導航點
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}無法在此放置浮標...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}興建水�橋
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}無法興建水�橋...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}無法興建水�橋...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (改�)
 STR_REFIT_TITLE                                                 :{GOLD}�擇���的貨物種類：
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}新容�：{GOLD}{CARGO}{}{BLACK}改�費用：{GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(�改�)
+STR_PURCHASE_INFO_REFITTABLE                                    :(�改�)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}æ©Ÿå ´
@@ -2812,7 +2812,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}興建æ©
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}市民慶賀 . . .{}首架飛機抵� {STATION}�
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}空難�{}{COMMA} �乘客與機組員�幸罹難於 {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}空難�{}飛機燃油耗盡，{COMMA} �乘客與機組員�幸罹難�
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (時刻表)
 
@@ -2825,13 +2825,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}{TOWN} 附近的煤礦發生�塌而毀�
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}洪水�{}至少 {COMMA} 人失蹤，在洪水後宣告死亡
 
-STR_BRIBE_FAILED                                                :{WHITE}您嘗試行賄的舉動
-STR_BRIBE_FAILED_2                                              :{WHITE}已被地方調查員發�
-STR_BUILD_DATE                                                  :{BLACK}建於：{LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}您嘗試行賄的舉動
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}已被地方調查員發�
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}建於：{LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}車站等級：{LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}車站類型：{LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF：{LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}車站等級：{LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}車站類型：{LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF：{LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}詳細營�評比
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}詳細資料
@@ -2851,28 +2851,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}資金ï¼
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}貸款：
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}總計：
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}交通工具數�；包��公路車輛� 船舶與飛機
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}車站�部份數�。�部份車站 (�車站�公車站�機場) 都算在内，就算連在一起亦然
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}使用兩年以上的交通工具之中，最低 收入車輛的�益
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}�三年的單月最低收入
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}�三年的單月最高收入
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}�四季��的貨物�
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}上一季��的貨物種類
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}這間公�的銀行存款
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}公�的貸款金�
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}全部的總得分
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}交通工具數�；包��公路車輛� 船舶與飛機
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}車站�部份數�。�部份車站 (�車站�公車站�機場) 都算在内，就算連在一起亦然
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}使用兩年以上的交通工具之中，最低 收入車輛的�益
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}�三年的單月最低收入
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}�三年的單月最高收入
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}�四季��的貨物�
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}上一季��的貨物種類
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}這間公�的銀行存款
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}公�的貸款金�
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}全部的總得分
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF 設定
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}顯示 NewGRF 設定
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF 設定
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}儲存變動
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}切�色盤
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}切�所� NewGRF 的色盤。{}若是該 NewGRF 檔在�戲中看起來是一片橘色， 您�以試試這麼�以解決�題
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}設定�數
-STR_NEWGRF_FILENAME                                             :{BLACK}檔�：{SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}色盤: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF 編號：{SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5 雜湊值：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}儲存變動
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}切�色盤
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}切�所� NewGRF 的色盤。{}若是該 NewGRF 檔在�戲中看起來是一片橘色， 您�以試試這麼�以解決�題
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}設定�數
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}檔�：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}色盤: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF 編號：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5 雜湊值：{SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}您正準備修改進行中的�戲；這�能使 OpenTTD 當掉。{}您確定一定�這麼�嗎？
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2895,34 +2895,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :嘗試使用的
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} 包�了毀�的 sprite。所有毀�的 sprite 會以紅色�號 (？) 顯示。
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :包�多個 Action 8 指令。
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}載入所�的設定值
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}儲存設定值
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}儲存目�清單為設定值
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}輸入設定值�稱
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}刪除設定值
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}刪除目�所�的設定值
-STR_NEWGRF_ADD                                                  :{BLACK}新增
-STR_NEWGRF_ADD_TIP                                              :{BLACK}為清單加入新的 NewGRF 檔
-STR_NEWGRF_REMOVE                                               :{BLACK}移除
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}從清單移除�定的 NewGRF 檔
-STR_NEWGRF_MOVEUP                                               :{BLACK}上移
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}將�定的 NewGRF 檔往清單上方移動
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}下移
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}將�定的 NewGRF 檔往清單下方移動
-STR_NEWGRF_FILE_TIP                                             :{BLACK}列出已安�的 NewGRF 檔案，點�檔 案以修改設定
-STR_NEWGRF_PARAMETER                                            :{BLACK}�數：{SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}輸入 NewGRF �數
-STR_NEWGRF_NO_INFO                                              :{BLACK}沒有相關資訊
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}載入所�的設定值
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}儲存設定值
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}儲存目�清單為設定值
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}輸入設定值�稱
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}刪除設定值
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}刪除目�所�的設定值
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}新增
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}為清單加入新的 NewGRF 檔
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}移除
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}從清單移除�定的 NewGRF 檔
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}上移
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}將�定的 NewGRF 檔往清單上方移動
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}下移
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}將�定的 NewGRF 檔往清單下方移動
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}列出已安�的 NewGRF 檔案，點�檔 案以修改設定
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}�數：{SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}輸入 NewGRF �數
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}沒有相關資訊
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}�用的 NewGRF 檔案
 STR_NEWGRF_ADD_FILE                                             :{BLACK}加入設定
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}將�定的 NewGRF 加入目�設定
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}�新掃�檔案
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}更新�用的 NewGRF 檔案清單
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}將�定的 NewGRF 加入目�設定
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}�新掃�檔案
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}更新�用的 NewGRF 檔案清單
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}無法新增檔案：GRF ID �複
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}找�到符�的檔案
-STR_NEWGRF_DISABLED                                             :{RED}關閉
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}找�到符�的檔案
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}關閉
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}找�到符�的檔案 (已載入相容的 GRF)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}已為找�到的檔案載入相容的 GRF
@@ -2936,7 +2936,7 @@ STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}'{1:COMP
 
 STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF「{0:STRING}��供了錯誤的資訊。
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}此存檔版本�支�路�電車，已移除所有路�電車
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}此存檔版本�支�路�電車，已移除所有路�電車
 
 STR_CURRENCY_WINDOW                                             :{WHITE}自訂幣值
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}匯率：{ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2947,16 +2947,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}改用æ
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}改用�元：{ORANGE}永�改用
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}�覽：{ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}變更自訂幣值�數
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}�低自訂幣值� 1 英鎊 (£) 的匯率
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}��自訂幣值� 1 英鎊 (£) 的匯率
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}設定自訂幣值� 1 英鎊 (£) 的匯率
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}設定貨幣的分隔符
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}為你的貨幣指定�置字串
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}為你的貨幣指定後置字串
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}早點切�為�元(Euro)
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}晚點切�為�元(Euro)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}設定兌���元的年代
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}將10000 Pound (£)�算�你的幣值
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}�低自訂幣值� 1 英鎊 (£) 的匯率
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}��自訂幣值� 1 英鎊 (£) 的匯率
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}設定自訂幣值� 1 英鎊 (£) 的匯率
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}設定貨幣的分隔符
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}為你的貨幣指定�置字串
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}為你的貨幣指定後置字串
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}早點切�為�元(Euro)
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}晚點切�為�元(Euro)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}設定兌���元的年代
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}將10000 Pound (£)�算�你的幣值
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2975,8 +2975,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - 船舶 {COMMA} 艘
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - 飛機 {COMMA} 架
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} 組交通工具的共用指令
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}顯示所有共用這份指令的交通工具
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA} 組交通工具的共用指令
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}顯示所有共用這份指令的交通工具
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} 在車庫等待中
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} 正在車庫待命
@@ -3083,39 +3083,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}改è£�è»
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}改�貨船以便����貨物
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}改�飛機以��其他貨物
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}正�往 {TOWN} 機廠
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}正�往 {TOWN} 機廠，{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}正�往 {TOWN} 車庫
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}正�往 {TOWN} 車庫，{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}正�往 {TOWN} 船塢
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}正�往 {TOWN} 船塢，{VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}正�往 {STATION} 機棚
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}正�往 {STATION} 機棚，{VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}正在 {TOWN} 機廠維護中
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}正在 {TOWN} 機廠維護中，{VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}在 {TOWN} 車庫維護中
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}在 {TOWN} 車庫維護中，{VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}正在 {TOWN} 船塢維護中
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}正在 {TOWN} 船塢維護中，{VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}在 {STATION} 機棚維護中
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}在 {STATION} 機棚維護中，{VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}複製列車
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}複製車輛
-STR_CLONE_SHIP                                                  :{BLACK}複製船舶
-STR_CLONE_AIRCRAFT                                              :{BLACK}複製飛機
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}這會購買一列相�的列車，包�所有車廂，按� CTRL 點�還�共享指令
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}這會將購買一部相�的車輛，按� CTRL 點�還�共享指令
-STR_CLONE_SHIP_INFO                                             :{BLACK}這會購買一艘相�的船舶，按� CTRL 點�還�共享指令
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}這會購買一架相�的飛機，按� CTRL 點�還�共享指令
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}這會購買一列相�的列車，包�所有車廂，按下按鈕之後�點�機廠内外的其他列車。按� CTRL 點�還�共享指令
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}這會購買一部相�的車輛，按下按鈕之後�點�於車庫内或外的車輛，按� CTRL 點�還�共享指令
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}這會購買一艘相�的船舶，按下按鈕之後�點�船塢内或外的船舶，按� CTRL 點�還�共享指令
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}這會購買一架相�的飛機，按下此鈕之後�點�機棚内或外的飛機，按� CTRL 點�還�共享指令
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}正�往 {TOWN} 機廠
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}正�往 {TOWN} 機廠，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}正�往 {TOWN} 車庫
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}正�往 {TOWN} 車庫，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}正�往 {TOWN} 船塢
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}正�往 {TOWN} 船塢，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}正�往 {STATION} 機棚
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}正�往 {STATION} 機棚，{VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}正在 {TOWN} 機廠維護中
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}正在 {TOWN} 機廠維護中，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}在 {TOWN} 車庫維護中
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}在 {TOWN} 車庫維護中，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}正在 {TOWN} 船塢維護中
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}正在 {TOWN} 船塢維護中，{VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}在 {STATION} 機棚維護中
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}在 {STATION} 機棚維護中，{VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}複製列車
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}複製車輛
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}複製船舶
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}複製飛機
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}這會購買一列相�的列車，包�所有車廂，按� CTRL 點�還�共享指令
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}這會將購買一部相�的車輛，按� CTRL 點�還�共享指令
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}這會購買一艘相�的船舶，按� CTRL 點�還�共享指令
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}這會購買一架相�的飛機，按� CTRL 點�還�共享指令
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}這會購買一列相�的列車，包�所有車廂，按下按鈕之後�點�機廠内外的其他列車。按� CTRL 點�還�共享指令
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}這會購買一部相�的車輛，按下按鈕之後�點�於車庫内或外的車輛，按� CTRL 點�還�共享指令
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}這會購買一艘相�的船舶，按下按鈕之後�點�船塢内或外的船舶，按� CTRL 點�還�共享指令
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}這會購買一架相�的飛機，按下此鈕之後�點�機棚内或外的飛機，按� CTRL 點�還�共享指令
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}新購�路車輛
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}新電氣化列車
@@ -3185,28 +3185,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}將機æ£
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}您正準備出售車庫内所有車輛。確定嗎？
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :錯誤的機廠類型
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :錯誤的機廠類型
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}出售機廠内所有列車
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}出售車庫内所有車輛
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}出售船塢内所有船舶
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}出售機棚内所有飛機
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}出售機廠内所有列車
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}出售車庫内所有車輛
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}出售船塢内所有船舶
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}出售機棚内所有飛機
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}�得所有命令内有這個機廠的列車
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}�得所有命令内有這個車庫的車輛
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}�得所有命令内有這個船塢的船舶
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}�得所有命令内有這個機場機棚的 飛機
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}�得所有命令内有這個機廠的列車
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}�得所有命令内有這個車庫的車輛
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}�得所有命令内有這個船塢的船舶
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}�得所有命令内有這個機場機棚的 飛機
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}自動替�所有機廠内列車
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}自動替�所有車庫内車輛
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}自動替�所有船塢内船舶
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}自動替�所有機棚内飛機
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}自動替�所有機廠内列車
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}自動替�所有車庫内車輛
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}自動替�所有船塢内船舶
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}自動替�所有機棚内飛機
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}替� {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}開始替�交通工具
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}�止替�交通工具
-STR_NOT_REPLACING                                               :{BLACK}�替�
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}未�擇交通工具
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}�替�
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}未�擇交通工具
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}�擇�替�的車頭種類
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}�擇您想替�左方�定車頭的新車頭類型
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}按下之後會�止替�左方指定的車頭
@@ -3218,26 +3218,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}如果æ›
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}替�：{ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}在車頭�車廂替�畫�間切�。
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}交通工具已經�產
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}車輛已經�產
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}船舶已經�產
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}飛機已經�產
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}交通工具已經�產
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}車輛已經�產
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}船舶已經�產
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}飛機已經�產
 
-STR_ENGINES                                                     :車頭
-STR_WAGONS                                                      :車廂
+STR_REPLACE_ENGINES                                             :車頭
+STR_REPLACE_WAGONS                                              :車廂
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}點���止機廠内所有列車
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}點���止車庫内所有汽車
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}點���止船塢内所有船舶
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}點���止機棚内所有飛機
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}點���止機廠内所有列車
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}點���止車庫内所有汽車
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}點���止船塢内所有船舶
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}點���止機棚内所有飛機
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}點��起動機廠内所有列車
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}點��起動車庫内所有車輛
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}點��起動船塢内所有船舶
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}點��起動機棚内所有飛機
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}點��起動機廠内所有列車
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}點��起動車庫内所有車輛
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}點��起動船塢内所有船舶
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}點��起動機棚内所有飛機
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}點���止清單中所有交通工具
-STR_MASS_START_LIST_TIP                                         :{BLACK}點��起動清單内所有交通工具
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}點���止清單中所有交通工具
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}點��起動清單内所有交通工具
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}標誌清單 - 標誌 {COMMA} 個
@@ -3246,14 +3246,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}é‡�載å¤
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :列車
-STR_ELRAIL_VEHICLES                                             :電氣化列車
-STR_MONORAIL_VEHICLES                                           :單軌列車
-STR_MAGLEV_VEHICLES                                             :�浮列車
+STR_REPLACE_RAIL_VEHICLES                                       :列車
+STR_REPLACE_ELRAIL_VEHICLES                                     :電氣化列車
+STR_REPLACE_MONORAIL_VEHICLES                                   :單軌列車
+STR_REPLACE_MAGLEV_VEHICLES                                     :�浮列車
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}費用：{GOLD}{CURRENCY}{BLACK} 載�：{GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}速度：{GOLD}{VELOCITY}{BLACK} 功率：{GOLD}{POWER}
@@ -3280,70 +3280,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}產生
-STR_RANDOM                                                      :{BLACK}亂數化
-STR_RANDOM_HELP                                                 :{BLACK}改變地形產生的亂數種�
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}產生世界
-STR_RANDOM_SEED                                                 :{BLACK}亂數種�：
-STR_RANDOM_SEED_HELP                                            :{BLACK}點��輸入亂數種�
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}輸入亂數種�
-STR_LAND_GENERATOR                                              :{BLACK}地形產生器：
-STR_TREE_PLACER                                                 :{BLACK}�樹演算法：
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}高度圖旋轉：
-STR_TERRAIN_TYPE                                                :{BLACK}地形種類：
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}海平�：
-STR_SMOOTHNESS                                                  :{BLACK}平滑度：
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}雪線高度：
-STR_DATE                                                        :{BLACK}日期：
-STR_NUMBER_OF_TOWNS                                             :{BLACK}市鎮數�：
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}工業數�：
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}將雪線高度上移一層
-STR_SNOW_LINE_DOWN                                              :{BLACK}將雪線高度下移一層
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}變更雪線高度
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}變更開始年份
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}縮放警告
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}�建議�度縮放地圖。�繼續產生嗎？
-STR_HEIGHTMAP_NAME                                              :{BLACK}高度圖�稱：
-STR_HEIGHTMAP_SIZE                                              :{BLACK}大�：{ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}產生
+STR_MAPGEN_RANDOM                                               :{BLACK}亂數化
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}改變地形產生的亂數種�
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}產生世界
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}亂數種�：
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}點��輸入亂數種�
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}輸入亂數種�
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}地形產生器：
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}�樹演算法：
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}高度圖旋轉：
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}地形種類：
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}海平�：
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}平滑度：
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}雪線高度：
+STR_MAPGEN_DATE                                                 :{BLACK}日期：
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}市鎮數�：
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}工業數�：
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}將雪線高度上移一層
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}將雪線高度下移一層
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}變更雪線高度
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}變更開始年份
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}縮放警告
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}�建議�度縮放地圖。�繼續產生嗎？
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}高度圖�稱：
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}大�：{ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}正在產生世界...
 STR_GENERATION_ABORT                                            :{BLACK}放棄
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}放棄產生地形
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}您確定�放棄產生地形嗎？
-STR_PROGRESS                                                    :{WHITE}完� {NUM}%
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}產生世界
-STR_TREE_GENERATION                                             :{BLACK}產生樹木
-STR_UNMOVABLE_GENERATION                                        :{BLACK}無法移動
-STR_CLEARING_TILES                                              :{BLACK}產生粗地與岩石�域
-STR_SETTINGUP_GAME                                              :{BLACK}設定�戲
-STR_PREPARING_TILELOOP                                          :{BLACK}執行單格迴圈中
-STR_PREPARING_GAME                                              :{BLACK}準備�戲中
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}這個動作會將難度變�自訂
-STR_SE_FLAT_WORLD                                               :{WHITE}平地
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}產生平地
-STR_SE_RANDOM_LAND                                              :{WHITE}隨機產生地形
-STR_SE_NEW_WORLD                                                :{BLACK}建立新場景
-STR_SE_CAPTION                                                  :{WHITE}場景種類
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}將平地高度下移一層
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}將平地高度上移一層
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}修改平地高度
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}平地高度：
+STR_GENERATION_PROGRESS                                         :{WHITE}完� {NUM}%
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}產生世界
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}產生樹木
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}無法移動
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}產生粗地與岩石�域
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}設定�戲
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}執行單格迴圈中
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}準備�戲中
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}這個動作會將難度變�自訂
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}平地
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}產生平地
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}隨機產生地形
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}建立新場景
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}場景種類
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}將平地高度下移一層
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}將平地高度上移一層
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}修改平地高度
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}平地高度：
 
 STR_SMALLMAP_CENTER                                             :{BLACK}將�地圖移到目�地點
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}地圖邊緣：
-STR_NORTHWEST                                                   :{BLACK}西北方
-STR_NORTHEAST                                                   :{BLACK}�北方
-STR_SOUTHEAST                                                   :{BLACK}��方
-STR_SOUTHWEST                                                   :{BLACK}西�方
-STR_BORDER_FREEFORM                                             :{BLACK}自由地形
-STR_BORDER_WATER                                                :{BLACK}水域
-STR_BORDER_RANDOM                                               :{BLACK}隨機
-STR_BORDER_RANDOMIZE                                            :{BLACK}隨機
-STR_BORDER_MANUAL                                               :{BLACK}手動
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}地圖邊緣：
+STR_MAPGEN_NORTHWEST                                            :{BLACK}西北方
+STR_MAPGEN_NORTHEAST                                            :{BLACK}�北方
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}��方
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}西�方
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}自由地形
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}水域
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}隨機
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}隨機
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}手動
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}�機場
@@ -3368,21 +3368,21 @@ STR_MEASURE_AREA                                                :{BLACK}å�€åŸŸï¼
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}長度：{NUM}{}高度差：{NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}�域：{NUM} x {NUM}{}高度差：{NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}轉�進帳：{LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...此路段為市鎮所有
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...此�路��錯誤的方�
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}�明度�項
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}切�車站標籤是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}切�樹木是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}切�房屋是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}切�工業是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}切�建築物是��明，如車站�廠棚�號誌站等，按� CTRL 點��鎖定
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}切�橋樑是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}切�公用設施是��明，如燈塔�天線塔等，按� CTRL 點��鎖定
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}切�供電線是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}切��載進度指示是��明，按� CTRL 點��鎖定
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}讓物件完全隱�，而��明顯示
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}轉�進帳：{LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...此路段為市鎮所有
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...此�路��錯誤的方�
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}�明度�項
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}切�車站標籤是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}切�樹木是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}切�房屋是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}切�工業是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}切�建築物是��明，如車站�廠棚�號誌站等，按� CTRL 點��鎖定
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}切�橋樑是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}切�公用設施是��明，如燈塔�天線塔等，按� CTRL 點��鎖定
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}切�供電線是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}切��載進度指示是��明，按� CTRL 點��鎖定
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}讓物件完全隱�，而��明顯示
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3392,7 +3392,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :所有列車
 STR_GROUP_ALL_ROAD_VEHICLES                                     :所有車輛
 STR_GROUP_ALL_SHIPS                                             :所有船舶
@@ -3401,24 +3401,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :未分組的列
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :未分組的車輛
 STR_GROUP_DEFAULT_SHIPS                                         :未分組的船舶
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :未分組的飛機
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :加入共享指令的交通工具
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :移除所有交通工具
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}為群組�新命�
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}無法建立群組...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}無法移除群組...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}無法�新命�群組...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}無法移除此群組的所有交通工具...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}無法加入交通工具到此群組...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}無法加入共享指令的交通工具到此群組...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}無法建立群組...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}無法移除群組...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}無法�新命�群組...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}無法移除此群組的所有交通工具...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}無法加入交通工具到此群組...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}無法加入共享指令的交通工具到此群組...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}群組 - 點�群組顯示其中的交通工具 清單
-STR_GROUP_CREATE_TIP                                            :{BLACK}點��建立群組
-STR_GROUP_DELETE_TIP                                            :{BLACK}移除所�群組
-STR_GROUP_RENAME_TIP                                            :{BLACK}為群組�新命�
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}點���護此群組排除在全域自動替 �設定之外
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}群組 - 點�群組顯示其中的交通工具 清單
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}點��建立群組
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}移除所�群組
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}為群組�新命�
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}點���護此群組排除在全域自動替 �設定之外
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3479,35 +3479,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}�稱必須是唯一的
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}�稱必須是唯一的
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}�往下一個標誌
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}�往�一個標誌
-STR_SIGN_OSKTITLE                                               :{BLACK}輸入標誌�稱
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}�往下一個標誌
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}�往�一個標誌
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}輸入標誌�稱
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}設立
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}探勘
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}設立
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}從清單中�擇��的工業
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}設立
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}探勘
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}設立
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}從清單中�擇��的工業
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}進階
-STR_FACE_ADVANCED_TIP                                           :{BLACK}進階�擇新臉孔
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}進階�擇新臉孔
 STR_FACE_SIMPLE                                                 :{BLACK}簡易
-STR_FACE_SIMPLE_TIP                                             :{BLACK}簡易�擇新臉孔
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}簡易�擇新臉孔
 STR_FACE_LOAD                                                   :{BLACK}載入
-STR_FACE_LOAD_TIP                                               :{BLACK}載入喜愛臉孔
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}載入喜愛臉孔
 STR_FACE_LOAD_DONE                                              :{WHITE}您喜愛的臉孔已從 OpenTTD 設定檔中載入
 STR_FACE_FACECODE                                               :{BLACK}玩家臉孔編號
-STR_FACE_FACECODE_TIP                                           :{BLACK}檢視或設定玩家臉孔編號
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}檢視或設定玩家臉孔編號
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}檢視或設定玩家臉孔編號
 STR_FACE_FACECODE_SET                                           :{WHITE}新的臉孔編號已設定
 STR_FACE_FACECODE_ERR                                           :{WHITE}無法設定臉孔編號 - 應該�介於 0 ~ 4,294,967,295 之間�
 STR_FACE_SAVE                                                   :{BLACK}儲存
-STR_FACE_SAVE_TIP                                               :{BLACK}儲存喜愛臉孔
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}儲存喜愛臉孔
 STR_FACE_SAVE_DONE                                              :{WHITE}這將被當�您喜愛的臉孔存入 OpenTTD 設定檔
 STR_FACE_EUROPEAN                                               :{BLACK}�洲人
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}�擇�洲人臉孔
@@ -3515,51 +3515,51 @@ STR_FACE_AFRICAN                                                :{BLACK}é�žæ´²äº
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}�擇�洲人臉孔
 STR_FACE_YES                                                    :確定
 STR_FACE_NO                                                     :�消
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}增加�鬚或耳飾
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}增加�鬚或耳飾
 STR_FACE_HAIR                                                   :髮型：
-STR_FACE_HAIR_TIP                                               :{BLACK}改變髮型
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}改變髮型
 STR_FACE_EYEBROWS                                               :眉毛：
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}改變眉毛
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}改變眉毛
 STR_FACE_EYECOLOUR                                              :眼��色：
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}改變眼��色
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}改變眼��色
 STR_FACE_GLASSES                                                :眼�：
-STR_FACE_GLASSES_TIP                                            :{BLACK}增加眼�
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}改變眼�
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}增加眼�
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}改變眼�
 STR_FACE_NOSE                                                   :鼻�：
-STR_FACE_NOSE_TIP                                               :{BLACK}改變鼻�
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}改變鼻�
 STR_FACE_LIPS                                                   :嘴唇：
 STR_FACE_MOUSTACHE                                              :�鬚：
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}改變嘴唇或�鬚
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}改變嘴唇或�鬚
 STR_FACE_CHIN                                                   :下巴：
-STR_FACE_CHIN_TIP                                               :{BLACK}改變下巴
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}改變下巴
 STR_FACE_JACKET                                                 :外套：
-STR_FACE_JACKET_TIP                                             :{BLACK}改變外套
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}改變外套
 STR_FACE_COLLAR                                                 :衣領：
-STR_FACE_COLLAR_TIP                                             :{BLACK}改變衣領
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}改變衣領
 STR_FACE_TIE                                                    :領帶：
 STR_FACE_EARRING                                                :耳飾：
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}改變領帶或耳飾
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}改變領帶或耳飾
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}號誌�擇
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}無法轉�這裡的號誌...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}閉塞號誌 (懸臂){}當路網中有多列列車時，為了�� 發生相撞�外就必須設置號誌
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}入�號誌 (懸臂){}當綠燈亮時，代表此號誌後有一個 以上的出�號誌呈�綠燈，�則將會 亮紅燈
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}出�號誌 (懸臂){}與閉塞號誌類似，但它還會負責觸發 �頭的入�號誌�組�號誌
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}組�號誌 (懸臂){}組�號誌�時具有入��出�號誌的 特性，這�讓玩家設置一�車的�告 號誌
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}路徑號誌 (懸臂){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。標準 路徑號誌�以從號誌後方穿�
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}單�路徑號誌 (懸臂){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。單� 路徑號誌無法從號誌後方穿�
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}閉塞號誌 (電氣){}當路網中有多列列車時，為了�� 發生相撞�外就必須設置號誌
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}入�號誌 (電氣){}當綠燈亮時，代表此號誌後有一個 以上的出�號誌呈�綠燈，�則將會 亮紅燈
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}出�號誌 (電氣){}與閉塞號誌類似，但它還會負責觸發 �頭的入�號誌�組�號誌
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}組�號誌 (電氣){}組�號誌�時具有入��出�號誌的 特性，這�讓玩家設置一�車的�告 號誌
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}路徑號誌 (電氣){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。標準 路徑號誌�以從號誌後方穿�
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}單�路徑號誌 (電氣){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。單� 路徑號誌無法從號誌後方穿�
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}號誌轉�{}當��時，點�到的�有號誌將會 轉����上所��的類型�風格； 若按� CTRL 則�會變更風格
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}變更等�號誌拖曳間隔
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}減少 (拉近)
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}增加 (拉�)
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}號誌�擇
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}無法轉�這裡的號誌...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}閉塞號誌 (懸臂){}當路網中有多列列車時，為了�� 發生相撞�外就必須設置號誌
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}入�號誌 (懸臂){}當綠燈亮時，代表此號誌後有一個 以上的出�號誌呈�綠燈，�則將會 亮紅燈
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}出�號誌 (懸臂){}與閉塞號誌類似，但它還會負責觸發 �頭的入�號誌�組�號誌
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}組�號誌 (懸臂){}組�號誌�時具有入��出�號誌的 特性，這�讓玩家設置一�車的�告 號誌
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}路徑號誌 (懸臂){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。標準 路徑號誌�以從號誌後方穿�
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}單�路徑號誌 (懸臂){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。單� 路徑號誌無法從號誌後方穿�
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}閉塞號誌 (電氣){}當路網中有多列列車時，為了�� 發生相撞�外就必須設置號誌
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}入�號誌 (電氣){}當綠燈亮時，代表此號誌後有一個 以上的出�號誌呈�綠燈，�則將會 亮紅燈
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}出�號誌 (電氣){}與閉塞號誌類似，但它還會負責觸發 �頭的入�號誌�組�號誌
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}組�號誌 (電氣){}組�號誌�時具有入��出�號誌的 特性，這�讓玩家設置一�車的�告 號誌
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}路徑號誌 (電氣){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。標準 路徑號誌�以從號誌後方穿�
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}單�路徑號誌 (電氣){}路徑號誌�在列車能找到�往下個 安全�車點的路徑的��下，容許 多列列車進入�一個閉塞�間。單� 路徑號誌無法從號誌後方穿�
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}號誌轉�{}當��時，點�到的�有號誌將會 轉����上所��的類型�風格； 若按� CTRL 則�會變更風格
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}變更等�號誌拖曳間隔
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}減少 (拉近)
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}增加 (拉�)
 ########
 
 ############ on screen keyboard
@@ -3571,36 +3571,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}AI 設定
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}顯示 AI 設定
 STR_AI_DEBUG                                                    :{WHITE}AI 除錯
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}AI �稱
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}AI �稱
 STR_AI_DEBUG_RELOAD                                             :{BLACK}�新載入 AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}�� AI��新載入腳本��新啟動 AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}AI 除錯視窗��於伺�器使用
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}�� AI��新載入腳本��新啟動 AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI 除錯視窗��於伺�器使用
 STR_AI_CONFIG_CAPTION                                           :{WHITE}AI 組態
-STR_AI_CHANGE                                                   :{BLACK}�擇 AI
-STR_AI_CONFIGURE                                                :{BLACK}組態設定
-STR_AI_CHANGE_TIP                                               :{BLACK}載入其他 AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}設定 AI �數
-STR_AI_LIST_TIP                                                 :{BLACK}所有 AI 會在下次開始�戲時載入
+STR_AI_CONFIG_CHANGE                                            :{BLACK}�擇 AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}組態設定
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}載入其他 AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}設定 AI �數
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}所有 AI 會在下次開始�戲時載入
 STR_AI_LIST_CAPTION                                             :{WHITE}�用 AI
-STR_AI_AILIST_TIP                                               :{BLACK}按一下�擇 AI
-STR_AI_ACCEPT                                                   :{BLACK}接�
-STR_AI_ACCEPT_TIP                                               :{BLACK}�擇標示到的 AI
-STR_AI_CANCEL                                                   :{BLACK}�消
-STR_AI_CANCEL_TIP                                               :{BLACK}�改變 AI
-STR_AI_CLOSE                                                    :{BLACK}關閉
-STR_AI_RESET                                                    :{BLACK}�設
-STR_AI_HUMAN_PLAYER                                             :人類玩家
-STR_AI_RANDOM_AI                                                :隨機 AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}按一下�擇 AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}接�
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}�擇標示到的 AI
+STR_AI_LIST_CANCEL                                              :{BLACK}�消
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�改變 AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}關閉
+STR_AI_SETTINGS_RESET                                           :{BLACK}�設
+STR_AI_CONFIG_HUMAN_PLAYER                                      :人類玩家
+STR_AI_CONFIG_RANDOM_AI                                         :隨機 AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}AI �數
-STR_AI_AUTHOR                                                   :{BLACK}作者： {STRING}
-STR_AI_VERSION                                                  :{BLACK}版本： {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}正在�行中的其中一個 AI 發生錯誤。請打開「AI 除錯�視窗後擷�螢幕圖片，將此�題回報給 AI 作者。
+STR_AI_LIST_AUTHOR                                              :{BLACK}作者： {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}版本： {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}正在�行中的其中一個 AI 發生錯誤。請打開「AI 除錯�視窗後擷�螢幕圖片，將此�題回報給 AI 作者。
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}市鎮噪音�制：{ORANGE}{COMMA}{BLACK}  最大：{ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}產生噪音：{GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}市鎮噪音�制：{ORANGE}{COMMA}{BLACK}  最大：{ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}產生噪音：{GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3614,21 +3614,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :場景
 STR_CONTENT_TYPE_HEIGHTMAP                                      :高度圖
 STR_CONTENT_TITLE                                               :{WHITE}內容下載中
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}é¡žåž‹
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}內容類型
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}內容類型
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}�稱
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}內容�稱
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}按一下項目查看詳細資訊{}勾���的方塊��擇是�下載
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}內容�稱
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}按一下項目查看詳細資訊{}勾���的方塊��擇是�下載
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}全�
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}將所有內容標示為�下載
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}將所有內容標示為�下載
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}�擇�級檔
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}將所有已下載項目的�級檔標示為�下載
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}將所有已下載項目的�級檔標示為�下載
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}�消全�
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}將所有內容標示為��下載
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}將所有內容標示為��下載
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}輸入篩�字串
-STR_CONTENT_FILTER_TIP                                          :{BLACK}輸入篩�所使用的關�字，�於清單……
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}輸入篩�所使用的關�字，�於清單……
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}�濾�件 (標籤��稱)：
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}下載
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}開始下載�擇的內容
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}開始下載�擇的內容
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}總下載大�：{WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}內容資訊
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}你尚未�擇下載此項目
@@ -3661,6 +3661,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}無法è§
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}檢查線上內容
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}檢查有無最新或�更新的內容�下載
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}線上尋找�失的內容
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}檢查線上是��以下載�失的內容
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}線上尋找�失的內容
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}檢查線上是��以下載�失的內容
 ########
diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt
index 066708d38..e8a5742c9 100644
--- a/src/lang/turkish.txt
+++ b/src/lang/turkish.txt
@@ -454,11 +454,11 @@ STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLAC
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Kargo türünü göster/gizle
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLACK}{STRING}
 
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Detaylı performans oranlarını göster
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Detaylı performans oranlarını göster
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Åžirket grafikleri anahtari
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Grafikte şirketi göstermek/gizlemek için tıkla
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Grafikte şirketi göstermek/gizlemek için tıkla
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Åžirketler Ligi
@@ -493,16 +493,16 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Para:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Kredi:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Toplam:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Araç sayısı; araba, tren uçak ve gemiler dahil
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}İstasyon parçaları. Tek bir istasyon halinde olsa bile istasyonun her parçasi ayri olarak sayılir (ör: tren istasyonu, otobüs durağı, havalimanı)
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}En az gelirli aracın kârı (2 yildan yasli tüm araçlar için)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Son 12 çeyrekte en az kârlı aydaki gelir
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Son 12 çeyrekte en çok kârlı aydaki gelir
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Son 4 çeyrekte taşınan kargo miktar
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Son çeyrekte taşınan farkli kargo türleri
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Bu şirketin bankadaki para miktarı
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Bu şirketin bankadan aldığı kredi miktarı
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Toplam puan
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Araç sayısı; araba, tren uçak ve gemiler dahil
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}İstasyon parçaları. Tek bir istasyon halinde olsa bile istasyonun her parçasi ayri olarak sayılir (ör: tren istasyonu, otobüs durağı, havalimanı)
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}En az gelirli aracın kârı (2 yildan yasli tüm araçlar için)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Son 12 çeyrekte en az kârlı aydaki gelir
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Son 12 çeyrekte en çok kârlı aydaki gelir
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Son 4 çeyrekte taşınan kargo miktar
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Son çeyrekte taşınan farkli kargo türleri
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Bu şirketin bankadaki para miktarı
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Bu şirketin bankadan aldığı kredi miktarı
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Toplam puan
 
 # Music window
 STR_MUSIC_JAZZ_JUKEBOX_CAPTION                                  :{WHITE}Caz Paketi
@@ -630,8 +630,8 @@ STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  KAYD
 
 # News message history
 STR_MESSAGE_HISTORY                                             :{WHITE}Mesaj Geçmişi
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}En son haberlerin özetleri
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}En son haberlerin özetleri
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Mesaj
@@ -852,7 +852,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Görüne
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Tam ekran
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Tam ekran oynamak için bunu isaretleyin
-STR_FULLSCREEN_FAILED                                           :{WHITE}Tam ekran modu başarısız
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Tam ekran modu başarısız
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ekran Çözünürlüğü
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Kullanılacak ekran çözünürlüğünü seçin
@@ -905,7 +905,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}'OpenTTD
 
 # Cheat window
 STR_CHEATS                                                      :{WHITE}Hileler
-STR_CHEATS_TIP                                                  :{BLACK}Onay kutuları bu hilenin daha önce kullanılıp kullanmadığını bildirir.
+STR_CHEATS_TOOLTIP                                              :{BLACK}Onay kutuları bu hilenin daha önce kullanılıp kullanmadığını bildirir.
 STR_CHEATS_WARNING                                              :{BLACK}Uyarı! Rakiplerine ihanet etmek üzeresin. Böyle bir davranışı sonsuza dek unutmayacaklarını akılda tut.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Parayı {CURRENCY} kadar arttır
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Oynanan ÅŸirket: {ORANGE}{COMMA}
@@ -920,14 +920,14 @@ STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ãœretim
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Yeni Renk
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Genel renk şemalarını göster
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Tren renk düzenlerini göster
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Araba renk düzenlerini göster
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Gemi renk düzenlerini göster
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Uçakların renk şemalarını göster
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Seçili düzen için birincil rengi seç
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Seçili düzen için ikincil rengi seç
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Değiştirilecek bir renk düzeni seçin ya da CTRL+tıklama ile birden düzen seçin. Düzenin kullanımını açıp kapatmak için kutuya tıklayın.
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Genel renk şemalarını göster
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Tren renk düzenlerini göster
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Araba renk düzenlerini göster
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Gemi renk düzenlerini göster
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Uçakların renk şemalarını göster
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Seçili düzen için birincil rengi seç
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Seçili düzen için ikincil rengi seç
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Değiştirilecek bir renk düzeni seçin ya da CTRL+tıklama ile birden düzen seçin. Düzenin kullanımını açıp kapatmak için kutuya tıklayın.
 
 STR_LIVERY_DEFAULT                                              :Åžirket Rengi
 STR_LIVERY_STEAM                                                :Buharlı Lokomotif
@@ -965,19 +965,19 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Bayan su
 STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Yeni Surat
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Rastgele surat yap
 STR_FACE_ADVANCED                                               :{BLACK}GeliÅŸmiÅŸ
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Gelişmiş yüz seçimi.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Gelişmiş yüz seçimi.
 STR_FACE_SIMPLE                                                 :{BLACK}Basit
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Basit yüz seçimi.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Basit yüz seçimi.
 STR_FACE_LOAD                                                   :{BLACK}Yükle
-STR_FACE_LOAD_TIP                                               :{BLACK}Tercih edilen yüzü yükle
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Tercih edilen yüzü yükle
 STR_FACE_LOAD_DONE                                              :{WHITE}Tercih edilen yüz OpenTTD ayar dosyasından yüklendi.
 STR_FACE_FACECODE                                               :{BLACK}Oyuncu yüzü no.
-STR_FACE_FACECODE_TIP                                           :{BLACK}Oyuncu suratının numarasını göster/değiştir
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Oyuncu suratının numarasını göster/değiştir
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Oyuncu suratının numarasını göster/değiştir
 STR_FACE_FACECODE_SET                                           :{WHITE}Surat numarası ayarlandı.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Oyuncu surat numarası ayarlanamadı - 0 ve 4.294.967.295 arasında bir sayı olmalı!
 STR_FACE_SAVE                                                   :{BLACK}Kaydet
-STR_FACE_SAVE_TIP                                               :{BLACK}Tercih edilen yüzü kaydet
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Tercih edilen yüzü kaydet
 STR_FACE_SAVE_DONE                                              :{WHITE}Bu surat OpenTTD ayar dosyasına kaydedilecek.
 STR_FACE_EUROPEAN                                               :{BLACK}Avrupalı
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Beyaz yüz seç
@@ -985,49 +985,49 @@ STR_FACE_AFRICAN                                                :{BLACK}AfrikalÄ
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Siyah yüz seç
 STR_FACE_YES                                                    :Evet
 STR_FACE_NO                                                     :Hayır
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Bıyık veya küpeyi etkinleştir
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Bıyık veya küpeyi etkinleştir
 STR_FACE_HAIR                                                   :Saç:
-STR_FACE_HAIR_TIP                                               :{BLACK}Saçı değiştir
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Saçı değiştir
 STR_FACE_EYEBROWS                                               :KaÅŸlar:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Kaşları değiştir
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Kaşları değiştir
 STR_FACE_EYECOLOUR                                              :Göz rengi:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Göz rengini değiştir
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Göz rengini değiştir
 STR_FACE_GLASSES                                                :Gözlük:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Gözlüğü etkinleştir
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Gözlüğü değiştir
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Gözlüğü etkinleştir
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Gözlüğü değiştir
 STR_FACE_NOSE                                                   :Burun:
-STR_FACE_NOSE_TIP                                               :{BLACK}Burnu deÄŸiÅŸtir
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Burnu deÄŸiÅŸtir
 STR_FACE_LIPS                                                   :Dudak:
 STR_FACE_MOUSTACHE                                              :Bıyık:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Dudakları veya bıyığı değiştir
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Dudakları veya bıyığı değiştir
 STR_FACE_CHIN                                                   :Çene:
-STR_FACE_CHIN_TIP                                               :{BLACK}Çeneyi değiştir
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Çeneyi değiştir
 STR_FACE_JACKET                                                 :Ceket:
-STR_FACE_JACKET_TIP                                             :{BLACK}Ceketi deÄŸiÅŸtir
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Ceketi deÄŸiÅŸtir
 STR_FACE_COLLAR                                                 :Yaka:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Yakayı değiştir
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Yakayı değiştir
 STR_FACE_TIE                                                    :Kravat:
 STR_FACE_EARRING                                                :Küpe:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Kravatı veya küpeyi değiştir
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Kravatı veya küpeyi değiştir
 
 # Content downloading window
 STR_CONTENT_TITLE                                               :{WHITE}İçerik indirme
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Tür
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}İçeriğin türü
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}İçeriğin türü
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Ad
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}İçeriğin adı
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Ayrıntıları görmek için bir satıra tıklayın{}İndirmek için seçim kutucuğuna tıklayın
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}İçeriğin adı
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Ayrıntıları görmek için bir satıra tıklayın{}İndirmek için seçim kutucuğuna tıklayın
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Tümünü seç
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Tüm içeriği indirilmek üzere işaretle
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Tüm içeriği indirilmek üzere işaretle
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Güncellemeleri seç
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Mevcut içeriğin güncellemesi olan tüm içeriği indirilmek üzere işaretle
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Mevcut içeriğin güncellemesi olan tüm içeriği indirilmek üzere işaretle
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Tümünden seçimi kaldır
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Tüm içeriği indirilmemek üzere işaretle
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Tüm içeriği indirilmemek üzere işaretle
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Filtre metnini girin
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Listeyi filtrelemek için bir anahtar sözcük girin
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Listeyi filtrelemek için bir anahtar sözcük girin
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Etiket/isim filtresi:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Ä°ndir
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Seçili içeriği indirmeye başla
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Seçili içeriği indirmeye başla
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Toplam indirme boyutu: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}İÇERİK BİLGİSİ
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Bunu indirmek üzere seçmediniz
@@ -1064,17 +1064,17 @@ STR_CONTENT_DOWNLOAD_COMPLETE                                   :{WHITE}Ä°ndirme
 STR_CONTENT_DOWNLOAD_PROGRESS_SIZE                              :{WHITE}{1:BYTES}'ın {0:BYTES}'ı indirildi ({2:NUM} %)
 
 # Transparency settings window
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Şeffaflık Seçenekleri
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Durak tabelaları için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Ağaçlar için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Evler için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Fabrikalar için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}İstasyonlar, garajlar tershaneler vb. için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Köprüler için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Antenler ve deniz fenerleri için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Tren elektrik hatları için şeffaflığı aç/kapat. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Transparan yükleme göstergesi. Kilitlemek için Ctrl ile tıklayın.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Nesneleri şeffaf değil görünmez yap
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Şeffaflık Seçenekleri
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Durak tabelaları için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Ağaçlar için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Evler için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Fabrikalar için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}İstasyonlar, garajlar tershaneler vb. için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Köprüler için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Antenler ve deniz fenerleri için şeffaflık. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Tren elektrik hatları için şeffaflığı aç/kapat. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Transparan yükleme göstergesi. Kilitlemek için Ctrl ile tıklayın.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Nesneleri şeffaf değil görünmez yap
 
 # Base for station construction window(s)
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Kapsama alanı
@@ -1112,28 +1112,28 @@ STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Tren ist
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Sürükle Bırak
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Sürükle bırak tekniğiyle istasyon kur
 
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Görüntülenecek istasyon türünü seçin
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Yapılacak istasyon türünü seçin
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Görüntülenecek istasyon türünü seçin
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Yapılacak istasyon türünü seçin
 
 # Signal window
-STR_SIGNAL_SELECTION                                            :{WHITE}Sinyal Seçimi
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Buradaki sinyaller dönüştürülemez...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Blok Sinyali (semafor){}Bu en temel sinyal tipidir, bir blok içinde aynı anda yalnız bir tren bulunmasına izin verir.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Giriş-Sinyali (semafor){}Yolun devam eden bölümünde en az bir yeşil çıkış sinyali olduğu sürece yeşil yanar. Aksi halde kırmızı yanar.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Çıkış Sinyali (semafor){}Blok sinyali ile aynı şekilde çalışır ancak giriş ve karışık ön sinyaller ile doğru rengi tetiklemek gerekmektedir.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Karışık Sinyal (semafor){}Karışık sinyal hem giriş hem de çıkış sinyali gibi davranır. Bu büyük ön sinyal "ağaçları" yapmanızı sağlar.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Yol Sinyali (semafor){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Standart yol sinyalleri arka taraftan geçişe izin verir.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Tek Yön Yol Sinyali (semafor){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Tek yön yol sinyalleri arka taraftan geçişe izin vermez.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Blok Sinyali (elektrikli){}En temel sinyal tipidir, bir blok içinde aynı anda yalnız bir tren bulunmasına izin verir.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Giriş-Sinyali (elektrikli){}Yolun devam eden bölümünde en az bir yeşil çıkış sinyali olduğu sürece yeşil yanar. Aksi halde kırmızı yanar.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Çıkış Sinyali (elektrikli){}Blok sinyali ile aynı şekilde çalışır ancak giriş ve karışık ön sinyaller ile doğru rengi tetiklemek gerekmektedir.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Karışık Sinyal (elektrikli){}Karışık sinyal hem giriş hem de çıkış sinyali gibi davranır. Bu büyük ön sinyal "ağaçları" yapmanızı sağlar.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Yol Sinyali (elektrikli){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Standart yol sinyalleri arka taraftan geçişe izin verir.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Tek Yön Yol Sinyali (elektrikli){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Tek yön yol sinyalleri arka taraftan geçişe izin vermez.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Sinyal Dönüştür{}Seçildiğinde, tıklama var olan sinyali seçili sinyal tür ve alt türüne çevirir, CTRL ile tıklama mevcut alt türü değiştirir.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Sinyal sürükleme yoğunluğu
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Sinyal sürükleme yoğunluğunu azalt
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Sinyal sürükleme yoğunluğunu arttır
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Sinyal Seçimi
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Buradaki sinyaller dönüştürülemez...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Blok Sinyali (semafor){}Bu en temel sinyal tipidir, bir blok içinde aynı anda yalnız bir tren bulunmasına izin verir.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Giriş-Sinyali (semafor){}Yolun devam eden bölümünde en az bir yeşil çıkış sinyali olduğu sürece yeşil yanar. Aksi halde kırmızı yanar.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Çıkış Sinyali (semafor){}Blok sinyali ile aynı şekilde çalışır ancak giriş ve karışık ön sinyaller ile doğru rengi tetiklemek gerekmektedir.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Karışık Sinyal (semafor){}Karışık sinyal hem giriş hem de çıkış sinyali gibi davranır. Bu büyük ön sinyal "ağaçları" yapmanızı sağlar.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Yol Sinyali (semafor){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Standart yol sinyalleri arka taraftan geçişe izin verir.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Tek Yön Yol Sinyali (semafor){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Tek yön yol sinyalleri arka taraftan geçişe izin vermez.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Blok Sinyali (elektrikli){}En temel sinyal tipidir, bir blok içinde aynı anda yalnız bir tren bulunmasına izin verir.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Giriş-Sinyali (elektrikli){}Yolun devam eden bölümünde en az bir yeşil çıkış sinyali olduğu sürece yeşil yanar. Aksi halde kırmızı yanar.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Çıkış Sinyali (elektrikli){}Blok sinyali ile aynı şekilde çalışır ancak giriş ve karışık ön sinyaller ile doğru rengi tetiklemek gerekmektedir.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Karışık Sinyal (elektrikli){}Karışık sinyal hem giriş hem de çıkış sinyali gibi davranır. Bu büyük ön sinyal "ağaçları" yapmanızı sağlar.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Yol Sinyali (elektrikli){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Standart yol sinyalleri arka taraftan geçişe izin verir.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Tek Yön Yol Sinyali (elektrikli){}Yol sinyali, gelen tren güvenli bir durma noktasına yol ayırabiliyor ise bir sinyal bloğuna aynı anda birden fazla trenin girmesine izin verir. Tek yön yol sinyalleri arka taraftan geçişe izin vermez.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Sinyal Dönüştür{}Seçildiğinde, tıklama var olan sinyali seçili sinyal tür ve alt türüne çevirir, CTRL ile tıklama mevcut alt türü değiştirir.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Sinyal sürükleme yoğunluğu
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Sinyal sürükleme yoğunluğunu azalt
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Sinyal sürükleme yoğunluğunu arttır
 
 # Road construction toolbar
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Yol Yapımı
@@ -1158,9 +1158,9 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Tramvay
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Garaj Yönü
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Garaj yönünü seç
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Garaj yönünü seç
 STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION                        :{WHITE}Tramvay Garı Yönü
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Tramvay garı yönü
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Tramvay garı yönü
 
 # Road vehicle station construction window
 STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Otobüs Durağı Yönü
@@ -1224,40 +1224,40 @@ STR_STATION_VIEW_WAITING_CARGO                                  :{WHITE}{CARGO}
 STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({SHORTCARGO} çıkış noktası {STATION})
 STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Ä°stenen: {WHITE}
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Hiç kargo yok
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Tüm türleri seç
-STR_SELECT_ALL_TYPES                                            :{BLACK}Tüm kargo türlerini seç (hiç beklemeyenler dahil)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Bu araç türü için mümkün olan lokomotif tasarimlari
-STR_MANAGE_LIST                                                 :{BLACK}Listeyi yönet
-STR_MANAGE_LIST_TIP                                             :{BLACK}Listedeki tüm araçlara talimat ver
-STR_REPLACE_VEHICLES                                            :Araçları Değiştir
-STR_SEND_FOR_SERVICING                                          :Bakıma İçin Gönder
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Hiç kargo yok
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Tüm türleri seç
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Tüm kargo türlerini seç (hiç beklemeyenler dahil)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Bu araç türü için mümkün olan lokomotif tasarimlari
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Listeyi yönet
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Listedeki tüm araçlara talimat ver
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Araçları Değiştir
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Bakıma İçin Gönder
 
 STR_ERROR_OWNED_BY                                              :{WHITE}...sahibi {STRING}
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Kargo
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Bilgi
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapasite
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Toplam Kargo
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Bu trenin toplam kapasitesi:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Bu trenin toplam kapasitesi:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
-STR_MAPSIZE                                                     :{BLACK}Harita boyutu:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Harita boyutu:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 STR_COMPANY_SOMEONE                                             :birisi{SKIP}{SKIP}
 
 STR_ABOUT_OPENTTD                                               :{WHITE}OpenTTD Hakkında
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Oyunu bitirmek istediÄŸinizden emin misiniz?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Ana Menüye Dön
-STR_SORT_ORDER_TIP                                              :{BLACK}Sıralama türü seçin (azalan/artan)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Sıralama kriteri seçin
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Süzme kriterini seçin
-STR_SORT_BY                                                     :{BLACK}Sırala
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Sıralama türü seçin (azalan/artan)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Sıralama kriteri seçin
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Süzme kriterini seçin
+STR_BUTTON_SORT_BY                                              :{BLACK}Sırala
 
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Mesaj
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Mesaj (gönderen {STRING})
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Uyarı!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Uyarı!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Yapılamaz....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Bu alan temizlenemez....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Orijinal kopyalama hakkı {COPYRIGHT} 1995 Chris Sawyer, Her hakkı saklıdır
@@ -1265,45 +1265,45 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD takımı
 
 STR_QUIT_CAPTION                                                :{WHITE}Çıkış
-STR_YES                                                         :{BLACK}Evet
-STR_NO                                                          :{BLACK}Hayır
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Oyundan çıkıp {STRING} sisteminize dönmek istediğinizden emin misiniz?
+STR_QUIT_YES                                                    :{BLACK}Evet
+STR_QUIT_NO                                                     :{BLACK}Hayır
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Oyundan çıkıp {STRING} sisteminize dönmek istediğinizden emin misiniz?
 
 STR_JUST_NOTHING                                                :Hiçbir şey
 STR_ERROR_TOO_MANY_VEHICLES_IN_GAME                             :{WHITE}Oyunda çok fazla araç var
 STR_BUTTON_LOCATION                                             :{BLACK}Göster
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Varsayılan
-STR_QUERY_CANCEL                                                :{BLACK}Ä°ptal
-STR_QUERY_OK                                                    :{BLACK}Tamam
-STR_QUERY_RENAME                                                :{BLACK}Yeni ad
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Varsayılan
+STR_BUTTON_CANCEL                                               :{BLACK}Ä°ptal
+STR_BUTTON_OK                                                   :{BLACK}Tamam
+STR_BUTTON_RENAME                                               :{BLACK}Yeni ad
 
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Servis aralığı değiştirilemiyor...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Pencereyi kapat
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Pencere başlığı - pencereyi hareket ettirmek için sürükle
-STR_STICKY_BUTTON                                               :{BLACK}'Tüm pencereleri kapat' tuşuyla kapanmasın
-STR_RESIZE_BUTTON                                               :{BLACK}Pencereyi boyutlandirmak için tıklayıp sürükle
+STR_TOOLTIP_STICKY                                              :{BLACK}'Tüm pencereleri kapat' tuşuyla kapanmasın
+STR_TOOLTIP_RESIZE                                              :{BLACK}Pencereyi boyutlandirmak için tıklayıp sürükle
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Su anki varsayılan kayıt/yükleme dizinine gitmek için tıklayın
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Bir arazi üzerinde bulunan binaları ve benzeri yapıları yık
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Araziyi alçalt
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Araziyi yükselt
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Araziyi alçalt
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Araziyi yükselt
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Kaydırma çubuğu - listeyi aşağı/yukarı kaydırır
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Kaydırma çubuğu - listeyi sağa/sola kaydır
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Bu seneki kâr: {CURRENCY} (geçen sene: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} sene ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} sene ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} sene ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} sene ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Tren
-STR_VEHICLE_ROAD_VEHICLE                                        :Karayolu taşıtı
-STR_VEHICLE_SHIP                                                :Gemi
-STR_VEHICLE_AIRCRAFT                                            :Uçak
+STR_REPLACE_VEHICLE_TRAIN                                       :Tren
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Karayolu taşıtı
+STR_REPLACE_VEHICLE_SHIP                                        :Gemi
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Uçak
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Arazi Bilgisi
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Temizleme fiyatı: {LTBLUE}Yok
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Temizleme fiyatı: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Kaldırıldığında kazanılacak: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Kaldırıldığında kazanılacak: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Yok
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Sahibi: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Yolun sahibi: {LTBLUE}{STRING}
@@ -1312,11 +1312,11 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Demiryol
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Belediyesi: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Hiçbiri
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Ä°sim
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Ä°stenen: {LTBLUE}
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Görüntüyü ortalamak için servisi tıklayın
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Görüntüyü ortalamak için servisi tıklayın
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_ERROR_TOO_FAR_FROM_PREVIOUS_DESTINATION                     :{WHITE}...önceki hedeften çok uzak
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
@@ -1327,7 +1327,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Yükselt
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Rastgele harita yarat
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Haritayı sıfırla
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Haritayı Sıfırla
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Haritada oyuncuya ait olan herÅŸeyi sil
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Haritada oyuncuya ait olan herÅŸeyi sil
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Oyuncuya ait olan herÅŸeyi silmek istediÄŸinize emin misiniz?
 STR_FOUND_TOWN_CAPTION                                          :{WHITE}Şehir Yapımı
 STR_FOUND_TOWN_NEW_TOWN_BUTTON                                  :{BLACK}Yeni Åžehir
@@ -1337,11 +1337,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...harit
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...başka bir şehire çok yakın
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...yer uygun deÄŸil
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...çok fazla şehir var
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Åžehir kurulamaz
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...haritada boÅŸ yer yok
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Åžehir kurulamaz
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...haritada boÅŸ yer yok
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Şehrin boyutunu büyült
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}GeniÅŸlet
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Şehir yol yapmayacak. Yol yapımını Gelişmiş Ayarlar->Ekonomi->Şehirler'den etkinleştirebilirsiniz.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Şehir yol yapmayacak. Yol yapımını Gelişmiş Ayarlar->Ekonomi->Şehirler'den etkinleştirebilirsiniz.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Rastgele Åžehir
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Rastgele bir yerde ÅŸehir yarat
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Buraya {STRING} yapılamaz...
@@ -1355,20 +1355,20 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Haritaya
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Deniz feneri koy
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Verici koy
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Çöl yap.{}Kaldırmak için CTRL'ye basılı tut
-STR_CREATE_LAKE                                                 :{BLACK}Su alanını belirle.{}Deniz seviyesinde CTRL tuşu basılı olmadığı sürece kanal yapar, basılıysa etraftakileri su altında bırakır
-STR_CREATE_RIVER                                                :{BLACK}Irmak oluÅŸtur.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Su alanını belirle.{}Deniz seviyesinde CTRL tuşu basılı olmadığı sürece kanal yapar, basılıysa etraftakileri su altında bırakır
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Irmak oluÅŸtur.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Sil
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Bu ÅŸehri tamamen sil
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Senaryoyu kaydet
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Senaryoyu yükle
-STR_MENU_LOAD_HEIGHTMAP                                         :Yükseklik haritası yükle
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Yükseklik haritası yükle
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Editörden çık
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Oyundan Çık
 STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Senaryoyu kaydet, senaryoyu yükle, editörden çık, oyundan çık
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Senaryoyu Yükle
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Senaryoyu Kaydet
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Bu senaryodan çıkmak istediğinizden emin misiniz ?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Bu senaryodan çıkmak istediğinizden emin misiniz ?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...yalnızca nüfusu en az 1200 olan şehirlere yapılabilir
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Başlangıç tarihini 1 yıl gerilet
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Başlangıç tarihini 1 yıl ilerlet
@@ -1376,19 +1376,19 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...köpr
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Küçük
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Orta
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Büyük
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Rastgele
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Rastgele
 STR_FOUND_TOWN_CITY                                             :{BLACK}Åžehir
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Şehirler normal kasabalardan daha hızlı büyürler{}Ayarlara göre değişmekle birlikte, ilk kurulduklarında daha büyük olurlar.
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Şehir büyüklüğü seç
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Şehir büyüklüğü:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Kasaba yol yerleÅŸimi:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Bu kasaba için kullanılacak yol yerleşimini seç
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Orijinal
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Daha iyi yollar
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 ÅŸebeke
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 ÅŸebeke
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Rastgele
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Kasaba yol yerleÅŸimi:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Bu kasaba için kullanılacak yol yerleşimini seç
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orijinal
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Daha iyi yollar
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 ÅŸebeke
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 ÅŸebeke
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Rastgele
 
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Yeni fabrika aç
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}...yalnızca yağmur ormanlarında yapılabilir
@@ -1397,15 +1397,15 @@ STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}...yalnÄ
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Ekran görüntüsü '{STRING}' olarak kaydedildi
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Ekran görüntüsü alınamadı!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Gelecekte kullanım için arazi satın al
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Kayıt işlemi sürüyor,{}lütfen bitene kadar bekleyin!
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Gelecekte kullanım için arazi satın al
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Kayıt işlemi sürüyor,{}lütfen bitene kadar bekleyin!
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Otokayıt başarısız
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Otokayıt başarısız
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Gidiyor {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Gidiyor {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Talimat yok
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Talimat yok, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Gidiyor {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Gidiyor {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Talimat yok
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Talimat yok, {VELOCITY}
 
 STR_PASSENGERS                                                  :yolcu
 STR_BAGS                                                        :çanta
@@ -1416,9 +1416,9 @@ STR_CRATES                                                      :kasa
 STR_RES_OTHER                                                   :diÄŸer
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Talimat listesi paylasilamiyor...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Talimat listesi kopyalanamiyor...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Paylaşılmış talimat sonu - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Talimat listesi paylasilamiyor...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Talimat listesi kopyalanamiyor...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Paylaşılmış talimat sonu - -
 
 STR_ERROR_TRAIN_TOO_LONG_AFTER_REPLACEMENT                      :{WHITE}{VEHICLE} değiştirmeden sonra çok uzun oldu
 STR_ERROR_AUTOREPLACE_NOTHING_TO_DO                             :{WHITE}Hiçbir otomatik değiştirme/yenileme kuralı uygulanmadı.
@@ -1671,170 +1671,170 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Haritan
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :kapalı
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Ayar deÄŸerini deÄŸiÅŸtir
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Ayar deÄŸerini deÄŸiÅŸtir
 
-STR_TEMPERATE_LANDSCAPE                                         :Ilıman iklim
-STR_SUB_ARCTIC_LANDSCAPE                                        :SoÄŸuk iklim
-STR_SUB_TROPICAL_LANDSCAPE                                      :Tropik iklim
-STR_TOYLAND_LANDSCAPE                                           :Oyun bahçesi
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Ilıman iklim
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :SoÄŸuk iklim
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Tropik iklim
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Oyun bahçesi
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Gidiyor -> {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Gidiyor -> {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Gidiyor -> {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Gidiyor -> {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :{WAYPOINT} üzerinden git
-STR_GO_NON_STOP_TO_WAYPOINT                                     :{WAYPOINT} üzerinden durmaksızın git
+STR_ORDER_GO_TO_WAYPOINT                                        :{WAYPOINT} üzerinden git
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :{WAYPOINT} üzerinden durmaksızın git
 
-STR_WAYPOINTNAME_CITY                                           :Yerimi {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Yerimi {TOWN} #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Şamandırası
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Şamandırası #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Yerimi
+STR_FORMAT_WAYPOINT_NAME                                        :Yerimi {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Yerimi {TOWN} #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Şamandırası
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Şamandırası #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Yerimi
 
-STR_WAYPOINT                                                    :{WHITE}Yerimi
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Yerimi türü seç
+STR_WAYPOINT_CAPTION                                            :{WHITE}Yerimi
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Yerimi türü seç
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Yerimi adını değiştir
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Yerimi adı değiştirilemedi...
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Buraya tren yerimi yapılamaz...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Tren yerimi kaldırılamaz...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Yerimi adı değiştirilemedi...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Buraya tren yerimi yapılamaz...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Tren yerimi kaldırılamaz...
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...Bu senaryoda hiç şehir yok
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Harita oluşturulması iptal edildi...{}...uygun yerleşim bölgesi yok
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...Bu senaryoda hiç şehir yok
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Harita oluşturulması iptal edildi...{}...uygun yerleşim bölgesi yok
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Birçok rastgele şehir
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Haritayı rastgele şehirlerle doldur
-STR_MANY_RANDOM_INDUSTRIES                                      :Birçok rastgele fabrika
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Haritayı rastgele fabrikalarla doldur
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Fabrika yapılamıyor...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Birçok rastgele şehir
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Haritayı rastgele şehirlerle doldur
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Birçok rastgele fabrika
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Haritayı rastgele fabrikalarla doldur
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Fabrika yapılamıyor...
 
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Arazi düzenleme
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Düzleştir
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Düzleştir
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Rastgele türde ağaçlar
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Rastgele türde ağaçlar koy
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Rastgele türde ağaçlar koy
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Buraya kanal yapılamaz...
-STR_LANDINFO_CANAL                                              :Kanal
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Buraya kanal yapılamaz...
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Buraya kilit yapılamaz...
-STR_LANDINFO_LOCK                                               :Kilit
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Buraya kilit yapılamaz...
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Kilit
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Burada nehirler yapamazsınız...
-STR_LANDINFO_RIVER                                              :Nehir
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Burada nehirler yapamazsınız...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Nehir
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...samandıra kullanımda!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...samandıra kullanımda!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Koordinatlar: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Koordinatlar: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}İstasyonun parçasi kaldırılamaz...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Ray türü değiştirilemiyor...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}İstasyonun parçasi kaldırılamaz...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Ray türü değiştirilemiyor...
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Trenin hepsini satmak için lokomotifi buraya sürükle
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Trenin hepsini satmak için lokomotifi buraya sürükle
 
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Hepsini kapa
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Hepsini aç
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Hepsini kapa
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Hepsini aç
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Fabrikalar
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} (%{COMMA} taşındı)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} (%{COMMA}/%{COMMA} taşındı)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Fabrika adları - görüntüyü fabrikada merkezlemek için adına tıklayın
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Fabrikalar
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} (%{COMMA} taşındı)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} (%{COMMA}/%{COMMA} taşındı)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Fabrika adları - görüntüyü fabrikada merkezlemek için adına tıklayın
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...başka bir fabrikaya çok yakın
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...başka bir fabrikaya çok yakın
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Ãœretimi deÄŸiÅŸtir
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Çok Oyunculu
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Oyuncu adı:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Oyuncuların görecegi adınızı seçin
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Ä°sminizi girin
-STR_NETWORK_CONNECTION                                          :{BLACK}Bağlantı:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}İnternet ya da yerel ağ bağlantısı (LAN) oyunundan birini seçin
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Sunucu baÅŸlat
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Kendi sunucunu baÅŸlat
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Ä°sim
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Oyunun ismi
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Dil, sunucu sürümü, vb.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Seçmek için listeden bir oyun tıklayın
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Geçen sefer katıldığınız sunucu:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Son oynadığınız sunucuya katılmak için tıklayın
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Sunucu bul
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Sunucu bulmak için bir agi ara
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Sunucu ekle
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Her zaman çalışan oyunlarına bakabilmek için bir sunucu ekle.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Sunucunun ip'sini ve portunu girin
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Oyuncular
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Bağlı oyuncular / en fazla oyuncu
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Harita ebadı
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Oyunun harita ebadı{}Alana göre sıralamak için tıklayın
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Tarih
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Güncel tarih
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Yıl
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Oyunda geçen{}yıl sayısı
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}OYUN BÄ°LGÄ°SÄ°
-STR_NETWORK_CLIENTS                                             :{SILVER}Ä°stemciler: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Dil: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Set: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Harita boyutu: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Sunucu sürümü: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Sunucu adresi: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}BaÅŸlama tarihi: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Åžimdiki tarih: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Parola korumalı!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SUNUCU KAPALI
-STR_NETWORK_SERVER_FULL                                         :{SILVER}SUNUCU DOLU
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}SÃœRÃœM UYUÅžMAZLIÄžI
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF UYUÅžMAZLIÄžI
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Oyuna gir
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Yeni çok oyunculu oyun başlat
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Oyun adı:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Bu oyun adı diğer oyuncuların server listesinde görünecek
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Ağ oyunu için bir isim girin
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Parola koy
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Erişimi kısıtlamak için oyuna parola koy
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Harita seç:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Hangi haritada oynamak istiyorsun?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Ä°nternet
-STR_NETWORK_LAN_INTERNET                                        :LAN / internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Ä°nternet (reklam vererek)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} istemci
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Ä°zin verilen en fazla oyuncu:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}İzin verilen en fazla oyuncu sayısını seç. Her yerin dolması gerekmez
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} ÅŸirket
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}En fazla ÅŸirket:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Sunucudaki şirket sayısını sınırla
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} seyirci
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}En fazla izleyici:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Sunucudaki izleyici sayısını sınırla
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}KonuÅŸulan dil:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Diğer oyuncular sunucuda hangi dilin konuşulacağını bilecek
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Oyunu BaÅŸlat
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Rastgele harita ya da senaryoda network oyunu aç
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Oyun Yükle
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Kayıtlı oyunu devam ettir (doğru oyuncu olarak bağlandığından emin ol)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Çok Oyunculu
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Ä°sminizi girin
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Bağlantı:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}İnternet ya da yerel ağ bağlantısı (LAN) oyunundan birini seçin
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Sunucu baÅŸlat
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Kendi sunucunu baÅŸlat
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Ä°sim
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Oyunun ismi
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Dil, sunucu sürümü, vb.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Seçmek için listeden bir oyun tıklayın
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Geçen sefer katıldığınız sunucu:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Son oynadığınız sunucuya katılmak için tıklayın
+
+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_ENTER_IP                                :{BLACK}Sunucunun ip'sini ve portunu girin
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Oyuncular
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Bağlı oyuncular / en fazla oyuncu
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Harita ebadı
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Oyunun harita ebadı{}Alana göre sıralamak için tıklayın
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Tarih
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Güncel tarih
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Yıl
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Oyunda geçen{}yıl sayısı
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}OYUN BÄ°LGÄ°SÄ°
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Ä°stemciler: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Dil: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Set: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Harita boyutu: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Sunucu sürümü: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Sunucu adresi: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}BaÅŸlama tarihi: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Åžimdiki tarih: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Parola korumalı!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SUNUCU KAPALI
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}SUNUCU DOLU
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}SÃœRÃœM UYUÅžMAZLIÄžI
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF UYUÅžMAZLIÄžI
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Oyuna gir
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Yeni çok oyunculu oyun başlat
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Oyun adı:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Bu oyun adı diğer oyuncuların server listesinde görünecek
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Ağ oyunu için bir isim girin
+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_SELECT_MAP                             :{BLACK}Harita seç:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Hangi haritada oynamak istiyorsun?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Ä°nternet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Ä°nternet (reklam vererek)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} istemci
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Ä°zin verilen en fazla oyuncu:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}İzin verilen en fazla oyuncu sayısını seç. Her yerin dolması gerekmez
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} ÅŸirket
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}En fazla ÅŸirket:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Sunucudaki şirket sayısını sınırla
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} seyirci
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}En fazla izleyici:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Sunucudaki izleyici sayısını sınırla
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}KonuÅŸulan dil:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Diğer oyuncular sunucuda hangi dilin konuşulacağını bilecek
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Oyunu BaÅŸlat
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Rastgele harita ya da senaryoda network oyunu aç
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Oyun Yükle
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Kayıtlı oyunu devam ettir (doğru oyuncu olarak bağlandığından emin ol)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Farketmez
@@ -1875,33 +1875,33 @@ STR_NETWORK_LANG_GREEK                                          :Yunanca
 STR_NETWORK_LANG_LATVIAN                                        :Letonca
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Çok oyunculu oyun lobisi
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Çok oyunculu oyun lobisi
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Katılmaya hazırlanıyor: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Oyundaki tüm şirketlerin listesi. Birine katılabilir ya da boş yer varsa yeni bir tane açabilirsiniz
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Yeni ÅŸirket
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Yeni bir ÅŸirket kur
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Oyunu izle
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Oyuna izlemek için katıl
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Åžirkete Katil
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Şirket yönetimine yardım et
-STR_NETWORK_REFRESH                                             :{BLACK}Sunucuyu tazele
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Sunucu bilgisini tazele
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Katılmaya hazırlanıyor: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Oyundaki tüm şirketlerin listesi. Birine katılabilir ya da boş yer varsa yeni bir tane açabilirsiniz
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Yeni ÅŸirket
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Yeni bir ÅŸirket kur
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Oyunu izle
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Oyuna izlemek için katıl
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Åžirkete Katil
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Şirket yönetimine yardım et
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Sunucuyu tazele
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Sunucu bilgisini tazele
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}ŞİRKET BİLGİSİ
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}ŞİRKET BİLGİSİ
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Şirket adı: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Kurulus: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Åžirket deÄŸeri: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Åžimdiki dengesi: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Geçen seneki geliri: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performans: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Şirket adı: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Kurulus: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Åžirket deÄŸeri: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Åžimdiki dengesi: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Geçen seneki geliri: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performans: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Araçlar: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Ä°stasyon: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Oyuncular: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Araçlar: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Ä°stasyon: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Oyuncular: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Bağlanıyor...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Bağlanıyor...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Bağlanıyor..
@@ -1917,49 +1917,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Åžirket
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} -> önünde olan oyuncular
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} indirildi
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Bağlantıyı kes
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Bağlantıyı kes
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Vermek istediğiniz para miktarını girin
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Sunucu korumalı. Parola girin
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Şirket korumalı. Parola girin
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Oyuncu listesi
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Oyuncu listesi
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Gözlemle
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Yeni Åžirket
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Network aygıtı bulunamadı veya ENABLE_NETWORK olmadan derlendi
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Network oyunu bulunamadı
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Sunucu isteÄŸe cevap vermedi
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}NewGRF uyuşmazlığı yüzünden bağlanılamadı
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Network-Oyunu senkronizasyonu başarısız
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Network-Oyunu bağlatısı düştü
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Kayıtlı oyun yüklenemedi
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Sunucu başlatılamadı
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Bağlanamadı
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Bağlantı #{NUM} zaman aşımına uğradı
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Protokol hatası yapıldı ve bağlantı koparıldı
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Bu istemcinin revizyonu sunucununki ile aynı değil
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Yanlış parola
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Sunucu dolu
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Sunucuya girmeniz yasaklandı
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Oyundan atıldınız
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Bu sunucuda hileler kapalı
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Network aygıtı bulunamadı veya ENABLE_NETWORK olmadan derlendi
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Network oyunu bulunamadı
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Sunucu isteÄŸe cevap vermedi
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}NewGRF uyuşmazlığı yüzünden bağlanılamadı
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Network-Oyunu senkronizasyonu başarısız
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Network-Oyunu bağlatısı düştü
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Kayıtlı oyun yüklenemedi
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Sunucu başlatılamadı
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Bağlanamadı
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Bağlantı #{NUM} zaman aşımına uğradı
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Protokol hatası yapıldı ve bağlantı koparıldı
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Bu istemcinin revizyonu sunucununki ile aynı değil
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Yanlış parola
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Sunucu dolu
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Sunucuya girmeniz yasaklandı
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Oyundan atıldınız
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Bu sunucuda hileler kapalı
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :genel hata
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :desync hatası
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :harita yüklenemiyor
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :bağlantı kaybedildi
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :protokol hatası
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF uyuşmazlığı
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :izin verilmedi
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :ilginç paket alındı
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :yanlış düzeltme
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :isim kullanımda
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :yanlış parola
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :DoCommand için yanlış company-id
-STR_NETWORK_ERR_CLIENT_KICKED                                   :sunucu tarafından atıldı
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :hile yapmaya çalıştı
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :sunucu dolu
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :genel hata
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :desync hatası
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :harita yüklenemiyor
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :bağlantı kaybedildi
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :protokol hatası
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF uyuşmazlığı
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :izin verilmedi
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :ilginç paket alındı
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :yanlış düzeltme
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :isim kullanımda
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :yanlış parola
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :DoCommand için yanlış company-id
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :sunucu tarafından atıldı
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :hile yapmaya çalıştı
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :sunucu dolu
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1969,15 +1969,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Oyun durdu (ist
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Oyun devam ediyor (istemci bağlandı)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Oyun devam ediyor (istemci bağlanamadı)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :ayrılıyor
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} oyuna katıldı
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} #{2:NUM} numaralı şirkete katıldı
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} gözlemcilere katıldı
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} yeni bir ÅŸirket kurdu (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} oyunu terketti ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} adını {STRING} olarak değiştirdi
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} ÅŸirketinize {2:CURRENCY} verdi
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** {1:STRING} oyuncusuna {2:CURRENCY} verdiniz
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :ayrılıyor
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} oyuna katıldı
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} #{2:NUM} numaralı şirkete katıldı
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} gözlemcilere katıldı
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} yeni bir ÅŸirket kurdu (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} oyunu terketti ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} adını {STRING} olarak değiştirdi
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} ÅŸirketinize {2:CURRENCY} verdi
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** {1:STRING} oyuncusuna {2:CURRENCY} verdiniz
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Takım] :
 STR_NETWORK_CHAT_COMPANY                                        :[Takım] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Takım] -> {STRING}: {WHITE}{STRING}
@@ -1987,8 +1987,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Özel] -> {STR
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Herkes] :
 STR_NETWORK_CHAT_ALL                                            :[Herkes] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Ağ sohbeti için yazı girin
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Sunucu kapandı
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Sunucu baştan başlatılıyor...{}Lütfen bekleyin...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Sunucu kapandı
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Sunucu baştan başlatılıyor...{}Lütfen bekleyin...
 
 STR_NETWORK_SERVER                                              :Sunucu
 STR_NETWORK_CLIENT                                              :Ä°stemci
@@ -2002,19 +2002,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Åžirketle konuÅ
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Özel mesaj
 
 
-STR_NETWORK_SEND                                                :{BLACK}Gönder
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Gönder
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}PNG'den yükseklik haritası yüklenemedi...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...dosya bulunamadı.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...resim türü işlenemiyor. 8 veya 24-bit PNG resmi gerekli.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...yanlış bir şeyler oldu. (dosya bozuk olabilir)
+STR_ERROR_PNGMAP                                                :{WHITE}PNG'den yükseklik haritası yüklenemedi...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...dosya bulunamadı.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...resim türü işlenemiyor. 8 veya 24-bit PNG resmi gerekli.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...yanlış bir şeyler oldu. (dosya bozuk olabilir)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Arazi BMP'den yüklenemedi...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...resim türü çevrilemedi.
+STR_ERROR_BMPMAP                                                :{WHITE}Arazi BMP'den yüklenemedi...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...resim türü çevrilemedi.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Gider: {CURRENCY}
@@ -2028,13 +2028,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Tahmini
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Burada arazi yükseltilemez...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Burada arazi alçaltılamaz...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Burada toprağı düzleyemezsiniz...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Kayalar
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Engebeli arazi
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Çıplak arazi
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Çim
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Mera
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Karlı arazi
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Çöl
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Kayalar
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Engebeli arazi
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Çıplak arazi
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Çim
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Mera
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Karlı arazi
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Çöl
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Arazi yanlış yöne doğru meyilli
@@ -2042,11 +2042,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Ä°mkansi
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Kazı tünele hasar verebilir
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}... zaten deniz seviyesinde
 STR_ERROR_TOO_HIGH                                              :{WHITE}... çok yüksek
-STR_ALREADY_LEVELLED                                            :{WHITE}... zaten düz
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... zaten düz
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Uygun ray yok
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...zaten yapıldı
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Önce ray kaldırılmalı
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Yol tek yönlü veya kapalı
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Yol tek yönlü veya kapalı
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Demiryolu Yapımı
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Elektrikli Ray Yapımı
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Monoray Yapımı
@@ -2058,43 +2058,43 @@ STR_ERROR_CAN_T_BUILD_SIGNALS_HERE                              :{WHITE}Buraya s
 STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK                            :{WHITE}Buraya ray yapılamıyor...
 STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK                           :{WHITE}Buradan ray kaldırılamıyor...
 STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM                             :{WHITE}Buradan sinyaller kaldırılamıyor...
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Köprü seçimi - yapacağınız köprüyü seçin
-STR_RAILROAD_TRACK                                              :Ray
-STR_RAILROAD_TRAIN_DEPOT                                        :Tren garı
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Köprü seçimi - yapacağınız köprüyü seçin
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Ray
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Tren garı
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...alan baÅŸka bir ÅŸirkete ait
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Blok sinyalli ray
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Ön-sinayalli ray
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Çıkış-sinyalli ray
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :BirleÅŸik sinyalli ray
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Yol sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Tek yön yol sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Blok ve ön sinyalli ray
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Blok ve çıkış sinyalli ray
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Blok ve birleÅŸik sinyalli ray
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Blok ve yol sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Blok ve tek yön sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Ön ve Çıkış sinyalli ray
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Ön ve birleşik sinyalli ray
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Ön- ve yol sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Ön- ve tek yön sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Çıkış ve birleşik sinyalli ray
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Çıkış- ve yol sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Çıkış- ve tek yön sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Karışık- ve yol sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Karışık- ve tek yön sinyalleri olan demiryolu
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Ön ve tek yön sinyalli ray
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Önce tren istasyonu kaldırılmalı
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Önce demiryolu yerimi kaldırılmalı
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Ayrı bir istasyon inşa et
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}Ayrı bir yerimi yap
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Ä°stasyonu birleÅŸtir
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Yerimini birleÅŸtir
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Blok sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Ön-sinayalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Çıkış-sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :BirleÅŸik sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Yol sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Tek yön yol sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Blok ve ön sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Blok ve çıkış sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Blok ve birleÅŸik sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Blok ve yol sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Blok ve tek yön sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Ön ve Çıkış sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Ön ve birleşik sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Ön- ve yol sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Ön- ve tek yön sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Çıkış ve birleşik sinyalli ray
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Çıkış- ve yol sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Çıkış- ve tek yön sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Karışık- ve yol sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Karışık- ve tek yön sinyalleri olan demiryolu
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Ön ve tek yön sinyalli ray
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Önce tren istasyonu kaldırılmalı
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Önce demiryolu yerimi kaldırılmalı
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Ayrı bir istasyon inşa et
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Ayrı bir yerimi yap
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Ä°stasyonu birleÅŸtir
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Yerimini birleÅŸtir
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Önce yol silinmeli
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Yol çalışmaları
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Yol çalışmaları
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Köprü Seç
 STR_ERROR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION                      :{WHITE}...tek yönlü yollar kesişemez
 STR_ERROR_CAN_T_BUILD_ROAD_HERE                                 :{WHITE}Yol buraya yapılamıyor...
@@ -2107,12 +2107,12 @@ STR_ERROR_CAN_T_BUILD_BUS_STATION                               :{WHITE}Otobüs
 STR_ERROR_CAN_T_BUILD_TRUCK_STATION                             :{WHITE}Kamyon durağı yapılamıyor...
 STR_ERROR_CAN_T_BUILD_PASSENGER_TRAM_STATION                    :{WHITE}Yolcu tramvayı istasyonu yapılamaz...
 STR_ERROR_CAN_T_BUILD_CARGO_TRAM_STATION                        :{WHITE}Yük tramvayı istasyonu yapılamaz...
-STR_ROAD_DESCRIPTION_ROAD                                       :Yol
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Lambali yol
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Ağaçli yol
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Araba garı
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Hemzemin geçit
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramvay
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Yol
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Lambali yol
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Ağaçli yol
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Araba garı
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Hemzemin geçit
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramvay
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Otobüs durağı kaldırılamaz...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Kamyon durağı kaldırılamaz...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Yolcu tramvayı istasyonu kaldırılamıyor...
@@ -2120,12 +2120,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Yük tra
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Åžehirler
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Önce bina yıkılmalı
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Åžehir)
@@ -2138,9 +2138,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Ana gör
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Åžehrin ismini deÄŸiÅŸtir
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Geçen ayki yolcular: {ORANGE}{COMMA}{BLACK}  mak: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Geçen ayki posta: {ORANGE}{COMMA}{BLACK}  mak: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Kasaba büyümesi için gerekli kargo:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} gerekli
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :Geçen ay {SETX 20}{ORANGE}{CARGO}{BLACK} taşındı
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Kasaba büyümesi için gerekli kargo:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} gerekli
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :Geçen ay {SETX 20}{ORANGE}{CARGO}{BLACK} taşındı
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Yüksek ofis binasi
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Ofis binasi
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Küçük apartman
@@ -2170,7 +2170,7 @@ STR_SUBSIDIES_NONE                                              :{ORANGE}Yok
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Verilen sübvansiyonlar:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} {STATION} -> {STATION}{YELLOW} ({COMPANY}{YELLOW}, {DATE_SHORT} tarihine kadar)
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}{TOWN} belediyesi bu şehir için başka havalimanına izin vermiyor
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} belediyesi gürültü endişesiyle havalimanına izin vermiyor
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} belediyesi gürültü endişesiyle havalimanına izin vermiyor
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Kulübe
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Evler
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Daireler
@@ -2204,7 +2204,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{WHITE}{STRING}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{WHITE}{STRING}{}{YELLOW} Bir yıllık ayrıcalıklı nakliyat haklarını satın al. Belediye şehirde sadece senin şirketine yolcu ve kargo taşıma izni verir.{} Fiyat: {CURRENCY}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}{}{YELLOW}Yakalanma riskini göze alarak belediyeye rüşvet ver.{} Fiyat: {CURRENCY}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (inÅŸa halinde)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (inÅŸa halinde)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Eskimo Evi
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Çadır
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Çaydanlık ev
@@ -2214,17 +2214,17 @@ STR_TOWN_BUILDING_NAME_PIGGY_BANK_1                             :Kumbara
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Ağaçlar
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...burada zaten ağaç var
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Buraya ağaç dikilemez...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...çok fazla tabela
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Buraya tabela konulamiyor...
-STR_SIGN_DEFAULT                                                :Tabela
+STR_DEFAULT_SIGN_NAME                                           :Tabela
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Tabelayı değiştir
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Tabela adı değiştirilemiyor...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Tabelayı silemezsiniz...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Dikilecek ağaç türünü seçin
-STR_TREE_NAME_TREES                                             :Ağaçlar
-STR_TREE_NAME_RAINFOREST                                        :Yağmur Ormanı
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktüs Bitkileri
+STR_LAI_TREE_NAME_TREES                                         :Ağaçlar
+STR_LAI_TREE_NAME_RAINFOREST                                    :Yağmur Ormanı
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktüs Bitkileri
 
 ##id 0x3000
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_RAILROAD                         :{WHITE}Başka tren istasyonuna çok yakın
@@ -2241,7 +2241,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Önce tr
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Başka bir havalimanına çok yakın
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Önce havalimanı yıkılmalı
 
-STR_QUERY_RENAME_STATION_CAPTION                                :İstasyonu yeniden adlandır
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :İstasyonu yeniden adlandır
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Ä°sim deÄŸiÅŸtirilemiyor...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Reyting
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Ä°stenen
@@ -2259,10 +2259,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Mükemmel
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Talimat listesinde bu durak olan trenleri listele
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Talimat listesinde bu durak olan arabaları listele
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Talimat listesinde bu durak olan uçakları listele
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Talimat listesinde bu durak olan gemileri listele
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Talimat listesinde bu durak olan trenleri listele
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Talimat listesinde bu durak olan arabaları listele
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Talimat listesinde bu durak olan uçakları listele
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Talimat listesinde bu durak olan gemileri listele
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_ERROR_MUST_DEMOLISH_BUS_STATION_FIRST                       :{WHITE}Önce otobüs durağı yıkılmalı
@@ -2283,41 +2283,41 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Ä°stasyo
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}İstenen kargoların listesini göster
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}İstasyon isimleri - gitmek için istasyon ismini tıklayın
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Havalimanı boyutunu seç
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Tren istasyonu
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Hangar
-STR_STATION_DESCRIPTION_AIRPORT                                 :Havalimanı
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Kamyon durağı
-STR_STATION_DESCRIPTION_BUS_STATION                             :Otobüs durağı
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Ä°skele
-STR_STATION_DESCRIPTION_BUOY                                    :Şamandıra
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Tren istasyonu
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Hangar
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Havalimanı
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Kamyon durağı
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Otobüs durağı
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Ä°skele
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Şamandıra
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...yolda şamandıra var
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...istasyon çok yayılmış
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...özel istasyon ayarı kapalı
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Birden fazla şey seçmek için Ctrl'yi basılı tutun
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...özel istasyon ayarı kapalı
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Birden fazla şey seçmek için Ctrl'yi basılı tutun
 
 STR_UNDEFINED                                                   :(tanımlanmamış sözcük)
-STR_STAT_CLASS_DFLT                                             :Varsayılan istasyon
-STR_STAT_CLASS_WAYP                                             :Yerimleri
+STR_STATION_CLASS_DFLT                                          :Varsayılan istasyon
+STR_STATION_CLASS_WAYP                                          :Yerimleri
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...suya yapılmali
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Buraya tersane yapılamaz...
-STR_WATER_DESCRIPTION_WATER                                     :Su
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Sahil veya göl kenarı
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Tersane
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Su kemeri
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Su
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Sahil veya göl kenarı
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Tersane
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Su kemeri
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Suya yapılamaz
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Önce kanal kaldırılmalı
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Önce kanal kaldırılmalı
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Kaydet
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Yükle
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Kaydet
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Sil
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Gözlemci, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Gözlemci, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} bos
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Sürücü okunamıyor
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Oyun kaydedilemedi{}{STRING}
@@ -2333,12 +2333,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}SürücÃ
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Kaydetmek için kullanılacak dosya adı
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Seçili oyunu sil
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Oyunu seçilen isimle kaydet
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Rastgele haritada oyna
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Yükseklik haritası yükle
-STR_SAVE_OSKTITLE                                               :{BLACK}Kayıtlı oyun için bir isim girin
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Rastgele haritada oyna
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Yükseklik haritası yükle
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Kayıtlı oyun için bir isim girin
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}yolda {STRING} var
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}yolda {STRING} var
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Kömür Madeni
 STR_INDUSTRY_NAME_POWER_STATION                                 :Elektrik Santrali
@@ -2404,23 +2404,23 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Ãœretir:
 STR_INDUSTRY_VIEW_PRODUCTION_LAST_MONTH_TITLE                   :{BLACK}Geçen ayki üretim:
 STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}{STRING}{BLACK} (%{COMMA} taşındı)
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Fabrikaya git
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Fiyat: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Fiyat: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Buraya bu fabrikadan yapılamaz...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...Orman sadece kar sınırı üzerinde olabilir
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...sadece haritanin kenarlarına yapılabilir
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Yolda başka bir tünel var
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Tünel haritanın dışında bitiyor
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Tünel haritanın dışında bitiyor
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Tünelin diğer ucunda düzeltme yapılmasi gerekiyor
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Önce tünel yıkılmalı
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Önce köprü yıkılmalı
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Aynı noktada başlayıp bitemez
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Köprü uçları aynı seviyede değil
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Köprü bu arazi için çok alçakta
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Aynı noktada başlayıp bitemez
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Köprü uçları aynı seviyede değil
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Köprü bu arazi için çok alçakta
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Başlangıç ve bitiş aynı çizgi üzerinde olmalı
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Yer tünel girişi için uygun değil
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Çelik, Asma
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Çelik, Kirişli
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Çelik, Ağ
@@ -2431,30 +2431,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Çelik, Tüplü
 STR_BRIDGE_TUBULAR_SILICON                                      :Silikon, Tüplü
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Buraya köprü yapılamaz...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Buraya tünel yapılamaz...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Demiryolu Tüneli
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Karayolu Tüneli
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Çelik asma demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Çelik kirişli demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Çelik ağ demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Destekli beton asma demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Odun demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Beton demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Çelik asma karayolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Çelik kirişli karayolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Çelik ağ karayolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Destekli beton asma karayolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Odun karayolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Beton karayolu köprüsü
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Tüplü demiryolu köprüsü
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Tüplü karayolu köprüsü
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Demiryolu Tüneli
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Karayolu Tüneli
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Çelik asma demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Çelik kirişli demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Çelik ağ demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Destekli beton asma demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Odun demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Beton demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Çelik asma karayolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Çelik kirişli karayolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Çelik ağ karayolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Destekli beton asma karayolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Odun karayolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Beton karayolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Tüplü demiryolu köprüsü
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Tüplü karayolu köprüsü
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Yolda birsey var
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Verici
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fener
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Åžirket binasi
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Verici
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fener
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Åžirket binasi
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...yolda ÅŸirket binasi var
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Satın alınmış alan
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Satın alınmış alan
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Burası satın alınamaz...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...zaten senin!
 
@@ -2502,7 +2502,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} {NUM}.
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Zorluk seviyesi
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Kaydet
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Kaydet
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Kolay
@@ -2574,8 +2574,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Renkler
 STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Renk:
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Åžirket ismi
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Müdür ismi
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Åžirketin ismi
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Yöneticinin ismi
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Åžirketin ismi
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Yöneticinin ismi
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Åžirket ismi deÄŸiÅŸtirilemez...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Yönetici ismi degitirilemez...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Hesaplar {BLACK}{COMPANYNUM}
@@ -2600,7 +2600,7 @@ STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Toplam:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Banka Hesabı
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Kredi
-STR_MAX_LOAN                                                    :{WHITE}Azami Kredi: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Azami Kredi: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Ödünç al {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Öde {SKIP}{SKIP}{CURRENCY}
@@ -2609,7 +2609,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Daha faz
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...ödenecek kredi yok
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...{CURRENCY} gerekli
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Kredi ödenemiyor...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Bankadan ödünç alınan para verilemez...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Bankadan ödünç alınan para verilemez...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Müdür için yeni surat seç
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Araç renklerini değiştir
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Müdürün ismini değiştir
@@ -2619,31 +2619,31 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Krediyi
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Yönetici)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}KuruluÅŸ: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Araçlar:
-STR_TRAINS                                                      :{WHITE}{COMMA} tren
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} araba
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} uçak
-STR_SHIPS                                                       :{WHITE}{COMMA} gemi
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tren
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} araba
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} uçak
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} gemi
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Yok
 STR_PRESIDENT_NAME_MANAGER                                      :{BLACK}{PRESIDENTNAME}{}(Yönetici)
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Şirketimizi satın alacak birilerini arıyoruz.{}{} {COMPANY} şirketini şu fiyata almak ister misiniz: {CURRENCY}?
 STR_ERROR_CAN_T_BUY_COMPANY                                     :{WHITE}Şirket satın alınamaz...
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Bina Yap
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Åžirket binasi yap / ÅŸirket binasina bak
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Şirket değerinin %1'i karşılığında binanın yerini değiştir
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Şirket değerinin %1'i karşılığında binanın yerini değiştir
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Şirket binasi yapılamaz...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Binaya Bak
-STR_RELOCATE_HQ                                                 :{BLACK}Binayı Taşı
-STR_COMPANY_JOIN                                                :{BLACK}Katıl
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Katıl ve bu şirket olarak oyna
-STR_COMPANY_PASSWORD                                            :{BLACK}Parola
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Başkalarınin girmemesi için parola koy.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Şirket parolası
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Binayı Taşı
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Katıl
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Katıl ve bu şirket olarak oyna
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Parola
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Başkalarınin girmemesi için parola koy.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Şirket parolası
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Girilen parolayı kaydetme
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Yeni parolayı şirkete ver
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Şirket parolası
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Öntanımlı şirket parolası
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Bu şirketin parolasını yeni şirketlerde öntanımlı olarak kullan
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Pencere boyutunu büyült/küçült
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Öntanımlı şirket parolası
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Bu şirketin parolasını yeni şirketlerde öntanımlı olarak kullan
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Pencere boyutunu büyült/küçült
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Åžirket deÄŸeri: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}%25'ini satın al
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}%25'ini geri ver
@@ -2652,7 +2652,7 @@ STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Åžirketi
 STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Şirketin %25'i alınamıyor...
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Şirketin %25'i satılamıyor...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}(%{COMMA} ortağı {COMPANY})
-STR_PROTECTED                                                   :{WHITE}Bu ÅŸirket hisselerini satacak kadar eski deÄŸil...
+STR_ERROR_PROTECTED                                             :{WHITE}Bu ÅŸirket hisselerini satacak kadar eski deÄŸil...
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Buhar)
@@ -2959,9 +2959,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(BoÅŸaltma ve h
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Seçili emrin durma davranışını değiştir
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Seçili emrin doldurma davranışını değiştir
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Seçili emrin boşaltma davranışını değiştir
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}GeliÅŸmiÅŸ talimat ekle
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}GeliÅŸmiÅŸ talimat ekle
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :En yakın gara git
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :En yakın hangara git
 STR_ORDER_NEAREST_DEPOT                                         :en yakın
@@ -2971,9 +2971,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Durmaksızın b
 STR_ORDER_TRAIN_DEPOT                                           :Tren Garı
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Araba Garajı
 STR_ORDER_SHIP_DEPOT                                            :Tershane
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Hangar
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Hangar
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Her zaman git
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Gerekiyorsa bakıma gir
@@ -2998,10 +2998,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :büyüktür
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :büyük eşit
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :doÄŸrudur
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :yanlıştır
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Emre sıçra {COMMA}
-STR_CONDITIONAL_NUM                                             :{COMMA} no'lu emre {STRING} {STRING} {COMMA} sağlandığında sıçra
-STR_CONDITIONAL_TRUE_FALSE                                      :{COMMA} nolu emre {STRING} {STRING} sağlandığında sıçra
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Emre sıçra {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :{COMMA} no'lu emre {STRING} {STRING} {COMMA} sağlandığında sıçra
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :{COMMA} nolu emre {STRING} {STRING} sağlandığında sıçra
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Sefer yok
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Gezi (zamanlı değil)
@@ -3024,18 +3024,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Sadece g
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Atla
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Sil
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Git
-STR_REFIT                                                       :{BLACK}Modifiye
-STR_REFIT_TIP                                                   :{BLACK}Bu talimatta değiştirilecek kargo türünü seçin. Değiştirmeyi kaldırmak için Ctrl ile tıklayın
-STR_REFIT_ORDER                                                 :(Moifiye ile > {STRING})
-STR_REFIT_STOP_ORDER                                            :(Kargo tipini {STRING} yap ve dur)
-STR_STOP_ORDER                                                  :(Dur)
-STR_TIMETABLE_VIEW                                              :{BLACK}Zaman çizelgesi
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Zaman tablosu görünümüne geç
-STR_ORDER_VIEW                                                  :{BLACK}Talimatlar
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Emir görünümüne geç
+STR_ORDER_REFIT                                                 :{BLACK}Modifiye
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Bu talimatta değiştirilecek kargo türünü seçin. Değiştirmeyi kaldırmak için Ctrl ile tıklayın
+STR_ORDER_REFIT_ORDER                                           :(Moifiye ile > {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Kargo tipini {STRING} yap ve dur)
+STR_ORDER_STOP_ORDER                                            :(Dur)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Zaman çizelgesi
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Zaman tablosu görünümüne geç
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Talimatlar
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Emir görünümüne geç
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Talimatlar)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Talimatların Sonu - -
-STR_SERVICE                                                     :{BLACK}Bakım
+STR_ORDER_SERVICE                                               :{BLACK}Bakım
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Tarih: {LTBLUE}{NUM}{BLACK} DeÄŸeri: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   DeÄŸeri: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -3055,7 +3055,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}araç bu
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}bu emri paylaşan bir araç bu istasyona gidemiyor
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Araç hareket edemiyor...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Arkadaki lokomotif daima önündekini takip edecek
-STR_CARGO_N_A                                                   :yok{SKIP}
+STR_QUANTITY_N_A                                                :yok{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Yakındaki bir gara gidecek yol yok
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Bakım zamanı: {LTBLUE}{COMMA}günde bir{BLACK}   Son bakım: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Bakım zamanı: {LTBLUE}%{COMMA}{BLACK}   Son bakım: {LTBLUE}{DATE_LONG}
@@ -3075,10 +3075,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Zaman ç
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Seçili talimatın harcaması gereken süreyi değiştir
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Seçili talimatın harcaması gereken süreyi sil
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Geç kalma sayacını sıfırla, böylece araç zamanında gitmiş sayılacak
-STR_SERVICE_HINT                                                :{BLACK}Bakım gerekmiyorsa bunu atla
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Fiyat: {CURRENCY} Ağırlık: {WEIGHT_S}{}Hız: {VELOCITY}  Güç: {POWER}{}Bakım: {CURRENCY}/sene{}Kapasite: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Maliyet: {CURRENCY} Azami Hız: {VELOCITY}{}Kapasite: {CARGO}, {CARGO}{}İşletme Gideri: {CURRENCY}/yıl
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Maliyet: {CURRENCY} Azami Hız: {VELOCITY}{}Kapasite: {CARGO}{}İşletme Gideri: {CURRENCY}/yıl
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Bakım gerekmiyorsa bunu atla
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Fiyat: {CURRENCY} Ağırlık: {WEIGHT_S}{}Hız: {VELOCITY}  Güç: {POWER}{}Bakım: {CURRENCY}/sene{}Kapasite: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Maliyet: {CURRENCY} Azami Hız: {VELOCITY}{}Kapasite: {CARGO}, {CARGO}{}İşletme Gideri: {CURRENCY}/yıl
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Maliyet: {CURRENCY} Azami Hız: {VELOCITY}{}Kapasite: {CARGO}{}İşletme Gideri: {CURRENCY}/yıl
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}YaÅŸ: {LTBLUE}{STRING}{BLACK}   Ä°ÅŸletme Gideri: {LTBLUE}{CURRENCY}/yr
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Azami Hız: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Ağırlık: {LTBLUE}{WEIGHT_S} {BLACK}Güç: {LTBLUE}{POWER}{BLACK} Azami Hız: {LTBLUE}{VELOCITY}
@@ -3097,24 +3097,24 @@ STR_VEHICLE_STATUS_CRASHED                                      :{RED}Çarptı!
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Tren çevrilemez...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}Aracın yönü çevrilemiyor...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Birden fazla birimden oluşan araçlar çevrilemez
-STR_CLEAR_TIME                                                  :{BLACK}Zamanı Temizle
-STR_RESET_LATENESS                                              :{BLACK}Gecikme sayacını sıfırla
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Yolimi adını değiştir
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Şamandıra adını değiştir
-
-STR_TRAIN_STOPPING                                              :{RED}Frenliyor
-STR_TRAIN_STOPPING_VEL                                          :{RED}Frenliyor, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Uyumsuz ray türleri
-STR_TRAIN_NO_POWER                                              :{RED}Elektrik yok
-STR_TRAIN_START_NO_CATENARY                                     :Bu rayda elektrik olmadiği için bu tren çalışamaz
-STR_TRAIN_STUCK                                                 :{ORANGE}BoÅŸ yol bekleniyor
-
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Hurda araçlar satılamaz...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Yok olmuş araç modifiye edilemez...
-
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Aracın zaman çizelgesi oluşturulamıyor...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Araçlar sadece istasyonlarda bekleyebilir.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Araç bu istasyonda durmuyor.
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Zamanı Temizle
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Gecikme sayacını sıfırla
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Yolimi adını değiştir
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Şamandıra adını değiştir
+
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Frenliyor
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Frenliyor, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Uyumsuz ray türleri
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Elektrik yok
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Bu rayda elektrik olmadiği için bu tren çalışamaz
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}BoÅŸ yol bekleniyor
+
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Hurda araçlar satılamaz...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Yok olmuş araç modifiye edilemez...
+
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Aracın zaman çizelgesi oluşturulamıyor...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Araçlar sadece istasyonlarda bekleyebilir.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Araç bu istasyonda durmuyor.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Zamanı değiştir
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Bu araç zamanında çalışıyor
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Bu araç {STRING} geç çalışıyor
@@ -3128,7 +3128,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Zaman ta
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...bir araba garajında duruyor olmalı
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Yerel garaj bulunamadı
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Aracı etrafta dolaşmaya zorla
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Kapasite: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapasite: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} araç{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -3141,39 +3141,39 @@ STR_ERROR_CAN_T_BUILD_DOCK_HERE                                 :{WHITE}Buraya i
 STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT                         :{WHITE}Gemi tersanede durdurulmalı
 
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Şamandıra yerlestirilemez...
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Buraya su kemeri yapılamaz...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Buraya su kemeri yapılamaz...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Modifiye)
 STR_REFIT_TITLE                                                 :{GOLD}Tasinacak kargo türünü seçin:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Yeni kapasite: {GOLD}{CARGO}{}{BLACK}Modifiye fiyatı: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(modifiyeli)
+STR_PURCHASE_INFO_REFITTABLE                                    :(modifiyeli)
 
 ##id 0xA000
 STR_ERROR_CAN_T_BUILD_AIRPORT_HERE                              :{WHITE}Buraya havalimanı yapılamaz...
 STR_ERROR_AIRCRAFT_IS_IN_FLIGHT                                 :{WHITE}Şu an uçusta
 STR_ERROR_AIRCRAFT_MUST_BE_STOPPED                              :{WHITE}Uçak hangarda durdurulmalı
 
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Zaman çizelgesi)
 
 ##id 0xB000
-STR_BRIBE_FAILED                                                :{WHITE}Rüsvet teşebbüsünüzü
-STR_BRIBE_FAILED_2                                              :{WHITE}Reha Muhtar açığa çıkardı
-STR_BUILD_DATE                                                  :{BLACK}Yapım: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Rüsvet teşebbüsünüzü
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}Reha Muhtar açığa çıkardı
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Yapım: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}İstasyon sınıfı: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}İstasyon türü: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}İstasyon sınıfı: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}İstasyon türü: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}NewGRF ayarları
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Uygula
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Palet deÄŸiÅŸtir
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Seçili NewGRF'nin paletini değiştir.{}Bu işlemi bu NewGRF'nin grafikleri oyun içerisinde pembe görünüyorsa yapın.
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Parametreler
-STR_NEWGRF_FILENAME                                             :{BLACK}Dosya adı: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palet: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Uygula
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Palet deÄŸiÅŸtir
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Seçili NewGRF'nin paletini değiştir.{}Bu işlemi bu NewGRF'nin grafikleri oyun içerisinde pembe görünüyorsa yapın.
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Parametreler
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Dosya adı: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palet: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Çalışan bir oyunu değiştirmek üzeresiniz; bu OpenTTD'yi çökertebilir.{}Emin misiniz?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3196,34 +3196,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Geçersiz ID ku
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} bozuk bir sprayt içeriyor. Tüm bozuk spraytlar kırmızı bir soru işareti (?) olarak görünecektir.
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Birden fazla Action 8 girişi içeriyor.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Seçili seçkiyi yükle
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Seçkiyi kaydet
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Şimdiki listeyi seçki olarak kaydet
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Seçki için isim girin
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Seçkiyi sil
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Seçili olan seçkiyi sil
-STR_NEWGRF_ADD                                                  :{BLACK}Ekle
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Listeye NewGRF dosyası ekle
-STR_NEWGRF_REMOVE                                               :{BLACK}Kaldır
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Seçili NewGRF dosyasını listeden kaldır
-STR_NEWGRF_MOVEUP                                               :{BLACK}Yukarı Taşı
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Seçili NewGRF dosyasını listenin yukarısına taşı
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Aşağı Taşı
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Seçili NewGRF dosyasını listenin aşağısına taşı
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Yüklü NewGRF dosyalarının listesidir. Seçeneklerini değiştirmek için bir dosyayı tıklayın
-STR_NEWGRF_PARAMETER                                            :{BLACK}Seçenekler: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}NewGRF seçeneklerini girin
-STR_NEWGRF_NO_INFO                                              :{BLACK}Hiç bilgi yok
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Seçili seçkiyi yükle
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Seçkiyi kaydet
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Şimdiki listeyi seçki olarak kaydet
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Seçki için isim girin
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Seçkiyi sil
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Seçili olan seçkiyi sil
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Ekle
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Listeye NewGRF dosyası ekle
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Kaldır
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Seçili NewGRF dosyasını listeden kaldır
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Yukarı Taşı
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Seçili NewGRF dosyasını listenin yukarısına taşı
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Aşağı Taşı
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Seçili NewGRF dosyasını listenin aşağısına taşı
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Yüklü NewGRF dosyalarının listesidir. Seçeneklerini değiştirmek için bir dosyayı tıklayın
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Seçenekler: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}NewGRF seçeneklerini girin
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Hiç bilgi yok
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Mümkün olan NewGRF dosyaları
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Seçime ekle
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}seçili NewGRF'i ayarlarıma ekle
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Dosyaları tekrar tara
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Mümkün olan NewGRF dosyalarının listesini güncelle
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}seçili NewGRF'i ayarlarıma ekle
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Dosyaları tekrar tara
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Mümkün olan NewGRF dosyalarının listesini güncelle
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Dosya eklenemiyor: GRF ID çakışması
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Eşleşen dosya bulunamadı
-STR_NEWGRF_DISABLED                                             :{RED}Etkisiz
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Eşleşen dosya bulunamadı
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Etkisiz
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Eşleşen dosya bulunamadı (uyumlu GRF yüklendi)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Eksik dosyalar için uyumlu GRF(ler) yüklendi
@@ -3239,7 +3239,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}'{1:ENGINE}' için kargo tür değişim bilgisi yapımdan sonraki alım listesinden farklı. Bu otomatik yenileme-değiştirmenin kargo türünü doğru şekilde değiştirmesine engel olabilir.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' üretim yordamında sonsuz döngüye neden oldu.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Oyun tramvay desteği olmayan bir sürümde kaydedilmiş. Tüm tramvaylar kaldırılmıştır.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Oyun tramvay desteği olmayan bir sürümde kaydedilmiş. Tüm tramvaylar kaldırılmıştır.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Özel Para Birimi
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Çarpan: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -3250,16 +3250,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Euro'ya
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Euro'ya geç: {ORANGE}hiçbir zaman
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Önizleme: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Özel para birimini değiştir
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Bir Sterlin'e (£) karşılık gelen para biriminizi azaltın
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Bir Sterlin'e (£) karşılık gelen para biriminizi arttırın
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Bir Sterlin'e (£) karşılık gelen para biriminizi belirleyin
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Para biriminiz için ondalık ayıracı belirleyin
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Para biriminiz için ön ek belirleyin
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Para biriminiz için son ek belirleyin
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Avro'ya daha erken geç
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Avro'ya daha sonra geç
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Avro'ya geçiş yılını seçin
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Sterlin'in (£) para biriminizdeki karşılığı
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Bir Sterlin'e (£) karşılık gelen para biriminizi azaltın
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Bir Sterlin'e (£) karşılık gelen para biriminizi arttırın
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Bir Sterlin'e (£) karşılık gelen para biriminizi belirleyin
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Para biriminiz için ondalık ayıracı belirleyin
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Para biriminiz için ön ek belirleyin
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Para biriminiz için son ek belirleyin
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Avro'ya daha erken geç
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Avro'ya daha sonra geç
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Avro'ya geçiş yılını seçin
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Sterlin'in (£) para biriminizdeki karşılığı
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3278,8 +3278,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Gemi
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Uçak
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}{COMMA} Aracın paylaşılan talimatları
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Aynı talimatlara sahip bütün araçları göster
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}{COMMA} Aracın paylaşılan talimatları
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Aynı talimatlara sahip bütün araçları göster
 
 STR_REFIT_TRAIN_REFIT_BUTTON                                    :{BLACK}Modifiye
 STR_REFIT_ROAD_VEHICLE_REFIT_BUTTON                             :{BLACK}Kamyonu modifiye et
@@ -3381,39 +3381,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Kamyonu
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Başka bir yük taşımasi için modifiye et
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Başka bir yük taşımak için modifiye et
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}{TOWN} Tren Garına gidiyor
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}{TOWN} Tren Garına gidiyor, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}{TOWN} Garajina gidiyor
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}{TOWN} Garajina gidiyor, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Gidiyor: {TOWN} Tersanesi
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Gidiyor: {TOWN} Tersanesi, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}{STATION} Hangarına gidiyor
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}{STATION} Hangarına gidiyor, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}{TOWN} Garında Bakım
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}{TOWN} Garında Bakım, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}{TOWN} Garajinda Bakıma Gir
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}{TOWN} Garajinda Bakım, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}{TOWN} Tersanesinde Bakım
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}{TOWN} Tersanesinde Bakım, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}{STATION} Hangarında Bakım
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}{STATION} Hangarında Bakım, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Treni kopyala
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Arabayı kopyala
-STR_CLONE_SHIP                                                  :{BLACK}Gemiyi kopyala
-STR_CLONE_AIRCRAFT                                              :{BLACK}Uçağı kopyala
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Tüm vagonlarla birlikte treni kopyalar. Ctrl-tıklama talimatları paylaştırır
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Arabanın bir kopyasını yapar. Ctrl-tıklama talimatları paylaştırır
-STR_CLONE_SHIP_INFO                                             :{BLACK}Geminin bir kopyasını oluşturur. Ctrl-tıklama talimatları paylaştırır
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Uçağın bir kopyasını oluşturur. Ctrl-tıklama talimatları paylaştırır
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Tüm vagonlarla birlikte treni kopyalar. Önce bu düğmeye sonra da garın içindeki veya dışındaki bir araca tıklayın. Ctrl-tıklama talimatları paylaştırır
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Arabanın bir kopyasını yapar. Önce bu düğmeye sonra da garın içindeki veya dışındaki bir araca tıklayın. Ctrl-tıklama talimatları paylaştırır
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Geminin bir kopyasını oluşturur. Önce bu düğmeye sonra da tersanenin içindeki veya dışındaki bir gemiye tıklayın. Ctrl-tıklama talimatları paylaştırır
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Uçağın bir kopyasını oluşturur. Önce bu düğmeye sonra da hangarın içindeki veya dışındaki bir uçaga tıklayın. Ctrl-tıklama talimatları paylaştırır
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}{TOWN} Tren Garına gidiyor
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}{TOWN} Tren Garına gidiyor, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}{TOWN} Garajina gidiyor
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}{TOWN} Garajina gidiyor, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Gidiyor: {TOWN} Tersanesi
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Gidiyor: {TOWN} Tersanesi, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}{STATION} Hangarına gidiyor
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}{STATION} Hangarına gidiyor, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}{TOWN} Garında Bakım
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}{TOWN} Garında Bakım, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}{TOWN} Garajinda Bakıma Gir
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}{TOWN} Garajinda Bakım, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}{TOWN} Tersanesinde Bakım
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}{TOWN} Tersanesinde Bakım, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}{STATION} Hangarında Bakım
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}{STATION} Hangarında Bakım, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Treni kopyala
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Arabayı kopyala
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Gemiyi kopyala
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Uçağı kopyala
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Tüm vagonlarla birlikte treni kopyalar. Ctrl-tıklama talimatları paylaştırır
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Arabanın bir kopyasını yapar. Ctrl-tıklama talimatları paylaştırır
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Geminin bir kopyasını oluşturur. Ctrl-tıklama talimatları paylaştırır
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Uçağın bir kopyasını oluşturur. Ctrl-tıklama talimatları paylaştırır
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Tüm vagonlarla birlikte treni kopyalar. Önce bu düğmeye sonra da garın içindeki veya dışındaki bir araca tıklayın. Ctrl-tıklama talimatları paylaştırır
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Arabanın bir kopyasını yapar. Önce bu düğmeye sonra da garın içindeki veya dışındaki bir araca tıklayın. Ctrl-tıklama talimatları paylaştırır
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Geminin bir kopyasını oluşturur. Önce bu düğmeye sonra da tersanenin içindeki veya dışındaki bir gemiye tıklayın. Ctrl-tıklama talimatları paylaştırır
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Uçağın bir kopyasını oluşturur. Önce bu düğmeye sonra da hangarın içindeki veya dışındaki bir uçaga tıklayın. Ctrl-tıklama talimatları paylaştırır
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Yeni Tren
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Yeni Elektrikli Trenler
@@ -3483,38 +3483,38 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Hangarı
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Garajdaki bütün araçları satmak üzeresiniz. Emin misiniz?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :Yanlış gar türü
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :Yanlış gar türü
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Gardaki tüm trenleri sat
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Garajdaki tüm arabaları sat
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Tersanedeki tüm gemileri sat
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Hangardaki tüm hava araçlarıni sat
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Gardaki tüm trenleri sat
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Garajdaki tüm arabaları sat
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Tersanedeki tüm gemileri sat
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Hangardaki tüm hava araçlarıni sat
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Bu garı talimat listesinde içeren trenleri listele
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Bu garajı talimat listesinde içeren arabaları listele
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Bu tersaneyi talimat listesinde içeren gemileri listele
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Bu havalimanındaki hangarlardan birini talimat listesinde içeren uçakları listele
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Bu garı talimat listesinde içeren trenleri listele
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Bu garajı talimat listesinde içeren arabaları listele
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Bu tersaneyi talimat listesinde içeren gemileri listele
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Bu havalimanındaki hangarlardan birini talimat listesinde içeren uçakları listele
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Gardaki tüm trenleri otomatik yenile
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Garajdaki tüm arabaları otomatik yenile
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Tersanedeki tüm gemileri otomatik yenile
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Hangardaki tüm uçakları otomatik yenile
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Gardaki tüm trenleri otomatik yenile
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Garajdaki tüm arabaları otomatik yenile
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Tersanedeki tüm gemileri otomatik yenile
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Hangardaki tüm uçakları otomatik yenile
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Kullanılabilir Trenler
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Kullanılabilir Arabalar
-STR_AVAILABLE_SHIPS                                             :{BLACK}Kullanılabilir Gemiler
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Kullanılabilir Uçaklar
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Kullanılabilir Trenler
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Kullanılabilir Arabalar
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Kullanılabilir Gemiler
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Kullanılabilir Uçaklar
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Gara Gönder
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Garaja Gönder
-STR_SEND_SHIP_TO_DEPOT                                          :Tersaneye Gönder
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Hangara Gönder
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Gara Gönder
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Garaja Gönder
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Tersaneye Gönder
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Hangara Gönder
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}{STRING} DeÄŸiÅŸtir
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Araçları Değiştirmeye Başla
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Araçları değiştirmeyi durdur
-STR_NOT_REPLACING                                               :{BLACK}DeÄŸiÅŸtirilmiyor
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Hiç Araç Seçilmedi
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}DeÄŸiÅŸtirilmiyor
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Hiç Araç Seçilmedi
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Değiştirilecek türü seçin
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Değiştirilecek türün yerine geçecek türü seçin
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Değiştirme işlemini durdurmak için basın
@@ -3526,40 +3526,40 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Otomatik
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}DeÄŸiÅŸtiriyor: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Lokomotif ve vagon değişimi pencereleri arasında geçiş yap.
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Tren kullanılamaz
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Araba kullanılamaz
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Gemi kullanılamaz
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Uçak kullanılamaz
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Tren kullanılamaz
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Araba kullanılamaz
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Gemi kullanılamaz
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Uçak kullanılamaz
 
-STR_ENGINES                                                     :Lokomotifler
-STR_WAGONS                                                      :Vagon
+STR_REPLACE_ENGINES                                             :Lokomotifler
+STR_REPLACE_WAGONS                                              :Vagon
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Gardaki tüm trenleri durdurmak için tıkla
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Garajdaki tüm arabaları durdurmak için tıkla
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Tersanedeki tüm gemileri durdurmak için tıkla
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Hangardaki tüm uçakları durdurmak için tıkla
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Gardaki tüm trenleri durdurmak için tıkla
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Garajdaki tüm arabaları durdurmak için tıkla
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Tersanedeki tüm gemileri durdurmak için tıkla
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Hangardaki tüm uçakları durdurmak için tıkla
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Gardaki tüm trenleri başlatmak için tıkla
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Garajdaki tüm arabaları başlatmak için tıkla
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Tersanedeki tüm gemileri başlatmak için tıkla
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Hangardaki tüm uçakları başlatmak için tıkla
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Gardaki tüm trenleri başlatmak için tıkla
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Garajdaki tüm arabaları başlatmak için tıkla
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Tersanedeki tüm gemileri başlatmak için tıkla
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Hangardaki tüm uçakları başlatmak için tıkla
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Listedeki tüm araçları durdurmak için bas
-STR_MASS_START_LIST_TIP                                         :{BLACK}Listedeki tüm araçları başlatmak için bas
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Listedeki tüm araçları durdurmak için bas
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Listedeki tüm araçları başlatmak için bas
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Tabela Listesi - {COMMA} Tabela
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Demiryolu Araçları
-STR_ELRAIL_VEHICLES                                             :Elektrikli Trenler
-STR_MONORAIL_VEHICLES                                           :Monoray Araçları
-STR_MAGLEV_VEHICLES                                             :Maglev Araçları
+STR_REPLACE_RAIL_VEHICLES                                       :Demiryolu Araçları
+STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrikli Trenler
+STR_REPLACE_MONORAIL_VEHICLES                                   :Monoray Araçları
+STR_REPLACE_MAGLEV_VEHICLES                                     :Maglev Araçları
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Fiyat: {GOLD}{CURRENCY}{BLACK} Ağırlık: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Hız: {GOLD}{VELOCITY}{BLACK} Güç: {GOLD}{POWER}
@@ -3586,67 +3586,67 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}OluÅŸtur
-STR_RANDOM                                                      :{BLACK}Rastgele
-STR_RANDOM_HELP                                                 :{BLACK}Harita yapımı için kullanilan rastgele sayıyi değiştir
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Harita üretimi
-STR_RANDOM_SEED                                                 :{BLACK}Rastgele Sayı:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Rastgele bir sayı girmek için tıklayın
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Rastgele bir tohum girin
-STR_LAND_GENERATOR                                              :{BLACK}Harita üretici:
-STR_TREE_PLACER                                                 :{BLACK}Ağaç algoritmasi:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Yükseklik haritası döndür:
-STR_TERRAIN_TYPE                                                :{BLACK}Arazi türü:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Deniz seviyesi:
-STR_SMOOTHNESS                                                  :{BLACK}Düzlük seviyesi:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Kar yüksekliği:
-STR_DATE                                                        :{BLACK}Tarih:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Şehir sayısı:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Fabrika sayısı:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Kar yüksekliğini bir arttır
-STR_SNOW_LINE_DOWN                                              :{BLACK}Kar yüksekliğini bir azalt
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Kar yüksekliğini değiştir
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Başlangıç yılını değiştir
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Ölcek uyarısı
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Kaynak haritanin boyutunu değiştirmek önerilmez. Harita oluşturmaya devam edilsin mi?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Yükseklik haritası adı:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Boyut: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}OluÅŸtur
+STR_MAPGEN_RANDOM                                               :{BLACK}Rastgele
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Harita yapımı için kullanilan rastgele sayıyi değiştir
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Harita üretimi
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Rastgele Sayı:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Rastgele bir sayı girmek için tıklayın
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Rastgele bir tohum girin
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Harita üretici:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Ağaç algoritmasi:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Yükseklik haritası döndür:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Arazi türü:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Deniz seviyesi:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Düzlük seviyesi:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Kar yüksekliği:
+STR_MAPGEN_DATE                                                 :{BLACK}Tarih:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Şehir sayısı:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Fabrika sayısı:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Kar yüksekliğini bir arttır
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Kar yüksekliğini bir azalt
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Kar yüksekliğini değiştir
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Başlangıç yılını değiştir
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Ölcek uyarısı
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Kaynak haritanin boyutunu değiştirmek önerilmez. Harita oluşturmaya devam edilsin mi?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Yükseklik haritası adı:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Boyut: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Harita oluÅŸturuluyor...
 STR_GENERATION_ABORT                                            :{BLACK}Ä°ptal
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Harita Yapmayı iptal Et
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Oluşturmayı iptal etmek istediğinizden emin misiniz?
-STR_PROGRESS                                                    :{WHITE}%{NUM} tamamlandı
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Harita üretimi
-STR_TREE_GENERATION                                             :{BLACK}Ağaç üretimi
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Tasinmaz üretimi
-STR_CLEARING_TILES                                              :{BLACK}Engebeli ve kayalik alan oluÅŸtur
-STR_SETTINGUP_GAME                                              :{BLACK}Oyun ayarlanıyor
-STR_PREPARING_TILELOOP                                          :{BLACK}tile-loop çalıştırılıyor
-STR_PREPARING_GAME                                              :{BLACK}Oyun hazırlanıyor
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Bu işlem zorluk seviyesini özel'e getirdi
-STR_SE_FLAT_WORLD                                               :{WHITE}Düzlük alan
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Düzlük alan oluştur
-STR_SE_RANDOM_LAND                                              :{WHITE}Rastgele alan
-STR_SE_NEW_WORLD                                                :{BLACK}Yeni senaryo oluÅŸtur
-STR_SE_CAPTION                                                  :{WHITE}Senaryo türü
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Düzlüğü bir alçalt
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Düzlüğün yüksekliğini bir arttır
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Düzlüğün yüksekliğini değiştir
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Düzlüğün Yüksekliği:
+STR_GENERATION_PROGRESS                                         :{WHITE}%{NUM} tamamlandı
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Harita üretimi
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Ağaç üretimi
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Tasinmaz üretimi
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Engebeli ve kayalik alan oluÅŸtur
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Oyun ayarlanıyor
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}tile-loop çalıştırılıyor
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Oyun hazırlanıyor
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Bu işlem zorluk seviyesini özel'e getirdi
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Düzlük alan
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Düzlük alan oluştur
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Rastgele alan
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Yeni senaryo oluÅŸtur
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Senaryo türü
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Düzlüğü bir alçalt
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Düzlüğün yüksekliğini bir arttır
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Düzlüğün yüksekliğini değiştir
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Düzlüğün Yüksekliği:
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Harita kenarları:
-STR_NORTHWEST                                                   :{BLACK}Kuzeybatı
-STR_NORTHEAST                                                   :{BLACK}KuzeydoÄŸu
-STR_SOUTHEAST                                                   :{BLACK}Güneydoğu
-STR_SOUTHWEST                                                   :{BLACK}Güneybatı
-STR_BORDER_FREEFORM                                             :{BLACK}Serbest
-STR_BORDER_WATER                                                :{BLACK}Su
-STR_BORDER_RANDOM                                               :{BLACK}Rastgele
-STR_BORDER_RANDOMIZE                                            :{BLACK}Rastgele
-STR_BORDER_MANUAL                                               :{BLACK}El ile
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Harita kenarları:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Kuzeybatı
+STR_MAPGEN_NORTHEAST                                            :{BLACK}KuzeydoÄŸu
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}Güneydoğu
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}Güneybatı
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Serbest
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Su
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Rastgele
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Rastgele
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}El ile
 
 ############ Tooltip measurment
 
@@ -3655,9 +3655,9 @@ STR_MEASURE_AREA                                                :{BLACK}Alan: {N
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Uzunluk: {NUM}{}Yükseklik farkı: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Alan: {NUM} x {NUM}{}Yükseklik farkı: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Aktarma Maliyeti: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...bu yol belediyeye ait
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...yol yanlış yönde
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Aktarma Maliyeti: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...bu yol belediyeye ait
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...yol yanlış yönde
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}%{NUM}{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}%{NUM}{UPARROW}
@@ -3667,7 +3667,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}%{NUM}{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Bütün trenler
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Bütün arabalar
 STR_GROUP_ALL_SHIPS                                             :Bütün Gemiler
@@ -3676,24 +3676,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Gruplanmamış
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Gruplanmamış arabalar
 STR_GROUP_DEFAULT_SHIPS                                         :Gruplanmamış gemiler
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Gruplanmamış uçaklar
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Bütün paylaşılan araçlar
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Bütün araçları çıkar
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Grubun ismini deÄŸiÅŸtir
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Grup oluşturulamıyor...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Bu grup silinemiyor...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Grubun ismi deÄŸiÅŸtirilemiyor...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Bu gruptaki bütün araçlar çıkartılamıyor...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Araç bu gruba eklenemiyor...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Paylaşılan araçlar bu gruba eklenemiyor...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Grup oluşturulamıyor...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Bu grup silinemiyor...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Grubun ismi deÄŸiÅŸtirilemiyor...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Bu gruptaki bütün araçlar çıkartılamıyor...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Araç bu gruba eklenemiyor...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Paylaşılan araçlar bu gruba eklenemiyor...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Gruplar - gruba ait araçları listelemek için grubun üzerine tıklayın
-STR_GROUP_CREATE_TIP                                            :{BLACK}Grup oluşturmak için tıklayın
-STR_GROUP_DELETE_TIP                                            :{BLACK}Seçili grubu sil
-STR_GROUP_RENAME_TIP                                            :{BLACK}Seçili grubun ismini değiştir
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Bu grubu otomatik yenilemeden ayrı tutmak için tıklayın
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Gruplar - gruba ait araçları listelemek için grubun üzerine tıklayın
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Grup oluşturmak için tıklayın
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Seçili grubu sil
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Seçili grubun ismini değiştir
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Bu grubu otomatik yenilemeden ayrı tutmak için tıklayın
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3710,7 +3710,7 @@ STR_WAYPOINT_NAME                                               :{WAYPOINT}
 STR_JUST_CARGO                                                  :{CARGO}
 STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_JUST_CURRENCY                                               :{CURRENCY}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
@@ -3755,19 +3755,19 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}İsim daha önce kullanılmamış olmalı
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}İsim daha önce kullanılmamış olmalı
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Sonraki tabelaya git
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Önceki tabelaya git
-STR_SIGN_OSKTITLE                                               :{BLACK}Tabela için bir isim girin
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Sonraki tabelaya git
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Önceki tabelaya git
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Tabela için bir isim girin
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Parayla Yap
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Tetkik arama
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Ä°nÅŸa et
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Bu listeden uygun fabrikayı seçin
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Parayla Yap
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Tetkik arama
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Ä°nÅŸa et
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Bu listeden uygun fabrikayı seçin
 
 ############ on screen keyboard
 STR_OSK_KEYBOARD_LAYOUT                                         :"1234567890*-\qwertyuıopğüasdfghjklşi,'  zxcvbnmöç. .
@@ -3776,37 +3776,37 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :"!'^+%&/()=?_|Q
 
 ############ AI GUI
 STR_AI_DEBUG                                                    :{WHITE}YZ Hata Ayıklama
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}YZ adı
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}YZ adı
 STR_AI_DEBUG_RELOAD                                             :{BLACK}YZ'yı baştan yükle
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}YZ'yı öldür, kodu tekrar yükle ve YZ'yı tekrar başlat
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}YZ Hata Ayıklama penceresi sadece sunucu içindir
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}YZ'yı öldür, kodu tekrar yükle ve YZ'yı tekrar başlat
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}YZ Hata Ayıklama penceresi sadece sunucu içindir
 STR_AI_CONFIG_CAPTION                                           :{WHITE}YZ Yapılandırması
-STR_AI_CHANGE                                                   :{BLACK}YZ Seç
-STR_AI_CONFIGURE                                                :{BLACK}Yapılandır
-STR_AI_CHANGE_TIP                                               :{BLACK}Başka bir YZ yükle
-STR_AI_CONFIGURE_TIP                                            :{BLACK}YZ parametrelerini yapılandır
-STR_AI_LIST_TIP                                                 :{BLACK}Sonraki oyunda yüklenecek tüm YZ'ler
+STR_AI_CONFIG_CHANGE                                            :{BLACK}YZ Seç
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Yapılandır
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Başka bir YZ yükle
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}YZ parametrelerini yapılandır
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Sonraki oyunda yüklenecek tüm YZ'ler
 STR_AI_LIST_CAPTION                                             :{WHITE}Mevcut YZ'ler
-STR_AI_AILIST_TIP                                               :{BLACK}YZ seçmek için bir tuşa basın
-STR_AI_ACCEPT                                                   :{BLACK}Kabul et
-STR_AI_ACCEPT_TIP                                               :{BLACK}Vurgulanan YZ'yi seç
-STR_AI_CANCEL                                                   :{BLACK}Ä°ptal
-STR_AI_CANCEL_TIP                                               :{BLACK}YZ'yi deÄŸiÅŸtirme
-STR_AI_CLOSE                                                    :{BLACK}Kapat
-STR_AI_RESET                                                    :{BLACK}Yeniden baÅŸlat
-STR_AI_HUMAN_PLAYER                                             :Ä°nsan oyuncu
-STR_AI_RANDOM_AI                                                :Rastgele YZ
+STR_AI_LIST_TOOLTIP                                             :{BLACK}YZ seçmek için bir tuşa basın
+STR_AI_LIST_ACCEPT                                              :{BLACK}Kabul et
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vurgulanan YZ'yi seç
+STR_AI_LIST_CANCEL                                              :{BLACK}Ä°ptal
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}YZ'yi deÄŸiÅŸtirme
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Kapat
+STR_AI_SETTINGS_RESET                                           :{BLACK}Yeniden baÅŸlat
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Ä°nsan oyuncu
+STR_AI_CONFIG_RANDOM_AI                                         :Rastgele YZ
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}YZ Parametreleri
-STR_AI_AUTHOR                                                   :{BLACK}Yazar: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Sürüm: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Çalışan YZ'lerden biri çakıldı. Lütfen bu durumu AI Hata Ayıklama Penceresi görüntüsüyle birlikte YZ'nin yazarına bildirin.
-STR_AI_NO_AI_FOUND                                              :Yüklenecek uygun bir YZ bulunamadı.{}Bu YZ boş bir YZ'dir ve hiçbir şey yapmaz.{}'Çevrimiçi İçerik" sistemiyle pekçok YZ'yi indirebilirsiniz.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Yazar: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Sürüm: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Çalışan YZ'lerden biri çakıldı. Lütfen bu durumu AI Hata Ayıklama Penceresi görüntüsüyle birlikte YZ'nin yazarına bildirin.
+STR_ERROR_AI_NO_AI_FOUND                                        :Yüklenecek uygun bir YZ bulunamadı.{}Bu YZ boş bir YZ'dir ve hiçbir şey yapmaz.{}'Çevrimiçi İçerik" sistemiyle pekçok YZ'yi indirebilirsiniz.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Kasabadaki gürültü sınırı: {ORANGE}{COMMA}{BLACK}  En fazla: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Üretilen gürültü: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Kasabadaki gürültü sınırı: {ORANGE}{COMMA}{BLACK}  En fazla: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Üretilen gürültü: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3816,6 +3816,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST            :{WHITE}... baÄŸ
 STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE          :{WHITE}... dosya yazılabilir değil
 STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}İndirilen sıkıştırılmış dosya açılamadı
 
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Eksik içeriği internetten bul
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Eksik içeriğin internetten bulunup bulunamadığını kontrol et
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Eksik içeriği internetten bul
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Eksik içeriğin internetten bulunup bulunamadığını kontrol et
 ########
diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt
index e61d9d9c2..6e638f4a8 100644
--- a/src/lang/ukrainian.txt
+++ b/src/lang/ukrainian.txt
@@ -283,7 +283,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Карт
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опції гри
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Повідомленн�
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Повідомленн� від {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Обережно!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Обережно!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}�еможливо зробити це...
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}�еможливо очи�тити цю діл�нку...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}�втор�ьке право {COPYRIGHT} 1995 Крі� Сойєр, В�і права захищені
@@ -291,9 +291,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 команда OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Вийти
-STR_YES                                                         :{BLACK}Так
-STR_NO                                                          :{BLACK}�і
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ви дій�но бажаєте вийти до {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Так
+STR_QUIT_NO                                                     :{BLACK}�і
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ви дій�но бажаєте вийти до {STRING}?
 
 STR_JUST_NOTHING                                                :нічого
 STR_COLOUR_DARK_BLUE                                            :Темно-�иній
@@ -354,11 +354,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Пу�тел�
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Сніг
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Повідомленн�
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}За замовч.
-STR_QUERY_CANCEL                                                :{BLACK}Відміна
-STR_QUERY_OK                                                    :{BLACK}Так
-STR_QUERY_RENAME                                                :{BLACK}�азва
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}За замовч.
+STR_BUTTON_CANCEL                                               :{BLACK}Відміна
+STR_BUTTON_OK                                                   :{BLACK}Так
+STR_BUTTON_RENAME                                               :{BLACK}�азва
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -375,16 +375,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Вант
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Інформаці�
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Мі�ткі�ть
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Повна мі�ткі�ть
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Повна мі�ткі�ть цього поїзду:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Повна мі�ткі�ть цього поїзду:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}�ова гра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Завантажити гру
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Мережна гра
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Редактор �ценарію
 
-STR_MAPSIZE                                                     :{BLACK}Розмір карти:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Розмір карти:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}�алаштуванн� гри
 
 STR_COMPANY_SOMEONE                                             :дехто{SKIP}{SKIP}
@@ -433,10 +433,10 @@ STR_FILE_MENU_QUIT_GAME                                         :ПокинутÐ
 STR_FILE_MENU_EXIT                                              :Вихід
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Покинути гру?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Покинути гру
-STR_SORT_ORDER_TIP                                              :{BLACK}Виберіть пор�док �ортуванн� (�падаючий/зро�таючий)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Виберіть критерій �ортуванн�
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Оберіть критерій виборки
-STR_SORT_BY                                                     :{BLACK}Сортувати
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Виберіть пор�док �ортуванн� (�падаючий/зро�таючий)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Виберіть критерій �ортуванн�
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Оберіть критерій виборки
+STR_BUTTON_SORT_BY                                              :{BLACK}Сортувати
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}за на�еленн�м
@@ -468,24 +468,24 @@ STR_SORT_BY_RUNNING_COST                                        :за варті
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :за потужні�тю/варті�тю ек�плуатації
 STR_SORT_BY_CARGO_CAPACITY                                      :за мі�ткі�тю
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Звід�и поки що нічого перевозити
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Вибрати ве�ь тран�порт
-STR_SELECT_ALL_TYPES                                            :{BLACK}Вибрати в�і типи вантажів
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Перелік до�тупного тран�порту
-STR_MANAGE_LIST                                                 :{BLACK}Редагувати �пи�ок
-STR_MANAGE_LIST_TIP                                             :{BLACK}Дати завданн� в�ьому тран�порту зі �пи�ку
-STR_REPLACE_VEHICLES                                            :Оновленн�
-STR_SEND_FOR_SERVICING                                          :Відправити на техогл�д
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}До�тупні поїзди
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}До�тупні автомобілі
-STR_AVAILABLE_SHIPS                                             :{BLACK}До�тупні кораблі
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}До�тупні літаки
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Відправити до депо
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Відправити до депо
-STR_SEND_SHIP_TO_DEPOT                                          :Відправити до депо
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Відправити в ангар
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Звід�и поки що нічого перевозити
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Вибрати ве�ь тран�порт
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Вибрати в�і типи вантажів
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Перелік до�тупного тран�порту
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Редагувати �пи�ок
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Дати завданн� в�ьому тран�порту зі �пи�ку
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Оновленн�
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Відправити на техогл�д
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}До�тупні поїзди
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}До�тупні автомобілі
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}До�тупні кораблі
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}До�тупні літаки
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Відправити до депо
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Відправити до депо
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Відправити до депо
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Відправити в ангар
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -515,12 +515,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Опці
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}�е можна змінити інтервал об�луговуванн�...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Закрити вікно
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Заголовок вікна - пот�гніть дл� переміщенн� вікна
-STR_STICKY_BUTTON                                               :{BLACK}Закріпити вікно - воно не буде закривати�� командою "Закрити в�і вікна"
-STR_RESIZE_BUTTON                                               :{BLACK}�ати�ніть і т�гніть дл� зміни розміру вікна
+STR_TOOLTIP_STICKY                                              :{BLACK}Закріпити вікно - воно не буде закривати�� командою "Закрити в�і вікна"
+STR_TOOLTIP_RESIZE                                              :{BLACK}�ати�ніть і т�гніть дл� зміни розміру вікна
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}�ати�ніть дл� переходу до поточного каталогу збереженн�/завантаженн�
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Зруйнувати будинки, дороги і т.п.
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Опу�тити діл�нку землі
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Підн�ти діл�нку землі
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Опу�тити діл�нку землі
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Підн�ти діл�нку землі
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Смуга прокрутки - прокручує �пи�ок вверх/вниз
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Смуга прокрутки - прокручує �пи�ок вліво/вправо
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Показати рельєф на карті
@@ -533,21 +533,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Пока
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Прибуток цього року: {CURRENCY} (торік: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} р{P ік оки оків} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} р{P ік оки оків} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} р{P ік оки оків} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} р{P ік оки оків} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Поїзд
-STR_VEHICLE_ROAD_VEHICLE                                        :�вто
-STR_VEHICLE_SHIP                                                :Корабель
-STR_VEHICLE_AIRCRAFT                                            :Літак
+STR_REPLACE_VEHICLE_TRAIN                                       :Поїзд
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :�вто
+STR_REPLACE_VEHICLE_SHIP                                        :Корабель
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Літак
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} зі�тарив��
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} дуже зі�тарив��
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} зі�тарив�� і негайно потребує заміни
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Інформаці� про діл�нку
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Варті�ть очи�тки: {LTBLUE}неможливо
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Варті�ть очи�тки: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Дохід при очи�тці: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Дохід при очи�тці: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :немає
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Вла�ник: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Вла�ник дороги: {LTBLUE}{STRING}
@@ -556,7 +556,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Вла�
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Мі�цева влада: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :немає
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}�азва
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -668,7 +668,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Вибе
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Клікніть на мелодії дл� її видаленн� зі �пи�ку (лише �абір1 та �абір2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Вкл./відкл. випадкову програму
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Показує вікно вибору музичної програми
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}�ати�ніть дл� показу в центрі екрану
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}�ати�ніть дл� показу в центрі екрану
 STR_INTRO_DIFFICULTY                                            :{BLACK}Складні�ть ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :О�таннє повідомленн�
@@ -717,7 +717,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Змен
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Створити випадкову діл�нку
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Очи�тити ландшафт
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Очи�тити ландшафт
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Видалити в�ю вла�ні�ть гравц� з карти
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Видалити в�ю вла�ні�ть гравц� з карти
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ви впевнені, що хочете видалити в�ю вла�ні�ть гравц�?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Створенн� ландшафту
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Створенн� мі�т
@@ -731,11 +731,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...наÐ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...надто близько до іншого мі�та
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...невідповідне мі�це
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...забагато мі�т
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�е можна �творити мі�то
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...на карті немає вільного мі�ц�
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�е можна �творити мі�то
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...на карті немає вільного мі�ц�
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Збільшити розмір мі�та
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Розширити
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Мі�то не буде будувати дороги. ВИ можете дозволити будівництво доріг у вікні Розширені налаштуванн�->Економіка->Мі�та.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Мі�то не буде будувати дороги. ВИ можете дозволити будівництво доріг у вікні Розширені налаштуванн�->Економіка->Мі�та.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Випадкове мі�то
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Будувати мі�то у випадковому мі�ці
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}�еможливо будувати {STRING.z} тут...
@@ -749,13 +749,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Розм
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}По�тавити ма�к
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}По�тавити ретран�л�тор
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Позначити територію пу�телі.{}�ати�ніть і утримуйте CTRL, щоб відмінити
-STR_CREATE_LAKE                                                 :{BLACK}Позначити, де буде вода.{}Робити канал, поки не нати�нений Ctrl на рівні мор�, - тоді будуть затоплені околиці
-STR_CREATE_RIVER                                                :{BLACK}Прокла�ти річки.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Позначити, де буде вода.{}Робити канал, поки не нати�нений Ctrl на рівні мор�, - тоді будуть затоплені околиці
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Прокла�ти річки.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Видалити
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Видалити мі�то повні�тю
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Зберегти �ценарій
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Завантажити �ценарій
-STR_MENU_LOAD_HEIGHTMAP                                         :Завантажити карту ви�от
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Завантажити карту ви�от
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Вийти з редактору
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Вихід
@@ -765,7 +765,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Збер
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Грати за �ценарієм
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Грати з карти ви�от
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Почати нову гру, викори�тавши карту ви�от за ландшафт
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Ви дій�но бажаєте вийти з цього �ценарію?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Ви дій�но бажаєте вийти з цього �ценарію?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...можливо будувати лише у мі�тах з на�еленн�м не менш 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Перене�ти початкову дату на 1 рік назад
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Перене�ти початкову дату на 1 рік вперед
@@ -773,21 +773,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...кіÐ
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Мале
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Середнє
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Велике
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Довільний
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Довільний
 STR_FOUND_TOWN_CITY                                             :{BLACK}Мі�то
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Мегаполі�и ро�туть швидше за звичайні мі�та{}Вони більші при за�нуванні, �кщо вказано у на�тройках
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Вибір розміру мі�та
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Розмір мі�та:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Розміщенн� шл�хів у мі�ті:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Оберіть розміщенн� шл�хів дл� цього мі�та:
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Оригінальне
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Кращі шл�хи
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Сітка 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Сітка 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Довільне
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Розміщенн� шл�хів у мі�ті:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Оберіть розміщенн� шл�хів дл� цього мі�та:
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Оригінальне
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Кращі шл�хи
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Сітка 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Сітка 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Довільне
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Показує о�таннє повідомленн� або новини
 STR_NEWS_MESSAGES_OFF                                           :Відкл.
 STR_NEWS_MESSAGES_SUMMARY                                       :Коротко
@@ -887,10 +887,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}*  *  Ð
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Екран збережено в '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Помилка збереженн� екрану!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Купити діл�нку дл� викори�танн� у майбутньому
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Купити діл�нку дл� викори�танн� у майбутньому
 STR_STATUSBAR_AUTOSAVE                                          :{RED}�втозбереженн�
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ЗБЕРЕЖЕ��Я ГРИ  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Збереженн�...{}зачекайте, доки завершить��!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Збереженн�...{}зачекайте, доки завершить��!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Вибрати програму 'Дорожні теми'
 
 ############ start of townname region
@@ -953,7 +953,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Вибе
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}В повний екран
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}�ати�ніть цю кнопку щоб грати в повний екран
-STR_FULLSCREEN_FAILED                                           :{WHITE}Повноекранний режим не працює
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Повноекранний режим не працює
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Роздільна здатні�ть
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Виберіть роздільну здатні�ть екрану
@@ -966,12 +966,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Обер
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} від�утн{P ий их их}/пошкоджен{P ий их их} файл{P "" а ів}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Додаткова інформаці� про базовий набір графіки
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Помилка автозбереженн�
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Помилка автозбереженн�
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Пр�мує до {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Пр�мує до {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Без завдань
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Без завдань, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Пр�мує до {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Пр�мує до {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Без завдань
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Без завдань, {VELOCITY}
 
 STR_PASSENGERS                                                  :па��жир
 STR_BAGS                                                        :мішків
@@ -982,9 +982,9 @@ STR_CRATES                                                      :ЯщикИ
 STR_RES_OTHER                                                   :інша
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}�еможливо розділити �пи�ок завдань...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}�еможливо �копіювати �пи�ок завдань...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Кінець наказів - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}�еможливо розділити �пи�ок завдань...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}�еможливо �копіювати �пи�ок завдань...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Кінець наказів - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} не може знайти шл�х.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} загубив��.
@@ -1253,15 +1253,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-роÐ
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :вимкнено
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Змініть значенн�
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Змініть значенн�
 
-STR_TEMPERATE_LANDSCAPE                                         :Помірний ландшафт
-STR_SUB_ARCTIC_LANDSCAPE                                        :Субарктичний ландшафт
-STR_SUB_TROPICAL_LANDSCAPE                                      :Субтропічний ландшафт
-STR_TOYLAND_LANDSCAPE                                           :Іграшковий ландшафт
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Помірний ландшафт
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Субарктичний ландшафт
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Субтропічний ландшафт
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Іграшковий ландшафт
 
 STR_CHEATS                                                      :{WHITE}Гратиму нече�но
-STR_CHEATS_TIP                                                  :{BLACK}Галка показує, що Ви �тали грати нече�но
+STR_CHEATS_TOOLTIP                                              :{BLACK}Галка показує, що Ви �тали грати нече�но
 STR_CHEATS_WARNING                                              :{BLACK}Попередженн�! Ви збираєте�� обманювати конкурентів. Зауважте, подібне безче�т� запам'�таєть�� назавжди.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Збільшити кошти на {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Грає �к компані�: {ORANGE}{COMMA}
@@ -1273,177 +1273,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}ЗміÐ
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Змінити дату: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Дозволити зміну рівн� виробництва: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Пр�мує до {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Пр�мує до {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Пр�мує до {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Пр�мує до {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Їхати через {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Їхати без зупинок через {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Їхати через {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Їхати без зупинок через {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Пункт {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Пункт {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Пункт
+STR_FORMAT_WAYPOINT_NAME                                        :Пункт {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Пункт {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Пункт
 
-STR_WAYPOINT                                                    :{WHITE}Точка маршруту
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Виберіть тип точки маршруту
+STR_WAYPOINT_CAPTION                                            :{WHITE}Точка маршруту
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Виберіть тип точки маршруту
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Перейменуйте точку маршруту
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}�е можна перейменувати точку маршруту...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}�е можна перейменувати точку маршруту...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}В�тановити точку маршруту
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Тут не можна в�тановити точку маршруту..
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Тут не можна прибрати точку маршруту..
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Тут не можна в�тановити точку маршруту..
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Тут не можна прибрати точку маршруту..
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Будувати колію, викори�товуючи авторежим
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...у цьому �ценарію немає мі�т
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Генераці� карти перервана...{}...немає де розташувати мі�та
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...у цьому �ценарію немає мі�т
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Генераці� карти перервана...{}...немає де розташувати мі�та
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Багато різних мі�т
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Випадково розташувати мі�та по карті
-STR_MANY_RANDOM_INDUSTRIES                                      :Багато різної проми�лово�ті
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Випадково розташувати проми�лові�ть по карті
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}�еможливо �творити проми�лові�ть...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Багато різних мі�т
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Випадково розташувати мі�та по карті
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Багато різної проми�лово�ті
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Випадково розташувати проми�лові�ть по карті
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}�еможливо �творити проми�лові�ть...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Змінити ландшафт
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Ландшафт
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Рівень землі
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Рівень землі
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Дерева випадкового типу
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Садити дерева випадкового типу
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Садити дерева випадкового типу
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}�еможливо будувати канал тут...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}�еможливо будувати канал тут...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Будувати канали.
-STR_LANDINFO_CANAL                                              :Канал
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Канал
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}�еможливо будувати шлюз тут...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}�еможливо будувати шлюз тут...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Будувати шлюз
-STR_LANDINFO_LOCK                                               :Шлюз
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Шлюз
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Тут не можна зробити річку...
-STR_LANDINFO_RIVER                                              :Річка
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Тут не можна зробити річку...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Річка
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...бакен викори�товуєть��!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...бакен викори�товуєть��!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Координати: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Координати: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}�е можна зруйнувати ча�тину �танції...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Тут не можна модернізувати колію...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}�е можна зруйнувати ча�тину �танції...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Тут не можна модернізувати колію...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Модернізувати колію
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Перет�гніть �юди поїзд дл� його продажу повні�тю
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Перет�гніть �юди поїзд дл� його продажу повні�тю
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Малювати
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Будувати �танцію за методом "перет�гнути й відпу�тити"
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Виберіть тип �танції дл� відображенн�
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Виберіть тип �танції дл� забудови
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Виберіть тип �танції дл� відображенн�
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Виберіть тип �танції дл� забудови
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}При�корити гру
 STR_MESSAGE_HISTORY                                             :{WHITE}І�торі� повідомлень
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Спи�ок о�танніх нових повідомлень
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Вимкнути в�і
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Показувати в�і
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Спи�ок о�танніх нових повідомлень
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Вимкнути в�і
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Показувати в�і
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Проми�лові�ть
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% перевезено)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}�азви підприєм�тв - клікніть на назві, щоб показати підприєм�тво у центрі
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Проми�лові�ть
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% перевезено)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% перевезено)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}�азви підприєм�тв - клікніть на назві, щоб показати підприєм�тво у центрі
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...дуже близько до іншої проми�лово�ті
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...дуже близько до іншої проми�лово�ті
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Змінити виробництво
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Мережна гра
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Ім'� гравц�:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Ім'�, за �ким тебе розпізнаватимуть інші гравці
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Введіть ваше ім'�
-STR_NETWORK_CONNECTION                                          :{BLACK}З'єднанн�:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Виберіть гру через інтернет або через локальну мережу(ЛОМ)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Створити �ервер
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Створити ваш вла�ний �ервер
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}�азва
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}�азва гри
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Мова, вер�і� �ервера, та інше.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}�ати�ніть на гру із �пи�ку, щоб вибрати її
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Сервер, до �кого під'єднували�ь во�таннє
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}�ати�ніть, щоб вибрати �ервер, на �кому ви грали во�таннє
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Знайти �ервер
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Пошук мережі дл� �ервера
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Додати �ервер
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Додати �ервер до �пи�ку, �кий завжди буде перевір�ти�ь на поточні ігри.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Введіть адре�у �ервера
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Клієнти
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Клієнти в мережі/мак�.клієнтів{}Компанії в мережі/мак�.компаній
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Розмір карти
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Розмір карти гри{}Клікніть дл� �ортуванн� за районом
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Дата
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Поточна дата
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Роки
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Кількі�ть років{}впродовж �ких іде гра
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}Інформаці� про гру
-STR_NETWORK_CLIENTS                                             :{SILVER}Клієнти: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Мова: {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Шаблон: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Розмір карти: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Вер�і� �ерверу: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}�дре�а �ерверу: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Дата початку: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Поточна дата: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Захищено паролем!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}Сервер відключений
-STR_NETWORK_SERVER_FULL                                         :{SILVER}Сервер зайн�тий
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}Вер�і� не �півпадає
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ПОМИЛК�
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Приєднати��
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Створити нову мережеву гру
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}�азва гри:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}�азва гри відображатиметь�� іншим гравц�м у меню мережної гри
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Введіть назву мережевої гри
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}В�тановити пароль
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Захи�тіть вашу гру паролем, �кщо не бажаєте загального до�тупу
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Виберіть карту:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}�а �кій карті бажаєте грати?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :Локальна
-STR_NETWORK_INTERNET                                            :Інтернет
-STR_NETWORK_LAN_INTERNET                                        :Локальна/Інтернет
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (advertise)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} клієнт{P "" а ів}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Мак�. клієнтів:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Виберіть мак�имальну кількі�ть клієнтів. �е в�і �лоти мають бути зайн�ті
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} компані{P � ї й}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Мак�имум компаній:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Обмежує кількі�ть компаній на �ервері
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} �погл�дач{P "" а ів}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Мак�имум гл�дачів:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Обмежує кількі�ть гл�дачів на �ервері
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Мова:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Інші гравці будуть знати �кою мовою �пілкують�� на �ервері
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Почати гру
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Почати нову мережну гру з випадковою картою або �ценарієм
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Завантаженн� гри
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Продовжити збережену мережну гру
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Мережна гра
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Ім'� гравц�:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Ім'�, за �ким тебе розпізнаватимуть інші гравці
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Введіть ваше ім'�
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}З'єднанн�:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Виберіть гру через інтернет або через локальну мережу(ЛОМ)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Створити �ервер
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Створити ваш вла�ний �ервер
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}�азва
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}�азва гри
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Мова, вер�і� �ервера, та інше.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}�ати�ніть на гру із �пи�ку, щоб вибрати її
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Сервер, до �кого під'єднували�ь во�таннє
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}Введіть адре�у �ервера
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Клієнти
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Клієнти в мережі/мак�.клієнтів{}Компанії в мережі/мак�.компаній
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Розмір карти
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Розмір карти гри{}Клікніть дл� �ортуванн� за районом
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Дата
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Поточна дата
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Роки
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Кількі�ть років{}впродовж �ких іде гра
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}Інформаці� про гру
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Клієнти: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Мова: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Шаблон: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Розмір карти: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Вер�і� �ерверу: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}�дре�а �ерверу: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Дата початку: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Поточна дата: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Захищено паролем!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}Сервер відключений
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}Сервер зайн�тий
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}Вер�і� не �півпадає
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF ПОМИЛК�
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Приєднати��
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Створити нову мережеву гру
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}�азва гри:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}�азва гри відображатиметь�� іншим гравц�м у меню мережної гри
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Введіть назву мережевої гри
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}В�тановити пароль
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Захи�тіть вашу гру паролем, �кщо не бажаєте загального до�тупу
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Виберіть карту:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}�а �кій карті бажаєте грати?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :Локальна
+STR_NETWORK_SERVER_LIST_INTERNET                                :Інтернет
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :Локальна/Інтернет
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (advertise)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} клієнт{P "" а ів}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Мак�. клієнтів:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Виберіть мак�имальну кількі�ть клієнтів. �е в�і �лоти мають бути зайн�ті
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} компані{P � ї й}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Мак�имум компаній:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Обмежує кількі�ть компаній на �ервері
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} �погл�дач{P "" а ів}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Мак�имум гл�дачів:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Обмежує кількі�ть гл�дачів на �ервері
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Мова:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Інші гравці будуть знати �кою мовою �пілкують�� на �ервері
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Почати гру
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Почати нову мережну гру з випадковою картою або �ценарієм
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Завантаженн� гри
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Продовжити збережену мережну гру
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Будь-�ка
@@ -1484,33 +1484,33 @@ STR_NETWORK_LANG_GREEK                                          :Грецька
 STR_NETWORK_LANG_LATVIAN                                        :Латвій�ька
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Мережева гра - кімната
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Мережева гра - кімната
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Підготовка до з'єднанн�: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Спи�ок в�іх компаній при�утніх у цій грі. Ви можете �к приєднати�ь до компанії так і �творити нову, �кщо є вільне мі�це
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}�ова компані�
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Створити нову компанію
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Гра гл�дачем
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Спо�терігати за грою �к гл�дач
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Приєднати�ь до компанії
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Допомогти керувати цією компанією
-STR_NETWORK_REFRESH                                             :{BLACK}Оновити �ервер
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Оновити інформацію про �ервер
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Підготовка до з'єднанн�: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Спи�ок в�іх компаній при�утніх у цій грі. Ви можете �к приєднати�ь до компанії так і �творити нову, �кщо є вільне мі�це
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}�ова компані�
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Створити нову компанію
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Гра гл�дачем
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Спо�терігати за грою �к гл�дач
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Приєднати�ь до компанії
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Допомогти керувати цією компанією
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Оновити �ервер
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Оновити інформацію про �ервер
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}Інформаці� про компанію
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}Інформаці� про компанію
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}�азва компанії: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}За�новано: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Варті�ть компанії: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Поточний балан�: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Прибуток торік: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Продуктивні�ть: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}�азва компанії: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}За�новано: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Варті�ть компанії: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Поточний балан�: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Прибуток торік: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Продуктивні�ть: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Тран�порт: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Станцій: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Гравців: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Тран�порт: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Станцій: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Гравців: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}З'єднанн�...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}З'єднанн�...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) З'єднанн�..
@@ -1526,49 +1526,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Запи
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} клієнт{P "" и ів} перед вами
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} вже завантажено
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Роз'єднанн�
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Роз'єднанн�
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Введіть �уму грошей, �ку Ви хочете віддати
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Сервер захищено паролем. Введіть пароль
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Компані� захищена паролем. Введіть пароль
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Спи�ок клієнтів
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Спи�ок клієнтів
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Спо�терігати
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}�ова компані�
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}�е знайдено мережевого при�трою або �компільовано без ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}�е знайдено жодної мережної гри
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Сервер не відповів на запит
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}�е можна з'єднати�ь вна�лідок не�півпаданн� NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Помилка �инхронізації з мережною грою
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}З'єднанн� втрачено
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}�еможливо завантажити гру
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}�еможливо запу�тити �ервер
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}�еможливо з'єднати��
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Тайм-аут з'єднанн� #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Помилка протоколу - з'єднанн� розірвано
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE}Вер�і� клієнта не �півпадає з вер�ією �ервера
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Пароль невірний
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Сервер переповнений
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Ва� відключено від цього �ерверу
-STR_NETWORK_ERR_KICKED                                          :{WHITE}Ва� відключено від гри
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}�а цьому �ервері грати нече�но не можна
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}�е знайдено мережевого при�трою або �компільовано без ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}�е знайдено жодної мережної гри
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Сервер не відповів на запит
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}�е можна з'єднати�ь вна�лідок не�півпаданн� NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Помилка �инхронізації з мережною грою
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}З'єднанн� втрачено
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}�еможливо завантажити гру
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}�еможливо запу�тити �ервер
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}�еможливо з'єднати��
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Тайм-аут з'єднанн� #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Помилка протоколу - з'єднанн� розірвано
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE}Вер�і� клієнта не �півпадає з вер�ією �ервера
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Пароль невірний
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Сервер переповнений
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Ва� відключено від цього �ерверу
+STR_NETWORK_ERROR_KICKED                                        :{WHITE}Ва� відключено від гри
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}�а цьому �ервері грати нече�но не можна
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :фатальна помилка
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :помилка �инхронізації
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :неможливо завантажити карту
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :з'єднанн� втрачено
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :помилка протоколу
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :�е�півпаданн� NewGRF
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :відмова авторизації
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :отримано не�умі�ний пакет даних
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :невірна вер�і� гри
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :таке ім'� вже є
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :пароль невірний
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :неправильний company-id в DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :відключено �ервером від гри
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :�проба грати нече�но
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :�ервер переповнений
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :фатальна помилка
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :помилка �инхронізації
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :неможливо завантажити карту
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :з'єднанн� втрачено
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :помилка протоколу
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :�е�півпаданн� NewGRF
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :відмова авторизації
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :отримано не�умі�ний пакет даних
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :невірна вер�і� гри
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :таке ім'� вже є
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :пароль невірний
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :неправильний company-id в DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :відключено �ервером від гри
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :�проба грати нече�но
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :�ервер переповнений
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1578,15 +1578,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Гру приз
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Гру продовжено (клієнт приєднав��)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Гру продовжено (клієнту не вдало�� приєднати��)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :виходжу...
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} приєднав�� до гри
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} приєднав�� до компанії №{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} �тав �по�терігачем
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} за�нував нову компанію (№{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} покинув гру ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} змінив(-ла) �воє ім'� на {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} дав Вашій компанії {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Ви дали {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :виходжу...
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} приєднав�� до гри
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} приєднав�� до компанії №{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} �тав �по�терігачем
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} за�нував нову компанію (№{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} покинув гру ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} змінив(-ла) �воє ім'� на {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} дав Вашій компанії {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Ви дали {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Команда] :
 STR_NETWORK_CHAT_COMPANY                                        :[Команда] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Команда] до {STRING}: {WHITE}{STRING}
@@ -1596,8 +1596,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Приватн
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[В�ім] :
 STR_NETWORK_CHAT_ALL                                            :[В�ім] {STRING}:{WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Введіть тек�т дл� мережевого чату
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Сервер закрив �еан�
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Перезавантаженн� �ервера...{}Зачекайте...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Сервер закрив �еан�
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Перезавантаженн� �ервера...{}Зачекайте...
 
 STR_NETWORK_SERVER                                              :Сервер
 STR_NETWORK_CLIENT                                              :Клієнт
@@ -1611,19 +1611,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :ПовідомÐ
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Приватне повідомленн�
 
 
-STR_NETWORK_SEND                                                :{BLACK}Відправити
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Відправити
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}�еможливо завантажити ландшафт з PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...файл не знайдено
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...неможливо конвертувати. Треба 8 чи 24-bit PNG формат.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...помилка (можливо, зіп�ований файл).
+STR_ERROR_PNGMAP                                                :{WHITE}�еможливо завантажити ландшафт з PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...файл не знайдено
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...неможливо конвертувати. Треба 8 чи 24-bit PNG формат.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...помилка (можливо, зіп�ований файл).
 
-STR_BMPMAP_ERROR                                                :{WHITE}�еможливо завантажити ландшафт з BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...неможливо перетворити тип зображенн�
+STR_ERROR_BMPMAP                                                :{WHITE}�еможливо завантажити ландшафт з BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...неможливо перетворити тип зображенн�
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Витрачено: {CURRENCY}
@@ -1637,13 +1637,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Приб
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}�еможливо підн�ти діл�нку...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}�еможливо опу�тити діл�нку...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Тут не можна вирівн�ти землю...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Камінн�
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :�ерівна земл�
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Пу�тир
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Трава
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Поле
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :За�ніжена земл�
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Пу�тел�
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Камінн�
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :�ерівна земл�
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Пу�тир
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Трава
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Поле
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :За�ніжена земл�
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Пу�тел�
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Схил не в тому напр�мку
@@ -1651,11 +1651,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}�емо
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Роботи пошкод�ть тунель
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Вже понижено до рівн� мор�
 STR_ERROR_TOO_HIGH                                              :{WHITE}Дуже ви�око
-STR_ALREADY_LEVELLED                                            :{WHITE}... вже рівна
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... вже рівна
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}�евідповідний тип колії
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...вже побудовано
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Спочатку приберіть колію
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Дорога з одно�тороннім рухом  або блокована
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Дорога з одно�тороннім рухом  або блокована
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Будівництво залізниці
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Будувати електрифіковану колію
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Будівництво монорель�а
@@ -1679,41 +1679,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Буду
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Будувати мі�т
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Будувати тунель
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Будувати/демонтувати колію або �игнали
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Вибір мо�ту - нати�ніть на мі�т, �кий бажаєте збудувати
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Вибір мо�ту - нати�ніть на мі�т, �кий бажаєте збудувати
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Вибір орієнтації депо
-STR_RAILROAD_TRACK                                              :Залізнична колі�
-STR_RAILROAD_TRAIN_DEPOT                                        :Залізничне депо
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Залізнична колі�
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Залізничне депо
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...ц� діл�нка у вла�но�ті іншої компанії
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Колі� зі звичайними �игналами
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Колі� з вхідними �игналами
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Колі� з вихідними �игналами
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Колі� з комбо-�игналами
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Залізнична колі� з розширеними �игналами
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Залізнична колі� з одно�торонніми розширеними �игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Залізнична колі� зі звичайним та пре-�игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Залізнична колі� зі звичайним та вихід-�игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Колі� зі звичайним і комбо-�игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Залізнична колі� з нормальними і розширеними �игналами
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Залізнична колі� з нормальними та одно�торонніми розширеними �игналами
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Залізнична колі� з пре- та вихід-�игналами
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Колі� з пре- і комбо-�игналами
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Залізнична колі� з пре- і розширеними �игналами
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Залізнична колі� з пре- і одно�торонніми розширеними �игналами
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Колі� з вихідними і комбо-�игналами
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Залізнична колі� з вихідними і розширеними �игналами
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Залізнична колі� з вихідними і одно�торонніми розширеними �игналами
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Залізнична колі� з комбінованими і розширеними �игналами
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Залізнична колі� з комбінованими і одно�торонніми розширеними �игналами
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Залізнична колі� з розширеними і одно�торонніми розширеними �игналами
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Спочатку потрібно зне�ти залізничну �танцію
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Побудувати окрему �танцію
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Об'єднати �танцію
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Колі� зі звичайними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Колі� з вхідними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Колі� з вихідними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Колі� з комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Залізнична колі� з розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Залізнична колі� з одно�торонніми розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Залізнична колі� зі звичайним та пре-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Залізнична колі� зі звичайним та вихід-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Колі� зі звичайним і комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Залізнична колі� з нормальними і розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Залізнична колі� з нормальними та одно�торонніми розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Залізнична колі� з пре- та вихід-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Колі� з пре- і комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Залізнична колі� з пре- і розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Залізнична колі� з пре- і одно�торонніми розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Колі� з вихідними і комбо-�игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Залізнична колі� з вихідними і розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Залізнична колі� з вихідними і одно�торонніми розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Залізнична колі� з комбінованими і розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Залізнична колі� з комбінованими і одно�торонніми розширеними �игналами
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Залізнична колі� з розширеними і одно�торонніми розширеними �игналами
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Спочатку потрібно зне�ти залізничну �танцію
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Побудувати окрему �танцію
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Об'єднати �танцію
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Спочатку зруйнуйте дорогу
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Дорога ремонтуєть��
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Дорога ремонтуєть��
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Будівництво дороги
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Будівництво трамвайної колії
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Виберіть дорожній мі�т
@@ -1749,14 +1749,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Побу
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Вкл./відкл. одно�торонні дороги
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Будувати/зруйнувати дорогу
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Будувати/демонтувати колію
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Виберіть направленн� депо
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Виберіть орієнтацію трамвайного депо
-STR_ROAD_DESCRIPTION_ROAD                                       :Дорога
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Дорога з вуличними ліхтар�ми
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Дорога з на�адженн�ми
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :�втомобільне депо
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Залізничний переїзд
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Трамвайна дорога
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Виберіть направленн� депо
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Виберіть орієнтацію трамвайного депо
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Дорога
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Дорога з вуличними ліхтар�ми
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Дорога з на�адженн�ми
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :�втомобільне депо
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Залізничний переїзд
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Трамвайна дорога
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}�е можна зне�ти автобу�ну �танцію...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}�е можна зне�ти вантажну �танцію...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}�е можна зне�ти па�ажир�ьку трамвайну �танцію...
@@ -1764,12 +1764,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Ð�е мÐ
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Мі�та
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Спочатку зруйнуйте �поруду
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (мі�то)
@@ -1782,9 +1782,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Пока
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Змінити назву мі�та
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Па�ажирів за мі��ць: {ORANGE}{COMMA}{BLACK} найбільше: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Пошти за мі��ць: {ORANGE}{COMMA}{BLACK} найбільше: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Вантаж, потрібний дл� зро�танн� мі�та:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} потрібно
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} перевезено за о�танній мі��ць
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Вантаж, потрібний дл� зро�танн� мі�та:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} потрібно
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} перевезено за о�танній мі��ць
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Великий офі�
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Офі�ний район
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Будинки
@@ -1821,7 +1821,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Суб�идію надано {STRING}!{}{}Перевезенн� {STRING.r} з {STATION} до {STATION} прине�е втричі більше прибутків на�тупного року!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Суб�идію надано {STRING}!{}{}Перевезенн� {STRING.r} з {STATION} до {STATION} прине�е вчетверо більше прибутків на�тупного року!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE} Влада мі�та {TOWN} відмовл�є у будівництві ще одного аеропорту.
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN}: мі�цева влада відмовл�є у дозволі на аеропорт з міркувань шуму
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN}: мі�цева влада відмовл�є у дозволі на аеропорт з міркувань шуму
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Котеджі
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Будинки
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Квартири
@@ -1857,7 +1857,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Тран�портний безлад у мі�ті {TOWN}!{}{}Рекон�трукці� доріг, фінан�ована компанією {STRING} прине�е тран�порту незручно�ті прот�гом 6 мі��ців!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (будуєть��)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (будуєть��)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Іглу
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Вігвам
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Чайник-Дім
@@ -1870,17 +1870,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Зробити
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Дерева
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...Тут вже ро�те дерево
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}�еможливо по�адити тут дерево
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...дуже багато позначень
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}�еможливо позначити мі�це
-STR_SIGN_DEFAULT                                                :Позначенн�
+STR_DEFAULT_SIGN_NAME                                           :Позначенн�
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Редагуванн� напи�у
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}�еможливо перейменувати мі�це...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}�е можна видалити позначку...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Виберіть тип дерев
-STR_TREE_NAME_TREES                                             :Дерева
-STR_TREE_NAME_RAINFOREST                                        :Джунглі
-STR_TREE_NAME_CACTUS_PLANTS                                     :Какту�и
+STR_LAI_TREE_NAME_TREES                                         :Дерева
+STR_LAI_TREE_NAME_RAINFOREST                                    :Джунглі
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Какту�и
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Вибір �танції
@@ -1900,7 +1900,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Споч
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Дуже близько до іншого аеропорту
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Спочатку зруйнуйте аеропорт
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Перейменуванн� �танції
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Перейменуванн� �танції
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}�еможливо перейменувати �танцію...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Рейтинг
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Приймає
@@ -1918,10 +1918,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :найкращÐ
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Показати в�і поїзди, �кі заход�ть на цю �танцію
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Показати в�і авто, �кі заход�ть на цю �танцію
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Показати в�і літаки, �кі залітають на цю �танцію
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Показати в�і кораблі, �кі запливають на цю �танцію
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Показати в�і поїзди, �кі заход�ть на цю �танцію
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Показати в�і авто, �кі заход�ть на цю �танцію
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Показати в�і літаки, �кі залітають на цю �танцію
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Показати в�і кораблі, �кі запливають на цю �танцію
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}{STATION} більше не приймає {STRING}
@@ -1954,47 +1954,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Пере
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Показати �пи�ок прийманн� вантажів
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}�азва �танції - нати�ніть на назву, щоб показати в центрі екрану
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Виберіть розмір/тип аеропорту
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Залізнична �танці�
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :�нгар
-STR_STATION_DESCRIPTION_AIRPORT                                 :�еропорт
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Вантажна �танці�
-STR_STATION_DESCRIPTION_BUS_STATION                             :Зупинка
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Порт
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Залізнична �танці�
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :�нгар
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :�еропорт
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Вантажна �танці�
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Зупинка
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Порт
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Під�вічувати зону дії �танції
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}�е під�вічувати зону дії �танції
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Під�віченн� зони дії
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Порт
-STR_STATION_DESCRIPTION_BUOY                                    :Бакен
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Бакен
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...бакен на шл�ху
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...�танці� занадто велика
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...неоднорідні �танції відключені
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Утримуйте Ctrl дл� вибору декількох пунктів
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...неоднорідні �танції відключені
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Утримуйте Ctrl дл� вибору декількох пунктів
 
 STR_UNDEFINED                                                   :(невизначено)
-STR_STAT_CLASS_DFLT                                             :Звичайна �танці�
-STR_STAT_CLASS_WAYP                                             :Пункт
+STR_STATION_CLASS_DFLT                                          :Звичайна �танці�
+STR_STATION_CLASS_WAYP                                          :Пункт
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Орієнтаці� депо
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...має бути збудовано на воді
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}�еможливо будувати корабельне депо тут...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Виберіть орієнтацію корабельного депо
-STR_WATER_DESCRIPTION_WATER                                     :Вода
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Берег
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Корабельне депо
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :�кведук
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Вода
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Берег
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Корабельне депо
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :�кведук
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...�еможливо будувати на воді
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Спочатку потрібно прибрати канал
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Спочатку потрібно прибрати канал
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Зберегти гру
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Завантажити гру
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Зберегти
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Видалити
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Спо�терігач, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Спо�терігач, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} вільно
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}�еможливо прочитати при�трій
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Помилка запи�у гри{}{STRING}
@@ -2010,12 +2010,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Спи�
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Поточне вибране ім'� файлу дл� збереженн� гри
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Стерти вибрану збережену гру
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Зберегти поточну гру, викори�товуючи вибране ім'� файлу
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Генерувати випадкову нову гру
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Завантажити ландшафт
-STR_SAVE_OSKTITLE                                               :{BLACK}Введіть назву файла збереженої гри
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Генерувати випадкову нову гру
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Завантажити ландшафт
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Введіть назву файла збереженої гри
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} на шл�ху
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} на шл�ху
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :{G=f}Вугільна шахта
 STR_INDUSTRY_NAME_COAL_MINE.z                                   :{G=f}вугільну шахту
@@ -2110,7 +2110,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Показати в центрі екрану
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}Будуєть�� {STRING} біл� {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}�а�аджено {STRING} біл� {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Варті�ть: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Варті�ть: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}�еможливо будувати тут...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...лі� може бути по�аджений вище від рівн� �нігу
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} невдовзі закриєть��!
@@ -2128,16 +2128,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Інший тунель на шл�ху
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Тунель закінчить�� поза картою
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Тунель закінчить�� поза картою
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}�еможливо виконати будівництво іншого кінц� тунелю
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Спочатку зруйнуйте тунель
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Спочатку зруйнуйте мі�т
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Початок та кінець не можуть бути в одному мі�ці
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Кінці мо�тів на різних рівн�х
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Мі�т дуже низький дл� цього мі�ц�
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Початок та кінець не можуть бути в одному мі�ці
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Кінці мо�тів на різних рівн�х
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Мі�т дуже низький дл� цього мі�ц�
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Початок та кінець мають бути на одній лінії
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}�евідповідне мі�це дл� початку тунелю
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Підві�ний �талевий
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Балочний �талевий
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Карка�ний �талевий
@@ -2148,30 +2148,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :ТрубчаÑ�Ñ
 STR_BRIDGE_TUBULAR_SILICON                                      :Трубча�тий кремнієвий
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}�еможливо збудувати мі�т...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}�еможливо збудувати тунель...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Залізничний тунель
-STR_TUNNEL_DESCRIPTION_ROAD                                     :�втомобільний тунель
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Сталевий підві�ний залізничний мі�т
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Сталевий балочний залізничний мі�т
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Сталевий карка�ний залізничний мі�т
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Залізобетонний підві�ний залізничний мі�т
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Дерев'�ний залізничний мі�т
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Бетонний залізничний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Сталевий підві�ний автомобільний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Сталевий балочний автомобільний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Сталевий карка�ний автомобільний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Залізобетонний підві�ний автомобільний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Дерев'�ний автомобільний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Бетонний автомобільний мі�т
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Трубча�тий залізничний мі�т
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Трубча�тий автомобільний мі�т
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Залізничний тунель
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :�втомобільний тунель
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Сталевий підві�ний залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Сталевий балочний залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Сталевий карка�ний залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Залізобетонний підві�ний залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Дерев'�ний залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Бетонний залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Сталевий підві�ний автомобільний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Сталевий балочний автомобільний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Сталевий карка�ний автомобільний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Залізобетонний підві�ний автомобільний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Дерев'�ний автомобільний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Бетонний автомобільний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Трубча�тий залізничний мі�т
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Трубча�тий автомобільний мі�т
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Об'єкт на шл�ху
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Ретран�л�тор
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Ма�к
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Головний офі� компанії
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Ретран�л�тор
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Ма�к
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Головний офі� компанії
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...на шл�ху Головний офі�
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Ц� діл�нка - вла�ні�ть компанії
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Ц� діл�нка - вла�ні�ть компанії
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}�еможливо купити цю діл�нку ...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...це вже ваша вла�ні�ть!
 
@@ -2217,7 +2217,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Ста
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Рівень �кладно�ті
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Зберегти
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Зберегти
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Легкий
@@ -2290,8 +2290,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}СхемÐ
 STR_LIVERY_CAPTION                                              :{WHITE}�ова �хема кольорів
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}�азва компанії
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Ім'� керівника
-STR_QUERY_COMPANY_NAME_CAPTION                                  :�азва компанії
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Ім'� керівника
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :�азва компанії
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Ім'� керівника
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}�еможливо змінити назву компанії...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}�еможливо змінити ім'� керівника...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} - фінан�и {BLACK}{COMPANYNUM}
@@ -2315,11 +2315,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Під�умок:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Графік доходів
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Графік операційного прибутку
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Рахунок
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Позика
-STR_MAX_LOAN                                                    :{WHITE}Мак�. позика: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Мак�. позика: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Позичити {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Повернути {SKIP}{SKIP}{CURRENCY}
@@ -2328,7 +2328,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}�емо
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...позика вже повернута
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...потрібно {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}�еможливо повернути позику...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}�еможливо передати гроші, позичені у банку...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}�еможливо передати гроші, позичені у банку...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Вибрати нове обличч� керівника
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Зміна кольору тран�порту компанії
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Зміна імені керівника
@@ -2338,10 +2338,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Пове
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Керівник)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}За�новано у: {WHITE}{NUM} році
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Тран�порт:
-STR_TRAINS                                                      :{WHITE}{COMMA} поїзд{P "" и ів}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} авто
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} літак{P "" и ів}
-STR_SHIPS                                                       :{WHITE}{COMMA} кораб{P ель лі ів}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} поїзд{P "" и ів}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} авто
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} літак{P "" и ів}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} кораб{P ель лі ів}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}�ема
 STR_FACE_CAPTION                                                :{WHITE}Вибір обличч�
 STR_FACE_MALE_BUTTON                                            :{BLACK}Чоловік
@@ -2354,9 +2354,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Вибр
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Генерувати нове випадкове обличч�
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Ключ
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Показ ключа до графіків
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Показати детальні оцінки ефективно�ті
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Показати детальні оцінки ефективно�ті
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Ключ до графіків компанії
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}�ати�ніть тут дл� вкл./відкл. графіку окремої компанії
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}�ати�ніть тут дл� вкл./відкл. графіку окремої компанії
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}До�тавка одиниці вантажу
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Рейтинг продуктивно�ті компанії (найбільший рейтинг=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Варті�ть компанії
@@ -2390,23 +2390,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :ПрезидеÐ
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Магнат
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Будувати Офі�
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Будувати Офі�/Показати Офі�
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Перене�енн� Офі�у в інше мі�це. Коштує 1% від варто�ті компанії
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Перене�енн� Офі�у в інше мі�це. Коштує 1% від варто�ті компанії
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}�еможливо збудувати Офі�...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Показати Офі�
-STR_RELOCATE_HQ                                                 :{BLACK}Перене�ти Офі�
-STR_COMPANY_JOIN                                                :{BLACK}Приєднати�ь
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Приєднати�ь і грати за цю компанію
-STR_COMPANY_PASSWORD                                            :{BLACK}Пароль
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Пароль захищає вашу компанію від приєднанн� інших гравців.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}В�тановленн� паролю
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Перене�ти Офі�
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Приєднати�ь
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Приєднати�ь і грати за цю компанію
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Пароль
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Пароль захищає вашу компанію від приєднанн� інших гравців.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}В�тановленн� паролю
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}�е запам'�товувати введений пароль
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Дати компанії новий пароль
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Пароль компанії
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Пароль компанії за замовчуванн�м
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Викори�товувати цей пароль компанії за замовчуванн�м дл� нових компаній
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Пароль компанії за замовчуванн�м
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Викори�товувати цей пароль компанії за замовчуванн�м дл� нових компаній
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Світова економічна криза!{}{}Фінан�и�ти очікують �пад виробництва та попиту!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Криза минула!{}{}Збільшенн� виробництва вна�лідок �табілізації економіки надає впевнено�ті підприєм�твам!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Розмір вікна великий/малий
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Розмір вікна великий/малий
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Варті�ть компанії: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Купити 25% акцій компанії
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Продати 25% акцій компанії
@@ -2416,7 +2416,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}�емо
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}�еможливо продати 25% акцій цієї компанії...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% у вла�но�ті {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}{STRING} викуплено {STRING}!
-STR_PROTECTED                                                   :{WHITE}Ц� компані� поки ще не продаєть��...
+STR_ERROR_PROTECTED                                             :{WHITE}Ц� компані� поки ще не продаєть��...
 
 STR_LIVERY_DEFAULT                                              :Стандартний колір
 STR_LIVERY_STEAM                                                :Паровози
@@ -2442,14 +2442,14 @@ STR_LIVERY_LARGE_PLANE                                          :Великий
 STR_LIVERY_PASSENGER_TRAM                                       :Па�ажир�ький трамвай
 STR_LIVERY_FREIGHT_TRAM                                         :Вантажний трамвай
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Показати о�новні кольорові �хеми
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Показати кольорову �хему поїздів
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Показати кольорові �хеми дл� авто
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Показати кольорову �хему кораблів
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Показати кольорові �хеми літаків
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Виберіть о�новний колір дл� обраної �хеми
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Оберіть другий колір дл� �хеми
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Оберіть кольорову �хему дл� зміни, чи декілька з Ctrl+клік. Клікніть на пр�мокутнику, щоб ввімкнути/вимкнути викори�танн� �хем
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Показати о�новні кольорові �хеми
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Показати кольорову �хему поїздів
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Показати кольорові �хеми дл� авто
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Показати кольорову �хему кораблів
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Показати кольорові �хеми літаків
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Виберіть о�новний колір дл� обраної �хеми
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Оберіть другий колір дл� �хеми
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Оберіть кольорову �хему дл� зміни, чи декілька з Ctrl+клік. Клікніть на пр�мокутнику, щоб ввімкнути/вимкнути викори�танн� �хем
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (паровий)
@@ -2757,9 +2757,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Ð�е розвÐ
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Змінити поведінку зупинки виділеного пункту
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Змінити поведінку завантаженн� виділеного пункту
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Змінити поведінку розвантаженн� виділеного пункту
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Додати �кладний наказ
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Додати �кладний наказ
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Пр�мувати до найближчого депо
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Пр�мувати до найближчого ангару
 STR_ORDER_NEAREST_DEPOT                                         :найближчому
@@ -2769,9 +2769,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :ТехоглÑ�Ð
 STR_ORDER_TRAIN_DEPOT                                           :Залізничне депо
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :�втомобільне депо
 STR_ORDER_SHIP_DEPOT                                            :Док
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} �нгар
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} �нгар
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Завжди рухати�ь
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Об�луговувати при потребі
@@ -2796,10 +2796,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :більше н
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :більше або дорівнює
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :- так
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :- ні
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Перейти до наказу {COMMA}
-STR_CONDITIONAL_NUM                                             :Перейти до наказу {COMMA}, �кщо {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Перейти до наказу {COMMA}, �кщо {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Перейти до наказу {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Перейти до наказу {COMMA}, �кщо {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Перейти до наказу {COMMA}, �кщо {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}�е пр�мувати
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Пр�мує (не за розкладом)
@@ -2822,18 +2822,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Поїз
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Пропу�к
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Видалити
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Пр�мувати
-STR_REFIT                                                       :{BLACK}Переобладнати
-STR_REFIT_TIP                                                   :{BLACK}Оберіть, на �кий тип вантажу переобладнати у цьому завданні. Ctrl+клік дл� видаленн� команди переобладнанн�
-STR_REFIT_ORDER                                                 :(Переобладнати до {STRING})
-STR_REFIT_STOP_ORDER                                            :(Переобладнати на {STRING} і зупинити)
-STR_STOP_ORDER                                                  :(зупинити)
-STR_TIMETABLE_VIEW                                              :{BLACK}Розклад
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Переключити�ь на розклад
-STR_ORDER_VIEW                                                  :{BLACK}Завданн�
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Переключити�ь до вікна завдань
+STR_ORDER_REFIT                                                 :{BLACK}Переобладнати
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Оберіть, на �кий тип вантажу переобладнати у цьому завданні. Ctrl+клік дл� видаленн� команди переобладнанн�
+STR_ORDER_REFIT_ORDER                                           :(Переобладнати до {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Переобладнати на {STRING} і зупинити)
+STR_ORDER_STOP_ORDER                                            :(зупинити)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Розклад
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Переключити�ь на розклад
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Завданн�
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Переключити�ь до вікна завдань
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (�акази)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Кінець наказів - -
-STR_SERVICE                                                     :{BLACK}Техогл�д
+STR_ORDER_SERVICE                                               :{BLACK}Техогл�д
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Рік випу�ку: {LTBLUE}{NUM}{BLACK} Ціна: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Ціна: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2853,7 +2853,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}Тран
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}Тран�порт зі �пільного розкладу не може йти на цю �танцію
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}�еможливо перемі�тити тран�порт...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}задній пот�г буде завжди йти за переднім
-STR_CARGO_N_A                                                   :немає{SKIP}
+STR_QUANTITY_N_A                                                :немає{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}�еможливо знайти маршрут до мі�цевого депо
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Інтервал техогл�ду: {LTBLUE}{COMMA} днів{BLACK}   О�танній техогл�д: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Інтервал техогл�ду: {LTBLUE}{COMMA}%{BLACK}   О�танній техогл�д: {LTBLUE}{DATE_LONG}
@@ -2873,10 +2873,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Розк
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Змінити ча�, впродовж �кого має виконувати�ь наказ
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Очи�тити ча� дл� виділеного наказу
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Очи�тити лічильник запізненн�, щоб тран�порт в�тигнув
-STR_SERVICE_HINT                                                :{BLACK}Пропу�тити це завданн�, доки не буде потрібне об�луговуванн�
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Ціна: {CURRENCY} Вага: {WEIGHT_S}{}Швидкі�ть: {VELOCITY}{}Потужні�ть: {POWER}{}Варті�ть ек�плуатації: {CURRENCY}/рік{}Мі�ткі�ть: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Варті�ть: {CURRENCY} Мак�. швидкі�ть: {VELOCITY}{}Мі�ткі�ть: {CARGO}, {CARGO}{}Варті�ть ек�плуатації: {CURRENCY}/рік
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Варті�ть: {CURRENCY} Мак�. швидкі�ть: {VELOCITY}{}Мі�ткі�ть: {CARGO}{}Варті�ть ек�плуатації: {CURRENCY}/рік
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Пропу�тити це завданн�, доки не буде потрібне об�луговуванн�
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Ціна: {CURRENCY} Вага: {WEIGHT_S}{}Швидкі�ть: {VELOCITY}{}Потужні�ть: {POWER}{}Варті�ть ек�плуатації: {CURRENCY}/рік{}Мі�ткі�ть: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Варті�ть: {CURRENCY} Мак�. швидкі�ть: {VELOCITY}{}Мі�ткі�ть: {CARGO}, {CARGO}{}Варті�ть ек�плуатації: {CURRENCY}/рік
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Варті�ть: {CURRENCY} Мак�. швидкі�ть: {VELOCITY}{}Мі�ткі�ть: {CARGO}{}Варті�ть ек�плуатації: {CURRENCY}/рік
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Вік: {LTBLUE}{STRING}{BLACK}   Варті�ть ек�плуатації: {LTBLUE}{CURRENCY}/рік
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Мак�. швидкі�ть: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Вага: {LTBLUE}{WEIGHT_S} {BLACK}Потужні�ть: {LTBLUE}{POWER}{BLACK} Мак�. швидкі�ть: {LTBLUE}{VELOCITY}
@@ -2896,27 +2896,27 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}�еможливо розвернути поїзд...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}�е можна розвернути поїзд...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}�еможливо розвернути довгий тран�порт
-STR_CLEAR_TIME                                                  :{BLACK}Очи�тити ча�
-STR_RESET_LATENESS                                              :{BLACK}Очи�тити лічильник запізненн�
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Перейменувати точку маршруту
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Очи�тити ча�
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Очи�тити лічильник запізненн�
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Перейменувати точку маршруту
 
-STR_TRAIN_STOPPING                                              :{RED}Зупин�єть��
-STR_TRAIN_STOPPING_VEL                                          :{RED}Зупин�єть��, {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Залізничні колій не�умі�ні
-STR_TRAIN_NO_POWER                                              :{RED}�е електрифіковано
-STR_TRAIN_START_NO_CATENARY                                     :�ема електрики, поїзд �тоїть
-STR_TRAIN_STUCK                                                 :{ORANGE}Чекає, поки звільнить�� шл�х
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Зупин�єть��
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Зупин�єть��, {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Залізничні колій не�умі�ні
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}�е електрифіковано
+STR_ERROR_TRAIN_START_NO_CATENARY                               :�ема електрики, поїзд �тоїть
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Чекає, поки звільнить�� шл�х
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}Став до�тупним новий {STRING}!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}Став до�тупним новий {STRING}!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}�е можна продати знищений тран�порт...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}�е можна переобладнати знищений тран�порт...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}�е можна продати знищений тран�порт...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}�е можна переобладнати знищений тран�порт...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}�е можна в�тановити розклад дл� тран�порту...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Тран�порт може чекати тільки на �танці�х.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Цей тран�порт не зупин�єть�� на цій �танції.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}�е можна в�тановити розклад дл� тран�порту...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Тран�порт може чекати тільки на �танці�х.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Цей тран�порт не зупин�єть�� на цій �танції.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Змінити ча�
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Цей тран�порт зараз пр�мує за розкладом
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Цей тран�порт запізнюєть�� на {STRING}
@@ -2930,7 +2930,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}�вто
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...авто повинно �то�ти в депо
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}�еможливо знайти мі�цеве депо
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Розвернути авто
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Мі�ткі�ть: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Мі�ткі�ть: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} тран�порт{P "" и ів}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2957,11 +2957,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Розмі�тити бакен, �кий можна викори�товувати �к точку маршруту
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}�еможливо розмі�тити бакен тут...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Побудувати акведук
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Тут не можна побудувати акведук...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Тут не можна побудувати акведук...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Переобладнанн�)
 STR_REFIT_TITLE                                                 :{GOLD}Виберіть вид вантажу дл� перевезенн�:-
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}�ова мі�ткі�ть: {GOLD}{CARGO}{}{BLACK}Варті�ть переобладнанн�: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(змінюєть��)
+STR_PURCHASE_INFO_REFITTABLE                                    :(змінюєть��)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}�еропорти
@@ -2974,7 +2974,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Буду
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Жителі �в�ткують . . .{}Перший літак з'�вив�� на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}{}{COMMA} загиблих в авіаката�трофі! Літак розбив�� біл� {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}�віаката�трофа!{}В літака закінчило�ь пальне, {COMMA} людей загинуло!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (розклад)
 
@@ -2987,13 +2987,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}З�ув ґрунту вна�лідок обвалу на вугільній шахті біл� мі�та {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Повінь!{}Щонайменше {COMMA} зникло безві�ти та загинуло!
 
-STR_BRIBE_FAILED                                                :{WHITE}Ваша �проба дати хабара була
-STR_BRIBE_FAILED_2                                              :{WHITE}викрита мі�цевим �лідчим
-STR_BUILD_DATE                                                  :{BLACK}Рік випу�ку: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Ваша �проба дати хабара була
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}викрита мі�цевим �лідчим
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Рік випу�ку: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Кла� �танції: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Тип �танції: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Кла� �танції: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Тип �танції: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Детальна характери�тика продуктивно�ті
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Детально
@@ -3013,28 +3013,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Кошт
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Кредит:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Під�умок:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Загальна кількі�ть тран�порту
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Загальна кількі�ть �танцій.
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Прибуток тран�порту з найменшим доходом (з у�ього тран�порту від 2 років)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}�айменший мі��чний прибуток за о�танні 12 кварталів
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}�айбільший мі��чний прибуток за о�танні 12 кварталів
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Кількі�ть одиниць вантажу, до�тавлених за о�танні 4 квартали
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Кількі�ть видів вантажу, до�тавлених за о�танній квартал
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Сума коштів на рахунку компанії
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Сума позики, наданої компанії
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Загальна кількі�ть балів
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Загальна кількі�ть тран�порту
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Загальна кількі�ть �танцій.
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Прибуток тран�порту з найменшим доходом (з у�ього тран�порту від 2 років)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}�айменший мі��чний прибуток за о�танні 12 кварталів
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}�айбільший мі��чний прибуток за о�танні 12 кварталів
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Кількі�ть одиниць вантажу, до�тавлених за о�танні 4 квартали
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Кількі�ть видів вантажу, до�тавлених за о�танній квартал
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Сума коштів на рахунку компанії
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Сума позики, наданої компанії
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Загальна кількі�ть балів
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}�алаштуванн� NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Показати на�тройки NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}�алаштуванн� нової графіки
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}За�то�увати зміни
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Переключити палітру
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Переключити палітру обраного NewGRF.{}Зробіть це, �кщо графіка з цього NewGRF вигл�дає рожевою у грі
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}В�тановленн� параметрів
-STR_NEWGRF_FILENAME                                             :{BLACK}Ім'� файлу: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Палітра: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5�ума: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}За�то�увати зміни
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Переключити палітру
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Переключити палітру обраного NewGRF.{}Зробіть це, �кщо графіка з цього NewGRF вигл�дає рожевою у грі
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}В�тановленн� параметрів
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Ім'� файлу: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Палітра: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5�ума: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Ви хочете зробити зміни у вже запущеній грі; це може приве�ти до зави�анн� OpenTTD.{}Ви впевнені що хочете зробити це?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -3057,34 +3057,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Спроба в
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} мі�тить зіп�ований �прайт. У�і зіп�овані �прайти будуть показані �к червоний знак питанн� (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Мі�тить багато запи�ів Action 8.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Завантажити обрані на�тройки
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Запи�ати на�тройки
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Запи�ати поточний �пи�ок �к на�тройки
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Введіть назву на�тройок
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Видалити на�тройки
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Видалити обрані на�тройки
-STR_NEWGRF_ADD                                                  :{BLACK}Додати
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Додати файли NewGRF до �пи�ку
-STR_NEWGRF_REMOVE                                               :{BLACK}Видалити
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Видалити обрані файли NewGRF зі �пи�ку
-STR_NEWGRF_MOVEUP                                               :{BLACK}Вище
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Перемі�тити вибрані файли вверх по �пи�ку
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}�ижче
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Перемі�тити вибрані файли вниз по �пи�ку
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Спи�ок в�тановлених NewGRF файлів. Клікніть на файлі, щоб змінити його параметри
-STR_NEWGRF_PARAMETER                                            :{BLACK}Параметри: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Введіть параметри NewGRF
-STR_NEWGRF_NO_INFO                                              :{BLACK}�емає до�тупної інформації
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Завантажити обрані на�тройки
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Запи�ати на�тройки
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Запи�ати поточний �пи�ок �к на�тройки
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Введіть назву на�тройок
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Видалити на�тройки
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Видалити обрані на�тройки
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Додати
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Додати файли NewGRF до �пи�ку
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Видалити
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Видалити обрані файли NewGRF зі �пи�ку
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Вище
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Перемі�тити вибрані файли вверх по �пи�ку
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}�ижче
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Перемі�тити вибрані файли вниз по �пи�ку
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Спи�ок в�тановлених NewGRF файлів. Клікніть на файлі, щоб змінити його параметри
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Параметри: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Введіть параметри NewGRF
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}�емає до�тупної інформації
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}До�тупні NewGRF файли
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Додати файл
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Додати вибраний NewGRF файл до Вашої конфігурації
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Пере�канувати файли
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Оновити �пи�ок до�тупних NewGRF файлів
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Додати вибраний NewGRF файл до Вашої конфігурації
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Пере�канувати файли
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Оновити �пи�ок до�тупних NewGRF файлів
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}�е можу додати файл: однакові GRF ID
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Таких файлів не знайдено
-STR_NEWGRF_DISABLED                                             :{RED}Вимкнено
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Таких файлів не знайдено
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Вимкнено
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Відповідного GRF-файлу не знайдено (завантажено �умі�ний файл)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Дл� від�утніх GRF-файлів завантажені �умі�ні
@@ -3100,7 +3100,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}NewGRF '
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Інформаці� про вантаж/переобладнанн� дл� '{1:ENGINE}' відрізн�єть�� від �пи�ку покупки пі�л� побудови. Це може �причинити невідповідно�ті під ча� автооновленн�/заміни.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' �причинив не�кінченний цикл у виклику виробництва
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Гра була запи�ана у вер�ії без підтримки трамваїв. У�і трамваї були видалені.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Гра була запи�ана у вер�ії без підтримки трамваїв. У�і трамваї були видалені.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Вибір грошової одиниці
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Валютний кур�: {ORANGE}{0:CURRENCY} = Ј {1:COMMA}
@@ -3111,16 +3111,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}ПерÐ
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Перехід на євро: {ORANGE}ні
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Відображенн�: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}�алаштуванн� іншої грошової одиниці
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Зменшити кількі�ть �воєї валюти за 1 фунт (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Збільшити кількі�ть �воєї валюти за 1 фунт (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}В�тановити обмінний кур� �воєї валюти до 1 фунта (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}В�тановити роздільник дл� �воєї валюти
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}В�тановити префік� дл� �воєї валюти
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}В�тановити �уфік� дл� �воєї валюти
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Перейти на Євро раніше
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Перейти на Євро пізніше
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Визначити рік введенн� Євро
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 фунтів (£) у вашій валюті
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Зменшити кількі�ть �воєї валюти за 1 фунт (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Збільшити кількі�ть �воєї валюти за 1 фунт (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}В�тановити обмінний кур� �воєї валюти до 1 фунта (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}В�тановити роздільник дл� �воєї валюти
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}В�тановити префік� дл� �воєї валюти
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}В�тановити �уфік� дл� �воєї валюти
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Перейти на Євро раніше
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Перейти на Євро пізніше
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Визначити рік введенн� Євро
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 фунтів (£) у вашій валюті
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -3139,8 +3139,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} кораб{P ель лі лів}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} літак{P "" и ів}
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Спільні маршрути {COMMA} тран�п.за�об{P у iв ів}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Показати тран�порт з таким �амим маршрутом
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Спільні маршрути {COMMA} тран�п.за�об{P у iв ів}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Показати тран�порт з таким �амим маршрутом
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}{VEHICLE} чакає в депо
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}{VEHICLE} чакає в депо
@@ -3247,39 +3247,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Пере
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Переобладнати корабель дл� перевезенн� іншого виду вантажу
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Переобладнати літак дл� перевезенн� іншого виду вантажу
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Пр�мує до {TOWN} депо
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Пр�мує до {TOWN} депо, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Пр�мує до {TOWN} дорожного депо
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Пр�мує до {TOWN} дорожного депо, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Пр�мує до {TOWN} корабельного депо
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Пр�мує до {TOWN} корабельного депо, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Летить до {STATION} ангару
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Летить до {STATION} ангару, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Техогл�д в {TOWN} депо
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Техогл�д в {TOWN} депо, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Техогл�д в  {TOWN} дорожному депо
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Техогл�д в  {TOWN} дорожному депо, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Техогл�д в {TOWN} корабельному депо
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Техогл�д в {TOWN} корабельному депо, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Техогл�д в {STATION} ангарі
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Техогл�д в {STATION} ангарі, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Клонувати
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Клонувати
-STR_CLONE_SHIP                                                  :{BLACK}Клонувати
-STR_CLONE_AIRCRAFT                                              :{BLACK}Клонувати
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Будувати копію поїзда з у�іма вагонами. Утримуйте Ctrl дл� �пільного завданн�
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Будувати копію авто. Утримуйте Ctrl дл� �пільного завданн�
-STR_CLONE_SHIP_INFO                                             :{BLACK}Будувати копію корабл�. Утримуйте Ctrl дл� �пільного завданн�
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Будувати копію літака. Утримуйте Ctrl дл� �пільного завданн�
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Будувати копію поїзда з у�іма вагонами. �ати�ніть на цю кнопку і потім на поїзд в депо або ззовні. Утримуйте Ctrl дл� �пільного завданн�
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Будувати копію авто. �ати�ніть на цю кнопку і потім на авто в депо або ззовні. Утримуйте Ctrl дл� �пільного завданн�
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Будувати копію корабл�. �ати�ніть на цю кнопку, і потім на корабель в депо або ззовні. Утримуйте Ctrl дл� �пільного завданн�
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Будувати копію літака. �ати�ніть на цю кнопку і потім на літак в ангарі або ззовні. Утримуйте Ctrl дл� �пільного завданн�
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Пр�мує до {TOWN} депо
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Пр�мує до {TOWN} депо, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Пр�мує до {TOWN} дорожного депо
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Пр�мує до {TOWN} дорожного депо, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Пр�мує до {TOWN} корабельного депо
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Пр�мує до {TOWN} корабельного депо, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Летить до {STATION} ангару
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Летить до {STATION} ангару, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Техогл�д в {TOWN} депо
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Техогл�д в {TOWN} депо, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Техогл�д в  {TOWN} дорожному депо
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Техогл�д в  {TOWN} дорожному депо, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Техогл�д в {TOWN} корабельному депо
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Техогл�д в {TOWN} корабельному депо, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Техогл�д в {STATION} ангарі
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Техогл�д в {STATION} ангарі, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Клонувати
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Клонувати
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Клонувати
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Клонувати
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Будувати копію поїзда з у�іма вагонами. Утримуйте Ctrl дл� �пільного завданн�
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Будувати копію авто. Утримуйте Ctrl дл� �пільного завданн�
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Будувати копію корабл�. Утримуйте Ctrl дл� �пільного завданн�
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Будувати копію літака. Утримуйте Ctrl дл� �пільного завданн�
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Будувати копію поїзда з у�іма вагонами. �ати�ніть на цю кнопку і потім на поїзд в депо або ззовні. Утримуйте Ctrl дл� �пільного завданн�
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Будувати копію авто. �ати�ніть на цю кнопку і потім на авто в депо або ззовні. Утримуйте Ctrl дл� �пільного завданн�
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Будувати копію корабл�. �ати�ніть на цю кнопку, і потім на корабель в депо або ззовні. Утримуйте Ctrl дл� �пільного завданн�
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Будувати копію літака. �ати�ніть на цю кнопку і потім на літак в ангарі або ззовні. Утримуйте Ctrl дл� �пільного завданн�
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}�овий залізничний тран�порт
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}�овий електрозалізничний тран�порт
@@ -3349,28 +3349,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Пока
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Ви впевнені, що хочете продати у�і машини в депо?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :�еправильний тип депо
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :�еправильний тип депо
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Продати в�і поїзди з депо
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Продати в�і автомобілі з депо
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Продати в�і кораблі з депо
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Продати в�і літаки з ангару
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Продати в�і поїзди з депо
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Продати в�і автомобілі з депо
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Продати в�і кораблі з депо
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Продати в�і літаки з ангару
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Отримати �пи�ок у�іх поїздів, що заход�ть до цього депо
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Отримати �пи�ок у�іх автомобілів, що заход�ть до цього депо
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Отримати �пи�ок у�іх кораблів, що заход�ть до цього депо
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Отримати �пи�ок у�іх літаків, що заход�ть до ангарів у цьому аеропорті
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Отримати �пи�ок у�іх поїздів, що заход�ть до цього депо
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Отримати �пи�ок у�іх автомобілів, що заход�ть до цього депо
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Отримати �пи�ок у�іх кораблів, що заход�ть до цього депо
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Отримати �пи�ок у�іх літаків, що заход�ть до ангарів у цьому аеропорті
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Оновити в�і поїзди в депо
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Оновити в�і автомобілі в депо
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Оновити в�і кораблі в депо
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Оновити в�і літаки в ангарі
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Оновити в�і поїзди в депо
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Оновити в�і автомобілі в депо
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Оновити в�і кораблі в депо
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Оновити в�і літаки в ангарі
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Оновити {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Почати оновленн�
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Зупинити оновленн�
-STR_NOT_REPLACING                                               :{BLACK}�е можна оновити
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}�е вибрано машину
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}�е можна оновити
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}�е вибрано машину
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Виберіть тран�порт дл� оновленн�
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Виберіть новий тран�порт, �ким ви бажаєте замінити �тарий
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}�ати�ніть дл� припиненн� проце�у оновленн� пот�гів, що вибрані ліворуч
@@ -3382,26 +3382,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Дозв
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Оновленн�: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Переключенн� між вікнами заміни пот�гів та вагонів.
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Поїзд недо�тупний
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}�втомобіль недо�тупний
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Корабель недо�тупний
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Літак недо�тупний
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Поїзд недо�тупний
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}�втомобіль недо�тупний
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Корабель недо�тупний
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Літак недо�тупний
 
-STR_ENGINES                                                     :Пот�ги
-STR_WAGONS                                                      :Вагони
+STR_REPLACE_ENGINES                                             :Пот�ги
+STR_REPLACE_WAGONS                                              :Вагони
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}�ати�ніть дл� зупинки в�іх поїздів, що в депо
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}�ати�ніть дл� зупинки в�іх авто, що в депо
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}�ати�ніть дл� зупинки в�іх кораблів, що в депо
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}�ати�ніть дл� зупинки в�іх літаків, що в ангарі
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}�ати�ніть дл� зупинки в�іх поїздів, що в депо
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}�ати�ніть дл� зупинки в�іх авто, що в депо
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}�ати�ніть дл� зупинки в�іх кораблів, що в депо
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}�ати�ніть дл� зупинки в�іх літаків, що в ангарі
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}�ати�ніть дл� виїзду поїздів з депо
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}�ати�ніть дл� виїзду в�іх автомобілів з депо
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}�ати�ніть дл� виїзду в�іх кораблів з депо
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}�ати�ніть дл� вильоту в�іх літаків з ангару
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}�ати�ніть дл� виїзду поїздів з депо
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}�ати�ніть дл� виїзду в�іх автомобілів з депо
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}�ати�ніть дл� виїзду в�іх кораблів з депо
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}�ати�ніть дл� вильоту в�іх літаків з ангару
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}�ати�ніть дл� зупинки в�іх авто, що у �пи�ку
-STR_MASS_START_LIST_TIP                                         :{BLACK}�ати�ніть дл� виїзду в�ього тран�порту, що у �пи�ку
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}�ати�ніть дл� зупинки в�іх авто, що у �пи�ку
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}�ати�ніть дл� виїзду в�ього тран�порту, що у �пи�ку
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Спи�ок позначень - {COMMA} Позначен{P н� н� ь}
@@ -3410,14 +3410,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Збій
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Залізниц�
-STR_ELRAIL_VEHICLES                                             :Електрифіковані поїзди
-STR_MONORAIL_VEHICLES                                           :Монорель�
-STR_MAGLEV_VEHICLES                                             :Магнітна подушка
+STR_REPLACE_RAIL_VEHICLES                                       :Залізниц�
+STR_REPLACE_ELRAIL_VEHICLES                                     :Електрифіковані поїзди
+STR_REPLACE_MONORAIL_VEHICLES                                   :Монорель�
+STR_REPLACE_MAGLEV_VEHICLES                                     :Магнітна подушка
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Ціна: {GOLD}{CURRENCY}{BLACK}   Вага: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Швидкі�ть: {GOLD}{VELOCITY}{BLACK} Потужні�ть: {GOLD}{POWER}
@@ -3444,70 +3444,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Генерувати
-STR_RANDOM                                                      :{BLACK}Випадково
-STR_RANDOM_HELP                                                 :{BLACK}Змінити початкове значенн� дл� генератора
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Створенн� �віту
-STR_RANDOM_SEED                                                 :{BLACK}Випадкове чи�ло:
-STR_RANDOM_SEED_HELP                                            :{BLACK}Клік дл� вводу значенн�
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Введіть випадкове чи�ло
-STR_LAND_GENERATOR                                              :{BLACK}Ландшафт:
-STR_TREE_PLACER                                                 :{BLACK}�а�адженн� дерев:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Поворот рельєфу
-STR_TERRAIN_TYPE                                                :{BLACK}Тип ландшафту:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Рівень мор�:
-STR_SMOOTHNESS                                                  :{BLACK}Згладжений:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Ви�ота лінії �нігу:
-STR_DATE                                                        :{BLACK}Дата:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Мі�та:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Проми�лові�ть:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Підвищити лінію �нігу
-STR_SNOW_LINE_DOWN                                              :{BLACK}Понизити лінію �нігу
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Змінити ви�оту лінії �нігу
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Змінити рік початку гри
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Завелике значенн�
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Розміри дуже великі. Продовжити генерацію?
-STR_HEIGHTMAP_NAME                                              :{BLACK}�азва рельєфу:
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Розмір: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Генерувати
+STR_MAPGEN_RANDOM                                               :{BLACK}Випадково
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Змінити початкове значенн� дл� генератора
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Створенн� �віту
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Випадкове чи�ло:
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Клік дл� вводу значенн�
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Введіть випадкове чи�ло
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Ландшафт:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}�а�адженн� дерев:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Поворот рельєфу
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Тип ландшафту:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Рівень мор�:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Згладжений:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Ви�ота лінії �нігу:
+STR_MAPGEN_DATE                                                 :{BLACK}Дата:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Мі�та:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Проми�лові�ть:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Підвищити лінію �нігу
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Понизити лінію �нігу
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Змінити ви�оту лінії �нігу
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Змінити рік початку гри
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Завелике значенн�
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Розміри дуже великі. Продовжити генерацію?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}�азва рельєфу:
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Розмір: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Генераці� �віту...
 STR_GENERATION_ABORT                                            :{BLACK}Перервати
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Перервати генерацію �віту
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ви дій�но хочете перервати генерацію �віту
-STR_PROGRESS                                                    :{WHITE}{NUM}% завершено
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Створенн� �віту
-STR_TREE_GENERATION                                             :{BLACK}�а�адженн� дерев
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Генераці� нерухомо�ті
-STR_CLEARING_TILES                                              :{BLACK}Розкидати камінн�
-STR_SETTINGUP_GAME                                              :{BLACK}�алаштуванн� гри
-STR_PREPARING_TILELOOP                                          :{BLACK}Виконуємо цикл
-STR_PREPARING_GAME                                              :{BLACK}Генеруєть�� гра
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Змінити рівень �кладно�ті
-STR_SE_FLAT_WORLD                                               :{WHITE}Рівнина
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Генерувати рівнину
-STR_SE_RANDOM_LAND                                              :{WHITE}Випадково
-STR_SE_NEW_WORLD                                                :{BLACK}Створити новий �ценарій
-STR_SE_CAPTION                                                  :{WHITE}Тип �ценарію
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Підн�ти рівень рівної землі на 1
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Опу�тити рівень рівної землі на 1
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Змінити ви�оту рівн� рівної землі
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}Ви�ота рівн� мор�
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% завершено
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Створенн� �віту
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}�а�адженн� дерев
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Генераці� нерухомо�ті
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Розкидати камінн�
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}�алаштуванн� гри
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Виконуємо цикл
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Генеруєть�� гра
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Змінити рівень �кладно�ті
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Рівнина
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Генерувати рівнину
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Випадково
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Створити новий �ценарій
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}Тип �ценарію
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Підн�ти рівень рівної землі на 1
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Опу�тити рівень рівної землі на 1
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Змінити ви�оту рівн� рівної землі
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}Ви�ота рівн� мор�
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Центрувати мінікарту �юди
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Краї карти:
-STR_NORTHWEST                                                   :{BLACK}північно-західний
-STR_NORTHEAST                                                   :{BLACK}північно-�хідний
-STR_SOUTHEAST                                                   :{BLACK}південно-�хідний
-STR_SOUTHWEST                                                   :{BLACK}південно-західний
-STR_BORDER_FREEFORM                                             :{BLACK}вільний формат
-STR_BORDER_WATER                                                :{BLACK}Вода
-STR_BORDER_RANDOM                                               :{BLACK}Будь-�кий
-STR_BORDER_RANDOMIZE                                            :{BLACK}Будь-�кий
-STR_BORDER_MANUAL                                               :{BLACK}Вручну
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Краї карти:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}північно-західний
+STR_MAPGEN_NORTHEAST                                            :{BLACK}північно-�хідний
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}південно-�хідний
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}південно-західний
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}вільний формат
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Вода
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Будь-�кий
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Будь-�кий
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Вручну
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Малий
@@ -3532,21 +3532,21 @@ STR_MEASURE_AREA                                                :{BLACK}Діл�
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Довжина: {NUM}{}Різниц� ви�от: {NUM} м
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Діл�нка: {NUM} x {NUM}{}Різниц� ви�от: {NUM} м
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Плата за тран�фер: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...ц� дорога у вла�но�ті мі�та
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...дорога не в тому напр�мку
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Опції прозоро�ті
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Переключити прозорі�ть дл� знаків �танцій. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Переключити прозорі�ть дл� дерев. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Переключити прозорі�ть дл� будинків. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Переключити прозорі�ть дл� проми�лово�ті. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Переключити прозорі�ть дл� �поруд, таких �к �танції, депо тощо. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Переключити прозорі�ть дл� мо�тів. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Переключити прозорі�ть дл� �поруд, таких �к ма�ки та антени. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Переключити прозорі�ть дл� ЛЕП. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Змінити прозорі�ть індикаторів завантаженн�. Утримуйте Ctrl, щоб заблокувати
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Зробити об'єкти невидимими, а не прозорими
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Плата за тран�фер: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...ц� дорога у вла�но�ті мі�та
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...дорога не в тому напр�мку
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Опції прозоро�ті
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Переключити прозорі�ть дл� знаків �танцій. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Переключити прозорі�ть дл� дерев. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Переключити прозорі�ть дл� будинків. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Переключити прозорі�ть дл� проми�лово�ті. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Переключити прозорі�ть дл� �поруд, таких �к �танції, депо тощо. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Переключити прозорі�ть дл� мо�тів. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Переключити прозорі�ть дл� �поруд, таких �к ма�ки та антени. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Переключити прозорі�ть дл� ЛЕП. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Змінити прозорі�ть індикаторів завантаженн�. Утримуйте Ctrl, щоб заблокувати
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Зробити об'єкти невидимими, а не прозорими
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3556,7 +3556,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :У�і поїзди
 STR_GROUP_ALL_ROAD_VEHICLES                                     :У�і автомобілі
 STR_GROUP_ALL_SHIPS                                             :У�і кораблі
@@ -3565,24 +3565,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Ð�езгрупÐ
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :�езгруповані автомобілі
 STR_GROUP_DEFAULT_SHIPS                                         :�езгруповані кораблі
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :�езгруповані літаки
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Добавити �пільний тран�порт
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Позбути�� в�ього тран�порту
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Перейменувати групу
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}�е можна �творити групу...
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}�е можна �терти групу...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}�е можна перейменувати групу...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}�е можна позбути�� в�ього тран�порту цієї групи...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}�е можна додати цей тран�порт у групу...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}�е можна додати �пільний тран�порт у групу...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}�е можна �творити групу...
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}�е можна �терти групу...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}�е можна перейменувати групу...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}�е можна позбути�� в�ього тран�порту цієї групи...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}�е можна додати цей тран�порт у групу...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}�е можна додати �пільний тран�порт у групу...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Групи - клікніть на групі, щоб побачити �пи�ок тран�порту цієї групи
-STR_GROUP_CREATE_TIP                                            :{BLACK}Клікніть, щоб �творити групу
-STR_GROUP_DELETE_TIP                                            :{BLACK}Стерти вибрану групу
-STR_GROUP_RENAME_TIP                                            :{BLACK}Перейменувати вибрану групу
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Клікніть, щоб захи�тити групу від глобальної автозаміни
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Групи - клікніть на групі, щоб побачити �пи�ок тран�порту цієї групи
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Клікніть, щоб �творити групу
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Стерти вибрану групу
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Перейменувати вибрану групу
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Клікніть, щоб захи�тити групу від глобальної автозаміни
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3643,35 +3643,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}�азва має бути унікальною
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}�азва має бути унікальною
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}�а�тупне позначенн�
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Попереднє позначенн�
-STR_SIGN_OSKTITLE                                               :{BLACK}Введіть назву знака
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}�а�тупне позначенн�
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Попереднє позначенн�
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Введіть назву знака
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Фінан�увати
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Огл�д
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Будувати
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Виберіть необхідне виробництво
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Фінан�увати
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Огл�д
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Будувати
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Виберіть необхідне виробництво
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Детальний
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Детальний вибір обличч�
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Детальний вибір обличч�
 STR_FACE_SIMPLE                                                 :{BLACK}Про�тий
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Про�тий вибір обличч�
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Про�тий вибір обличч�
 STR_FACE_LOAD                                                   :{BLACK}Завантажити
-STR_FACE_LOAD_TIP                                               :{BLACK}Завантажити обране обличч�
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Завантажити обране обличч�
 STR_FACE_LOAD_DONE                                              :{WHITE}Обране обличч� було завантажене з файлу конфігурації OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Обличч� №
-STR_FACE_FACECODE_TIP                                           :{BLACK}Подивити�ь та/чи змінити номер обличч� гравц�
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Подивити�ь та/чи змінити номер обличч� гравц�
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Подивити�ь та/чи змінити номер обличч� гравц�
 STR_FACE_FACECODE_SET                                           :{WHITE}Було в�тановлено новий номер
 STR_FACE_FACECODE_ERR                                           :{WHITE}�е можна в�тановити номер обличч� гравц� - це має бути чи�ло  від 0 до 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Зберегти
-STR_FACE_SAVE_TIP                                               :{BLACK}Зберегти обране обличч�
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Зберегти обране обличч�
 STR_FACE_SAVE_DONE                                              :{WHITE}Це обличч� буде збережене �к обране у файлі конфігурації OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Європей�ькі
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Вибрати європей�ькі обличч�
@@ -3679,51 +3679,51 @@ STR_FACE_AFRICAN                                                :{BLACK}�фри
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Вибрати африкан�ькі обличч�
 STR_FACE_YES                                                    :Так
 STR_FACE_NO                                                     :�і
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Дозволити ву�а або �ережки
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Дозволити ву�а або �ережки
 STR_FACE_HAIR                                                   :Воло���:
-STR_FACE_HAIR_TIP                                               :{BLACK}Змінити воло���
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Змінити воло���
 STR_FACE_EYEBROWS                                               :Брова:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Змінити брова
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Змінити брова
 STR_FACE_EYECOLOUR                                              :Колір очей:
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Змінити колір очей:
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Змінити колір очей:
 STR_FACE_GLASSES                                                :Окул�ри:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Дозволити окул�ри
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Змінити окул�ри
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Дозволити окул�ри
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Змінити окул�ри
 STR_FACE_NOSE                                                   :�і�:
-STR_FACE_NOSE_TIP                                               :{BLACK}Змінити ні�
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Змінити ні�
 STR_FACE_LIPS                                                   :Губи:
 STR_FACE_MOUSTACHE                                              :Ву�а:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Змінити губи або ву�а
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Змінити губи або ву�а
 STR_FACE_CHIN                                                   :Підборідд�:
-STR_FACE_CHIN_TIP                                               :{BLACK}Змінити підборідд�
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Змінити підборідд�
 STR_FACE_JACKET                                                 :Піджак:
-STR_FACE_JACKET_TIP                                             :{BLACK}Змінити піджак
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Змінити піджак
 STR_FACE_COLLAR                                                 :Комір
-STR_FACE_COLLAR_TIP                                             :{BLACK}Змінити комір
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Змінити комір
 STR_FACE_TIE                                                    :Краватка:
 STR_FACE_EARRING                                                :Сережки:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Змінити комір або �ережки
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Змінити комір або �ережки
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Вибір �игналів
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}�е можна конвертувати �игнали тут...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Звичайний �игнал (�емафор){}Сигнали необхідні дл� того, щоб уникнути зіткнень поїздів на залізниц�х, де більше одного поїзда.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Вхідний �игнал (�емафор){}Зелений, доки є один або більше зелених вихідних �игналів з на�тупної �екції колії. Якщо нема - червоний.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Вихідний �игнал (�емафор){}Поводить��, �к звичайний �игнал, але необхідний дл� нормальної роботи вхідного або комбінованого �игналів.
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Комбінований �игнал (�емафор){}Комбінований �игнал працює �к пара вхідний-вихідний �игнал. Це дозвол�є будувати великі "дерева" �игналів.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Розширений �игнал (�емафор){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Розширені �игнали можуть проходити�ь з заднього боку.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Одно�торонній розширений �игнал (�емафор){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Одно�торонні розширені �игнали не можуть проходити�ь з заднього боку.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Звичайний �игнал (електричний){}Сигнали необхідні дл� того, щоб уникнути зіткнень поїздів на залізниц�х, де більше одного поїзда.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Вхідний �игнал (електричний){}Зелений, доки є один або більше зелених вихідних �игналів з на�тупної �екції колії. Якщо нема - червоний.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Вихідний �игнал (електричний){}Поводить��, �к звичайний �игнал, але необхідний дл� нормальної роботи вхідного або комбінованого �игналів.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Комбінований �игнал (електричний){}Комбінований �игнал працює �к пара вхідний-вихідний �игнал. Це дозвол�є будувати великі "дерева" �игналів.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Розширений �игнал (електричний){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Розширені �игнали можуть проходити�ь з заднього боку.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Одно�торонній розширений �игнал (електричний){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Одно�торонні розширені �игнали не можуть проходити�ь з заднього боку.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Заміна �игналів{}Якщо активна, нати�канн� на і�нуючому �игналі замінить його на обраний тип �игналу, CTRL-нати�канн� буде переключати і�нуючий варіант.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Ча�тота �игналів при перета�куванні
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Зменшити ча�тоту �игналів
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Збільшити ча�тоту �игналів
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Вибір �игналів
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}�е можна конвертувати �игнали тут...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Звичайний �игнал (�емафор){}Сигнали необхідні дл� того, щоб уникнути зіткнень поїздів на залізниц�х, де більше одного поїзда.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Вхідний �игнал (�емафор){}Зелений, доки є один або більше зелених вихідних �игналів з на�тупної �екції колії. Якщо нема - червоний.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Вихідний �игнал (�емафор){}Поводить��, �к звичайний �игнал, але необхідний дл� нормальної роботи вхідного або комбінованого �игналів.
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Комбінований �игнал (�емафор){}Комбінований �игнал працює �к пара вхідний-вихідний �игнал. Це дозвол�є будувати великі "дерева" �игналів.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Розширений �игнал (�емафор){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Розширені �игнали можуть проходити�ь з заднього боку.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Одно�торонній розширений �игнал (�емафор){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Одно�торонні розширені �игнали не можуть проходити�ь з заднього боку.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Звичайний �игнал (електричний){}Сигнали необхідні дл� того, щоб уникнути зіткнень поїздів на залізниц�х, де більше одного поїзда.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Вхідний �игнал (електричний){}Зелений, доки є один або більше зелених вихідних �игналів з на�тупної �екції колії. Якщо нема - червоний.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Вихідний �игнал (електричний){}Поводить��, �к звичайний �игнал, але необхідний дл� нормальної роботи вхідного або комбінованого �игналів.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Комбінований �игнал (електричний){}Комбінований �игнал працює �к пара вхідний-вихідний �игнал. Це дозвол�є будувати великі "дерева" �игналів.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Розширений �игнал (електричний){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Розширені �игнали можуть проходити�ь з заднього боку.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Одно�торонній розширений �игнал (електричний){}Розширений �игнал дозвол�є більше ніж одному поїзду одноча�но заходити до блоку �игналів, �кщо поїзд може зарезервувати шл�х до безпечної точки о�танову. Одно�торонні розширені �игнали не можуть проходити�ь з заднього боку.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Заміна �игналів{}Якщо активна, нати�канн� на і�нуючому �игналі замінить його на обраний тип �игналу, CTRL-нати�канн� буде переключати і�нуючий варіант.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Ча�тота �игналів при перета�куванні
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Зменшити ча�тоту �игналів
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Збільшити ча�тоту �игналів
 ########
 
 ############ on screen keyboard
@@ -3735,36 +3735,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Ð
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Параметри AI
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Показати на�тройки AI
 STR_AI_DEBUG                                                    :{WHITE}Дебаг AI
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}�азва AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}�азва AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Перезавантажити AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}Знищити AI, перезавантажити �крипт, та ре�тартувати AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Вікно Дебаг AI до�тупно тільки �ерверу
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Знищити AI, перезавантажити �крипт, та ре�тартувати AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Вікно Дебаг AI до�тупно тільки �ерверу
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Конфігураці� AI
-STR_AI_CHANGE                                                   :{BLACK}Вибір AI
-STR_AI_CONFIGURE                                                :{BLACK}�а�троїти
-STR_AI_CHANGE_TIP                                               :{BLACK}Завантажити інший AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}�а�троїти параметри AI
-STR_AI_LIST_TIP                                                 :{BLACK}У�і AI, �кі будуть завантажені у на�тупній грі
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Вибір AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}�а�троїти
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Завантажити інший AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}�а�троїти параметри AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}У�і AI, �кі будуть завантажені у на�тупній грі
 STR_AI_LIST_CAPTION                                             :{WHITE}До�тупні AI
-STR_AI_AILIST_TIP                                               :{BLACK}Клікніть, щоб вибрати AI
-STR_AI_ACCEPT                                                   :{BLACK}Прийн�ти
-STR_AI_ACCEPT_TIP                                               :{BLACK}Вибрати виділений AI
-STR_AI_CANCEL                                                   :{BLACK}Відміна
-STR_AI_CANCEL_TIP                                               :{BLACK}�е мін�ти AI
-STR_AI_CLOSE                                                    :{BLACK}Закрити
-STR_AI_RESET                                                    :{BLACK}Скиданн�
-STR_AI_HUMAN_PLAYER                                             :Гравець-людина
-STR_AI_RANDOM_AI                                                :Випадковий AI
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Клікніть, щоб вибрати AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Прийн�ти
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Вибрати виділений AI
+STR_AI_LIST_CANCEL                                              :{BLACK}Відміна
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}�е мін�ти AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Закрити
+STR_AI_SETTINGS_RESET                                           :{BLACK}Скиданн�
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Гравець-людина
+STR_AI_CONFIG_RANDOM_AI                                         :Випадковий AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Параметри AI
-STR_AI_AUTHOR                                                   :{BLACK}�втор: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Вер�і�: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Один з поточних AI зазнав краху. Будь ла�ка, повідомте про це автора AI зі знімком налагоджувального вікна AI.
+STR_AI_LIST_AUTHOR                                              :{BLACK}�втор: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Вер�і�: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Один з поточних AI зазнав краху. Будь ла�ка, повідомте про це автора AI зі знімком налагоджувального вікна AI.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Ліміт шуму в мі�ті: {ORANGE}{COMMA}{BLACK}  мак�: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Генерований шум: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Ліміт шуму в мі�ті: {ORANGE}{COMMA}{BLACK}  мак�: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Генерований шум: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3778,21 +3778,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :СценаріÐ
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Карта ви�от
 STR_CONTENT_TITLE                                               :{WHITE}Завантаженн� змі�ту
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Тип
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Тип вмі�ту
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Тип вмі�ту
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}�азва
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}�азва вмі�ту
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Клікніть на р�дку, щоб побачити деталі{}Клікніть позначку, щоб обрати його дл� завантаженн�
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}�азва вмі�ту
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Клікніть на р�дку, щоб побачити деталі{}Клікніть позначку, щоб обрати його дл� завантаженн�
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Вибрати в�і
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Позначити дл� завантаженн� ве�ь вмі�т
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Позначити дл� завантаженн� ве�ь вмі�т
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Вибрати оновленн�
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Позначити ве�ь вмі�т, що є оновленн�м і�нуючого, дл� завантаженн�
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Позначити ве�ь вмі�т, що є оновленн�м і�нуючого, дл� завантаженн�
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Зн�ти позначки
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}�е завантажувати нічого
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}�е завантажувати нічого
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Введіть �троку фільтру
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Введіть ключове �лово дл� фільтраціі �пи�ку
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Введіть ключове �лово дл� фільтраціі �пи�ку
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Фільтр за назвою:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Завантажити
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Почати завантаженн� обраного вмі�ту
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Почати завантаженн� обраного вмі�ту
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Загальний розмір завантажень: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}Вмі�т - інформаці�
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Ви не обрали це дл� завантаженн�
@@ -3825,6 +3825,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Ð�е мÐ
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Перевірити вмі�т у Internet
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Перевірити новий та оновлений вмі�т дл� завантаженн�
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Знайти від�утній вмі�т в Інтернет
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Перевірити, чи можна знайти від�утній вмі�т в Інтернет
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Знайти від�утній вмі�т в Інтернет
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Перевірити, чи можна знайти від�утній вмі�т в Інтернет
 ########
diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt
index 5b262da1b..853ef1a45 100644
--- a/src/lang/unfinished/frisian.txt
+++ b/src/lang/unfinished/frisian.txt
@@ -198,26 +198,26 @@ STR_UNITS_VOLUME_LONG_SI                                        :{COMMA} m³
 STR_UNITS_FORCE_SI                                              :{COMMA} kN
 
 # Common window strings
-STR_SORT_ORDER_TIP                                              :{BLACK}Selektear skiftrjochting (oprinnend/ôfrinnend)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Selektear skiftnoarm
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Selekear filternoarm
-STR_SORT_BY                                                     :{BLACK}Skifte op
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Selektear skiftrjochting (oprinnend/ôfrinnend)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Selektear skiftnoarm
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Selekear filternoarm
+STR_BUTTON_SORT_BY                                              :{BLACK}Skifte op
 STR_BUTTON_LOCATION                                             :{BLACK}Lokaasje
-STR_QUERY_RENAME                                                :{BLACK}Omneame
+STR_BUTTON_RENAME                                               :{BLACK}Omneame
 
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Slút finster
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Finstertitel - hjirmei kinst it finster ferslepe
-STR_STICKY_BUTTON                                               :{BLACK}Skerm as net-slútber markeare mei de kaai 'Slút alle skermen'
-STR_RESIZE_BUTTON                                               :{BLACK}Klik en sleep om skermgrutte oan te passen
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Wikselje tusken lytse/grutte skermgrutte
+STR_TOOLTIP_STICKY                                              :{BLACK}Skerm as net-slútber markeare mei de kaai 'Slút alle skermen'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik en sleep om skermgrutte oan te passen
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Wikselje tusken lytse/grutte skermgrutte
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rolbalke - rollet de list op/del
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Rôlbalke - rôlje list links/rjochts
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Brek gebouen ensfh. ôf op in stikje lân
 
 # Query window
-STR_DEFAULT                                                     :{BLACK}Standert
-STR_QUERY_CANCEL                                                :{BLACK}Annulearje
-STR_QUERY_OK                                                    :{BLACK}OK
+STR_BUTTON_DEFAULT                                              :{BLACK}Standert
+STR_BUTTON_CANCEL                                               :{BLACK}Annulearje
+STR_BUTTON_OK                                                   :{BLACK}OK
 
 # On screen keyboard window
 
@@ -288,7 +288,7 @@ STR_SCENEDIT_TOOLBAR_PLACE_SIGN                                 :{BLACK}Set in b
 ############ range for SE file menu starts
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Sla scenario op
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Laad scenario
-STR_MENU_LOAD_HEIGHTMAP                                         :Laad hichtekaart
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Laad hichtekaart
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Slút de lânskipsbouer
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Ôfslúte
@@ -453,7 +453,7 @@ STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINYFONT}{BLAC
 
 # Graph key window
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Kaai foar bedriuwsgrafiken
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Klik hjir om te bedriuwstagong foar grafyk oan of út te sette
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Klik hjir om te bedriuwstagong foar grafyk oan of út te sette
 
 # Company league window
 STR_COMPANY_LEAGUE_TABLE_CAPTION                                :{WHITE}Bedriuwskompetysjetabel
@@ -597,7 +597,7 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  PA
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AUTOSAVE
 
 # News message history
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 
 # Message settings window
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Berjocht
@@ -854,9 +854,9 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Slút 'O
 
 # Quit window
 STR_QUIT_CAPTION                                                :{WHITE}Ôfslúte
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Witte jo seker dat jo dit spul ôfslúte wolle en werom gean wolle nei {STRING}?
-STR_YES                                                         :{BLACK}Ja
-STR_NO                                                          :{BLACK}Nee
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Witte jo seker dat jo dit spul ôfslúte wolle en werom gean wolle nei {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ja
+STR_QUIT_NO                                                     :{BLACK}Nee
 
 # Supported OSes
 STR_OSNAME_WINDOWS                                              :Windows
@@ -872,10 +872,10 @@ STR_OSNAME_SUNOS                                                :SunOS
 # Abandon game
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Ferlit Spul
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Wolsto echt dit lânskip slúte?
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Wolsto echt dit lânskip slúte?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Wolsto echt dit lânskip slúte?
 
 # Cheat window
-STR_TOYLAND_LANDSCAPE                                           :Boartersguodlânskip
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Boartersguodlânskip
 
 # Livery window
 STR_LIVERY_CAPTION                                              :{WHITE}Nei Kleurenskema
@@ -895,46 +895,46 @@ STR_FACE_NEW_FACE_BUTTON                                        :{BLACK}Nei Gesi
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Meistje willekeurich nij gesicht
 
 # Network server list
-STR_NETWORK_CONNECTION                                          :{BLACK}Ferbining:
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Ynternet
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Namme fan spieler:
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Ferbining:
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Ynternet
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Namme fan spieler:
 
-STR_NETWORK_GAME_NAME                                           :{BLACK}Namme
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Namme fan dit spul
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Lângrutte
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Datum
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Jieren
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Namme
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Namme fan dit spul
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Lângrutte
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Datum
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Jieren
 
 
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Lângrutte: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Tsjinnerferzje: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Start datum: {WHITE}{DATE_SHORT}
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}SERVER NET BESKIKBER
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}FERKEARDE FERZJE
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Lângrutte: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Tsjinnerferzje: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Start datum: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}SERVER NET BESKIKBER
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}FERKEARDE FERZJE
 
 
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Tsjinner tafoegje
-STR_NETWORK_START_SERVER                                        :{BLACK}Start tsjinner
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Start dien eigen tsjinner
+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
 
 
 # Start new multiplayer server
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Start in spul foar multispilers
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Start in spul foar multispilers
 
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Spulnamme:
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Selektear in lân:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Spulnamme:
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Selektear in lân:
 
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN_INTERNET                                        :LAN / Ynternet
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} taskôger{P "" s}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Maksimaal tal taskôgers:
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Ynternet
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} taskôger{P "" s}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Maksimaal tal taskôgers:
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
 
-STR_NETWORK_START_GAME                                          :{BLACK}Start Spul
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Laad Spul
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Start Spul
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Laad Spul
 
 
 # Network game languages
@@ -944,15 +944,15 @@ STR_NETWORK_LOAD_GAME                                           :{BLACK}Laad Spu
 # Network game lobby
 
 
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Prestaasje: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Prestaasje: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Auto's: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stasjons: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Spilers: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Auto's: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stasjons: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Spilers: {WHITE}{STRING}
 
 
 # Network connecting window
-STR_NETWORK_CONNECTING                                          :{WHITE}Ferbyning meitsje...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Ferbyning meitsje...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Ferbyning meitsje...
@@ -985,20 +985,20 @@ STR_NETWORK_CHAT_TO_COMPANY                                     :[Team] Oan {STR
 STR_NETWORK_CHAT_CLIENT                                         :[Privee] {STRING}: {WHITE}{STRING}
 
 # Network messages
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Koe de tsjinner net starte
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Koe gjin ferbyning meitsje
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Koe de tsjinner net starte
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Koe gjin ferbyning meitsje
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :algemiene flater
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :koe it lân net lade
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :algemiene flater
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :koe it lân net lade
 ############ End of leave-in-this-order
 
 # Network related errors
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} is in neie taskôger
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} hat syn/har namme oanpast nei {STRING}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} is in neie taskôger
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} hat syn/har namme oanpast nei {STRING}
 
 # Content downloading window
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Type
@@ -1038,8 +1038,8 @@ STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Levert:
 
 # Join station window
 
-STR_SELECT_WAYPOINT_TO_JOIN                                     :{BLACK}Kontrôlepost gearfoegje
-STR_CREATE_SPLITTED_WAYPOINT                                    :{YELLOW}In apart kontrôlepost bouwe
+STR_JOIN_WAYPOINT_CAPTION                                       :{BLACK}Kontrôlepost gearfoegje
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}In apart kontrôlepost bouwe
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Spoarwei Konstruksje
@@ -1060,8 +1060,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Treindep
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Selektearje treindepot rjochting
 
 # Rail waypoint construction window
-STR_WAYPOINT                                                    :{WHITE}Kontrôlepost
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Selectear type kontrôlepost
+STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrôlepost
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Selectear type kontrôlepost
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Treinstasjon Seleksje
@@ -1072,15 +1072,15 @@ STR_STATION_BUILD_PLATFORM_LENGTH                               :{BLACK}Stasjon
 STR_STATION_BUILD_PLATFORM_LENGTH_TOOLTIP                       :{BLACK}Selektear lengte fan treinstasjon
 
 
-STR_STAT_CLASS_WAYP                                             :Kontrôleposten
+STR_STATION_CLASS_WAYP                                          :Kontrôleposten
 
 # Signal window
 
 # Bridge selection window
 STR_SELECT_RAIL_BRIDGE_CAPTION                                  :{WHITE}Selektear Spoarbrêge
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Selektear brêge
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Brêge seleksje - klik op de brêge dyst boue wolst
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Brêge seleksje - klik op de brêge dyst boue wolst
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Hingbrêge, Stiel
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Brêge mei balken, Stiel
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Fakwurkbrêge, Stiel
@@ -1102,13 +1102,13 @@ STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Wikselje
 
 # Road depot construction window
 STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION                        :{WHITE}Autodepot rjochting
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Kies rjochting foar autodepot
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Kies rjochting foar autodepot
 
 # Road vehicle station construction window
 
 # Waterways toolbar (last two for SE only)
-STR_CREATE_LAKE                                                 :{BLACK}Tsjut wettergebied oan.{}Meitsje in kanaal, of ast' Ctrl op seenivo yndrukst, dan oerstreamt it gebied deromhinne
-STR_CREATE_RIVER                                                :{BLACK}Rivier pleatse.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Tsjut wettergebied oan.{}Meitsje in kanaal, of ast' Ctrl op seenivo yndrukst, dan oerstreamt it gebied deromhinne
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Rivier pleatse.
 
 # Ship depot construction window
 
@@ -1124,9 +1124,9 @@ STR_STATION_BUILD_AIRPORT_CAPTION                               :{WHITE}Fleanfji
 
 
 # Landscaping toolbar
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Ferleech in hoekje lân
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Ferheech in hoekje lân
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Keapje lân om letter te brûken
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Ferleech in hoekje lân
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Ferheech in hoekje lân
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Keapje lân om letter te brûken
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Beammen
@@ -1144,7 +1144,7 @@ STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA                :{BLACK}Fergruts
 STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Ferlyts gebiet om te ferheegjen/ferleegjen
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Meitsje samar wat lân
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Set it lânskip werom
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Alle spilerbesittings fan'e kaart fuortsmite
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Alle spilerbesittings fan'e kaart fuortsmite
 
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Lânskip weromsette
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Bisto der wis fan alle spilerbesittings fuort te smiten?
@@ -1160,28 +1160,28 @@ STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Grutte
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Lyts
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Middel
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Grut
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Samar in getal
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Samar in getal
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Selektear de grutte fan 'e stêd
 STR_FOUND_TOWN_CITY                                             :{BLACK}Stêd
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Stêden groeien flugger as doarpen{}Ôfhinklik fan ynstellings binne se grutter at se makke wurde
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Strjittenpatroan
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Selektear strjittenpatroan foar dit plak
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Orizjiniel
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Bettere diken
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}2x2 raster
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}3x3 raster
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Samar
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Strjittenpatroan
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Selektear strjittenpatroan foar dit plak
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Orizjiniel
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Bettere diken
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}2x2 raster
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}3x3 raster
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Samar
 
 # Fund new industry window
 STR_FUND_INDUSTRY_CAPTION                                       :{WHITE}Betelje nije yndustry
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Kostet: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Kostet: {YELLOW}{CURRENCY}
 
 # Land area window
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Lân Gebiet Ynformaasje
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Kosten om leech te meitsjen: {LTBLUE}N/B
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Kosten om leech te meitsjen: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Netto omset: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Netto omset: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/B
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Eigner: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Dykeigener: {LTBLUE}{STRING}
@@ -1193,65 +1193,65 @@ STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Akseptea
 STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
 
 # Description of land area of different tiles
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Rotsen
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Rûch lân
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Leech lân
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gers
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Fjilden
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Snie
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Woastine
-
-STR_RAILROAD_TRACK                                              :Spoarwei
-STR_RAILROAD_TRAIN_DEPOT                                        :Treindepot
-
-STR_ROAD_DESCRIPTION_ROAD                                       :Wei
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Wei mei strjitteljochten
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Wei mei beammen oan 'e siden
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Autodepot
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Dyk/spoar krusing
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Rotsen
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Rûch lân
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Leech lân
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gers
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Fjilden
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snie
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Woastine
+
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Spoarwei
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Treindepot
+
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Wei
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Wei mei strjitteljochten
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Wei mei beammen oan 'e siden
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Autodepot
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Dyk/spoar krusing
 
 # Houses come directly from their building names
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (yn oanbou)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (yn oanbou)
 
-STR_TREE_NAME_TREES                                             :Beammen
-STR_TREE_NAME_RAINFOREST                                        :Reinwâld
-STR_TREE_NAME_CACTUS_PLANTS                                     :Kaktussen
+STR_LAI_TREE_NAME_TREES                                         :Beammen
+STR_LAI_TREE_NAME_RAINFOREST                                    :Reinwâld
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Kaktussen
 
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Treinstasjon
-STR_STATION_DESCRIPTION_AIRPORT                                 :Fleanfjild
-STR_STATION_DESCRIPTION_BUS_STATION                             :Bushalte
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Haven
-STR_STATION_DESCRIPTION_BUOY                                    :Boei
-STR_LANDINFO_WAYPOINT                                           :Kontrôlepost
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Treinstasjon
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Fleanfjild
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Bushalte
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Haven
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Boei
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrôlepost
 
-STR_WATER_DESCRIPTION_WATER                                     :Wetter
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Wetter
 
 # Industries come directly from their industry names
 
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Spoartunnel
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Tunnel
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Spoartunnel
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Tunnel
 
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Stielen spoarfakwurkbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Stielen brêge mei balken
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Stielen spoarfakwurkbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Fersterke betonnen spoarhingbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Houten spoarbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Betonnen spoarbrêge
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Buis Spoarbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Stielen spoarfakwurkbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Stielen brêge mei balken
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Stielen spoarfakwurkbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Fersterke betonnen spoarhingbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Houten spoarbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Betonnen spoarbrêge
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Buis Spoarbrêge
 
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Stielen hingbrêge
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Stielen brêge mei balken
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Stielen fakwurkbrêge
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Fersterke betonnen hingbrêge
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Houten brêge
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Betonnen brêge
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Buis Brêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Stielen hingbrêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Stielen brêge mei balken
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Stielen fakwurkbrêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Fersterke betonnen hingbrêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Houten brêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Betonnen brêge
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Buis Brêge
 
 
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Sendmast
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Fjoertoer
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Haadkantoar Bedriuw
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Lân fan bedriuw
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Sendmast
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Fjoertoer
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Haadkantoar Bedriuw
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Lân fan bedriuw
 
 # About OpenTTD window
 STR_ABOUT_OPENTTD                                               :{WHITE}Oer OpenTTD
@@ -1264,7 +1264,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Spul Ops
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Spul Lade
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Sla Scenario op
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Laad Scenario
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Laad Hichtemap
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Laad Hichtemap
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Hjir klikke om nei standert opslach- en laadtriemtafel te gean
 STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}List fan skiven, mappen en bestânen
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Fuortsmite
@@ -1272,8 +1272,8 @@ STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Opslaan
 
 
 # World generation
-STR_MAPSIZE                                                     :{BLACK}Lângrutte:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Lângrutte:
+STR_MAPGEN_BY                                                   :{BLACK}*
 
 # Strings for map borders at game generation
 
@@ -1296,7 +1296,7 @@ STR_BY                                                          :{BLACK}*
 # NewGRF (self) generated warnings/errors
 
 # NewGRF related 'general' warnings
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Warskôging!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Warskôging!
 
 
 
@@ -1359,7 +1359,7 @@ STR_SUBSIDIES_OFFERED_FROM_TO                                   :{ORANGE}{STRING
 STR_SUBSIDIES_NONE                                              :{ORANGE}Gjin
 STR_SUBSIDIES_SUBSIDISED_TITLE                                  :{BLACK}Tsjinsten dy't al subsydzje krije:
 STR_SUBSIDIES_SUBSIDISED_FROM_TO                                :{ORANGE}{STRING} fan {STATION} nei {STATION}{YELLOW} ({COMPANY}{YELLOW}, oant {DATE_SHORT})
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik om te sentrearen op yndusty/stêd
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik om te sentrearen op yndusty/stêd
 
 # Station list window
 STR_STATION_LIST_STATION                                        :{YELLOW}{STATION} {STATIONFEATURES}
@@ -1388,13 +1388,13 @@ STR_CARGO_RATING_VERY_GOOD                                      :Hiel Goed
 STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Sintrearje it byld op de lokaasje fan dit stasjon
 
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Jou stasjon in oare namme
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Jou stasjon in oare namme
 
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Sintrearje it byld op de lokaasje fan dizze kontrôlepost
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Namme fan kontrôlepost oanpasse
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Namme fan kontrôlepost oanpasse
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Sintrearje it byld op de lokaasje fan dizze boei
-STR_CHANGE_BUOY_NAME                                            :{BLACK}Namme fan boei oanpasse
+STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Namme fan boei oanpasse
 
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Namme fan kontrôlepost oanpasse
 
@@ -1455,8 +1455,8 @@ STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Ferkeapj
 STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Keapje 25% oandielen fan dit bedriuw
 STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Ferkeapje 25% oandielen fan dit bedriuw
 
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Bedriuwsnamme
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Namme fan Direkteur
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Bedriuwsnamme
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Namme fan Direkteur
 
 STR_BUY_COMPANY_MESSAGE                                         :{WHITE}Wy sykje in transportbedriuw om ús bedriuw oer te nimmen.{}{}Wolsto {COMPANY} foar {CURRENCY} keapje?
 
@@ -1486,12 +1486,12 @@ STR_INDUSTRY_VIEW_PRODUCES_CARGO_CARGO                          :{BLACK}Produsea
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Fertsjinste dit jier: {CURRENCY} (ferline jier: {CURRENCY})
 
 
-STR_SEND_FOR_SERVICING                                          :Stjoer foar ûnderhâldsbeurt
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Stjoer foar ûnderhâldsbeurt
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Stjoer nei depot
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Stjoer nei depot
-STR_SEND_SHIP_TO_DEPOT                                          :Stjoer nei depot
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stjoer nei hangaar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Stjoer nei depot
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Stjoer nei depot
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Stjoer nei depot
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Stjoer nei hangaar
 
 
 
@@ -1532,10 +1532,10 @@ STR_SEND_AIRCRAFT_TO_HANGAR                                     :Stjoer nei hang
 
 
 # Autoreplace window
-STR_VEHICLE_TRAIN                                               :Trein
-STR_VEHICLE_ROAD_VEHICLE                                        :Auto
-STR_VEHICLE_SHIP                                                :Skip
-STR_VEHICLE_AIRCRAFT                                            :Fleanmasine
+STR_REPLACE_VEHICLE_TRAIN                                       :Trein
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Auto
+STR_REPLACE_VEHICLE_SHIP                                        :Skip
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Fleanmasine
 
 
 
@@ -1556,8 +1556,8 @@ STR_VEHICLE_AIRCRAFT                                            :Fleanmasine
 # Messages in the start stop button in the vehicle view
 
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Ûnderweis nei {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Ûnderweis nei {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Ûnderweis nei {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Ûnderweis nei {WAYPOINT}, {VELOCITY}
 
 
 
@@ -1566,8 +1566,8 @@ STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Namme
 
 
 # The next two need to stay in this order
-STR_AGE                                                         :{COMMA} jier{P "" ren} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} jier{P "" ren} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} jier{P "" ren} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} jier{P "" ren} ({COMMA})
 
 
 
@@ -1577,9 +1577,9 @@ STR_AGE_RED                                                     :{RED}{COMMA} ji
 
 # Extra buttons for train details windows
 
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Totale kapasiteit fan dizze trein:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Totale kapasiteit fan dizze trein:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 
 
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Fracht
@@ -1611,8 +1611,8 @@ STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Totale F
 
 
 # String parts to build the order string
-STR_GO_TO_WAYPOINT                                              :Lâns {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Oanienwei lâns {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Lâns {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Oanienwei lâns {WAYPOINT}
 
 
 
@@ -1634,21 +1634,21 @@ STR_GO_NON_STOP_TO_WAYPOINT                                     :Oanienwei lâns
 
 # AI debug window
 
-STR_AI_NO_AI_FOUND                                              :Gjin geskikte compjûterspiler fûn.{}Disse compjûterspiler is in dummy en docht neat.{}Jo kinne compjûterspilers delhelje fan 'Online Inhâld' ôf.
+STR_ERROR_AI_NO_AI_FOUND                                        :Gjin geskikte compjûterspiler fûn.{}Disse compjûterspiler is in dummy en docht neat.{}Jo kinne compjûterspilers delhelje fan 'Online Inhâld' ôf.
 
 # AI configuration window
 
 
 # Available AIs window
 
-STR_AI_VERSION                                                  :{BLACK}Ferzje: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Ferzje: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 
-STR_AI_ACCEPT                                                   :{BLACK}Akseptearje
-STR_AI_CANCEL                                                   :{BLACK}Annulearje
+STR_AI_LIST_ACCEPT                                              :{BLACK}Akseptearje
+STR_AI_LIST_CANCEL                                              :{BLACK}Annulearje
 
 # AI Parameters
-STR_AI_CLOSE                                                    :{BLACK}Slúte
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Slúte
 
 # Vehicle loading indicators
 
@@ -1692,7 +1692,7 @@ STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...terre
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...is al bout
 STR_ERROR_OWNED_BY                                              :{WHITE}...is fan {STRING}
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...gebiet is fan in oar bedriuw
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} yn it paad
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} yn it paad
 
 # Local authority errors
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}{TOWN} gemiente stiet dit net ta
@@ -1720,13 +1720,13 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Kin net
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Kin net 25% oandielen fan dit bedriuw ferkeapje...
 
 # Town related errors
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Kin gjin stêd bouwe
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Kin gjin stêd bouwe
 STR_ERROR_CAN_T_RENAME_TOWN                                     :{WHITE}Kin de namme net feroarje...
 STR_ERROR_CAN_T_BUILD_TOWN_HERE                                 :{WHITE}Kin hjir gjin stêd boue...
 STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...te ticht by de râne fan 'e map
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...te ticht by in oare stêd
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...te folle stêden
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...der is gjin romte mear op'e kaart
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...der is gjin romte mear op'e kaart
 
 # Industry related errors
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Kin hjir gjin {STRING} boue...
@@ -1768,11 +1768,11 @@ STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Fleanfji
 STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Foeget mear dan ien kontrôlepost gear
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}Te ticht by in oar kontrôlepost
 
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Kin jirre gjin kontrôlepost bouwe...
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Kin de namme fan it kontrôlepost net oanpasse...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kin jirre gjin kontrôlepost bouwe...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kin de namme fan it kontrôlepost net oanpasse...
 
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Kin kontrôlepost jirre net fuorthelje...
-STR_MUST_REMOVE_RAILWAYPOINT_FIRST                              :{WHITE}Kontrôlepost op it spoar earst ferwiderje
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kin kontrôlepost jirre net fuorthelje...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Kontrôlepost op it spoar earst ferwiderje
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...boei yn it paad
 
 # Depot related errors
@@ -1811,7 +1811,7 @@ STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Kin hjir
 # Bridge related errors
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Kin hjir gjin brêge boue...
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Brêge moat earst fuorthelle wurde
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Begjin en ein kin net op itselde plak wêze
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Begjin en ein kin net op itselde plak wêze
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Begjin en ein moatte op ien lijn wêze
 STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...beide úteinden fan'e brêge moatte op lân lizze
 
@@ -2135,24 +2135,24 @@ STR_FORMAT_DATE_SHORT                                           :{STRING} {NUM}
 STR_FORMAT_DATE_LONG                                            :{STRING} {STRING} {NUM}
 STR_FORMAT_DATE_ISO                                             :{2:NUM}-{1:STRING}-{0:STRING}
 
-STR_BUOYNAME_CITY                                               :{TOWN} Boei
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Boei #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Boei
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Boei #{COMMA}
 STR_FORMAT_COMPANY_NUM                                          :(Bedriuw {COMMA})
-STR_WAYPOINTNAME_CITY                                           :{TOWN} Kontrôlepost
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Kontrôlepost #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Kontrôlepost
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Kontrôlepost #{COMMA}
 
-STR_SIGN_DEFAULT                                                :Buordsje
+STR_DEFAULT_SIGN_NAME                                           :Buordsje
 STR_COMPANY_SOMEONE                                             :immen{SKIP}{SKIP}
 
 
 # Viewport strings
 
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
 
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 
 # Simple strings to get specific types of data
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -2191,11 +2191,11 @@ STR_SILVER_CROSS                                                :{SILVER}{CROSS}
 STR_WHITE_DATE_SHORT                                            :{WHITE}{DATE_SHORT}
 STR_WHITE_DATE_LONG                                             :{WHITE}{DATE_LONG}
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_BLACK_STRING                                                :{BLACK}{STRING}
 STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 STR_BLACK_SMALL_ARROW_UP                                        :{BLACK}{SMALLUPARROW}
 STR_BLACK_SMALL_ARROW_DOWN                                      :{BLACK}{SMALLDOWNARROW}
diff --git a/src/lang/unfinished/greek.txt b/src/lang/unfinished/greek.txt
index 2d67ef606..7703dd8e5 100644
--- a/src/lang/unfinished/greek.txt
+++ b/src/lang/unfinished/greek.txt
@@ -159,7 +159,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Χά�τ
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Επιλογές Παιχνιδιο�
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Μήνυμα
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Μήνυμα από {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Π�οσοχή!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Π�οσοχή!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Αυτό δεν γίνεται....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Αυτή η πε�ιοχή είναι αδ�νατο να καθα�ιστεί...
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Α�χικά Πνευματικά Δικαιώματα {COPYRIGHT} 1995 Chris Sawyer, Όλα τα δικαιώματα διατη�ο�νται
@@ -167,9 +167,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Η ομάδα του OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Έξοδος
-STR_YES                                                         :{BLACK}�αι
-STR_NO                                                          :{BLACK}Όχι
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Είστε σίγου�ος/η ότι θέλετε να πα�ατήσετε το παιχνίδι και να επιστ�έψετε στο {STRING};
+STR_QUIT_YES                                                    :{BLACK}�αι
+STR_QUIT_NO                                                     :{BLACK}Όχι
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Είστε σίγου�ος/η ότι θέλετε να πα�ατήσετε το παιχνίδι και να επιστ�έψετε στο {STRING};
 
 STR_JUST_NOTHING                                                :Τίποτα
 STR_COLOUR_DARK_BLUE                                            :Σκο��ο Μπλε
@@ -230,11 +230,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Έ�ημος
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Χιόνι
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Μήνυμα
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Π�οεπιλογή
-STR_QUERY_CANCEL                                                :{BLACK}Ακ��ωση
-STR_QUERY_OK                                                    :{BLACK}Εντάξει
-STR_QUERY_RENAME                                                :{BLACK}Μετονομασία
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Π�οεπιλογή
+STR_BUTTON_CANCEL                                               :{BLACK}Ακ��ωση
+STR_BUTTON_OK                                                   :{BLACK}Εντάξει
+STR_BUTTON_RENAME                                               :{BLACK}Μετονομασία
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -251,16 +251,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Φο�τ
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Πλη�οφο�ίες
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Χω�ητικότητες
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Συνολικό Φο�τίο
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Συνολική χω�ητικότητα φο�τίου του τ�αίνου:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Συνολική χω�ητικότητα φο�τίου του τ�αίνου:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}�έο Παιχνίδι
 STR_INTRO_LOAD_GAME                                             :{BLACK}Φό�τωση Παιχνιδιο�
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Πολοί παίκτες
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Διαμό�φωση Σενα�ίου
 
-STR_MAPSIZE                                                     :{BLACK}Διάσταση χά�τη:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Διάσταση χά�τη:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Επιλογές Παιχνιδιο�
 
 STR_COMPANY_SOMEONE                                             :κάποιος{SKIP}{SKIP}
@@ -309,10 +309,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Έξοδος α
 STR_FILE_MENU_EXIT                                              :Έξοδος
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Είστε σίγου�ος ότι θέλετε να εγκαταλείψετε το παιχνίδι;
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Εγκατάλειψη Παιχνιδιο�
-STR_SORT_ORDER_TIP                                              :{BLACK}Επιλογή σει�άς ταξινόμησης  (καθοδικά/ανοδικά)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Επιλογή κ�ιτη�ίου ταξινόμησης
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Επιλέξτε κ�ιτή�ια φιλτ�α�ίσματος
-STR_SORT_BY                                                     :{BLACK}Ταξινόμηση κατά
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Επιλογή σει�άς ταξινόμησης  (καθοδικά/ανοδικά)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Επιλογή κ�ιτη�ίου ταξινόμησης
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Επιλέξτε κ�ιτή�ια φιλτ�α�ίσματος
+STR_BUTTON_SORT_BY                                              :{BLACK}Ταξινόμηση κατά
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Πληθυσμός
@@ -344,24 +344,24 @@ STR_SORT_BY_RUNNING_COST                                        :Κόστος Σ
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Δ�ναμη/Κόστος Συντή�ησης
 STR_SORT_BY_CARGO_CAPACITY                                      :Χω�ητικότητα Φο�τίου
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Κανένα εμπό�ευμα κανενός τ�που δεν πε�ιμένει
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Επιλογή όλων των εγκαταστάσεων
-STR_SELECT_ALL_TYPES                                            :{BLACK}Επιλογή όλων των τ�πων φο�τίου (συμπε�ιλαμβανομένου φο�τίου μη-αναμονής)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Π�οβολή λίστας διαθέσιμων σχεδίων μηχανών για τον τ�πο οχήματος.
-STR_MANAGE_LIST                                                 :{BLACK}Διαχεί�ιση λίστας
-STR_MANAGE_LIST_TIP                                             :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
-STR_REPLACE_VEHICLES                                            :Αντικατέστησε τα οχήματα
-STR_SEND_FOR_SERVICING                                          :Στείλε για επισκευή
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Διαθέσιμα Τ�ένα
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Διαθέσιμα Οχήματα
-STR_AVAILABLE_SHIPS                                             :{BLACK}Διαθέσιμα Πλοία
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Διαθέσιμα Αε�οσκάφη
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Στείλε στο υπόστεγο
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Στείλε στο αμαξοστασίο
-STR_SEND_SHIP_TO_DEPOT                                          :Στείλε στο ναυπηγείο
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Στείλε στο υπόστεγο
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Κανένα εμπό�ευμα κανενός τ�που δεν πε�ιμένει
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Επιλογή όλων των εγκαταστάσεων
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Επιλογή όλων των τ�πων φο�τίου (συμπε�ιλαμβανομένου φο�τίου μη-αναμονής)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Π�οβολή λίστας διαθέσιμων σχεδίων μηχανών για τον τ�πο οχήματος.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Διαχεί�ιση λίστας
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Στείλε οδηγίες σε όλα τα οχήματα σε αυτή λίστα
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Αντικατέστησε τα οχήματα
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Στείλε για επισκευή
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Διαθέσιμα Τ�ένα
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Διαθέσιμα Οχήματα
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Διαθέσιμα Πλοία
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Διαθέσιμα Αε�οσκάφη
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Στείλε στο υπόστεγο
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Στείλε στο αμαξοστασίο
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Στείλε στο ναυπηγείο
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Στείλε στο υπόστεγο
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -391,12 +391,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Επιλ
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Δεν μπο�εί να αλλάξει το διάστημα της συντή�ησης...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Κλείσιμο πα�αθ��ου
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Τίτλος πα�αθ��ου - σ��ετε για να το μετακινήσετε
-STR_STICKY_BUTTON                                               :{BLACK}Σημείωση αυτο� του πα�αθ��ου να μην κλείνει από το πλήκτ�ο 'Κλείσιμο Πα�αθ��ων'
-STR_RESIZE_BUTTON                                               :{BLACK}Κάντε κλίκ και σ��ετε για να αλλάξετε το μέγεθος του πα�αθ��ου
+STR_TOOLTIP_STICKY                                              :{BLACK}Σημείωση αυτο� του πα�αθ��ου να μην κλείνει από το πλήκτ�ο 'Κλείσιμο Πα�αθ��ων'
+STR_TOOLTIP_RESIZE                                              :{BLACK}Κάντε κλίκ και σ��ετε για να αλλάξετε το μέγεθος του πα�αθ��ου
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Κάντε κλίκ εδώ για να πάτε στον τ�έχων φάκελλο αποθήκευσης
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Κατεδάφιση των κτη�ίων κ.λπ. σε συγκεκ�ιμένο τετ�άγωνο
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Χαμηλώστε μια γωνία του εδάφους
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Ανυψώστε μια γωνία του εδάφους
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Χαμηλώστε μια γωνία του εδάφους
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Ανυψώστε μια γωνία του εδάφους
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Μπά�α Κ�λισης - μετακινεί την λίστα πάνω/κάτω
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Μπά�α κίνησης - κινεί τη λίστα  α�ιστε�ά/δεξιά
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Εμφάνιση πε�ιγ�αμμάτων εδάφους στο χά�τη
@@ -409,21 +409,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Εναλ
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Κέ�δος αυτό το έτος: {CURRENCY} (π�οηγο�μενο έτος: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} χ�όν{P ος ια} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} χ�όν{P ος ια} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} χ�όν{P ος ια} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} χ�όν{P ος ια} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Τ�αίνο
-STR_VEHICLE_ROAD_VEHICLE                                        :Όχημα
-STR_VEHICLE_SHIP                                                :Πλοίο
-STR_VEHICLE_AIRCRAFT                                            :Αε�οσκάφος
+STR_REPLACE_VEHICLE_TRAIN                                       :Τ�αίνο
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Όχημα
+STR_REPLACE_VEHICLE_SHIP                                        :Πλοίο
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Αε�οσκάφος
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} παλαιώνει
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} ξεπε�νά το ό�ιο ηλικίας
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} πάλιωσε πολ� και χ�ειάζεται επειγόντως αλλαγή
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Πλη�οφο�ίες Πε�ιοχής Εδάφους
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Κόστος καθα�ισμο�: {LTBLUE}Μ/Δ
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Κόστος καθα�ισμο�: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}�φελος όταν καθα�ιστεί: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}�φελος όταν καθα�ιστεί: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :Μη Διαθέσιμο
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Ιδιοκτήτης: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Ιδιοκτήτης της Οδός: {LTBLUE}{STRING}
@@ -432,7 +432,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Ιδιο
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Τοπική α�χή: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Κανένα
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Όνομα
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1{G ος η ο}
@@ -544,7 +544,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Κάντ
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Κάντε κλικ στο τ�αγο�δι για να το αφαι�έσετε από το π�όγ�αμμα (Π�οσα�μοσμένο 1 ή 2 μόνο)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Εναλλαγή τυχαίας αναπα�αγωγής on/off στο π�όγ�αμμα
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Εμφάνιση πα�αθ��ου επιλογής μουσικο� κομματιο�
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Κάντε κλίκ στην υπη�εσία για κεντ�ά�ισμα στην βιομηχανία/πόλη
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Κάντε κλίκ στην υπη�εσία για κεντ�ά�ισμα στην βιομηχανία/πόλη
 STR_INTRO_DIFFICULTY                                            :{G=f}{BLACK}Δυσκολία ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Τελευταίο μήνυμα/αναφο�ά νέων
@@ -593,7 +593,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Μείω
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Δημιου�γία τυχαίου εδάφους
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Επαναφο�ά τοπίου
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Επαναφο�ά Τοπίου
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Αφαί�εση όλων των ιδιοκτησιών παικτών από το χά�τη
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Αφαί�εση όλων των ιδιοκτησιών παικτών από το χά�τη
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Είστε σίγου�ος ότι θέλετε να αφαι�έσετε όλες τις ιδιοκτησίες παικτών;
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Δημιου�γία τοπίου
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Δημιου�γία πόλης
@@ -607,11 +607,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...ποÎ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...πολ� κοντά σε άλλη πόλη
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...ακατάλληλη πε�ιοχή
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...πά�α πολλές πόλεις
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Αδ�νατο να χτιστο�ν πόλεις
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...δεν υπά�χει αλλος χώ�ος στον χά�τη
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Αδ�νατο να χτιστο�ν πόλεις
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...δεν υπά�χει αλλος χώ�ος στον χά�τη
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Α�ξηση μεγέθους πόλεως
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Επέκταση
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Η πόλη δεν θα οικοδομεί δ�όμους. Μπο�είτε να ενε�γοποιήσετε την κατασκευή οδών μέσω των Π�οχω�ημένων Επιλογών->Οικονομία->Πόλεις.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Η πόλη δεν θα οικοδομεί δ�όμους. Μπο�είτε να ενε�γοποιήσετε την κατασκευή οδών μέσω των Π�οχω�ημένων Επιλογών->Οικονομία->Πόλεις.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Τυχαία Πόλη
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Χτίσιμο πόλης σε τυχαία τοποθεσία
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Αδ�νατο να χτιστεί {G ο η το} {STRING} εδώ...
@@ -625,13 +625,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Τοπο
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Τοποθέτηση φά�ου
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Τοποθέτηση αναμεταδότη
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Ο�ίστε πε�ιοχή ε�ήμου.{}Πατήστε και κ�ατήστε το CTRL για αφαί�εση
-STR_CREATE_LAKE                                                 :{BLACK}Π�οσδιο�ισμός θαλάσσιας επιφάνειας.{}Δημιου�γία καναλιο�, εκτός εάν το πλήκτ�ο CTRL είναι κ�ατημένο στο επίπεδο της θάλασσας, όπου θα πλημμυ�ίσει τις πα�ακείμενες πε�ιοχές.
-STR_CREATE_RIVER                                                :{BLACK}Τοποθέτησε ποτάμια
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Π�οσδιο�ισμός θαλάσσιας επιφάνειας.{}Δημιου�γία καναλιο�, εκτός εάν το πλήκτ�ο CTRL είναι κ�ατημένο στο επίπεδο της θάλασσας, όπου θα πλημμυ�ίσει τις πα�ακείμενες πε�ιοχές.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Τοποθέτησε ποτάμια
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Διαγ�αφή
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Διαγ�άφη της πόλης ολοκλη�ωτικά
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Αποθήκευση σενα�ίου
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Φό�τωση σενα�ίου
-STR_MENU_LOAD_HEIGHTMAP                                         :Φό�τωση heightmap
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Φό�τωση heightmap
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Έξοδος από το π�όγ�αμμα επεξε�γασίας
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Έξοδος
@@ -641,7 +641,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Αποθ
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Παιξτε το Σενά�ιο
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Παίξτε Heightmap
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Εκκίνηση νέου παιχνιδιο�, χ�ησιμοποιώντας heightmap για χά�τη
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Είστε σίγου�οι οτι θέλετε να πα�ατήσετε το σενά�ιο;
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Είστε σίγου�οι οτι θέλετε να πα�ατήσετε το σενά�ιο;
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...μπο�εί να χτιστεί μόνο σε πόλεις με πληθυσμό άνω των 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Μετακίνηση ημ/νίας εκκίνησης 1 χ�όνο πίσω
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Μετακίνηση ημ/νίας εκκίνησης 1 χ�όνο μπ�οστά
@@ -649,21 +649,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...καÎ
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Μικ�ό
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Μεσαίο
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Μεγάλο
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Τυχαίο
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Τυχαίο
 STR_FOUND_TOWN_CITY                                             :{BLACK}Πόλη
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Οι πόλεις αναπτ�σσονται ταχ�τε�α από τις απλές κωμοπόλεις{}Ανάλογα με τις �υθμίσεις, είναι μεγαλ�τε�ες όταν ιδ��ονται
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Επιλογή μεγέθους πόλης
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Μέγεθος πόλης:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Σχέδιο δ�όμων πόλεως
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Επιλογή σχεδίου δ�όμων που χ�ησιμοποιείται για αυτή την πόλη
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Α�χικό
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Καλ�τε�οι δ�όμοι
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Πλέγμα 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Πλέγμα 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Τυχαίο
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Σχέδιο δ�όμων πόλεως
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Επιλογή σχεδίου δ�όμων που χ�ησιμοποιείται για αυτή την πόλη
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Α�χικό
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Καλ�τε�οι δ�όμοι
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Πλέγμα 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Πλέγμα 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Τυχαίο
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Εμφάνιση τελευταίου μην�ματος ή αναφο�άς νέων
 STR_NEWS_MESSAGES_OFF                                           :Κλειστό
 STR_NEWS_MESSAGES_SUMMARY                                       :Πε�ιγ�αφή
@@ -763,10 +763,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  Π
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Φωτογ�αφία εικόνας αποθηκε�θηκε επιτυχώς ώς '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Φωτογ�αφία εικόνας απέτυχε!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Αγο�ά γης για μελλοντική χ�ήση
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Αγο�ά γης για μελλοντική χ�ήση
 STR_STATUSBAR_AUTOSAVE                                          :{RED}ΑΥΤΟΜΑΤΗ ΑΠΟΘΗΚΕΥΣΗ
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  ΑΠΟΘΗΚΕΥΣΗ ΠΑΙΧ�ΙΔΙΟΥ  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}πα�ακαλώ πε�ιμένετε να τελειώσει!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Η αποθήκευση είναι σε εξέλιξη,{}πα�ακαλώ πε�ιμένετε να τελειώσει!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Επιλογή π�ογ�άμματος 'Ezy Street στυλ μουσικής'
 
 ############ start of townname region
@@ -829,7 +829,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Επιλ
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Σε όλη την οθόνη
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Τσεκά�εται αυτό το κουτάκι ωστε να παίξετε το OpenTTD σε όλη την οθόνη
-STR_FULLSCREEN_FAILED                                           :{WHITE}Πλή�εις Οθόνη απέτυχε
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Πλή�εις Οθόνη απέτυχε
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Ανάλυση οθόνης
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Διαλέξτε την ανάλυση της οθόνης που θέλετε
@@ -842,12 +842,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Επιλ
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} α�χείο που λείπε ή είναι κατεστ�αμμένο{P "" s}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Επιπλέον πλη�οφο�ίες σχετικά με το βασικό σετ γ�αφικών
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Το αυτόματο σώσιμο απέτυχε
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Το αυτόματο σώσιμο απέτυχε
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Πάει π�ος {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Πάει π�ος {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Δεν έχει οδηγίες
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Δεν έχει οδηγίες, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Πάει π�ος {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Πάει π�ος {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Δεν έχει οδηγίες
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Δεν έχει οδηγίες, {VELOCITY}
 
 STR_PASSENGERS                                                  :Επιβάτες
 STR_BAGS                                                        :Σάκκοι
@@ -858,9 +858,9 @@ STR_CRATES                                                      :Κουτιά
 STR_RES_OTHER                                                   :άλλα
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Αδ�νατο να μοι�αστεί η λίστα εντολών...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Αδ�νατο να αντιγ�αφεί η λίστα εντολών...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Τέλος Μοι�ασμένων Οδηγιών - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Αδ�νατο να μοι�αστεί η λίστα εντολών...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Αδ�νατο να αντιγ�αφεί η λίστα εντολών...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Τέλος Μοι�ασμένων Οδηγιών - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} δεν μπο�εί να β�ει δ�όμο να συνεχίσει
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} χάθηκε
@@ -1126,15 +1126,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-μέÎ
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :απενε�γοποιημένο
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Αλλαγή τιμής ��θμισης
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Αλλαγή τιμής ��θμισης
 
-STR_TEMPERATE_LANDSCAPE                                         :Συγκ�ατημένο τοπίο
-STR_SUB_ARCTIC_LANDSCAPE                                        :Πολικό τοπίο
-STR_SUB_TROPICAL_LANDSCAPE                                      :Υποτ�οπικό τοπίο
-STR_TOYLAND_LANDSCAPE                                           :Παιχνιδιάστικο τοπίο
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Συγκ�ατημένο τοπίο
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Πολικό τοπίο
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Υποτ�οπικό τοπίο
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Παιχνιδιάστικο τοπίο
 
 STR_CHEATS                                                      :{WHITE}Cheats
-STR_CHEATS_TIP                                                  :{BLACK}Τα κουτάκια δείχνουν αν έχετε χ�ησιμοποιήσει αυτό το cheat π�ίν
+STR_CHEATS_TOOLTIP                                              :{BLACK}Τα κουτάκια δείχνουν αν έχετε χ�ησιμοποιήσει αυτό το cheat π�ίν
 STR_CHEATS_WARNING                                              :{BLACK}Π�οσοχή! Είστε έτοιμος να π�οδώσετε τους φίλους ανταγωνιστές σας. Θυμηθείτε ότι αυτή η ντ�οπή θα μείνει για πάντα.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Α�ξηση χ�ημάτων κατά {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Παίζετε με την εται�ία: {ORANGE}{COMMA}
@@ -1146,177 +1146,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}ΑλλÎ
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Αλλαγή ημ/νίας: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Ενε�γοποίηση δυνατότητας αλλαγής τιμών πα�αγωγής: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Καθ' οδόν {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Πο�εία π�ος {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Καθ' οδόν {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Πο�εία π�ος {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Πήγαινε μέσω {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Πήγαινε χω�ίς στάση μέσω {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Πήγαινε μέσω {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Πήγαινε χω�ίς στάση μέσω {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Σημείο καθοδηγήσης {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :{TOWN} Σημείο καθοδηγήσης #{COMMA}
-STR_BUOYNAME_CITY                                               :{TOWN} Σημαδο��α
-STR_BUOYNAME_CITY_SERIAL                                        :{TOWN} Σημαδο��α #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Σημείο πο�είας
+STR_FORMAT_WAYPOINT_NAME                                        :Σημείο καθοδηγήσης {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Σημείο καθοδηγήσης #{COMMA}
+STR_FORMAT_BUOY_NAME                                            :{TOWN} Σημαδο��α
+STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Σημαδο��α #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Σημείο πο�είας
 
-STR_WAYPOINT                                                    :{WHITE}Σημείο πο�είας
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Επιλογή τ�που σημείου πο�είας
+STR_WAYPOINT_CAPTION                                            :{WHITE}Σημείο πο�είας
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Επιλογή τ�που σημείου πο�είας
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Διαμό�φωση ονόματος σημείου πο�είας
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Αδ�νατο να αλλαχτεί το όνομα του σημείου πο�είας...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Αδ�νατο να αλλαχτεί το όνομα του σημείου πο�είας...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Μετατ�οπή γ�αμμής σε σημείο πο�είας
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Αδ�νατο να χτιστεί σημείο πο�είας τ�ένου εδώ...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Αδ�νατο να αφαι�εθεί το σημείο πο�είας τ�ένου από εδώ...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Αδ�νατο να χτιστεί σημείο πο�είας τ�ένου εδώ...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Αδ�νατο να αφαι�εθεί το σημείο πο�είας τ�ένου από εδώ...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Κατασκευή σιδη�οδ�ομικής γ�αμμής χ�ησιμοποιώντας την Αυτόματη Γ�αμμή
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...δεν υπά�χει καμία πόλη στην πίστα
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Η δημιου�γία του χά�τη εγκαταλήφτηκε...{}...Δεν υπά�χουν κατάλληλες τοποθεσίες για πόλεις
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...δεν υπά�χει καμία πόλη στην πίστα
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Η δημιου�γία του χά�τη εγκαταλήφτηκε...{}...Δεν υπά�χουν κατάλληλες τοποθεσίες για πόλεις
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Πολλές τυχαίες πόλεις
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Κάλυψη του χά�τη με τυχαία τοποθετημένες πόλεις
-STR_MANY_RANDOM_INDUSTRIES                                      :Πολλές τυχαίες βιομηχανίες
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Γέμισε τον χά�τη με τυχαίες τοποθετημένες βιομηχανίες
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Δεν γίνεται να δημιου�γηθο�ν βιομηχανίες...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Πολλές τυχαίες πόλεις
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Κάλυψη του χά�τη με τυχαία τοποθετημένες πόλεις
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Πολλές τυχαίες βιομηχανίες
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Γέμισε τον χά�τη με τυχαίες τοποθετημένες βιομηχανίες
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Δεν γίνεται να δημιου�γηθο�ν βιομηχανίες...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Ανοίξτε την μπά�α ε�γαλείων μο�φοποίησης εδάφους για αν�ψωση/β�θιση γης, δενδ�οφ�τευση, κλπ.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Μο�φοποίηση εδάφους
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Επιπεδοποίηση γης
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Επιπεδοποίηση γης
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Δέντ�α τυχαίου τ�που
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Βάλε δέντ�α τυχαίου τ�που
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Βάλε δέντ�α τυχαίου τ�που
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Δεν μπο�εί να χτιστεί κανάλι εδώ
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Δεν μπο�εί να χτιστεί κανάλι εδώ
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Δημιου�γία καναλιών.
-STR_LANDINFO_CANAL                                              :Κανάλι
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Κανάλι
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Δεν μπο�εί να χτιστεί υδατοφ�άκτης εδώ...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Δεν μπο�εί να χτιστεί υδατοφ�άκτης εδώ...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Κατασκευή Υδατοφ�άκτη
-STR_LANDINFO_LOCK                                               :Κλείδωμα
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Κλείδωμα
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Δεν μπο�ο�ν να τοποθετηθο�ν ποτάμια εδώ...
-STR_LANDINFO_RIVER                                              :Ποτάμι
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Δεν μπο�ο�ν να τοποθετηθο�ν ποτάμια εδώ...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Ποτάμι
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...σημαδο��α σε χ�ήση
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...σημαδο��α σε χ�ήση
 
-STR_LANDINFO_COORDS                                             :{BLACK}Συντεταγμένες: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Συντεταγμένες: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Δεν μπο�εί να αφαι�εθεί μέ�ος του σταθμο�...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Δεν γίνεται να μετατ�απεί ο τ�πος της σιδη�οτ�οχιάς εδώ...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Δεν μπο�εί να αφαι�εθεί μέ�ος του σταθμο�...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Δεν γίνεται να μετατ�απεί ο τ�πος της σιδη�οτ�οχιάς εδώ...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Μετατ�έψτε/Αλλάξτε τον τ�πο της γ�αμμής
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Σ��ε την μηχανή του τ�ένου για να διαγ�αφεί ολόκλη�ο το τ�ένο
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Σ��ε την μηχανή του τ�ένου για να διαγ�αφεί ολόκλη�ο το τ�ένο
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Έλξη & πτώση
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Φτιάξε ένα σταθμό χ�ησιμοποιόντας έλξη & πτώση
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Επέλεξε τον τ�πο του σταθμο� π�ος χτίσιμο
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Επέλεξε τον τ�πο του σταθμο� π�ος χτίσιμο
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Γ�ήγο�η ταχ�τητα παιχνιδιο�
 STR_MESSAGE_HISTORY                                             :{WHITE}Ιστο�ικό Μηνυμάτων
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Λίστα των π�όσφατων μηνυμάτων ειδήσεων
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Απενε�γοποίηση όλων
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Ενε�γοποίηση όλων
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Λίστα των π�όσφατων μηνυμάτων ειδήσεων
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Απενε�γοποίηση όλων
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Ενε�γοποίηση όλων
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Βιομηχανίες
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% μεταφέ�θηκαν)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% μεταφέ�θηκαν)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Ονόματα βιομηχανιών - click στο ονομα για κεντ�ά�ισμα στην βιομηχανία
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Βιομηχανίες
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% μεταφέ�θηκαν)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% μεταφέ�θηκαν)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Ονόματα βιομηχανιών - click στο ονομα για κεντ�ά�ισμα στην βιομηχανία
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...πολ� κοντά σε άλλη βιομηχανία
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...πολ� κοντά σε άλλη βιομηχανία
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Αλλαγή πα�αγωγής
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Παιχνίδι πολλών παιχτών
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Όνομα παίκτη:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Αυτό είναι το όνομα με το οποίο θα σας αναγνω�ίζουν οι άλλοι παίκτες
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Εισάγετε το όνομά σας
-STR_NETWORK_CONNECTION                                          :{BLACK}Σ�νδεση:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Επιλέξτε μεταξ� παιχνιδιο� στο ίντε�νετ η τοπικο� (LAN) παιχνιδιο�
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Εκκίνηση διακομιστή
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Ξεκινήστε το δικό σας διακομιστή
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Όνομα
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Όνομα του παιχνιδιο�
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Γλώσσα, έκδοση διακομιστή, κλπ.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Κάντε κλικ σε ένα παιχνίδι από την λίστα για το επιλέξετε
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Ο διακομιστής που συμμετείχατε την τελευταία φο�ά:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Κάντε κλικ για να επιλέξετε το διακομιστή που συμμετείχατε την τελευταία φο�ά
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Β�είτε το διακομιστή
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Ψάξτε το δίκτυο για ένα διακομιστή
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Π�οσθέστε ένα διακομιστή
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Π�οσθέστε ένα διακομιστή στην λίστα ο οποίος θα ελέγχεται κάθε φο�ά για παιχνίδια.
-STR_NETWORK_ENTER_IP                                            :{BLACK}Εισάγετε τη διε�θυνση του οικοδεσπότη
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Συμμετέχοντες
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Συμμετέχοντες online  / μέγιστος α�ιθμός συμμετεχόντων {}Εται�ίες online / μέγιστος α�ιθμός εται�ιών
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Μέγεθος χά�τη
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Μέγεθος χά�τη του παιχνιδιο�{}Κάντε κλικ για ταξινόμηση ανά πε�ιοχή
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Ημε�ομηνία
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Τ�έχουσα ημε�ομηνία
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Χ�όνια
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Α�ιθμός χ�όνων{}που τ�έχει το παιχνίδι
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}ΠΛΗΡΟΦΟΡΙΕΣ ΠΑΙΧ�ΙΔΙΟΥ
-STR_NETWORK_CLIENTS                                             :{SILVER}Συμμετέχοντες:: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Γλώσσα: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Μέγεθος χά�τη: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Έκδοση διακομιστή: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Διε�θυνση διακομιστή: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Ημε�ομηνία ένα�ξης: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Τ�έχουσα ημε�ομηνία: {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Π�οστατευμένο με κωδικό!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}ΔΙΑΚΟΜΙΣΤΗΣ ΕΚΤΟΣ ΛΕΙΤΟΥΡΓΙΑΣ
-STR_NETWORK_SERVER_FULL                                         :{SILVER}ΔΙΑΚΟΜΙΣΤΗΣ ΓΕΜΑΤΟΣ
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}Α�Α�ΤΙΣΤΟΙΧΙΑ ΕΚΔΟΣΗΣ
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}Α�Α�ΤΙΣΤΟΙΧΙΑ NEWGRF
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Συμμετοχή σε παιχνίδι
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Ένα�ξη νέου παιχνιδιο� για πολλο�ς παίκτες
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Όνομα παιχνιδιο�:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Το όνομα του παιχνιδιο� θα εμφανιστεί στους άλλους παίκτες στο μενο� επιλογής παιχνιδιο� για πολλο�ς παίκτες
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Εισάγετε το όνομα του δικτυακο� παιχνιδιο�
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Θέστε κωδικό
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Π�οστατέψτε το παιχνίδι με έναν κωδικό εάν δε θέλετε να είναι δημοσίως π�οσβάσιμο
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Επιλέξτε έναν χά�τη:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Σε ποιό χά�τη θέλετε να παίξετε;
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Ίντε�νετ
-STR_NETWORK_LAN_INTERNET                                        :LAN / Ίντε�νετ
-STR_NETWORK_INTERNET_ADVERTISE                                  :Ίντε�νετ (αναγγελία)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} συμμετ{P έχων εχόντων}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Μέγιστος α�ιθμός συμμετεχόντων:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Επιλέξτε τον μέγιστο α�ιθμό συμμετεχόντων. Δεν είναι ανάγκη να γεμίσουν όλες οι θέσεις
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} εται�ί{P α ες}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Μέγιστος α�ιθμός εται�ιών:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}Πε�ιο�ισμός του διακομιστή σε συγκεκ�ιμένο α�ιθμό εται�ιών
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} θεατ{P ής ές}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Μέγιστος α�ιθμός θεατών:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}Πε�ιο�ισμός του διακομιστή σε συγκεκ�ιμένο α�ιθμό θεατών
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Ομιλο�μενη γλώσσα:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Οι υπόλοιποι παίκτες θα γνω�ίζουν ποια γλώσσα ομιλείται στο διακομιστή
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Ένα�ξη παιχνιδιο�
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Ένα�ξη νέου δικτυακο� παιχνιδιο� από τυχαίο χά�τη ή σενά�ιο
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Φό�τωση παιχνιδιο�
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Συνέχεια ενός αποθηκευμένου παιχνιδιο� με πολλο�ς παίκτες (επιβεβαιώστε πως συνδέεστε ως ο σωστός παίκτης)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Παιχνίδι πολλών παιχτών
+
+STR_NETWORK_SERVER_LIST_PLAYER_NAME                             :{BLACK}Όνομα παίκτη:
+STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP                      :{BLACK}Αυτό είναι το όνομα με το οποίο θα σας αναγνω�ίζουν οι άλλοι παίκτες
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Εισάγετε το όνομά σας
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Σ�νδεση:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Επιλέξτε μεταξ� παιχνιδιο� στο ίντε�νετ η τοπικο� (LAN) παιχνιδιο�
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Εκκίνηση διακομιστή
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Ξεκινήστε το δικό σας διακομιστή
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Όνομα
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Όνομα του παιχνιδιο�
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Γλώσσα, έκδοση διακομιστή, κλπ.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Κάντε κλικ σε ένα παιχνίδι από την λίστα για το επιλέξετε
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Ο διακομιστής που συμμετείχατε την τελευταία φο�ά:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{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_ENTER_IP                                :{BLACK}Εισάγετε τη διε�θυνση του οικοδεσπότη
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Συμμετέχοντες
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Συμμετέχοντες online  / μέγιστος α�ιθμός συμμετεχόντων {}Εται�ίες online / μέγιστος α�ιθμός εται�ιών
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Μέγεθος χά�τη
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Μέγεθος χά�τη του παιχνιδιο�{}Κάντε κλικ για ταξινόμηση ανά πε�ιοχή
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Ημε�ομηνία
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Τ�έχουσα ημε�ομηνία
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Χ�όνια
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Α�ιθμός χ�όνων{}που τ�έχει το παιχνίδι
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}ΠΛΗΡΟΦΟΡΙΕΣ ΠΑΙΧ�ΙΔΙΟΥ
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Συμμετέχοντες:: {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Γλώσσα: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Μέγεθος χά�τη: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Έκδοση διακομιστή: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Διε�θυνση διακομιστή: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Ημε�ομηνία ένα�ξης: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Τ�έχουσα ημε�ομηνία: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Π�οστατευμένο με κωδικό!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}ΔΙΑΚΟΜΙΣΤΗΣ ΕΚΤΟΣ ΛΕΙΤΟΥΡΓΙΑΣ
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}ΔΙΑΚΟΜΙΣΤΗΣ ΓΕΜΑΤΟΣ
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}Α�Α�ΤΙΣΤΟΙΧΙΑ ΕΚΔΟΣΗΣ
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}Α�Α�ΤΙΣΤΟΙΧΙΑ NEWGRF
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Συμμετοχή σε παιχνίδι
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Ένα�ξη νέου παιχνιδιο� για πολλο�ς παίκτες
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Όνομα παιχνιδιο�:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Το όνομα του παιχνιδιο� θα εμφανιστεί στους άλλους παίκτες στο μενο� επιλογής παιχνιδιο� για πολλο�ς παίκτες
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Εισάγετε το όνομα του δικτυακο� παιχνιδιο�
+STR_NETWORK_START_SERVER_SET_PASSWORD                           :{BLACK}Θέστε κωδικό
+STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP                       :{BLACK}Π�οστατέψτε το παιχνίδι με έναν κωδικό εάν δε θέλετε να είναι δημοσίως π�οσβάσιμο
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Επιλέξτε έναν χά�τη:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Σε ποιό χά�τη θέλετε να παίξετε;
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Ίντε�νετ
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Ίντε�νετ
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Ίντε�νετ (αναγγελία)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} συμμετ{P έχων εχόντων}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Μέγιστος α�ιθμός συμμετεχόντων:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Επιλέξτε τον μέγιστο α�ιθμό συμμετεχόντων. Δεν είναι ανάγκη να γεμίσουν όλες οι θέσεις
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} εται�ί{P α ες}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Μέγιστος α�ιθμός εται�ιών:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}Πε�ιο�ισμός του διακομιστή σε συγκεκ�ιμένο α�ιθμό εται�ιών
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} θεατ{P ής ές}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Μέγιστος α�ιθμός θεατών:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}Πε�ιο�ισμός του διακομιστή σε συγκεκ�ιμένο α�ιθμό θεατών
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Ομιλο�μενη γλώσσα:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Οι υπόλοιποι παίκτες θα γνω�ίζουν ποια γλώσσα ομιλείται στο διακομιστή
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Ένα�ξη παιχνιδιο�
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Ένα�ξη νέου δικτυακο� παιχνιδιο� από τυχαίο χά�τη ή σενά�ιο
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Φό�τωση παιχνιδιο�
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Συνέχεια ενός αποθηκευμένου παιχνιδιο� με πολλο�ς παίκτες (επιβεβαιώστε πως συνδέεστε ως ο σωστός παίκτης)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Οποιαδήποτε
@@ -1357,33 +1357,33 @@ STR_NETWORK_LANG_GREEK                                          :ΕλληνικÎ
 STR_NETWORK_LANG_LATVIAN                                        :Λετονικά
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Αίθουσας παιχνιδιο� για πολλο�ς παίκτες
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Αίθουσας παιχνιδιο� για πολλο�ς παίκτες
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Π�οετοιμασία για συμμετοχή: {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Λίστα όλων των εται�ιών αυτή τη στιγμή στο παιχνίδι. Μπο�είτε είτε να συμμετάσχετε σε μία ή να δημιου�γήσετε μια νέα αν υπά�χει κενή θέση
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}�έα εται�ία
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Δημιου�γία νέας εται�ίας
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Πα�ακολο�θηση παιχνιδιο�
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Δείτε το παιχνίδι ως θεατής
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Συμμετοχή σε εται�ία
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Βοηθείστε στην διαχεί�ιση αυτής της εται�ίας
-STR_NETWORK_REFRESH                                             :{BLACK}Ανανέωση διακομιστή
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Ανανεώση πλη�οφο�ιών του διακομιστή
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Π�οετοιμασία για συμμετοχή: {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Λίστα όλων των εται�ιών αυτή τη στιγμή στο παιχνίδι. Μπο�είτε είτε να συμμετάσχετε σε μία ή να δημιου�γήσετε μια νέα αν υπά�χει κενή θέση
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}�έα εται�ία
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Δημιου�γία νέας εται�ίας
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Πα�ακολο�θηση παιχνιδιο�
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Δείτε το παιχνίδι ως θεατής
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Συμμετοχή σε εται�ία
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Βοηθείστε στην διαχεί�ιση αυτής της εται�ίας
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Ανανέωση διακομιστή
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Ανανεώση πλη�οφο�ιών του διακομιστή
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}ΠΛΗΡΟΦΟΡΙΕΣ ΕΤΑΙΡΙΑΣ
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}ΠΛΗΡΟΦΟΡΙΕΣ ΕΤΑΙΡΙΑΣ
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Όνομα εται�ίας: {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Ίδ�υση: {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Αξία εται�ίας: {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Τ�έχων ισοζυγίο: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Έσοδα τελευταίας χ�ονιάς: {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Απόδοση: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Όνομα εται�ίας: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Ίδ�υση: {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Αξία εται�ίας: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Τ�έχων ισοζυγίο: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Έσοδα τελευταίας χ�ονιάς: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Απόδοση: {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Οχήματα: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Σταθμοί: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Παίχτες: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Οχήματα: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Σταθμοί: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Παίχτες: {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Σ�νδεση...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Σ�νδεση...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Σ�νδεση..
@@ -1399,48 +1399,48 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Ανε�
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} Συμμετέχοντες{P "" s} είναι π�ιν από σας
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} κατέβηκαν μέχ�ι τώ�α
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Αποσ�νδεση
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Αποσ�νδεση
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Εισάγετε το πόσο των χ�ήματων που θέλετε να δώσετε
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Ο διακομιστής π�οστατε�εται από κωδικό. Εισάγετε κωδικό
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Η εται�ία π�οστατε�εται από κωδικό. Εισάγετε κωδικό
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Λίστα συμμετεχόντων
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Λίστα συμμετεχόντων
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Πα�ακολο�θηση
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}�εα εται�ία
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE}Δεν β�έθηκε συσκευή δικτ�ου ή έγινε μεταγλώτηση χώ�ις πα�άμετ�ο ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Δεν β�έθηκε κάποιο δικτυακό παιχνίδι
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Ο διακομιστής δεν απάντησε στο αίτημα
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Απέτυχε η σ�νδεση λόγο ασυμφωνίας NewGRF
-STR_NETWORK_ERR_DESYNC                                          :{WHITE}Συγχ�ονισμός δικτυακο� παιχνιδιο� απέτυχε
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Χάθηκε η σ�νδεση δικτυακο� παιχνιδιο�
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE}Δεν είναι δυνατό το φό�τωμα αποθηκευμένου παιχνιδιο�
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Δεν είναι δυνατή η εκκίνηση του διακομιστή
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Η σ�νδεση δεν είναι δυνατή
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE}Τελειώσε ο χ�όνος της σ�νδεσης #{NUM}
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE}Έγινε ενα λάθος π�ωτόκολλου και η σ�νδεση έκλεισε
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Η υποέκδοση του πελάτη δεν ται�ιάζει με την υποέκδοση του διακομιστή
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE}Λανθασμένος κωδικός
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE}Ο διακομιστής είναι γεμάτος
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE}Έχει απαγο�ευτεί η είσοδος σας από το διακομιστή
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Έχετε εκδιωχτεί από το παιχνίδι
-STR_NETWORK_ERR_CHEATER                                         :{WHITE}Η χ�ήση cheats δεν επιτ�έπεται σε αυτό το διακομιστή
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE}Δεν β�έθηκε συσκευή δικτ�ου ή έγινε μεταγλώτηση χώ�ις πα�άμετ�ο ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Δεν β�έθηκε κάποιο δικτυακό παιχνίδι
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Ο διακομιστής δεν απάντησε στο αίτημα
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Απέτυχε η σ�νδεση λόγο ασυμφωνίας NewGRF
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE}Συγχ�ονισμός δικτυακο� παιχνιδιο� απέτυχε
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Χάθηκε η σ�νδεση δικτυακο� παιχνιδιο�
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE}Δεν είναι δυνατό το φό�τωμα αποθηκευμένου παιχνιδιο�
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Δεν είναι δυνατή η εκκίνηση του διακομιστή
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Η σ�νδεση δεν είναι δυνατή
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE}Τελειώσε ο χ�όνος της σ�νδεσης #{NUM}
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE}Έγινε ενα λάθος π�ωτόκολλου και η σ�νδεση έκλεισε
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Η υποέκδοση του πελάτη δεν ται�ιάζει με την υποέκδοση του διακομιστή
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE}Λανθασμένος κωδικός
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE}Ο διακομιστής είναι γεμάτος
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Έχει απαγο�ευτεί η είσοδος σας από το διακομιστή
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Έχετε εκδιωχτεί από το παιχνίδι
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Η χ�ήση cheats δεν επιτ�έπεται σε αυτό το διακομιστή
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :Γενικό π�όβλημα
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :Π�όβλημα συγχ�ονισμο�
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :Δεν είναι δυνατή η φο�τώση του χά�τη
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :Η σ�νδεση χάθηκε
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :Λάθος π�ωτόκολλου
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :Μη εξουσιοδοτημένο
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :λήψη πε�ίε�γων πακέτων
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :λάθος έκδοση
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :το όνομα χ�ησιμοποιείται
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :λάθος κωδικός
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :λάθος company-id στο DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :Εκδιωχθήκατε από το διακομιστή
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :π�οσπαθησε να χ�ησιμοποιησει cheat
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :Διακομιστής γεμάτος
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :Γενικό π�όβλημα
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :Π�όβλημα συγχ�ονισμο�
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :Δεν είναι δυνατή η φο�τώση του χά�τη
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :Η σ�νδεση χάθηκε
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :Λάθος π�ωτόκολλου
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :Μη εξουσιοδοτημένο
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :λήψη πε�ίε�γων πακέτων
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :λάθος έκδοση
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :το όνομα χ�ησιμοποιείται
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :λάθος κωδικός
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :λάθος company-id στο DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :Εκδιωχθήκατε από το διακομιστή
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :π�οσπαθησε να χ�ησιμοποιησει cheat
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :Διακομιστής γεμάτος
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1450,15 +1450,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Πα�ση πα
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Συνέχιση παιχνιδιο� (πελάτης συνδέθηκε)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Συνέχιση παιχνιδιο� (πελάτης απέτυχε να συνδεθεί)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :αποχώ�ηση
-STR_NETWORK_CLIENT_JOINED                                       :*** {STRING} συμμετέχει στο παιχνίδι
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** {STRING} συμμετέχει στην εται�ία #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** {STRING} συμμετέχει στους θεατές
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** {STRING} ξεκίνησε μια νεα εται�ία (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** {STRING} αποχώ�ηση από το παιχνίδι ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** {STRING} άλλαξε το όνομα του/της σε {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** {STRING} έδωσε στην εται�ία σας {2:CURRENCY}
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Δώσατε {1:STRING} {2:CURRENCY}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :αποχώ�ηση
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {STRING} συμμετέχει στο παιχνίδι
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {STRING} συμμετέχει στην εται�ία #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {STRING} συμμετέχει στους θεατές
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {STRING} ξεκίνησε μια νεα εται�ία (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** {STRING} αποχώ�ηση από το παιχνίδι ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** {STRING} άλλαξε το όνομα του/της σε {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** {STRING} έδωσε στην εται�ία σας {2:CURRENCY}
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Δώσατε {1:STRING} {2:CURRENCY}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Ομάδα] :
 STR_NETWORK_CHAT_COMPANY                                        :[Ομάδα] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Ομάδα] Σε {STRING}: {WHITE}{STRING}
@@ -1468,8 +1468,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Π�οσωπι
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Σε όλους] :
 STR_NETWORK_CHAT_ALL                                            :[Σε όλους] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}Εισάγετε το κείμενο για δικτυακή συζήτηση
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} Ο διακομιστής έκλεισε την συνεδ�ία
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Ο διακομιστής κάνει επανεκκίνηση...{}Πα�ακαλώ πολ�...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} Ο διακομιστής έκλεισε την συνεδ�ία
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Ο διακομιστής κάνει επανεκκίνηση...{}Πα�ακαλώ πολ�...
 
 STR_NETWORK_SERVER                                              :Διακομιστής
 STR_NETWORK_CLIENT                                              :Πελάτης
@@ -1483,19 +1483,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Μιλήστε
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Π�οσωπικό μήνυμα
 
 
-STR_NETWORK_SEND                                                :{BLACK}Στείλε
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Στείλε
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Δεν είναι δυνατή η φό�τωση από PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...το α�χείο δεν β�έθηκε.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...δεν είναι δυνατή η μετατ�οπή του τ�που εικόνας. 8 ή 24-bit PNG εικόνα χ�είαζεται.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...άπλα κάτι πήγε στ�αβά. Συγνώμη. (πιθανώς κατεστ�αμμένο α�χείο)
+STR_ERROR_PNGMAP                                                :{WHITE}Δεν είναι δυνατή η φό�τωση από PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...το α�χείο δεν β�έθηκε.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...δεν είναι δυνατή η μετατ�οπή του τ�που εικόνας. 8 ή 24-bit PNG εικόνα χ�είαζεται.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...άπλα κάτι πήγε στ�αβά. Συγνώμη. (πιθανώς κατεστ�αμμένο α�χείο)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Αδυναμία φό�τωσης τοπίου από το ΒΜΡ...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...αδ�νατη η μετατ�οπή τ�που εικόνας
+STR_ERROR_BMPMAP                                                :{WHITE}Αδυναμία φό�τωσης τοπίου από το ΒΜΡ...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...αδ�νατη η μετατ�οπή τ�που εικόνας
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Κόστος: {CURRENCY}
@@ -1509,13 +1509,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Υπολ
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Αδ�νατο να υψωθεί η γη εδώ...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Αδ�νατο να χαμηλώσει η γη εδώ...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Αδ�νατο να έ�θει στο ίδιο επίπεδο η γη εδώ...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Πέτ�ες
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Σκλη�ό έδαφος
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Γυμνό έδαφος
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Γ�ασίδι
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Χω�άφια
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Χιονισμένο έδαφος
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Έ�ημος
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Πέτ�ες
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Σκλη�ό έδαφος
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Γυμνό έδαφος
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Γ�ασίδι
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Χω�άφια
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Χιονισμένο έδαφος
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Έ�ημος
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Το έδαφος έχει λάθος κλίση
@@ -1523,11 +1523,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Αδ�ν
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Η εκσκαφή θα κατέστ�εφε το το�νελ
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Ήδη στο επίπεδο της θάλασσας
 STR_ERROR_TOO_HIGH                                              :{WHITE}...πολ� ψηλά
-STR_ALREADY_LEVELLED                                            :{WHITE}... ήδη επίπεδο
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... ήδη επίπεδο
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Μη συμβατή σιδη�οτ�οχιά
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...ήδη χτισμένο
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Π�έπει να αφαι�εθεί ο σιδη�όδ�ομος π�ώτα
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Η δ�όμος είναι μονόδ�ομος ή μπλοκα�ισμένος
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Η δ�όμος είναι μονόδ�ομος ή μπλοκα�ισμένος
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Κατασκευή Σιδη�όδ�ομου
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Κατασκευή ηλεκτ�οδοτουμένου σιδη�όδ�ομου
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Κατασκευή μονοτ�όχιου σιδη�οδ�όμου
@@ -1551,32 +1551,32 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Κατα
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Κατασκευή γέφυ�ας σιδη�όδ�ομου
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Κατασκευή το�νελ σιδη�όδ�ομου
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Εναλλαγή κατασκευής/αφαί�εσης για σιδη�όδ�ομους και σηματοδότες
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Επιλογή γέφυ�ας - κάντε κλικ στην γέφυ�α της π�οτίμησής σας για κατασκευή
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Επιλογή γέφυ�ας - κάντε κλικ στην γέφυ�α της π�οτίμησής σας για κατασκευή
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Επιλογή π�οσανατολισμο� αμαξοστασίου
-STR_RAILROAD_TRACK                                              :Σιδη�όδ�ομος
-STR_RAILROAD_TRAIN_DEPOT                                        :Αμαξοστάσιο
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Σιδη�όδ�ομος
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Αμαξοστάσιο
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...αυτή η πε�ιοχή είναι ιδιοκτησία άλλης εται�είας
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Κομματι σιδη�όδ�ομου με σηματοδότες τμήματος
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Κομματι σιδη�όδ�ομου με π�ο-σηματοδότες
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Κομματι σιδη�όδ�ομου με σηματοδότες εξόδου
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Κομματι σιδη�όδ�ομου με συνδιασμένους σηματοδότες
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Κομμάτι σιδη�όδ�ομου με σηματοδότες τ�οχιάς
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Κομμάτι σιδη�όδ�ομου με σηματοδότες μονόδ�ομης τ�οχιάς
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Κομμάτι σιδη�όδ�ομου με π�ο-σηματοδότες και τμήματος
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και εξόδου
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και συνδιασμένους
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και τ�οχιάς
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και μονόδ�ομης τ�οχιάς
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Κομμάτι σιδη�όδ�ομου με π�ο και εξόδου σηματοδότες
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Π�έπει π�ώτα να αφαί�εσετε τον σταθμό σιδη�οδ�ομου
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Χτίστε ένα ξεχω�ιστό σταθμό
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Ενώστε σταθμό
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Κομματι σιδη�όδ�ομου με σηματοδότες τμήματος
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Κομματι σιδη�όδ�ομου με π�ο-σηματοδότες
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Κομματι σιδη�όδ�ομου με σηματοδότες εξόδου
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Κομματι σιδη�όδ�ομου με συνδιασμένους σηματοδότες
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Κομμάτι σιδη�όδ�ομου με σηματοδότες τ�οχιάς
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Κομμάτι σιδη�όδ�ομου με σηματοδότες μονόδ�ομης τ�οχιάς
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Κομμάτι σιδη�όδ�ομου με π�ο-σηματοδότες και τμήματος
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και εξόδου
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και συνδιασμένους
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και τ�οχιάς
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Κομμάτι σιδη�όδ�ομου με σηματοδότες τμήματος και μονόδ�ομης τ�οχιάς
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Κομμάτι σιδη�όδ�ομου με π�ο και εξόδου σηματοδότες
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Π�έπει π�ώτα να αφαί�εσετε τον σταθμό σιδη�οδ�ομου
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Χτίστε ένα ξεχω�ιστό σταθμό
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Ενώστε σταθμό
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Π�έπει π�ώτα να αφαι�εθεί ο δ�όμος
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Έ�γα οδοποιϊας σε εξέλιξη
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Έ�γα οδοποιϊας σε εξέλιξη
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Κατασκευή Δ�όμου
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Κατασκευή τ�οχιοδ�ομο�(τ�αμ)
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Επιλογή Γέφυ�ας Δ�όμου
@@ -1611,24 +1611,24 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}Κατα
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Κατασκευή το�νελ τ�οχιόδ�ομο�(τ�αμ)
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Ενε�γοποίηση/Απενε�γοποίηση μονόδ�ομων
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Εναλλαγή κατασκευής/αφαί�εσης για αυτοκινητόδ�ομους
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Επιλογή π�οσανατολισμο� αμαξοστασίου οχημάτων
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Επιλογή π�οσανατολισμο� αμαξοστασίου τ�αμ
-STR_ROAD_DESCRIPTION_ROAD                                       :Δ�όμος
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Δ�όμος με φωτισμό
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Δ�όμος με δέντ�α
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Αμαξοστάσιο οχημάτων
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Διαστα��ωση δ�όμου/σιδη�όδ�ομου
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Τ�οχιόδ�ομος(τ�αμ)
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Επιλογή π�οσανατολισμο� αμαξοστασίου οχημάτων
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Επιλογή π�οσανατολισμο� αμαξοστασίου τ�αμ
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Δ�όμος
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Δ�όμος με φωτισμό
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Δ�όμος με δέντ�α
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Αμαξοστάσιο οχημάτων
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Διαστα��ωση δ�όμου/σιδη�όδ�ομου
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Τ�οχιόδ�ομος(τ�αμ)
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Αδ�νατο να αφαι�εθεί η στάση λεωφο�είων...
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Πόλεις
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Το κτί�ιο π�έπει π�ώτα να κατεδαφιστεί
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Πόλη)
@@ -1641,9 +1641,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Κεντ
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Αλλαγή ονόματος πόλεως
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}Επιβάτες τον π�οηγο�μενο μήνα: {ORANGE}{COMMA}{BLACK}  μεγ: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Αλληλογ�αφία τον π�οηγο�μενο μήνα: {ORANGE}{COMMA}{BLACK}  μεγ: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Εμπο�ε�ματα που χ�ειάζονται για την ανάπτυξη της πόλης:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} απαιτείται
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} πα�αδόθηκε τον τελευταίο μήνα
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Εμπο�ε�ματα που χ�ειάζονται για την ανάπτυξη της πόλης:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} απαιτείται
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} πα�αδόθηκε τον τελευταίο μήνα
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Ψηλό συγκ�ότημα γ�αφείων
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Συγκ�ότημα γ�αφείων
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Μικ�ό συγκ�ότημα διαμε�ισμάτων
@@ -1680,7 +1680,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Η επιχο�ήγηση υπη�εσίας απονεμήθη στην εται�εία {STRING}!{}{}Η υπη�εσία για {STRING} από το σταθμό {STATION} π�ος το σταθμό {STATION} θα χ�εώνεται τ�ιπλά για το επόμενο έτος!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Η επιχο�ήγηση υπη�εσίας απονεμήθη στην εται�εία {STRING}!{}{}Η υπη�εσία για {STRING} από το σταθμό {STATION} π�ος το σταθμό {STATION} θα χ�εώνεται τετ�απλά για το επόμενο έτος!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Η τοπική α�χή της πόλης {TOWN} α�νείται να επιτ�έψει τη δημιου�γία νέου αε�οδ�ομίου
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}{TOWN} Οι τοπικές α�χές α�νο�νται να δώσουν την άδεια για αε�οδ�όμιο λογω ανησυχιών για τον θό�υβο
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}{TOWN} Οι τοπικές α�χές α�νο�νται να δώσουν την άδεια για αε�οδ�όμιο λογω ανησυχιών για τον θό�υβο
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Χω�άφια
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Σπίτια
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Διαμε�ίσματα
@@ -1716,7 +1716,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Χαώδης κίνηση στην πόλη {TOWN}!{}{}Χ�ηματοδοτήθηκε π�όγ�αμμα επανακατασκευής των δ�όμων από την εται�εία {STRING} και π�οκαλεί 6 μήνες μιζέ�ιας στους οδηγο�ς!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (υπό κατασκευή)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (υπό κατασκευή)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Ιγκλο�
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Σκηνές ινδιάνων
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :Σπίτι-Καφετιέ�α
@@ -1729,17 +1729,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :ΤοποθέτÎ
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Δέντ�α
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...υπά�χει ήδη δέντ�ο εδώ
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Δεν γίνεται να φυτευθεί δέντ�ο εδώ...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...πά�α πολλοί σηματοδότες
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Δεν γίνεται να τοποθετηθεί σηματοδότης εδώ...
-STR_SIGN_DEFAULT                                                :Πινακίδα
+STR_DEFAULT_SIGN_NAME                                           :Πινακίδα
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Αλλαγή κειμένου πινακίδας
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Δεν γίνεται να αλλαχθεί το κείμενο της πινακίδας...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Δεν μπο�εί να διαγ�αφεί η πινακίδα
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Επιλέξτε τ�πο δέντ�ου για φ�τευση
-STR_TREE_NAME_TREES                                             :Δέντ�α
-STR_TREE_NAME_RAINFOREST                                        :Δάσος
-STR_TREE_NAME_CACTUS_PLANTS                                     :Κάκτοι
+STR_LAI_TREE_NAME_TREES                                         :Δέντ�α
+STR_LAI_TREE_NAME_RAINFOREST                                    :Δάσος
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Κάκτοι
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Επιλογή Σιδη�οδ�ομικο� Σταθμο�
@@ -1759,7 +1759,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Π�έπ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Πολ� κοντά σε άλλο αε�οδ�όμιο
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Π�έπει να κατεδαφιστεί το αε�οδ�όμιο π�ώτα
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Μετονομασία πε�ιοχής σταθμο�/φό�τωσης
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Μετονομασία πε�ιοχής σταθμο�/φό�τωσης
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Αδ�νατο να μετονομαστεί ο σταθμός...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Βαθμολογίες
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Δέχεται
@@ -1777,10 +1777,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :ΚαταπληÎ
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Εμφάνιση όλων των τ�αίνων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Εμφάνιση όλων των οχημάτων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Εμφάνιση όλων των αε�οπλάνων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Εμφάνιση όλων των αε�οπλάνων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Εμφάνιση όλων των τ�αίνων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Εμφάνιση όλων των οχημάτων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Εμφάνιση όλων των αε�οπλάνων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Εμφάνιση όλων των αε�οπλάνων που έχουν αυτό το σταθμό στο δ�ομολόγιο τους
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Ο σταθμός {STATION} δεν δέχεται πια {STRING}
@@ -1812,37 +1812,37 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Αλλα
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Εμφάνιση λίστας αποδεκτών φο�τίων
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Ονόματα σταθμών - Κλικ στο όνομα για κεντ�ά�ισμα εικόνας
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Επιλογή μεγέθους/τ�που αε�οδ�ομίου
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Σιδη�οδ�ομικός σταθμός
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Υπόστεγο Αε�οσκαφών
-STR_STATION_DESCRIPTION_AIRPORT                                 :Αε�οδ�όμιο
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Χώ�ος φό�τωσης φο�τηγών
-STR_STATION_DESCRIPTION_BUS_STATION                             :Στάση λεωφο�είων
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Αποβάθ�α πλοίων
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Σιδη�οδ�ομικός σταθμός
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Υπόστεγο Αε�οσκαφών
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Αε�οδ�όμιο
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Χώ�ος φό�τωσης φο�τηγών
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Στάση λεωφο�είων
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Αποβάθ�α πλοίων
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Εμφάνιση κάλυψης του π�οτεινο�μενου τόπου
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Μη εμφάνιση κάλυψης του π�οτεινο�μενου τόπου
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Κάλυψη πε�ιοχής
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Λιμάνι
-STR_STATION_DESCRIPTION_BUOY                                    :Σημαδο��α
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Σημαδο��α
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...σημαδο��α στη μέση
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...ο σταθμός είναι υπε�βολικά απλωμένος
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...ανομοιόμο�φοι σταθμοί απενε�γοποιημένοι
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Κ�ατήστε πατημένο το Ctrl για να επιλέξετε πε�ισσοτέ�α αντικείμενα
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...ανομοιόμο�φοι σταθμοί απενε�γοποιημένοι
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Κ�ατήστε πατημένο το Ctrl για να επιλέξετε πε�ισσοτέ�α αντικείμενα
 
 STR_UNDEFINED                                                   :(αποσδιό�ιστο)
-STR_STAT_CLASS_DFLT                                             :Εξ ο�ισμο� σταθμός
-STR_STAT_CLASS_WAYP                                             :Σημείο καθοδηγήσης
+STR_STATION_CLASS_DFLT                                          :Εξ ο�ισμο� σταθμός
+STR_STATION_CLASS_WAYP                                          :Σημείο καθοδηγήσης
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Π�οσανατολισμός Αποθήκης Πλοίων
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...π�έπει να χτιστεί στο νε�ό
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Αδ�νατο να χτιστεί αποθήκη πλοίων εδώ...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Επιλέξτε τον π�οσανατολισμό της αποθήκης πλοίων
-STR_WATER_DESCRIPTION_WATER                                     :�ε�ό
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Ακτή ή όχθη ποταμο�
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Αποθήκη πλοίων
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Κανάλι
+STR_LAI_WATER_DESCRIPTION_WATER                                 :�ε�ό
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Ακτή ή όχθη ποταμο�
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Αποθήκη πλοίων
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Κανάλι
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Αδ�νατο να χτιστεί στο νε�ό
 
 ##id 0x4000
@@ -1850,7 +1850,7 @@ STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Αποθ
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Φό�τωση Παιχνιδιο�
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Αποθήκευση
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Διαγ�αφή
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Θεατής, {SKIP}{STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Θεατής, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} ελε�θε�α
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Αδ�νατη η ανάγνωση του δίσκου
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Αποθήκευση Παιχνιδιο� Απέτυχε{}{STRING}
@@ -1866,11 +1866,11 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Λίστ
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Τ�έχον όνομα για το αποθηκευμένο παιχνίδι
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Διαγ�αφή του επιλεγμένου αποθηκευμένου παιχνιδιο�
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Αποθήκευση παιχνιδιο�, χ�ησιμοποιώντας το επιλεγμένο όνομα
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Δημιου�γία τυχαίου νέου παιχνιδιο�
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Φό�τωση Heightmap
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Δημιου�γία τυχαίου νέου παιχνιδιο�
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Φό�τωση Heightmap
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} στη μέση
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} στη μέση
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Ο�υχείο Άνθ�ακα
 STR_INDUSTRY_NAME_POWER_STATION                                 :Σταθμός Ηλεκτ�ισμο�
@@ -1924,7 +1924,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Κεντ�ά�ισμα εικόνας στην πε�ιοχή της βιομηχανίας
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}�έο {STRING} υπό κατασκευή κοντά στην πόλη {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}�έα {STRING} φυτε�εται κοντά στην πόλη {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Κόστος: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Κόστος: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Αδ�νατο να χτιστεί αυτός ο τ�πος βιομηχανίας εδώ...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...το δάσος μπο�εί να φυτευτεί μόνο πάνω από την γ�αμμή χιονιο�
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}Η βιομηχανία {STRING} ανακοίνωσε άμεσο κλείσιμο!
@@ -1943,12 +1943,12 @@ STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}Άλλο
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Αδ�νατο να γίνει εκσκαφή γης στην άλλη άκ�η του το�νελ
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Π�έπει π�ώτα να καταστ�αφεί το το�νελ
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Π�έπει π�ώτα να καταστ�αφεί η γέφυ�α
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Δεν γίνεται να ξεκινάει και να τελειώνει στο ίδιο σημείο
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Η γέφυ�α δεν καταλήγει στο ίδιο επίπεδο
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Η γέφυ�α είναι πολ� χαμηλή για το έδαφος
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Δεν γίνεται να ξεκινάει και να τελειώνει στο ίδιο σημείο
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Η γέφυ�α δεν καταλήγει στο ίδιο επίπεδο
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Η γέφυ�α είναι πολ� χαμηλή για το έδαφος
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Η α�χή και το τέλος π�έπει να είναι σε ευθεία
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Ακατάλληλη τοποθεσία για είσοδο το�νελ
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Ατσάλινη, με Ανα�τήσεις
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Με Δοκο�ς, Ατσάλινη
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Κ�εμαστή, Ατσάλινη
@@ -1959,30 +1959,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Φυσο�να,
 STR_BRIDGE_TUBULAR_SILICON                                      :Σωλήνας, Σιλικόνη
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Αδ�νατο να χτιστεί γέφυ�α εδώ...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Αδ�νατο να χτιστεί το�νελ εδώ...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Το�νελ σιδη�όδ�ομου
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Το�νελ δ�όμου
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Ατσάλινη σιδη�οδ�ομική γέφυ�α με ανα�τήσεις
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Ατσάλινη σιδη�οδ�ομική γέφυ�α με δοκο�ς
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Ατσάλινη κ�εμαστή σιδη�οδ�ομική γέφυ�α
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Σιδη�οδ�ομική γέφυ�α από ενισχυμένο τσιμέντο
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Ξ�λινη σιδη�οδ�ομική γέφυ�α
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Τσιμεντένια σιδη�οδ�ομική γέφυ�α
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Ατσάλινη γέφυ�α δ�όμου με ανα�τήσεις
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Ατσάλινη γέφυ�α δ�όμου με δοκο�ς
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Ατσάλινη κ�εμαστή γέφυ�α δ�όμου
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Γέφυ�α δ�όμου από ενισχυμένο τσιμέντο
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Ξ�λινη γέφυ�α δ�όμου
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Τσιμεντένια γέφυ�α δ�όμου
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Κυλινδ�ική σιδη�οδ�ομική γέφυ�α
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Κυλινδ�ική γέφυ�α δ�όμου
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Το�νελ σιδη�όδ�ομου
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Το�νελ δ�όμου
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Ατσάλινη σιδη�οδ�ομική γέφυ�α με ανα�τήσεις
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Ατσάλινη σιδη�οδ�ομική γέφυ�α με δοκο�ς
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Ατσάλινη κ�εμαστή σιδη�οδ�ομική γέφυ�α
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Σιδη�οδ�ομική γέφυ�α από ενισχυμένο τσιμέντο
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Ξ�λινη σιδη�οδ�ομική γέφυ�α
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Τσιμεντένια σιδη�οδ�ομική γέφυ�α
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Ατσάλινη γέφυ�α δ�όμου με ανα�τήσεις
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Ατσάλινη γέφυ�α δ�όμου με δοκο�ς
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Ατσάλινη κ�εμαστή γέφυ�α δ�όμου
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Γέφυ�α δ�όμου από ενισχυμένο τσιμέντο
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Ξ�λινη γέφυ�α δ�όμου
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Τσιμεντένια γέφυ�α δ�όμου
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Κυλινδ�ική σιδη�οδ�ομική γέφυ�α
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Κυλινδ�ική γέφυ�α δ�όμου
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Αντικείμενο στη μέση
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Αναμεταδότης
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Φά�ος
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Κεντ�ικά Γ�αφεία Εται�είας
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Αναμεταδότης
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Φά�ος
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Κεντ�ικά Γ�αφεία Εται�είας
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...κεντ�ικά γ�αφεία εται�είας στη μέση
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Ιδιόκτητη γή από εται�εία
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Ιδιόκτητη γή από εται�εία
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Αδ�νατο να αγο�αστεί το έδαφος...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...είστε ήδη ιδιοκτήτης!
 
@@ -2029,7 +2029,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Στα
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Βαθμός Δυσκολίας
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Αποθήκευση
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Αποθήκευση
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Ε�κολο
@@ -2102,8 +2102,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}ΧÏ�ωμÎ
 STR_LIVERY_CAPTION                                              :{WHITE}�έος Χ�ωματισμός
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Όνομα Εται�είας
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Όνομα Διευθυντή
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Όνομα Εται�είας
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Όνομα Διευθυντή
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Όνομα Εται�είας
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Όνομα Διευθυντή
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Αδ�νατο να αλλάξει το όνομα της εται�είας...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Αδ�νατο να αλλάξει το όνομα του διευθυντή...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Οικονομικά {BLACK}{COMPANYNUM}
@@ -2127,11 +2127,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Σ�νολο:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY} {COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Γ�άφημα Εισοδήματος
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Γ�άφημα Ενε�γών Εσόδων
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Ισολογισμός Τ�απέζης
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Δάνειο
-STR_MAX_LOAN                                                    :{WHITE}Μέγιστο Δάνειο: {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Μέγιστο Δάνειο: {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Δανεισμός {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Πλη�ωμή {SKIP}{SKIP}{CURRENCY}
@@ -2140,7 +2140,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Αδ�ν
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...δεν υπά�χει δάνειο π�ος αποπλη�ωμή
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...Απαιτο�νται {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Αδ�νατη η αποπλη�ωμή του δανείου...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Δεν είναι δυνατόν να δοθο�ν χ�ήματα που είναι δανεισμένα από την τ�άπεζα...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Δεν είναι δυνατόν να δοθο�ν χ�ήματα που είναι δανεισμένα από την τ�άπεζα...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Επιλογή νέου π�οσώπου διευθυντή
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Αλλαγή της εμφάνισης των οχημάτων της εται�είας
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Αλλαγή του ονόματος του διευθυντή
@@ -2150,10 +2150,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Αποπ
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Manager)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Εγκαινιασμένος: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Οχήματα:
-STR_TRAINS                                                      :{WHITE}{COMMA} τ�αίν{P ο α}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} {P όχημα οχήματα} δ�όμου
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} αε�οσκάφος
-STR_SHIPS                                                       :{WHITE}{COMMA} πλοί{P ο α}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} τ�αίν{P ο α}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} {P όχημα οχήματα} δ�όμου
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} αε�οσκάφος
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} πλοί{P ο α}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Κανένα
 STR_FACE_CAPTION                                                :{WHITE}Επιλογή Π�οσώπου
 STR_FACE_MALE_BUTTON                                            :{BLACK}Α�σενικό
@@ -2167,7 +2167,7 @@ STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Δημι
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Κλειδί
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Εμφάνιση κλειδιο� στα γ�αφήματα
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Γ�αφήματα κλειδιο� εται�είας
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Κάντε κλικ εδώ για ενναλαγή εμφάνισης της εται�είας στο γ�άφημα
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Κάντε κλικ εδώ για ενναλαγή εμφάνισης της εται�είας στο γ�άφημα
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Μονάδες φο�τίου που πα�αδόθηκαν
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Ποσοστά απόδοσης εται�είας (μέγιστη τιμή=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Αξία εται�είας
@@ -2201,23 +2201,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :ΠÏ�όεδÏ�οÏ
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Μεγιστάνας
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Χτίσιμο Α�χηγείου
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Χτίστιμο α�χηγείου εται�είας / π�οβολή α�χηγείου
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Ανοικοδόμηση του α�χηγείου της εται�ίας σε άλλο μέ�ος, με κόστος το 1% της αξίας της εται�ίας
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ανοικοδόμηση του α�χηγείου της εται�ίας σε άλλο μέ�ος, με κόστος το 1% της αξίας της εται�ίας
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Αδ�νατο να χτιστεί α�χηγείο εται�είας...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Π�οβολή Α�χηγείου
-STR_RELOCATE_HQ                                                 :{BLACK}Ανοικοδόμηση Α�χηγείου
-STR_COMPANY_JOIN                                                :{BLACK}Συμμετοχή
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Συμμετοχή και παιχνίδι ως αυτή η εται�ία
-STR_COMPANY_PASSWORD                                            :{BLACK}Κωδικός
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Π�οστατε�στε την εται�ία με κωδικό ώστε να αποφ�γετε την συμμετοχή ανεπιθ�μητων παικτών.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Θέστε τον κωδικό της εται�ίας
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Ανοικοδόμηση Α�χηγείου
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Συμμετοχή
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Συμμετοχή και παιχνίδι ως αυτή η εται�ία
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Κωδικός
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Π�οστατε�στε την εται�ία με κωδικό ώστε να αποφ�γετε την συμμετοχή ανεπιθ�μητων παικτών.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Θέστε τον κωδικό της εται�ίας
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}�α μην αποθηκευτεί ο κωδικός
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Δώστε στην εται�ία νέο κωδικό
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Κωδικός εται�ίας
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Π�οεπιλεγμένος κωδικός εται�ίας
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Χ�ήση αυτο� του κωδικο� ως π�οεπιλογή για τις νέες εται�ίες
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Π�οεπιλεγμένος κωδικός εται�ίας
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Χ�ήση αυτο� του κωδικο� ως π�οεπιλογή για τις νέες εται�ίες
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Παγκόσμια Υποχώ�ηση!{}{}Οι οικονομολόγοι φοβο�νται τα χει�ότε�α καθώς η οικονομία πιάνει πάτο!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Υποχώ�ηση Τέλος!{}{}Κέ�δη στο εμπό�ιο δίνει σιγου�ιά στις βιομηχανίες καθώς η οικονομία δυναμώνει!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Εναλλαγή μεγάλου/μικ�ο� πα�αθ��ου
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Εναλλαγή μεγάλου/μικ�ο� πα�αθ��ου
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Αξία εται�είας: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Αγο�ά με�ιδίου 25% στην εται�εία
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Πώληση με�ιδίου 25% της εται�είας
@@ -2227,7 +2227,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Αδ�ν
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Αδ�νατη η πώληση με�ιδίου 25% της εται�είας...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% είναι ιδιοκτησία της {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}Η {STRING} εξαγο�άστηκε από την {STRING}!
-STR_PROTECTED                                                   :{WHITE}Αυτή η εται�εία δεν είναι α�κετά ώ�ιμη για συναλλαγή μετοχών ακόμα...
+STR_ERROR_PROTECTED                                             :{WHITE}Αυτή η εται�εία δεν είναι α�κετά ώ�ιμη για συναλλαγή μετοχών ακόμα...
 
 STR_LIVERY_DEFAULT                                              :Π�ότυπο Μοτίβου Χ�ωμάτων
 STR_LIVERY_STEAM                                                :Ατμοκίνητη Μηχανή
@@ -2253,14 +2253,14 @@ STR_LIVERY_LARGE_PLANE                                          :Μεγάλο Α
 STR_LIVERY_PASSENGER_TRAM                                       :Επιβατηγό Τ�αμ
 STR_LIVERY_FREIGHT_TRAM                                         :Εμπο�ικό Τ�άμ
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Εμφάνιση γενικών χ�ωματικών μοτίβων
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Εμφάνιση χ�ωματικών μοτίβων τ�αίνων
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Εμφάνιση χ�ωματικών μοτίβων οχημάτων δ�όμου
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Εμφάνιση χ�ωματικών μοτίβων πλοίων
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Εμφάνιση χ�ωματικών μοτίβων αε�οσκαφών
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Επιλογή του βασικο� χ�ώματος για το επιλεγμένο μοτίβο
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Επιλογή του δευτε�ε�οντος χ�ώματος για το επιλεγμένο μοτίβο
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Επιλέξτε το χ�ωματικό μοτίβο για αλλαγή ή πολλά μοτίβα με Ctrl+Κλικ. Κάντε κλικ στο κουτάκι για να επιλέξετε τη χ�ήση του μοτίβου
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Εμφάνιση γενικών χ�ωματικών μοτίβων
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Εμφάνιση χ�ωματικών μοτίβων τ�αίνων
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Εμφάνιση χ�ωματικών μοτίβων οχημάτων δ�όμου
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Εμφάνιση χ�ωματικών μοτίβων πλοίων
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Εμφάνιση χ�ωματικών μοτίβων αε�οσκαφών
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Επιλογή του βασικο� χ�ώματος για το επιλεγμένο μοτίβο
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Επιλογή του δευτε�ε�οντος χ�ώματος για το επιλεγμένο μοτίβο
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Επιλέξτε το χ�ωματικό μοτίβο για αλλαγή ή πολλά μοτίβα με Ctrl+Κλικ. Κάντε κλικ στο κουτάκι για να επιλέξετε τη χ�ήση του μοτίβου
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Ατμοκίνητο)
@@ -2403,9 +2403,9 @@ STR_ORDER_UNLOAD_NO_LOAD                                        :(Ξεφό�τω
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Αλλάξε τη συμπε�ιφο�ά στάσης για την τονισμένη εντολή
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Αλλάξε τη συμπε�ιφο�ά φό�τωσης για την τονισμένη εντολή
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Αλλάξε τη συμπε�ιφο�ά ξεφό�τωσης για την τονισμένη εντολή
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Εισαγώγη μιας π�οχω�ημένης εντολής
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Εισαγώγη μιας π�οχω�ημένης εντολής
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Πήγαινε στο κοντινότε�ο αμαξοστάσιο
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Πήγαινε στο κοντινότε�ο υπόστεγο
 STR_ORDER_NEAREST_DEPOT                                         :το κοντινότε�ο
@@ -2415,9 +2415,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :ΕπισκευÎ
 STR_ORDER_TRAIN_DEPOT                                           :Αμαξοστάσιο τ�αίνων
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Αμαξοστάσιο οχημάτων
 STR_ORDER_SHIP_DEPOT                                            :�αυπηγείο Πλοίων
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Υπόστεγο
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Υπόστεγο
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Πάντα πήγαινε
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Επισκευή έαν χ�ειάζεται
@@ -2438,7 +2438,7 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :είναι πε
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :είναι πε�ισσότε�ο ή ισο από
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :είναι αληθές
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :είναι ψευδές
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Μη ταξιδέψεις
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Ταξίδεψε (όχι π�ογ�αμματισμένο)
@@ -2459,12 +2459,12 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Τα Ï„Ï
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Πα�έλειψε
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Διέγ�αψε
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Πήγαινε Στο
-STR_STOP_ORDER                                                  :(Στάση)
-STR_TIMETABLE_VIEW                                              :{BLACK}Π�ογ�αμματισμός
-STR_ORDER_VIEW                                                  :{BLACK}Οδηγίες
+STR_ORDER_STOP_ORDER                                            :(Στάση)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Π�ογ�αμματισμός
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Οδηγίες
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Εντολές)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Τέλος Εντολών - -
-STR_SERVICE                                                     :{BLACK}Επισκευή
+STR_ORDER_SERVICE                                               :{BLACK}Επισκευή
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Κατασκευασμένο: {LTBLUE}{NUM}{BLACK} Αξία: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Αξία: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2483,7 +2483,7 @@ STR_ERROR_CAN_T_COPY_SHARE_ORDER                                :{WHITE}το ÏŒÏ
 STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}Το όχημα δεν μπο�εί να πάει σε αυτό τον σταθμό
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}όχημα που μοι�άζεται αυτή την εντολή δεν μπο�εί να πάει σε αυτό τον σταθμό
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Δεν μπο�εί να μετακινηθεί το όχημα...
-STR_CARGO_N_A                                                   :Μ/Δ{SKIP}
+STR_QUANTITY_N_A                                                :Μ/Δ{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Αδ�νατο να β�έθει δ�όμος για το τοπικό αμαξοστάσιο
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Διάστημα επισκευών: {LTBLUE}{COMMA}μέ�ες{BLACK}   Τελευταία επισκευή: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}Διάστημα επισκευών: {LTBLUE}{COMMA}%{BLACK}   Τελευταία επισκευή: {LTBLUE}{DATE_LONG}
@@ -2495,10 +2495,10 @@ STR_VEHICLE_DETAILS_TRAIN_CARGO_TOOLTIP                         :{BLACK}Πα�ο
 STR_VEHICLE_DETAILS_TRAIN_INFORMATION_TOOLTIP                   :{BLACK}Πα�ουσίαση λεπτομε�ίων των βαγονιών
 STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP                    :{BLACK}Πα�ουσίαση χω�ητικότητας κάθε βαγονιο�
 STR_ORDERS_DELETE_TOOLTIP                                       :{BLACK}Διαγ�άφη της επιλεγμένης εντολής
-STR_SERVICE_HINT                                                :{BLACK}Πα�άλειψη αυτής της εντολής εκτός αν χ�ειάζεται επισκευή
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Κόστος: {CURRENCY} Βά�ος: {WEIGHT_S}{}Ταχ�τητα: {VELOCITY}  Ιπποδ�ναμη: {POWER}{}Κόστος Λειτου�γίας: {CURRENCY}/χ�{}Χω�ητικότητα: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Κόστος: {CURRENCY} Μεγ. Ταχ�τητα: {VELOCITY}{}Χω�ητικότητα: {CARGO}, {CARGO}{}Κόστος Λειτου�γίας: {CURRENCY}/χ�
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Κόστος: {CURRENCY} Μεγ. Ταχ�τητα: {VELOCITY}{}Χω�ητικότητα: {CARGO}{}Κόστος Λειτου�γίας: {CURRENCY}/χ�
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Πα�άλειψη αυτής της εντολής εκτός αν χ�ειάζεται επισκευή
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Κόστος: {CURRENCY} Βά�ος: {WEIGHT_S}{}Ταχ�τητα: {VELOCITY}  Ιπποδ�ναμη: {POWER}{}Κόστος Λειτου�γίας: {CURRENCY}/χ�{}Χω�ητικότητα: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Κόστος: {CURRENCY} Μεγ. Ταχ�τητα: {VELOCITY}{}Χω�ητικότητα: {CARGO}, {CARGO}{}Κόστος Λειτου�γίας: {CURRENCY}/χ�
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Κόστος: {CURRENCY} Μεγ. Ταχ�τητα: {VELOCITY}{}Χω�ητικότητα: {CARGO}{}Κόστος Λειτου�γίας: {CURRENCY}/χ�
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Ηλικία: {LTBLUE}{STRING}{BLACK}   Κόστος Λειτου�γίας: {LTBLUE}{CURRENCY}/χ�
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Μεγ. ταχ�τητα: {LTBLUE}{VELOCITY}
 
@@ -2523,7 +2523,7 @@ STR_ERROR_CAN_T_MAKE_ROAD_VEHICLE_TURN                          :{WHITE}Δεν Î
 ##id 0x9800
 
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Κατασκευή καναλιο�
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Δεν μπο�εί να χτιστεί κανάλι εδώ...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Δεν μπο�εί να χτιστεί κανάλι εδώ...
 
 ##id 0xA000
 
@@ -2538,9 +2538,9 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Κατά��ευση ανθ�ακω�υχείου αφήνει καταστ�οφικό �ήγμα κοντά στο {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Πλημμ��α!{}Τουλάχιστον {COMMA} αγνοο�μενοι, το πιθανότε�ο νεκ�οί μετά από μεγάλη πλημμ��α!
 
-STR_BRIBE_FAILED                                                :{WHITE}Η δω�οδοκία έγινε
-STR_BRIBE_FAILED_2                                              :{WHITE}αντιληπτή από πε�ιφε�ειακό επιθεω�ητή
-STR_BUILD_DATE                                                  :{BLACK}Κατασκευή: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Η δω�οδοκία έγινε
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}αντιληπτή από πε�ιφε�ειακό επιθεω�ητή
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Κατασκευή: {LTBLUE}{DATE_LONG}
 
 
 STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.
@@ -2550,13 +2550,13 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}.
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Ρυθμίσεις NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Εμφάνιση �υθμίσεων NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Ρυθμίσεις NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Εφα�μογή αλλαγών
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Εναλλαγή παλέτας
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Ρ�θμιση πα�αμέτ�ων
-STR_NEWGRF_FILENAME                                             :{BLACK}Όνομα α�χείου: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Παλέτα: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Εφα�μογή αλλαγών
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Εναλλαγή παλέτας
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Ρ�θμιση πα�αμέτ�ων
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Όνομα α�χείου: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Παλέτα: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
 STR_NEWGRF_ERROR_MSG_WARNING                                    :{RED}Π�οειδοποίηση: {SILVER}{STRING}
@@ -2568,15 +2568,15 @@ STR_NEWGRF_ERROR_LOAD_AFTER                                     :{SKIP}{STRING}
 STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{SKIP}{STRING} απαιτεί έκδοση OpenTTD {STRING} ή μεγαλ�τε�η.
 STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Άγνωστη ιδιότητα Action 0
 
-STR_NEWGRF_ADD                                                  :{BLACK}Π�όσθεσε
-STR_NEWGRF_ADD_TIP                                              :{BLACK}Π�όσθεσε ένα α�χείο NewGRF στη λίστα
-STR_NEWGRF_REMOVE                                               :{BLACK}Αφαί�εσε
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Αφαί�εσε ένα α�χείο NewGRF από τη λίστα
-STR_NEWGRF_PARAMETER                                            :{BLACK}Πα�άμετ�οι: {SILVER}{STRING}
-STR_NEWGRF_NO_INFO                                              :{BLACK}Δεν υπά�χουν διαθέσιμες πλη�οφο�ίες
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Π�όσθεσε
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}Π�όσθεσε ένα α�χείο NewGRF στη λίστα
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Αφαί�εσε
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Αφαί�εσε ένα α�χείο NewGRF από τη λίστα
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Πα�άμετ�οι: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Δεν υπά�χουν διαθέσιμες πλη�οφο�ίες
 
 
-STR_NEWGRF_DISABLED                                             :{RED}Απενε�γοποιημένο
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Απενε�γοποιημένο
 
 
 STR_BROKEN_VEHICLE_LENGTH                                       :{WHITE}Τ�ένο'{VEHICLE}' που ανήκει στην '{COMPANY}' έχει μη έγκυ�ο μήκος. Πιθανόν να π�οέ�χεται από π�όβλημα του NewGRFs. Το Παιχνίδι μπο�εί ν΄αποσυγχ�ονιστεί ή να κ�ασά�ει.
@@ -2591,16 +2591,16 @@ STR_CURRENCY_SUFFIX                                             :{LTBLUE}ΕπίÎ
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Αλλαγή σε Ευ�ώ: {ORANGE}{5:NUM}
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Αλλαγή σε Ευ�ώ: {ORANGE}ποτέ
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Π�οεπισκόπιση: {ORANGE}{6:CURRENCY}
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Μείωση του ποσο� της ισοτιμίας σας για μία λί�α (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}Α�ξηση του ποσο� της ισοτιμίας σας για μία λί�α (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Ρυθμίστε τη συναλλαγματική ισοτιμία του νομίσματος για μια λί�α (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Ο�ίστε το διαχω�ιστικό για το νόμισμά σας
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Ο�ίστε το π�όθεμα για το νόμισμά σας
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Ο�ίστε το επίθεμα για το νόμισμά σας
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}�α γίνει η μετάβαση σε Ευ�ώ νω�ίτε�α
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}�α γίνει η μετάβαση σε Ευ�ώ α�γότε�α
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Θέστε το χ�όνο που γίνεται η μετάβαση σε Ευ�ώ
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Λί�ες (£) στο νόμισμά σας
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Μείωση του ποσο� της ισοτιμίας σας για μία λί�α (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Α�ξηση του ποσο� της ισοτιμίας σας για μία λί�α (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Ρυθμίστε τη συναλλαγματική ισοτιμία του νομίσματος για μια λί�α (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Ο�ίστε το διαχω�ιστικό για το νόμισμά σας
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Ο�ίστε το π�όθεμα για το νόμισμά σας
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Ο�ίστε το επίθεμα για το νόμισμά σας
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}�α γίνει η μετάβαση σε Ευ�ώ νω�ίτε�α
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}�α γίνει η μετάβαση σε Ευ�ώ α�γότε�α
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Θέστε το χ�όνο που γίνεται η μετάβαση σε Ευ�ώ
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Λί�ες (£) στο νόμισμά σας
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2664,7 +2664,7 @@ STR_VEHICLE_VIEW_TRAIN_REFIT_TOOLTIP                            :{BLACK}Αναπ
 
 
 
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Αε�οσκάφος μη διαθέσιμο
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Αε�οσκάφος μη διαθέσιμο
 
 
 
@@ -2677,7 +2677,7 @@ STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Αε�ο
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 
 ########### For showing numbers in widgets
@@ -2688,8 +2688,8 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Δημιου�γία
-STR_RANDOM                                                      :{BLACK}Τυχαία δημιου�γία
+STR_MAPGEN_GENERATE                                             :{WHITE}Δημιου�γία
+STR_MAPGEN_RANDOM                                               :{BLACK}Τυχαία δημιου�γία
 
 
 # Strings for map borders at game generation
@@ -2713,12 +2713,12 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Όλα τα τ�αίνα
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Όλα τα οχήματα δ�όμου
 STR_GROUP_ALL_SHIPS                                             :Όλα τα πλοία
 STR_GROUP_ALL_AIRCRAFTS                                         :Όλα τα αε�οπλάνα
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 
 
 
@@ -2781,23 +2781,23 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Το όνομα π�έπει να είναι μοναδικό
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Το όνομα π�έπει να είναι μοναδικό
 
 #### Improved sign GUI
 
 ########
 
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Κατασκευή
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Κατασκευή
 
 ############ Face formatting
 STR_FACE_NOSE                                                   :Μ�τη:
 STR_FACE_LIPS                                                   :Χείλια:
 STR_FACE_MOUSTACHE                                              :Μουστάκι:
 STR_FACE_COLLAR                                                 :Κολλά�ο:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Αλλαγή κολλά�ου
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Αλλαγή κολλά�ου
 STR_FACE_TIE                                                    :Γ�αβάτα:
 STR_FACE_EARRING                                                :Σκουλα�ίκι:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Αλλαγή γ�αβάτας ή σκουλα�ικιο�
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Αλλαγή γ�αβάτας ή σκουλα�ικιο�
 ########
 
 ############ signal GUI
@@ -2810,24 +2810,24 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 ############ AI GUI
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Εμφάνιση �υθμίσεων AI
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Ρ�θμιση AI
-STR_AI_CHANGE                                                   :{BLACK}Επιλόγη AI
-STR_AI_CONFIGURE_TIP                                            :{BLACK}Ρ�θμιση των πα�αμέτ�ων ενός AI
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Επιλόγη AI
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Ρ�θμιση των πα�αμέτ�ων ενός AI
 STR_AI_LIST_CAPTION                                             :{WHITE}Διαθέσιμο AI
-STR_AI_ACCEPT                                                   :{BLACK}Αποδοχή
-STR_AI_CANCEL                                                   :{BLACK}Άκυ�ο
-STR_AI_CLOSE                                                    :{BLACK}Κλείσιμο
-STR_AI_HUMAN_PLAYER                                             :Ανθ�ώπινος παίκτης
-STR_AI_RANDOM_AI                                                :Τυχαίο AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Αποδοχή
+STR_AI_LIST_CANCEL                                              :{BLACK}Άκυ�ο
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Κλείσιμο
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Ανθ�ώπινος παίκτης
+STR_AI_CONFIG_RANDOM_AI                                         :Τυχαίο AI
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Πα�άμετ�οι AI
-STR_AI_AUTHOR                                                   :{BLACK}Συγγ�αφέας: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Έκδοση: {NUM}
-STR_AI_URL                                                      :{BLACK}Ιστιοσελίδα: {STRING}
-STR_AI_NO_AI_FOUND                                              :Δεν β�έθηκε κατάλληλο AI για φό�τωση.{}Αυτό το AI είναι ένα ψε�τικο AI και δεν θα κάνει τίποτα.{}Μπο�είτε να κατεβάσετε διάφο�α AΙ από το σ�στημα 'Online πε�ιεχομένου"
+STR_AI_LIST_AUTHOR                                              :{BLACK}Συγγ�αφέας: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Έκδοση: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}Ιστιοσελίδα: {STRING}
+STR_ERROR_AI_NO_AI_FOUND                                        :Δεν β�έθηκε κατάλληλο AI για φό�τωση.{}Αυτό το AI είναι ένα ψε�τικο AI και δεν θα κάνει τίποτα.{}Μπο�είτε να κατεβάσετε διάφο�α AΙ από το σ�στημα 'Online πε�ιεχομένου"
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Επίπεδο θο��βου στη πόλη: {ORANGE}{COMMA}{BLACK}  μέγιστο: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Πα�αγόμενος θό�υβος: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Επίπεδο θο��βου στη πόλη: {ORANGE}{COMMA}{BLACK}  μέγιστο: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Πα�αγόμενος θό�υβος: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -2841,9 +2841,9 @@ STR_CONTENT_NAME_CAPTION                                        :{BLACK}Όνομ
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Επιλογή όλων
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Επιλέξτε αναβαθμίσεις
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Αποεπιλογή όλων
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Εισάγετε μια λέξη για να φιλτ�α�ιστεί η λίστα για
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Εισάγετε μια λέξη για να φιλτ�α�ιστεί η λίστα για
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Κατέβασμα
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Ένα�ξη κατεβάσματος του επιλεγμένου πε�ιεχόμενου
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Ένα�ξη κατεβάσματος του επιλεγμένου πε�ιεχόμενου
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Συνολικό μέγεθος κατεβάσματος: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}ΠΛΗΡΟΦΟΡΙΕΣ ΠΕΡΙΕΧΟΜΕ�ΟΥ
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Δεν έχετε επιλέξει αυτό για να κατέβει
@@ -2876,6 +2876,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Δεν Î
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Έλεγχος Online πε�ιεχομένου
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Έλεγχος για νέο και ανανεωμένο πε�ιεχόμενο για κατέβασμα
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Αναζήτηση μη εγκατεστήμενου πε�ιεχομένου online
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Έλεγχος πότε μη εγκατεστημένο πε�ιεχόμενο μπο�εί να β�εθεί online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Αναζήτηση μη εγκατεστήμενου πε�ιεχομένου online
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Έλεγχος πότε μη εγκατεστημένο πε�ιεχόμενο μπο�εί να β�εθεί online
 ########
diff --git a/src/lang/unfinished/ido.txt b/src/lang/unfinished/ido.txt
index 7fe93c633..4807a7237 100644
--- a/src/lang/unfinished/ido.txt
+++ b/src/lang/unfinished/ido.txt
@@ -91,9 +91,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 La kruo OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Livas
-STR_YES                                                         :{BLACK}Yes
-STR_NO                                                          :{BLACK}Ne
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Kad tu esas certa ke tu volas livar OpenTTD ed rivenar a {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Yes
+STR_QUIT_NO                                                     :{BLACK}Ne
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Kad tu esas certa ke tu volas livar OpenTTD ed rivenar a {STRING}?
 
 STR_JUST_NOTHING                                                :Nulo
 STR_COLOUR_DARK_BLUE                                            :Obskur-blua
@@ -154,10 +154,10 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Dezerto
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Nivo
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Sendajo
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_QUERY_CANCEL                                                :{BLACK}Anular
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Rinomizar
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_CANCEL                                               :{BLACK}Anular
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Rinomizar
 
 
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Kargajo
@@ -198,10 +198,10 @@ STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLAC
 ############ range for service numbers starts
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Treni
-STR_VEHICLE_ROAD_VEHICLE                                        :Voy-vehili
-STR_VEHICLE_SHIP                                                :Bateli
-STR_VEHICLE_AIRCRAFT                                            :Aeroplani
+STR_REPLACE_VEHICLE_TRAIN                                       :Treni
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Voy-vehili
+STR_REPLACE_VEHICLE_SHIP                                        :Bateli
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Aeroplani
 
 ############ range for days starts (also used for the place in the highscore window)
 ############ range for days ends
@@ -387,7 +387,7 @@ STR_VEHICLE_AIRCRAFT                                            :Aeroplani
 ##id 0x5000
 
 ##id 0x5800
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Faro
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Faro
 
 
 ############ WARNING, using range 0x6000 for strings that are stored in the savegame
diff --git a/src/lang/unfinished/macedonian.txt b/src/lang/unfinished/macedonian.txt
index 457e5a474..64c06a001 100644
--- a/src/lang/unfinished/macedonian.txt
+++ b/src/lang/unfinished/macedonian.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Мапа
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Опции на Играта
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Порака
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Порака од {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Внимание!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Внимание!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Ова не е можно....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}�е може да �е и�чи�ти оваа обла�т....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Оригинален copyright {COPYRIGHT} 1995 Chris Sawyer, Сите права �е задржани
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 OpenTTD тимот
 
 STR_QUIT_CAPTION                                                :{WHITE}�апушти
-STR_YES                                                         :{BLACK}Да
-STR_NO                                                          :{BLACK}�е
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Дали �те �игурни дека �акате да ја напуштите OpenTTD и да �е вратите во {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Да
+STR_QUIT_NO                                                     :{BLACK}�е
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Дали �те �игурни дека �акате да ја напуштите OpenTTD и да �е вратите во {STRING}?
 
 STR_JUST_NOTHING                                                :�ишто
 STR_COLOUR_DARK_BLUE                                            :Темоно Сина
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Пу�тина
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Снег
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Порака
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Зададено
-STR_QUERY_CANCEL                                                :{BLACK}Откажи
-STR_QUERY_OK                                                    :{BLACK}Во ред
-STR_QUERY_RENAME                                                :{BLACK}Преименувај
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Зададено
+STR_BUTTON_CANCEL                                               :{BLACK}Откажи
+STR_BUTTON_OK                                                   :{BLACK}Во ред
+STR_BUTTON_RENAME                                               :{BLACK}Преименувај
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_UNIX                                                 :Unix
@@ -249,16 +249,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Това
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Информација
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Капацитети
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Вкупно Товар
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Вкупен капацитет на овој воз:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Вкупен капацитет на овој воз:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}�ова Игра
 STR_INTRO_LOAD_GAME                                             :{BLACK}Вчитај Игра
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Повеќе играчи
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Сценарио едитор
 
-STR_MAPSIZE                                                     :{BLACK}Големина на мапа:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Големина на мапа:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Опции на Играта
 
 STR_COMPANY_SOMEONE                                             :некој{SKIP}{SKIP}
@@ -306,9 +306,9 @@ STR_FILE_MENU_QUIT_GAME                                         :�апушти
 STR_FILE_MENU_EXIT                                              :Излез
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Дали �те �игурни дека �акате да ја напуштите играта?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}�апушти ја Играта
-STR_SORT_ORDER_TIP                                              :{BLACK}Изберете начин на �ортирање (намалувачки/зголемувачки)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Изберете критериум за �ортирање
-STR_SORT_BY                                                     :{BLACK}Сортирање �поред
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Изберете начин на �ортирање (намалувачки/зголемувачки)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Изберете критериум за �ортирање
+STR_BUTTON_SORT_BY                                              :{BLACK}Сортирање �поред
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}�а�елено�т
@@ -338,22 +338,22 @@ STR_SORT_BY_RUNNING_COST                                        :ПотрошуÐ
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Моќно�т/Потрошувачка
 STR_SORT_BY_CARGO_CAPACITY                                      :Капацитет за товар
 
-STR_NO_WAITING_CARGO                                            :{BLACK}�е чека никаков товар
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Избери ги �ите објекти
-STR_SELECT_ALL_TYPES                                            :{BLACK}Избери ги �ите видови товар (including no waiting cargo)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Преглед на ли�та на до�тапни мотори за овој вид на возило
-STR_MANAGE_LIST                                                 :{BLACK}Менаџирање на ли�та
-STR_MANAGE_LIST_TIP                                             :{BLACK}И�прати ги ин�трукциите на �ите возила во ли�тата
-STR_REPLACE_VEHICLES                                            :Замени ги возилата
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}�е чека никаков товар
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Избери ги �ите објекти
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Избери ги �ите видови товар (including no waiting cargo)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Преглед на ли�та на до�тапни мотори за овој вид на возило
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Менаџирање на ли�та
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}И�прати ги ин�трукциите на �ите возила во ли�тата
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Замени ги возилата
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}До�тапни Возови
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}До�тапни Возила
-STR_AVAILABLE_SHIPS                                             :{BLACK}До�тапни Бродови
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}До�тапни Летала
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}До�тапни Возови
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}До�тапни Возила
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}До�тапни Бродови
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}До�тапни Летала
 
-STR_SEND_TRAIN_TO_DEPOT                                         :И�прати во Гаража
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :И�прати во Гаража
-STR_SEND_SHIP_TO_DEPOT                                          :И�прати во Гаража
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :И�прати во Гаража
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :И�прати во Гаража
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :И�прати во Гаража
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -384,8 +384,8 @@ STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Ð�е мÐ
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Затвори го прозорецот
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}�а�лов на прозорец - влечи тука за да го поме�тиш прозорецот
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Уривање згради итн. на квадратна обла�т
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Снижи агол на земјата
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Подигни агол на земјата
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Снижи агол на земјата
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Подигни агол на земјата
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Поме�тувач - ја поме�тува ли�тата нагоре/надолу
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Прикажи ги контурите на земјата на мапа
 STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}Прикажи ги возилата на мапа
@@ -397,14 +397,14 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Вклу
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Годинашна заработка: {CURRENCY} (лани: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} година{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} година{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} година{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} година{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Воз
-STR_VEHICLE_ROAD_VEHICLE                                        :Патно возило
-STR_VEHICLE_SHIP                                                :Брод
-STR_VEHICLE_AIRCRAFT                                            :Летало
+STR_REPLACE_VEHICLE_TRAIN                                       :Воз
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Патно возило
+STR_REPLACE_VEHICLE_SHIP                                        :Брод
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Летало
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Информации за земјишна обла�т
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Цена за чи�тење: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Цена за чи�тење: {RED}{CURRENCY}
@@ -413,7 +413,7 @@ STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Соп�
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Локална вла�т: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :�ишто
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Име
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1-в
@@ -512,7 +512,7 @@ STR_PLAYLIST_TOOLTIP_SAVE_MUSIC_SETTINGS                        :{BLACK}Зачу
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Кликни на пе�на за да ја додадеш во тековниот програм (�амо Соп�твен1 или Соп�твен2)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Вклучи/и�клучи мешање за програм
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Прикажи диалог за избор на пе�на
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Кликни на �ерви� за да �е центрира погледот на инду�тријата/градот
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Кликни на �ерви� за да �е центрира погледот на инду�тријата/градот
 STR_INTRO_DIFFICULTY                                            :{BLACK}Тежина ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :По�ледната порака/ве�т
@@ -562,7 +562,7 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...прÐ
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...премногу бли�ку до друг град
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...не�оодветно ме�то
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...премногу градови
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}�е може да �е направи град
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}�е може да �е направи град
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Зголеми го градот
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Рашири
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Случаен Град
@@ -600,7 +600,7 @@ STR_GAME_OPTIONS_AUTOSAVE_DROPDOWN_EVERY_1_MONTH                :Секој ме
 
 
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}�втомат�кото �нимање неу�пешно
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}�втомат�кото �нимање неу�пешно
 
 
 STR_BAGS                                                        :вреќи
@@ -651,7 +651,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Изгр
 
 
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}�е може да �е направи канал овде...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}�е може да �е направи канал овде...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Гради канали.
 
 
@@ -711,13 +711,13 @@ STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Град
 ##### PNG-MAP-Loader
 
 
-STR_BMPMAP_ERROR                                                :{WHITE}�е може да �е вчита пеј�ажот од BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...не може да �е конвертира типот на �лика.
+STR_ERROR_BMPMAP                                                :{WHITE}�е може да �е вчита пеј�ажот од BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...не може да �е конвертира типот на �лика.
 
 ##id 0x0800
 
 ##id 0x1000
-STR_ALREADY_LEVELLED                                            :{WHITE}... веќе рамно
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... веќе рамно
 
 
 
@@ -745,7 +745,7 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Изгр
 
 
 ##id 0x3800
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Водовод
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Водовод
 
 ##id 0x4000
 
@@ -759,8 +759,8 @@ STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Водовод
 
 
 ##id 0x5000
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Краевите на мо�тот не �е на и�та ви�ина
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Мо�тот е пренизок за теренот
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Краевите на мо�тот не �е на и�та ви�ина
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Мо�тот е пренизок за теренот
 STR_BRIDGE_TUBULAR_SILICON                                      :Цилиндричен, Силикон�ки
 
 ##id 0x5800
@@ -784,7 +784,7 @@ STR_BRIDGE_TUBULAR_SILICON                                      :ЦилиндрÐ
 
 
 ##id 0x7000
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} авион
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} авион
 
 
 
@@ -805,7 +805,7 @@ STR_AIRCRAFT                                                    :{WHITE}{COMMA}
 
 
 ##id 0x9000
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Капацитет: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Капацитет: {LTBLUE}
 
 
 
@@ -825,7 +825,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Изгр
 
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Град�ка про�лава . . .{}Првиот авион при�тигна на {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}�вион�ка не�реќа!{}{COMMA} загинати во пожарот на {STATION}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 
 ##id 0xB000
@@ -837,9 +837,9 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Штета предизвикана од рудник за јаглен во близина на {TOWN}!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Поплави!{}�ајмалку {COMMA} и�чезнати лица, �е претпо�тавува дека �е загинати!
 
-STR_BRIBE_FAILED                                                :{WHITE}Твојот обид за поткуп беше
-STR_BRIBE_FAILED_2                                              :{WHITE}разоткриен од локалната ин�пекција
-STR_BUILD_DATE                                                  :{BLACK}Изградба: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Твојот обид за поткуп беше
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}разоткриен од локалната ин�пекција
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Изградба: {LTBLUE}{DATE_LONG}
 
 
 STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
@@ -949,7 +949,7 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Пози
 
 
 
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}�вионот е недо�тапен
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}�вионот е недо�тапен
 
 
 
@@ -1047,15 +1047,15 @@ STR_BLACK_7                                                     :{BLACK}7
 
 ########
 
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Изгради
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Изгради
 
 ############ Face formatting
 ########
 
 ############ signal GUI
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Влез �игнализација (електрика){}Зелено е �е додека има барем еден зелен излез-�игнал во продолжението на траката, во �противно е црвено.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Излез Сигнализација (електрика){}Се одне�ува на и�т начин како блок-�игналот, но потребно е да ја има точната боја на влезен и комбо пре�игнал.
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Комбо-Сигнал (електрика){}Комбо �игнализацијата има функција и на обете влезна и како излезна �игнализација. Ова овозможува да �е направи голема мрежа од пре-�игнализација.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Влез �игнализација (електрика){}Зелено е �е додека има барем еден зелен излез-�игнал во продолжението на траката, во �противно е црвено.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Излез Сигнализација (електрика){}Се одне�ува на и�т начин како блок-�игналот, но потребно е да ја има точната боја на влезен и комбо пре�игнал.
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Комбо-Сигнал (електрика){}Комбо �игнализацијата има функција и на обете влезна и како излезна �игнализација. Ова овозможува да �е направи голема мрежа од пре-�игнализација.
 ########
 
 ############ on screen keyboard
diff --git a/src/lang/unfinished/malay.txt b/src/lang/unfinished/malay.txt
index d9a9ba61e..3d8eb4bb6 100644
--- a/src/lang/unfinished/malay.txt
+++ b/src/lang/unfinished/malay.txt
@@ -139,7 +139,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}MAP-{STR
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Pilihan Permainan
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Pesanan
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Pesanan dari {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Amaran!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Amaran!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Tidak boleh lakukan....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Tidak boleh bersihkan kawasan....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Hakcipta terpelihara{COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -147,9 +147,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2008 The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}Keluar
-STR_YES                                                         :{BLACK}Ya
-STR_NO                                                          :{BLACK}Tidak
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Anda pasti mahu keluar dari OpenTTD dan kembali ke {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Ya
+STR_QUIT_NO                                                     :{BLACK}Tidak
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Anda pasti mahu keluar dari OpenTTD dan kembali ke {STRING}?
 
 STR_JUST_NOTHING                                                :Tiada
 STR_COLOUR_DARK_BLUE                                            :Biru Gelap
@@ -210,10 +210,10 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Padang Pasir
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Salji
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Pesanan
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_QUERY_CANCEL                                                :{BLACK}Batal
-STR_QUERY_OK                                                    :{BLACK}OK
-STR_QUERY_RENAME                                                :{BLACK}Tukar Nama
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_CANCEL                                               :{BLACK}Batal
+STR_BUTTON_OK                                                   :{BLACK}OK
+STR_BUTTON_RENAME                                               :{BLACK}Tukar Nama
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -230,16 +230,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Kargo
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Maklumat
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Kapasiti
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Jumlah Kargo
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Jumlah kapasiti kargo keretapi ini:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Jumlah kapasiti kargo keretapi ini:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Permainan Baru
 STR_INTRO_LOAD_GAME                                             :{BLACK}Muat Permainan
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Ramai pemain
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Pengarang Senario
 
-STR_MAPSIZE                                                     :{BLACK}Saiz peta:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Saiz peta:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Pilihan Permainan
 
 STR_COMPANY_SOMEONE                                             :Seseorang{SKIP}{SKIP}
@@ -286,9 +286,9 @@ STR_FILE_MENU_QUIT_GAME                                         :Tinggalkan Perm
 STR_FILE_MENU_EXIT                                              :Keluar
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Anda pasti mahu meninggalkan permainan ini?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Tinggalkan Permainan
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Pilih kriteria aturan
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}Pilih kriteria tapisan
-STR_SORT_BY                                                     :{BLACK}Menyusun mengikuti
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Pilih kriteria aturan
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}Pilih kriteria tapisan
+STR_BUTTON_SORT_BY                                              :{BLACK}Menyusun mengikuti
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Bilangan Penduduk
@@ -314,23 +314,23 @@ STR_SORT_BY_POWER                                               :Tenaga
 STR_SORT_BY_INTRO_DATE                                          :Tarikh Pengenalan
 STR_SORT_BY_CARGO_CAPACITY                                      :Kapasiti Kargo
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Tiada kargo menunggu
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Pilih semua kemudahan
-STR_SELECT_ALL_TYPES                                            :{BLACK}Pilih semua kargo (termasuk kargo tiada menunggu)
-STR_MANAGE_LIST                                                 :{BLACK}Kendali senarai
-STR_MANAGE_LIST_TIP                                             :{BLACK}Hantar arahan pada semua kenderaan didalam senarai
-STR_REPLACE_VEHICLES                                            :Tukar kenderaan
-STR_SEND_FOR_SERVICING                                          :Hantar untuk servis
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Tiada kargo menunggu
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Pilih semua kemudahan
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Pilih semua kargo (termasuk kargo tiada menunggu)
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Kendali senarai
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Hantar arahan pada semua kenderaan didalam senarai
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Tukar kenderaan
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Hantar untuk servis
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Keretapi sedia ada
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Kenderaan sedia ada
-STR_AVAILABLE_SHIPS                                             :{BLACK}Kapal sedia ada
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Kapal terbang sedia ada
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Keretapi sedia ada
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Kenderaan sedia ada
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Kapal sedia ada
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Kapal terbang sedia ada
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Hantar ke pangkalan
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Hantar ke pangkalan
-STR_SEND_SHIP_TO_DEPOT                                          :Hantar ke pangkalan
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Hantar ke bangsal Kapal Terbang
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Hantar ke pangkalan
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Hantar ke pangkalan
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Hantar ke pangkalan
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Hantar ke bangsal Kapal Terbang
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -360,10 +360,10 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Pilihan
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Tidak boleh tukar jarak waktu perkhidmatan...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Tutup window
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Tajuk tetingkap -  seret ini untuk pindahkan tetingkap
-STR_RESIZE_BUTTON                                               :{BLACK}Klik dan seret untuk mensaizkan tetingkap
+STR_TOOLTIP_RESIZE                                              :{BLACK}Klik dan seret untuk mensaizkan tetingkap
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Runtuhkan bangunan dll. atas sebuah tanah
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Rendahkan hujung tanah
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Meninggikan hujung tanah
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Rendahkan hujung tanah
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Meninggikan hujung tanah
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bar penatal - Menatal senarai atas/bawah
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Tunjukan bentuk muka bumi
 STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}Tunjukkan kenderaan di peta
@@ -375,14 +375,14 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Togol na
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Keuntungan tahun ini: {CURRENCY} (tahun lalu: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} tahun ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} tahun ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} tahun ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} tahun ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Keretapi
-STR_VEHICLE_ROAD_VEHICLE                                        :Kenderaan Jalan
-STR_VEHICLE_SHIP                                                :Kapal
-STR_VEHICLE_AIRCRAFT                                            :Kapal Terbang
+STR_REPLACE_VEHICLE_TRAIN                                       :Keretapi
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Kenderaan Jalan
+STR_REPLACE_VEHICLE_SHIP                                        :Kapal
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Kapal Terbang
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} menjadi semakin lama
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} menjadi terlalu lama
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} menjadi terlalu lama dan memerlukan penggantian dengan segera
@@ -397,7 +397,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Pemilik
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Pihak berkuasa: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Tiada
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Nama
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :Pertama
@@ -505,7 +505,7 @@ STR_PLAYLIST_TOOLTIP_SAVE_MUSIC_SETTINGS                        :{BLACK}Simpan s
 STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Klik atas trek muzik untuk menambahkan ke program semasa (Custom1 atau Custom2 sahaja)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Togol program kocok buka/tutup
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Paparkan tingkap pilihan trek muzik
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Klik di atas servis untuk mendapatkan pandangan tengah pada industri/bandar
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Klik di atas servis untuk mendapatkan pandangan tengah pada industri/bandar
 STR_INTRO_DIFFICULTY                                            :{BLACK}Kesukaran ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Utusan/laporan berita terakhir
@@ -553,7 +553,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Menurunk
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Hasilkan secara rawak
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Membentuk lanskap semula
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Membentuk lanskap semula
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Keluarkan semua harta pemain dari peta
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Keluarkan semua harta pemain dari peta
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Anda pasti untuk membuang semua harta milik pemain?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Pembentukan lanskap
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Pembentukan bandar
@@ -567,11 +567,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...terla
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...terlalu hampir kepada bandar lain
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...kawasan tidak sesuai
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...terlalu banyak bandar
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Tidak boleh bina bandar
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...ruang tidak mencukupi di dalam peta
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Tidak boleh bina bandar
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...ruang tidak mencukupi di dalam peta
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Besarkan saiz bandar
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Kembangkan
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Bandar ini tidak akan membina jalan. Anda boleh membenarkan pembinaan jalan melalui Advanced Settings->Economy->Towns.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Bandar ini tidak akan membina jalan. Anda boleh membenarkan pembinaan jalan melalui Advanced Settings->Economy->Towns.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Bandar Secara Rawak
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Bina bandar secara rawak
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Tidak boleh bina {STRING} di sini...
@@ -585,7 +585,7 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Letak ka
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Letak rumah api
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Letak alat pemancar
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Pilih kawasan gurun {}Tekan dan kekalkan CTRL untuk menanggalkannya
-STR_CREATE_RIVER                                                :{BLACK}Letak sungai.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Letak sungai.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Buang
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Buang bandar ini sepenuhnya
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Simpan senario
@@ -597,7 +597,7 @@ STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Simpan s
 STR_SAVELOAD_LOAD_SCENARIO                                      :{WHITE}Muat Senario
 STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Simpan Senario
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Main Senario
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Anda pasti mahu meninggalkan senario ini?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Anda pasti mahu meninggalkan senario ini?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... hanya boleh dibina di bandar dengan populasi lebih atau sama dengan 1200
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Pindah tarikh permulaan 1 tahun belakang
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Pindah tarikh permulaan 1 tahun ke hadapan
@@ -605,20 +605,20 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}... peng
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Kecil
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Sederhana
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Besar
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Rambang
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Rambang
 STR_FOUND_TOWN_CITY                                             :{BLACK}Bandar
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Pilih saiz bandar
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Saiz bandar
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Susunan jalan raya bandar:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Pilih susunan jalan untuk bandar ini
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Asal
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Jalan raya lebih baik
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Grid 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Grid 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Rawak
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Susunan jalan raya bandar:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Pilih susunan jalan untuk bandar ini
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Asal
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Jalan raya lebih baik
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Grid 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Grid 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Rawak
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Tunjukkan utusan atau laporan berita terakhir
 STR_NEWS_MESSAGES_OFF                                           :Padam
 STR_NEWS_MESSAGES_SUMMARY                                       :Ringkasan
@@ -711,10 +711,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  DI
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Tangkapan skrin berjaya disimpan sebagai '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Tangkapan skrin gagal!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Beli tanah untuk kegunaan masa hadapan
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Beli tanah untuk kegunaan masa hadapan
 STR_STATUSBAR_AUTOSAVE                                          :{RED}SIMPANAN AUTOMATIK
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  SIMPAN PERMAINAN  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Penyimpanan sedang berjalan,{}sila tunggu sehingga selesai!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Penyimpanan sedang berjalan,{}sila tunggu sehingga selesai!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Pilih program 'Muzik gaya Ezy Street'
 
 ############ start of townname region
@@ -757,7 +757,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Pilih ba
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Skrin Penuh
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Tanda kotak ini untuk bermain OpenTTD dalam mod skrin penuh
-STR_FULLSCREEN_FAILED                                           :{WHITE}Mod skrin penuh gagal
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Mod skrin penuh gagal
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Resolusi Skrin
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Pilih resolusi skrin untuk digunakan
@@ -771,10 +771,10 @@ STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} fail
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}Maklumat tambahan tentang set grafik asas ini
 
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Menuju ke {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Tiada perintah
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Tiada perintah, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Menuju ke {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Menuju ke {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Tiada perintah
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Tiada perintah, {VELOCITY}
 
 STR_PASSENGERS                                                  :penumpang
 STR_BAGS                                                        :beg
@@ -865,8 +865,8 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Tukar i
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Tukar tarikh: {ORANGE} {DATE_SHORT}
 
 
-STR_GO_TO_WAYPOINT                                              :Pergi melalui {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Pergi terus-menerus melalui {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Pergi melalui {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Pergi terus-menerus melalui {WAYPOINT}
 
 
 
@@ -874,23 +874,23 @@ STR_GO_NON_STOP_TO_WAYPOINT                                     :Pergi terus-men
 
 
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Banyak bandar rawak
-STR_MANY_RANDOM_INDUSTRIES                                      :Many industri rawak
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Tidak boleh menjana industri..
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Banyak bandar rawak
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Many industri rawak
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Tidak boleh menjana industri..
 
 
 
 
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Bina terusan.
-STR_LANDINFO_CANAL                                              :Terusan
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Terusan
 
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Tidak boleh letak sungai di sini...
-STR_LANDINFO_RIVER                                              :Sungai
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Tidak boleh letak sungai di sini...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Sungai
 
 
 
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Tidak boleh tukar jenis landasan di sini...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Tidak boleh tukar jenis landasan di sini...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Menukarkan/Meningkatkan jenis landasan
 
 
@@ -910,23 +910,23 @@ STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Menukark
 
 
 
-STR_NETWORK_LANGUAGE                                            :{SILVER}Bahasa: {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Saiz peta: {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Versi pelayan: {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Alamat pelayan: {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Tarikh permulaan: {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Tarikh sekarang: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Bahasa: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Saiz peta: {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Versi pelayan: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Alamat pelayan: {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Tarikh permulaan: {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Tarikh sekarang: {WHITE}{DATE_SHORT}
 
 
 
 
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Pilih peta:
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Internet
-STR_NETWORK_LAN_INTERNET                                        :LAN / Internet
-STR_NETWORK_INTERNET_ADVERTISE                                  :Internet (iklankan)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} pelanggan
+STR_NETWORK_START_SERVER_SELECT_MAP                             :{BLACK}Pilih peta:
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Internet
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Internet
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Internet (iklankan)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} pelanggan
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Mana-mana
@@ -940,13 +940,13 @@ STR_NETWORK_LANG_DUTCH                                          :Belanda
 
 
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Nama syarikat: {WHITE}{STRING}
-STR_NETWORK_VALUE                                               :{SILVER}Nilai syarikat: {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Pendapatan tahun lepas: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Nama syarikat: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Nilai syarikat: {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Pendapatan tahun lepas: {WHITE}{CURRENCY}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Kenderaan: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Stesen-stesen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Pemain: {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Kenderaan: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Stesen-stesen: {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Pemain: {WHITE}{STRING}
 
 
 ############ Leave those lines in this order!!
@@ -957,18 +957,18 @@ STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES}
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Masukkan jumlah wang anda hendak memberikan
 
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE}Tidak boleh jumpa permainan rangkaian
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE}Pelayan itu tidak menjawabkan permohonan ini
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE}Tidak boleh sambung kerana NewGRF yang tidak sama
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE}Permainan rangkaan telah dihilang
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE}Tidak boleh memulakan pelayan ini
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE}Tidak boleh bersambung
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Kata laluan salah
-STR_NETWORK_ERR_KICKED                                          :{WHITE} Anda telah ditendang keluar daripada permainan ini
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE}Tidak boleh jumpa permainan rangkaian
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE}Pelayan itu tidak menjawabkan permohonan ini
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE}Tidak boleh sambung kerana NewGRF yang tidak sama
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE}Permainan rangkaan telah dihilang
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE}Tidak boleh memulakan pelayan ini
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE}Tidak boleh bersambung
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Kata laluan salah
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} Anda telah ditendang keluar daripada permainan ini
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :tidak boleh memuatkan peta
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :sambungan terhilang
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :tidak boleh memuatkan peta
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :sambungan terhilang
 ############ End of leave-in-this-order
 ############ Leave those lines in this order!!
 ############ End of leave-in-this-order
@@ -988,17 +988,17 @@ STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}
 STR_INCOME_FLOAT_COST                                           :{RED}Kos: {CURRENCY}
 STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}Kos Jangkaan: {CURRENCY}
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Untung Jangkaan: {CURRENCY}
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Batu
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Rumput
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Tanah diliputi salji
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Batu
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Rumput
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Tanah diliputi salji
 
 ##id 0x1000
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Bina stesen kereta api
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Bina isyarat kereta api
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Bina jambatan kereta api
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Bina terowong kereta api
-STR_RAILROAD_TRACK                                              :Landasan keretapi
-STR_RAILROAD_TRAIN_DEPOT                                        :Depot keretapi
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Landasan keretapi
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Depot keretapi
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...kawasan sudah dimiliki oleh syarikat lain
 
 
@@ -1018,22 +1018,22 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Bina ter
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Hidupkan/Matikan jalan raya sehala
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}Togol bina/buang untuk pembinaan jalan raya
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Togol bina/buang untuk pembinaan landasan trem
-STR_ROAD_DESCRIPTION_ROAD                                       :Jalan
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Jalan berlampu
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Jalan dibarisi pokok
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depot kenderaan jalan
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Simpangan jalan/landasan
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Landasan trem
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Jalan
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Jalan berlampu
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Jalan dibarisi pokok
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depot kenderaan jalan
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Simpangan jalan/landasan
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Landasan trem
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Tidak boleh membuang stesen bas...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Tidak boleh membuang stesen lori...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Tidak boleh membuang stesen trem penumpang...
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Bandar
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Bangunan mesti diruntuhkan dahulu
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Bandar raya)
@@ -1088,18 +1088,18 @@ STR_LOCAL_AUTHORITY_ACTION_LARGE_ADVERTISING_CAMPAIGN           :Kempen iklan be
 STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT                  :Membeli hak penangkutan esklusif
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (sedang dibina)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (sedang dibina)
 
 ##id 0x2800
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Pokok
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Tidak boleh menanam pokok di sini...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...terlalu banyak papan tanda
-STR_SIGN_DEFAULT                                                :Papan tanda
+STR_DEFAULT_SIGN_NAME                                           :Papan tanda
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Gubarkan teks papan tanda
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Sila pilihkan jenis pokok untuk ditanam
-STR_TREE_NAME_TREES                                             :Pokok
-STR_TREE_NAME_RAINFOREST                                        :Hutan rimba
+STR_LAI_TREE_NAME_TREES                                         :Pokok
+STR_LAI_TREE_NAME_RAINFOREST                                    :Hutan rimba
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Pilihan Stesen Keretapi
@@ -1126,19 +1126,19 @@ STR_STATION_VIEW_CENTER_TOOLTIP                                 :{BLACK}Tengahka
 STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Tukarkan nama stesen
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Tunjukkan senarai kargo yang diterima
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Pilih saiz/jenis lapangan kapal terbang
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Stesen keretapi
-STR_STATION_DESCRIPTION_AIRPORT                                 :Lapangan kapal terbang
-STR_STATION_DESCRIPTION_BUS_STATION                             :Stesen bas
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Perlabuhan kapal
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Stesen keretapi
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Lapangan kapal terbang
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Stesen bas
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Perlabuhan kapal
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Perlabuhan
 
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...mesti dibina atas air
-STR_WATER_DESCRIPTION_WATER                                     :Air
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Depot kapal
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Air
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Depot kapal
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Tidak boleh dibina atas air
 
 ##id 0x4000
@@ -1196,9 +1196,9 @@ STR_LIVERY_SMALL_PLANE                                          :Kapal Terbang K
 STR_LIVERY_LARGE_PLANE                                          :Kapal Terbang Besar
 STR_LIVERY_PASSENGER_TRAM                                       :Trem Penumpang
 
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Pilih warna pertama untuk skim yang dipilih
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Pilih warna kedua untuk skim yang dipilih
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Pilih skim warna untuk menukarkanya atau berbilang skim dengan Ctrl+Klik. Klik kotak untuk menukarkan pakaian skim ini
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Pilih warna pertama untuk skim yang dipilih
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Pilih warna kedua untuk skim yang dipilih
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Pilih skim warna untuk menukarkanya atau berbilang skim dengan Ctrl+Klik. Klik kotak untuk menukarkan pakaian skim ini
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_MJS_250_DIESEL               :MJS 250 (Diesel)
@@ -1255,14 +1255,14 @@ STR_PERFORMANCE_DETAIL_INT                                      :{BLACK}{NUM}
 
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Kadar pertukaran: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
 STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Tukar ke Euro: {ORANGE}{5:NUM}
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}Tetapkan kadar pertukaran mata wang anda untuk stau Paun (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Tetapkan pemisah mata wang anda
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Tetapkan permulaan untuk mata wang anda
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Tetapkan akhiran untuk mata wang anda
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Tukar ke Euro dahulu
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Tukar ke Euro kemudian
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Tetapkan tahun untuk menukar ke Euro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}Mata wang anda berbanding 10000 Pound (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}Tetapkan kadar pertukaran mata wang anda untuk stau Paun (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Tetapkan pemisah mata wang anda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Tetapkan permulaan untuk mata wang anda
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Tetapkan akhiran untuk mata wang anda
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Tukar ke Euro dahulu
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Tukar ke Euro kemudian
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Tetapkan tahun untuk menukar ke Euro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}Mata wang anda berbanding 10000 Pound (£)
 
 
 ############ Vehicle lists
@@ -1319,25 +1319,25 @@ STR_QUERY_RENAME_AIRCRAFT_CAPTION                               :{WHITE}Nama kap
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Menggantikan: {ORANGE}{SKIP}{SKIP}{STRING}
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kenderaan tidak boleh didapati sekarang
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Kenderaan tidak boleh didapati sekarang
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Kapal tidak boleh didapati sekarang
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Kapal terbang tidak boleh didapati sekarang
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Kenderaan tidak boleh didapati sekarang
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Kenderaan tidak boleh didapati sekarang
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Kapal tidak boleh didapati sekarang
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Kapal terbang tidak boleh didapati sekarang
 
-STR_ENGINES                                                     :Enjin
+STR_REPLACE_ENGINES                                             :Enjin
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Klik untuk menghentikan semua kereta api di dalam depot
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Klik untuk menghentikan semua kenderaan di dalam depot
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Klik untuk menghentikan semua kapal di dalam depot
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Klik untuk menghentikan semua kapal terbang di dalam hangar
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Klik untuk menghentikan semua kereta api di dalam depot
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Klik untuk menghentikan semua kenderaan di dalam depot
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Klik untuk menghentikan semua kapal di dalam depot
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Klik untuk menghentikan semua kapal terbang di dalam hangar
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Klik untuk memulakan semua kereta api di dalam depot
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Klik untuk memulakan semua kenderaan di dalam depot
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Klik untuk memulakan semua kapal di dalam depot
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Klik untuk memulakan semua kapal terbang di dalam hangar
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Klik untuk memulakan semua kereta api di dalam depot
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Klik untuk memulakan semua kenderaan di dalam depot
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Klik untuk memulakan semua kapal di dalam depot
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Klik untuk memulakan semua kapal terbang di dalam hangar
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Klik untuk menghentikan semua kenderaan di dalam senarai
-STR_MASS_START_LIST_TIP                                         :{BLACK}Klik untuk memulakan semua kenderaan di dalam senarai
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Klik untuk menghentikan semua kenderaan di dalam senarai
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Klik untuk memulakan semua kenderaan di dalam senarai
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 
@@ -1372,7 +1372,7 @@ STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Muatan:
 
 
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Kumpulan - klik sebuah kumpulan untuk menaraikan semua kenderaan di dalam kumpulan
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Kumpulan - klik sebuah kumpulan untuk menaraikan semua kenderaan di dalam kumpulan
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -1447,9 +1447,9 @@ STR_FACE_NO                                                     :Tidak
 ########
 
 ############ AI GUI
-STR_AI_AUTHOR                                                   :{BLACK}Penulis: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Versi: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{BLACK}Penulis: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Versi: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
 ########
 
 ############ town controlled noise level
diff --git a/src/lang/unfinished/persian.txt b/src/lang/unfinished/persian.txt
index e33b695c9..b30bdba00 100644
--- a/src/lang/unfinished/persian.txt
+++ b/src/lang/unfinished/persian.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}نقشه
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}تنظیمات بازی
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}پیام
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}پیام از {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}اخطار!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}اخطار!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}نمی‌توانم انجام دهم
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}این منطقه پاک نمی‌شود
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Original copyright {COPYRIGHT} 1995 Chris Sawyer, All rights reserved
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}خروج
-STR_YES                                                         :{BLACK}بله
-STR_NO                                                          :{BLACK}خیر
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}آیا می‌خواهید از بازی خارج شوید و برگردید به{STRING}?
+STR_QUIT_YES                                                    :{BLACK}بله
+STR_QUIT_NO                                                     :{BLACK}خیر
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}آیا می‌خواهید از بازی خارج شوید و برگردید به{STRING}?
 
 STR_JUST_NOTHING                                                :هیچی
 STR_COLOUR_DARK_BLUE                                            :آبی تیره
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}صحرا
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}بر�
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}پیغام
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}حالت قراردادی
-STR_QUERY_CANCEL                                                :{BLACK}لغو
-STR_QUERY_OK                                                    :{BLACK}تایید
-STR_QUERY_RENAME                                                :{BLACK}نام گزاری
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}حالت قراردادی
+STR_BUTTON_CANCEL                                               :{BLACK}لغو
+STR_BUTTON_OK                                                   :{BLACK}تایید
+STR_BUTTON_RENAME                                               :{BLACK}نام گزاری
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}محمو
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}اطلاعات
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}ضر�یت ها
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}مجموع بار
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}مجموع ظر�یت بار این قطار:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}مجموع ظر�یت بار این قطار:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}بازی جدید
 STR_INTRO_LOAD_GAME                                             :{BLACK}ادامه بازی های قبلی
 STR_INTRO_MULTIPLAYER                                           :{BLACK}بازی چند ن�ره
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}ساخت سناریو
 
-STR_MAPSIZE                                                     :{BLACK}اندازه نقشه:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}اندازه نقشه:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}تنضیمات بازی
 
 STR_COMPANY_SOMEONE                                             :یک ن�ر{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :رها کردن
 STR_FILE_MENU_EXIT                                              :خروج
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}آیا مطمئن هستی که میخواهی این بازی را از بین ببری؟
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}رها کردن بازی
-STR_SORT_ORDER_TIP                                              :{BLACK}انتخاب طرز مرتب کردن (نزولی/صعودی)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}انتخاب معیار مرتب کردن
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}انتخاب معیار پایش
-STR_SORT_BY                                                     :{BLACK}مرتب کردن بر اساس
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}انتخاب طرز مرتب کردن (نزولی/صعودی)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}انتخاب معیار مرتب کردن
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}انتخاب معیار پایش
+STR_BUTTON_SORT_BY                                              :{BLACK}مرتب کردن بر اساس
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}جمعیت
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :هزینه کا
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :توان/هزینه کارکرد
 STR_SORT_BY_CARGO_CAPACITY                                      :ظر�یت محموله
 
-STR_NO_WAITING_CARGO                                            :{BLACK}هیچ نوع محموله در انتظار نیست
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}انتخاب تمامی تسهیلات
-STR_SELECT_ALL_TYPES                                            :{BLACK}انتخاب همه ی انواع محموله ها (شامل محموله های در انتظار)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}مشاهده ی تمامی موتورهای موجود برای این نوع وسیله ی نقلیه
-STR_MANAGE_LIST                                                 :{BLACK}اداره ی لیست
-STR_MANAGE_LIST_TIP                                             :{BLACK}�رستادن دستورالعمل ها برای تمامی وسایل نقیله موجود در این لیست
-STR_REPLACE_VEHICLES                                            :جایگزین کردن وسایل نقلیه
-STR_SEND_FOR_SERVICING                                          :�رستادن برای سرویس
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}قطارهای موجود
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}خودروهای موجود
-STR_AVAILABLE_SHIPS                                             :{BLACK}کشتی های موجود
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}هواپیماهای موجود
-
-STR_SEND_TRAIN_TO_DEPOT                                         :�رستادن به ایستگاه نگه داری �نی
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :�رستادن به ایستگاه نگه داری �نی
-STR_SEND_SHIP_TO_DEPOT                                          :�رستادن به مقر �نی
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :�رستادن به آشیانه
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}هیچ نوع محموله در انتظار نیست
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}انتخاب تمامی تسهیلات
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}انتخاب همه ی انواع محموله ها (شامل محموله های در انتظار)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}مشاهده ی تمامی موتورهای موجود برای این نوع وسیله ی نقلیه
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}اداره ی لیست
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}�رستادن دستورالعمل ها برای تمامی وسایل نقیله موجود در این لیست
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :جایگزین کردن وسایل نقلیه
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :�رستادن برای سرویس
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}قطارهای موجود
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}خودروهای موجود
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}کشتی های موجود
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}هواپیماهای موجود
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :�رستادن به ایستگاه نگه داری �نی
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :�رستادن به ایستگاه نگه داری �نی
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :�رستادن به مقر �نی
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :�رستادن به آشیانه
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,8 +390,8 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}تنضی
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}امکان تغییر �واصل زمانی سرویس وجود ندارد...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}بستن پنجره
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}تخریب ساختمان و ... در بخشی از زمین
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}پایین آوردن گوشه ی نقشه
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}بال آوردن گوشه ی نقشه
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}پایین آوردن گوشه ی نقشه
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}بال آوردن گوشه ی نقشه
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}حاشیه ی زمین را در نقشه نشان بده
 STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}وسایل حمل و نقل را در ص�حه نشن بده
 STR_SMALLMAP_TOOLTIP_SHOW_INDUSTRIES_ON_MAP                     :{BLACK}کارخانه ها را در نقشه نشان بده
@@ -401,14 +401,14 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}نشان
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}سود امسال : {CURRENCY} (سود پارسال: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA}سال{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} سال{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA}سال{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} سال{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :قطار
-STR_VEHICLE_ROAD_VEHICLE                                        :ماشین
-STR_VEHICLE_SHIP                                                :کشتی
-STR_VEHICLE_AIRCRAFT                                            :هواپیما
+STR_REPLACE_VEHICLE_TRAIN                                       :قطار
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :ماشین
+STR_REPLACE_VEHICLE_SHIP                                        :کشتی
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :هواپیما
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} بسیار قدیمی شده و سریعا احتیاج به جایگزینی دارد
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}اطلاعات زمین
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}هزینه پاک کردن: {LTBLUE}0
@@ -416,7 +416,7 @@ STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}هزین
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :0
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}مالک: {LTBLUE}{STRING}
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}نام
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1
@@ -562,7 +562,7 @@ STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}انتخ
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}اندازه ی شهر :
 
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK} اخرین پیغام یا گزارش را نشان بده
 STR_STATUSBAR_COMPANY_NAME                                      :{SILVER}- -  {COMPANY}  - -
 
@@ -630,7 +630,7 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  ت
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE} تصویر با مو�قیت در {STRING} ذخیره شد
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}تصئیر ذخیره نشد
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}خرید زمین برای است�اده های بعدی
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}خرید زمین برای است�اده های بعدی
 STR_STATUSBAR_AUTOSAVE                                          :{RED}ذخیره اتوماتیک
 
 ############ start of townname region
@@ -758,12 +758,12 @@ STR_MESSAGE_ESTIMATED_COST                                      :{WHITE}مخار
 STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}در آمد تقریبی: {CURRENCY}
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}نمی شود ا�زایش ارت�اع اد
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}نمی توان ارت�اع زمین را کم کرد
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :صخره
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :سرزمین سنگلاخی
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :سرزمین بایر
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :چمن
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :زمین پوشیده از بر�
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :صحرا
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :صخره
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :سرزمین سنگلاخی
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :سرزمین بایر
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :چمن
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :زمین پوشیده از بر�
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :صحرا
 
 ##id 0x1000
 STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}ترکیب ریل غیر ممکن است
@@ -790,8 +790,8 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}ساخت
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK} ساخت پل راه آهن
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK} ساخت تونل راه آهن
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}تغییر بین حذ� یا ساخت چراغ راهنمایی و ریل
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK} ساخت پل - بر روی پل مورد نظر خود کلیک کنید تا ساخته شود
-STR_RAILROAD_TRACK                                              :قطعه ریل راه آهن
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK} ساخت پل - بر روی پل مورد نظر خود کلیک کنید تا ساخته شود
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :قطعه ریل راه آهن
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE} این ناحیه توسط شرکت دیگری تصاحب شده
 
 
@@ -811,14 +811,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY                :{BLACK}ساخت
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE                      :{BLACK}ساخت پل ماشین رو
 STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL                      :{BLACK}ساخت تون ماشین رو
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK} تغییر بین ساخت/حذ� جاده
-STR_ROAD_DESCRIPTION_ROAD                                       :جاده
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :جاده با چراغ راهنمایی رانندگی
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :جاده 3 لاین
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :جاده
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :جاده با چراغ راهنمایی رانندگی
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :جاده 3 لاین
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}شهرها
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE} اول باید ساختمان تخریب شود
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_POPULATION_HOUSES                                 :{BLACK}جمعیت: {ORANGE}{COMMA}{BLACK}  خانه ها: {ORANGE}{COMMA}
@@ -863,7 +863,7 @@ STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY                    :ساخت مجس
 STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS                        :ساخت اختمان های جدید
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (در دست ساخت)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (در دست ساخت)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :ایگلو
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :خانه-قوری
 
@@ -873,16 +873,16 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :قرار داد
 STR_PLANT_TREE_CAPTION                                          :{WHITE}درختان
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE} قبلا اینجا درخت کشته شده است
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE} اینجا نمی شود درخت کاشت
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE} تعداد لامات بسیار زیاد شده
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}اینجا نمی شود علامت ساخت
-STR_SIGN_DEFAULT                                                :علامت
+STR_DEFAULT_SIGN_NAME                                           :علامت
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}تغییر نام علامت
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}نمی شود اسم علامت را عوض کرد
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}نوع درخت را مشخص کنید تا کاشته شود
-STR_TREE_NAME_TREES                                             :درختان
-STR_TREE_NAME_RAINFOREST                                        :جنگل بارانی
-STR_TREE_NAME_CACTUS_PLANTS                                     :کاکتوس
+STR_LAI_TREE_NAME_TREES                                         :درختان
+STR_LAI_TREE_NAME_RAINFOREST                                    :جنگل بارانی
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :کاکتوس
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}انتخاب ایستگاه راه آهن
@@ -898,7 +898,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE} اول
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE} به �رودگاه دیگری بسیار نزدیک شده
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE} اول باید �رودگاه تخریب شود
 
-STR_QUERY_RENAME_STATION_CAPTION                                :نام گذاری محوطه ایستگاه/بارگیری
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :نام گذاری محوطه ایستگاه/بارگیری
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}نام این ایستگاه را نمی شود تغییر داد
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}رده بندی
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}قبول می کند
@@ -934,13 +934,13 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}تغیی
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}نشان دادن لیست کالاهای قابل دریا�ت
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}نام ایستگاه ها- بر روی نام کلیک کنید تا مرکز ص�حه را بر روی ایستگاه قرار دهد
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}انتخاب اندازه/نوع �رودگاه
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :ایستگاه راه آهن
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :آشیانه هواپیما
-STR_STATION_DESCRIPTION_AIRPORT                                 :�رودگاه
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :محوطه بارگیری کامیون
-STR_STATION_DESCRIPTION_BUS_STATION                             :ایستگاه اتوبوس
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :اسکله
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :ایستگاه راه آهن
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :آشیانه هواپیما
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :�رودگاه
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :محوطه بارگیری کامیون
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :ایستگاه اتوبوس
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :اسکله
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}نور ناحیه ی اطرا� ایستگاه
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}اسکله
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}ایستگاه زیادی پخش شده است
@@ -948,8 +948,8 @@ STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}ایست
 
 ##id 0x3800
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE} باید بر روی آب ساخته شود
-STR_WATER_DESCRIPTION_WATER                                     :آب
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :خلیج یا ساحل رودخانه
+STR_LAI_WATER_DESCRIPTION_WATER                                 :آب
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :خلیج یا ساحل رودخانه
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}نمی شود بر روی آب ساخت
 
 ##id 0x4000
@@ -1016,7 +1016,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}مرکز تصویر را روی کارخانه قرار بده
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK} {STRING} جدیدی در مجاورت {TOWN} در حال ساخت است!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK} {STRING} جدیدی در مجاورت {TOWN} در حال کاشته شدن است!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}خرج: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}خرج: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}این نوع کاخانه را در اینجا نمی شود ساخت...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...جنگل باید بالای خط بر� کاشته شود
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}{STRING} تعطیلی �وری خود را اعلام کرد!
@@ -1032,27 +1032,27 @@ STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}...Ù�Ù‚Ø
 ##id 0x5000
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}اول باید تونل خراب شود
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}اول باید پل خراب شود
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE} محل شروع و پایاننمی توانند در یک نقطه باشند
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE} محل شروع و پایاننمی توانند در یک نقطه باشند
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}محل شروع پایان باید در یک خط باشند
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}محل برای شروع تونل نا مناسب است
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_WOODEN                                          :چوبی
 STR_BRIDGE_NAME_TUBULAR_STEEL                                   :لوله ای،�ولادی
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE} اینجا نمی شود پل ساخت
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE} اینجا نمی شود تونل ساخت
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :تونل راه آهن
-STR_TUNNEL_DESCRIPTION_ROAD                                     :تونل ماشین رو
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :پل راه آهن چوبی
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :پل ماشین رو چوبی
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :پل لوله ای راه آهن
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :پل جاده ای لوله ای
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :تونل راه آهن
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :تونل ماشین رو
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :پل راه آهن چوبی
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :پل ماشین رو چوبی
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :پل لوله ای راه آهن
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :پل جاده ای لوله ای
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}چیزی در مسیر قرار گر�ته
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :�انوس دریایی
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :ساختمان اصلی شرکت
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :�انوس دریایی
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :ساختمان اصلی شرکت
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}ساختمان اصلی شرکت در مسیر قرار گر�ته است
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :زمین خریداری شده
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :زمین خریداری شده
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}نمی توان این ناحیه را خرید
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE} قبلا توسط شرکت خریداری شده
 
@@ -1085,7 +1085,7 @@ STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_INITIAL_LOAN_000           :{LTBLUE}حد ا
 STR_NUM_CUSTOM                                                  :انتخابی
 
 ##id 0x7000
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} هواپیما
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} هواپیما
 STR_GRAPH_CARGO_PAYMENT_RATES_CAPTION                           :{WHITE}مبلغ پرداختی محموله ها
 STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINYFONT}{BLACK}روز های گذشته در حمل
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINYFONT}{BLACK}مبلغ پرداختی برای 10 واحد (یا 10000لیتر) به ازای 20 مربع
@@ -1104,7 +1104,7 @@ STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}ساخت
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}ساخت / دیدن ساختمان مرکزی
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}ساختمان مرکزی را نمی شود اینجا ساخت ...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}دیدن ساختمان مرکزی
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}تغییر دادن اندازه ی ص�حه
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}تغییر دادن اندازه ی ص�حه
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}ارزش شرکت: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}25% سهام شرکت را بخر
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}25% سهام شرکت را ب�روش
@@ -1407,7 +1407,7 @@ STR_ERROR_CAN_T_INSERT_NEW_ORDER                                :{WHITE}نمی Ø
 STR_ERROR_CAN_T_DELETE_THIS_ORDER                               :{WHITE}نمی شود دستور را حذ� کرد
 STR_ERROR_CAN_T_MODIFY_THIS_ORDER                               :{WHITE}این دستور تغییر نمی کند...
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE} ...این وسیله را نمی توان حرکت داد
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}مسیری به ایستگاه راه آهن پیدا نمیشود
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}�اصله ی زمانی بین تعمیرات دوره ای: {LTBLUE}{COMMA}روز {BLACK}   آخیرین تعمسرات: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP                    :{BLACK}قطار را مجبور کن بدون صبر برای علامت ترخیص شروع به حرکت کند
@@ -1429,7 +1429,7 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}جهت قطار را نمی شود تغییر داد...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}نمیتوان جهت حرکت وسیله را معکوس کرد...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}نمیتوان جهت وسایلی که از چند قطعه تشکیل شده اند را معکوس کرد
-STR_CLEAR_TIME                                                  :{BLACK}پاک کردن زمان
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}پاک کردن زمان
 
 
 
@@ -1452,7 +1452,7 @@ STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}نمیت
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (تعمیر مجدد)
 STR_REFIT_TITLE                                                 :{GOLD}انتخاب محموله قابل حمل:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}ظر�یت جدید : {GOLD}{CARGO}{}{BLACK} بهای تعمیر مجدد: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(قابل تعمیر)
+STR_PURCHASE_INFO_REFITTABLE                                    :(قابل تعمیر)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}�رودگاه ها
@@ -1464,7 +1464,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}ساخت
 
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}جشن شهروندان . . .{}اولین هواپیما به {STATION} می رسد!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}تصاد� هواپیما!{}{COMMA} مرگ در ان�جار در {STATION}
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 
 ##id 0xB000
@@ -1642,7 +1642,7 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}نمای
 
 
 
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}هواپیما در دسترس نیست
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}هواپیما در دسترس نیست
 
 
 
@@ -1758,29 +1758,29 @@ STR_BLACK_7                                                     :{BLACK}7
 STR_INTRO_AI_SETTINGS                                           :{BLACK}تنظیمات هوش مصنوعی
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}نمایش تنظیمات هوش مصنوعی
 STR_AI_DEBUG                                                    :{WHITE}ر�ع اشکالات هوش مصنوعی
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}نام هوش مصنوعی
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}نام هوش مصنوعی
 STR_AI_DEBUG_RELOAD                                             :{BLACK}بازگشایی مجدد هوش مصنوعی
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}از بین بردن هوش مصنوعی. بازگشایی اسکریپت. و شروع مجدد هوش مصنوعی
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}ص�حه ر�ع اشکال هوش مصنوعی �قط برای سرور قابل دسترس است
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}از بین بردن هوش مصنوعی. بازگشایی اسکریپت. و شروع مجدد هوش مصنوعی
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}ص�حه ر�ع اشکال هوش مصنوعی �قط برای سرور قابل دسترس است
 STR_AI_CONFIG_CAPTION                                           :{WHITE}تنظیمات هوش مصنوعی
-STR_AI_CHANGE                                                   :{BLACK}انتخاب هوش مصنوعی
-STR_AI_CONFIGURE                                                :{BLACK}تنظیم
-STR_AI_CHANGE_TIP                                               :{BLACK}باز گشایی یک هوش مصنوعی دیگر
-STR_AI_CONFIGURE_TIP                                            :{BLACK}تنظبم پارامتر های مربوط به هوش مصنوعی
-STR_AI_LIST_TIP                                                 :{BLACK}همه هوشهای مصنوعی که در بازی بعد بازگشایی می شوند
+STR_AI_CONFIG_CHANGE                                            :{BLACK}انتخاب هوش مصنوعی
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}تنظیم
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}باز گشایی یک هوش مصنوعی دیگر
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}تنظبم پارامتر های مربوط به هوش مصنوعی
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}همه هوشهای مصنوعی که در بازی بعد بازگشایی می شوند
 STR_AI_LIST_CAPTION                                             :{WHITE}هوش مصنوعی های موجود
-STR_AI_AILIST_TIP                                               :{BLACK}برای انتخلب هوش مصنوعی کلیک کنید
-STR_AI_ACCEPT                                                   :{BLACK}قبول
-STR_AI_ACCEPT_TIP                                               :{BLACK}انتخاب هوش مصنوعی مشخص شده
-STR_AI_CANCEL                                                   :{BLACK}لغو
-STR_AI_CANCEL_TIP                                               :{BLACK}هوش مصنوعی را تغییر نده
-STR_AI_CLOSE                                                    :{BLACK}بستن
-STR_AI_RESET                                                    :{BLACK}بازنشاندن
-STR_AI_HUMAN_PLAYER                                             :بازیکن آدمیزاد
-STR_AI_RANDOM_AI                                                :انتخاب هوش مصنوعی به صورت ات�اقی
+STR_AI_LIST_TOOLTIP                                             :{BLACK}برای انتخلب هوش مصنوعی کلیک کنید
+STR_AI_LIST_ACCEPT                                              :{BLACK}قبول
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}انتخاب هوش مصنوعی مشخص شده
+STR_AI_LIST_CANCEL                                              :{BLACK}لغو
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}هوش مصنوعی را تغییر نده
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}بستن
+STR_AI_SETTINGS_RESET                                           :{BLACK}بازنشاندن
+STR_AI_CONFIG_HUMAN_PLAYER                                      :بازیکن آدمیزاد
+STR_AI_CONFIG_RANDOM_AI                                         :انتخاب هوش مصنوعی به صورت ات�اقی
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}پارامترهای هوش مصنوعی
-STR_AI_VERSION                                                  :{BLACK}نسخه: {NUM}
-STR_AI_URL                                                      :{BLACK}آدرس اینترنتی: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}نسخه: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}آدرس اینترنتی: {STRING}
 ########
 
 ############ town controlled noise level
@@ -1797,21 +1797,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :سناریو
 STR_CONTENT_TYPE_HEIGHTMAP                                      :نقشه
 STR_CONTENT_TITLE                                               :{WHITE} در حال دانلود
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}نوع
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}نوع محتوی
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}نوع محتوی
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}نام
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}نام محتوی
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}برای مشاهده ی جزئیات روی خط کلیک کنید {}برای اتنخاب برای دانلود روی چک باکس کلیک کنید
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}نام محتوی
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}برای مشاهده ی جزئیات روی خط کلیک کنید {}برای اتنخاب برای دانلود روی چک باکس کلیک کنید
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}انتخاب تمامی موارد
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}علامت گذاری تمامی موارد را برای دانلود
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}علامت گذاری تمامی موارد را برای دانلود
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}انتخاب موارد ارتقاع
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK} علامت گذاری برای دانلود � تمام مواردی که برای ارتقاع محتوی موجود لازم می باشد
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK} علامت گذاری برای دانلود � تمام مواردی که برای ارتقاع محتوی موجود لازم می باشد
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}پاک کردن تمام انتخاب ها
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}علامت گذاری تمامی موارد را برای عدم دانلود
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}علامت گذاری تمامی موارد را برای عدم دانلود
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}وارد کردن رشته پایش
-STR_CONTENT_FILTER_TIP                                          :{BLACK}وارد کردن واژه کلیدی برای پایش لیست
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}وارد کردن واژه کلیدی برای پایش لیست
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}برچسب/پایش بر اساس نام
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}دانلود
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}شروع به دانلود موارد انتخاب شده
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}شروع به دانلود موارد انتخاب شده
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}حجم کل دانلود: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}اطلاعات محتوی
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER} شما این گزینه را برای دانلود انتخاب نکرده اید
@@ -1844,6 +1844,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}بازگ
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}چک کردن محتوی آنلاین
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}بررسی وجود مجموعه ها و به روز رسانی های جدید در اینترنت
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}یا�تن مجموعه ای که کم است در اینترنت
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK} بررسی اینکه آیا مجموعه ای که کم است در اینترنت یا�ت می شود یا نه
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}یا�تن مجموعه ای که کم است در اینترنت
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK} بررسی اینکه آیا مجموعه ای که کم است در اینترنت یا�ت می شود یا نه
 ########
diff --git a/src/lang/unfinished/thai.txt b/src/lang/unfinished/thai.txt
index 243403191..ad29439f1 100644
--- a/src/lang/unfinished/thai.txt
+++ b/src/lang/unfinished/thai.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}à¹�ผà¸
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}�ารตั้งค่าของเ�ม
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}ข้อความ
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}ข้อความจา� {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}คำเตือน!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}คำเตือน!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}ไม่สามารถทำได้....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}ไม่สามารถทำให้พื้นที่นี้โล่งได้....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}ลิขสิทธิ์เดิม {COPYRIGHT} ค.ศ.1995 ของ Chris Sawyer, สงวนลิขสิทธิ์
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}OpenTTD
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}ลิขสิทธิ์ OpenTTD {COPYRIGHT}2002-2008 ของ The OpenTTD team
 
 STR_QUIT_CAPTION                                                :{WHITE}ออ�จา�เ�ม
-STR_YES                                                         :{BLACK}ใช่
-STR_NO                                                          :{BLACK}ไม่
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}คุณ�น่ใจว่าจะออ�จา�เ�ม OpenTTD �ล้ว�ลับสู่ {STRING}?
+STR_QUIT_YES                                                    :{BLACK}ใช่
+STR_QUIT_NO                                                     :{BLACK}ไม่
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}คุณ�น่ใจว่าจะออ�จา�เ�ม OpenTTD �ล้ว�ลับสู่ {STRING}?
 
 STR_JUST_NOTHING                                                :ไม่มีอะไร
 STR_COLOUR_DARK_BLUE                                            :สี�รมท่า
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}ทะเลทราย
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}หิมะ
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}ข้อความ
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}ค่าป�ติ
-STR_QUERY_CANCEL                                                :{BLACK}ย�เลิ�
-STR_QUERY_OK                                                    :{BLACK}ต�ลง
-STR_QUERY_RENAME                                                :{BLACK}เปลี่ยนชื่อ
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}ค่าป�ติ
+STR_BUTTON_CANCEL                                               :{BLACK}ย�เลิ�
+STR_BUTTON_OK                                                   :{BLACK}ต�ลง
+STR_BUTTON_RENAME                                               :{BLACK}เปลี่ยนชื่อ
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -249,16 +249,16 @@ STR_ERROR_OWNED_BY                                              :{WHITE}...เà¸
 STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}สินค้า
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}ข้อมูล
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}ปริมาณที่รับได้
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}ความจุสินค้าทั้งหมดของรถไฟขบวนนี้:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}ความจุสินค้าทั้งหมดของรถไฟขบวนนี้:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}เริ่มเ�มใหม่
 STR_INTRO_LOAD_GAME                                             :{BLACK}เปิดเ�มเดิม
 STR_INTRO_MULTIPLAYER                                           :{BLACK}เล่นหลายคน
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}โปร��รม��้ฉา�
 
-STR_MAPSIZE                                                     :{BLACK}ขนาด�ผนที่:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}ขนาด�ผนที่:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}ตั้งค่าเ�ม
 
 STR_COMPANY_SOMEONE                                             :บางคน{SKIP}{SKIP}
@@ -306,7 +306,7 @@ STR_FILE_MENU_QUIT_GAME                                         :เลิ�เ
 STR_FILE_MENU_EXIT                                              :ออ�จา�เ�ม
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}�น่ใจนะว่าจะเลิ�เล่นเ�มนี้?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}เลิ�เล่น
-STR_SORT_BY                                                     :{BLACK}เรียงตาม
+STR_BUTTON_SORT_BY                                              :{BLACK}เรียงตาม
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}ประชา�ร
@@ -327,10 +327,10 @@ STR_SORT_BY_INTRO_DATE                                          :วันเป
 
 
 
-STR_SEND_TRAIN_TO_DEPOT                                         :ส่งเข้าอู่ซ่อมบำรุง
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :ส่งเข้าอู่ซ่อมรถ
-STR_SEND_SHIP_TO_DEPOT                                          :ส่งเข้าอู่ต่อเรือ
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :ส่งเข้าโรงเ�็บเครื่องบิน
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :ส่งเข้าอู่ซ่อมบำรุง
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :ส่งเข้าอู่ซ่อมรถ
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :ส่งเข้าอู่ต่อเรือ
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :ส่งเข้าโรงเ�็บเครื่องบิน
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -361,8 +361,8 @@ STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}ไมà¹
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}ปิดหน้าต่าง
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}หัวของหน้าต่าง - คลิ�ค้าง�ล้วลา�เพื่อเลื่อนหน้าต่าง
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}ทำลายสิ่ง�่อสร้าง�ละอื่นๆ ในพื้นที่ช่องนั้น
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}ขุดส่วนมุมของที่ดินให้ต่ำลง
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}ถมส่วนมุมของที่ดินให้สูงขึ้น
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}ขุดส่วนมุมของที่ดินให้ต่ำลง
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}ถมส่วนมุมของที่ดินให้สูงขึ้น
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}�ถบเลื่อน - ใช้เลื่อนราย�ารขึ้นลง
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}�สดงโครงร่างของพื้นดินบน�ผนที่
 STR_SMALLMAP_TOOLTIP_SHOW_VEHICLES_ON_MAP                       :{BLACK}�สดงยานยนต์บน�ผนที่
@@ -374,14 +374,14 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}เปà¸
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}�ำไรของปีนี้: {CURRENCY} (ปีที่ผ่านมา: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} ปี ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} ปี ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} ปี ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} ปี ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :รถไฟ
-STR_VEHICLE_ROAD_VEHICLE                                        :รถยนต์
-STR_VEHICLE_SHIP                                                :เรือ
-STR_VEHICLE_AIRCRAFT                                            :อา�าศยาน
+STR_REPLACE_VEHICLE_TRAIN                                       :รถไฟ
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :รถยนต์
+STR_REPLACE_VEHICLE_SHIP                                        :เรือ
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :อา�าศยาน
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} เริ่มเ�่า�ล้ว
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} เ�่ามา��ล้ว
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} เ�่ามา��ล้ว �ละควรเปลี่ยนใหม่ในทันที
@@ -396,7 +396,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}เจà¹
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}อาณาบริเวณ: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :ไม่มี
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}ชื่อ
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :อันดับที่ 1
@@ -556,8 +556,8 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...ตà¸
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...ใ�ล้�ับเมืองอื่นมา�เ�ินไป
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...พื้นที่นั้นไม่เหมาะสม
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...มีเมืองมา�เ�ินไป
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}ไม่สามารถสร้างเมืองใดได้อี�
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...มีพื้นที่บน�ผนที่ไม่มา�พอ
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}ไม่สามารถสร้างเมืองใดได้อี�
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...มีพื้นที่บน�ผนที่ไม่มา�พอ
 
 
 
@@ -597,7 +597,7 @@ STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}ออà¸
 
 
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  �ำลังบันทึ�เ�ม  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}ขณะนี้�ำลังบันทึ�,{}โปรดรอจน�ว่าจะเสร็จ!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}ขณะนี้�ำลังบันทึ�,{}โปรดรอจน�ว่าจะเสร็จ!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}เลือ�เพลงฟังราย�ารเพลง Ezy Street
 
 ############ start of townname region
@@ -625,10 +625,10 @@ STR_GAME_OPTIONS_TOWN_NAME_ROMANIAN                             :โรมาเ
 
 
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}มุ่งหน้าสู่ {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}มุ่งหน้าสู่ {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}ไม่มีสถานที่ที่ต้องไป
-STR_NO_ORDERS_VEL                                               :{LTBLUE}ไม่มีสถานที่ที่ต้องไป, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}มุ่งหน้าสู่ {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}มุ่งหน้าสู่ {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}ไม่มีสถานที่ที่ต้องไป
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}ไม่มีสถานที่ที่ต้องไป, {VELOCITY}
 
 STR_PASSENGERS                                                  :คน
 STR_BAGS                                                        :ถุง
@@ -639,9 +639,9 @@ STR_CRATES                                                      :ลัง
 STR_RES_OTHER                                                   :อื่นๆ
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}ไม่สามารถใช้ราย�ารสถานที่ร่วม�ันได้
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}ไม่สามารถคัดลอ�ราย�ารสถานที่ได้
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - สิ้นสุดราย�ารที่ใช้ร่วม�ัน - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}ไม่สามารถใช้ราย�ารสถานที่ร่วม�ันได้
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}ไม่สามารถคัดลอ�ราย�ารสถานที่ได้
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - สิ้นสุดราย�ารที่ใช้ร่วม�ัน - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} ไม่สามารถหาทางไปต่อได้.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE}{VEHICLE} �ำลังหลงทาง.
diff --git a/src/lang/unfinished/urdu.txt b/src/lang/unfinished/urdu.txt
index 1fe605865..5b487287e 100644
--- a/src/lang/unfinished/urdu.txt
+++ b/src/lang/unfinished/urdu.txt
@@ -96,8 +96,8 @@ STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}ÛŒÛ� Ù†Û
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}ی� جگ� صا� ن�یں کر سکتا۔۔۔
 
 STR_QUIT_CAPTION                                                :{WHITE}با�ر نکلو
-STR_YES                                                         :{BLACK}�اں
-STR_NO                                                          :{BLACK}ن�یں
+STR_QUIT_YES                                                    :{BLACK}�اں
+STR_QUIT_NO                                                     :{BLACK}ن�یں
 
 STR_JUST_NOTHING                                                :کچھ ن�یں
 STR_COLOUR_DARK_BLUE                                            :گ�را نیلا
@@ -160,9 +160,9 @@ STR_FILE_MENU_QUIT_GAME                                         :کھیل چھو
 STR_FILE_MENU_EXIT                                              :با�ر نکلو
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}کیا آپ کو یقین �ے ک� آپ اس کھیل کو چھوڑنا چا� ر�ے �یں؟
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}کھیل چھوڑ دو
-STR_SORT_ORDER_TIP                                              :{BLACK} (ترتیب کا طریق� منتخب کریں (کم �وتا/بڑھتا
-STR_SORT_CRITERIA_TIP                                           :{BLACK}ترتیب کا طریق� منتخب کریں
-STR_SORT_BY                                                     :{BLACK}سے ترتیب دو
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK} (ترتیب کا طریق� منتخب کریں (کم �وتا/بڑھتا
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}ترتیب کا طریق� منتخب کریں
+STR_BUTTON_SORT_BY                                              :{BLACK}سے ترتیب دو
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}آبادی
@@ -175,16 +175,16 @@ STR_SORT_BY_NUMBER                                              :تعداد
 STR_SORT_BY_PROFIT_LAST_YEAR                                    :پچھلے سال کا منا�ع
 STR_SORT_BY_CARGO_CAPACITY                                      :سامان کی گنجایش
 
-STR_NO_WAITING_CARGO                                            :{BLACK}کسی قسم کا کویی سامان انتظار ن�یں کر ر�ا �ے
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}تمام س�ولتوں کا انتخاب کرو
-STR_SELECT_ALL_TYPES                                            :{BLACK}تمام قسم کا سامان کا انتخاب کرو  (بشمول غیر منتظر سامان کے)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}اس قسم کی گاڑیوں کےلیے دستیاب انجنوں کی ��رست دیکھو
-STR_MANAGE_LIST                                                 :{BLACK}��رست کا انتظام کرو
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}کسی قسم کا کویی سامان انتظار ن�یں کر ر�ا �ے
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}تمام س�ولتوں کا انتخاب کرو
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}تمام قسم کا سامان کا انتخاب کرو  (بشمول غیر منتظر سامان کے)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}اس قسم کی گاڑیوں کےلیے دستیاب انجنوں کی ��رست دیکھو
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}��رست کا انتظام کرو
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}دستیاب ریل گاڑیاں
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}دستیاب گاڑیاں
-STR_AVAILABLE_SHIPS                                             :{BLACK}دستیاب کشتیاں
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}دستیاب �وایی ج�از
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}دستیاب ریل گاڑیاں
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}دستیاب گاڑیاں
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}دستیاب کشتیاں
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}دستیاب �وایی ج�از
 
 
 STR_TOOLBAR_TOOLTIP_DISPLAY_COMPANY_FINANCES                    :{BLACK}کمپنی کی مالیاتی معلومات دکھاو
@@ -203,8 +203,8 @@ STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}زمین
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}کھڑکی بند کرو
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}کھڑکی کا نام - کھڑکی کو �لانے کیلیے اسے پکڑ کر �لاو
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}زمین کے ایک مربے پر عمارتیں وغیر� گراو
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}زمین کا ایک کنار� نیچے کرو
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین کا ایک کنار� اونچا کرو
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}زمین کا ایک کنار� نیچے کرو
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}زمین کا ایک کنار� اونچا کرو
 
 ############ range for service numbers starts
 ############ range for service numbers ends
@@ -219,10 +219,10 @@ STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}زمین
 
 
 
-STR_CREATE_RIVER                                                :{BLACK}دریا رکھو.
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}دریا رکھو.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}مٹائو
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}اس ش�ر کو پورا مٹا دو
-STR_MENU_LOAD_HEIGHTMAP                                         :اونچائی کا نقش� دکھائو
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :اونچائی کا نقش� دکھائو
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :با�ر نکلو
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}اونچائی کے نقشے کو کھیلو
@@ -234,18 +234,18 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...پل
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{G=m}{BLACK}چھوٹا
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{G=m}{BLACK}درمیان�
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{G=m}{BLACK}بڑا
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{G=m}{BLACK}کوئی سا
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{G=m}{BLACK}کوئی سا
 STR_FOUND_TOWN_CITY                                             :{BLACK}ش�ر
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}ش�ر کا حجم منتخب کرو
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}ش�ر کا حجم:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}ش�ر کی سڑکوں کا پھیلائو:
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}اس ش�ر کیلئے سڑکوں کا بھیلائو منتخب کرو
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}اصلی
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}ب�تر سڑکیں
-STR_SELECT_LAYOUT_RANDOM                                        :{G=f}{BLACK}کوئٰ سی
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}ش�ر کی سڑکوں کا پھیلائو:
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}اس ش�ر کیلئے سڑکوں کا بھیلائو منتخب کرو
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}اصلی
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}ب�تر سڑکیں
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{G=f}{BLACK}کوئٰ سی
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}آخری پیغام یا خبر دکھائو
 STR_NEWS_MESSAGES_OFF                                           :بند
 STR_NEWS_MESSAGES_SUMMARY                                       :خلاص�
diff --git a/src/lang/unfinished/vietnamese.txt b/src/lang/unfinished/vietnamese.txt
index 5e5d1ee49..fe45f07e5 100644
--- a/src/lang/unfinished/vietnamese.txt
+++ b/src/lang/unfinished/vietnamese.txt
@@ -145,15 +145,15 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Bản đ
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Tùy ch�n Trò chơi
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Thông điệp
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Tin nhắn từ {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Chú ý!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Chú ý!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Không thể làm việc này....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Không thể d�n dẹp khu vực này....
 STR_ABOUT_VERSION                                               :{BLACK}OpenTTD phiên bản {REV}
 
 STR_QUIT_CAPTION                                                :{WHITE}Thoát
-STR_YES                                                         :{BLACK}�ồng ý
-STR_NO                                                          :{BLACK}Không đồng ý
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Bạn có chắc chắn muốn thoát kh�i OpenTTD và trở lại {STRING}?
+STR_QUIT_YES                                                    :{BLACK}�ồng ý
+STR_QUIT_NO                                                     :{BLACK}Không đồng ý
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Bạn có chắc chắn muốn thoát kh�i OpenTTD và trở lại {STRING}?
 
 STR_JUST_NOTHING                                                :Không màu
 STR_COLOUR_DARK_BLUE                                            :Xanh da tr�i đậm
@@ -214,11 +214,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Sa mạc
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Tuyết
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Thông điệp
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Mặc định
-STR_QUERY_CANCEL                                                :{BLACK}Thôi
-STR_QUERY_OK                                                    :{BLACK}�ồng ý
-STR_QUERY_RENAME                                                :{BLACK}�ổi tên
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Mặc định
+STR_BUTTON_CANCEL                                               :{BLACK}Thôi
+STR_BUTTON_OK                                                   :{BLACK}�ồng ý
+STR_BUTTON_RENAME                                               :{BLACK}�ổi tên
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -235,16 +235,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Toa xe
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Thông tin
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Sức chứa
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Tổng số toa xe
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Tổng số toa xe (sức chứa) của đoàn tàu:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Tổng số toa xe (sức chứa) của đoàn tàu:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Chơi mới
 STR_INTRO_LOAD_GAME                                             :{BLACK}Tải
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Nhi�u ngư�i chơi
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Trình biên tập kịch bản
 
-STR_MAPSIZE                                                     :{BLACK}Kích thước bản đồ:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Kích thước bản đồ:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Tùy ch�n trò chơi
 
 STR_COMPANY_SOMEONE                                             :ai đó{SKIP}{SKIP}
@@ -280,9 +280,9 @@ STR_FILE_MENU_QUIT_GAME                                         :Thoát trò chÆ
 STR_FILE_MENU_EXIT                                              :Thoát
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Bạn có chắc chắn muốn thoát kh�i trò chơi không?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Thoát
-STR_SORT_ORDER_TIP                                              :{BLACK}Ch�n thứ tự sắp xếp (giảm dần/tăng dần)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Ch�n tiêu chí sắp xếp
-STR_SORT_BY                                                     :{BLACK}Sắp xếp bởi
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Ch�n thứ tự sắp xếp (giảm dần/tăng dần)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Ch�n tiêu chí sắp xếp
+STR_BUTTON_SORT_BY                                              :{BLACK}Sắp xếp bởi
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Dân số
@@ -310,22 +310,22 @@ STR_SORT_BY_RUNNING_COST                                        :Chi phí chạy
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Năng lượng/Chi phí chạy
 STR_SORT_BY_CARGO_CAPACITY                                      :Dung lượng toa xe
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Không có bất kỳ loại toa xe nào đang ch�
-STR_SELECT_ALL_TYPES                                            :{BLACK}Ch�n tất cả loại toa xe (including no waiting cargo)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Xam danh sách các động cơ thiết kế cho loại toa xe này.
-STR_MANAGE_LIST                                                 :{BLACK}Quản lý danh sách
-STR_MANAGE_LIST_TIP                                             :{BLACK}Gửi chỉ dẫn tới toàn bộ phương tiện trong danh sách
-STR_REPLACE_VEHICLES                                            :Thay phương tiện
-STR_SEND_FOR_SERVICING                                          :Gửi tới dịch vụ sửa chữa
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Không có bất kỳ loại toa xe nào đang ch�
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Ch�n tất cả loại toa xe (including no waiting cargo)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Xam danh sách các động cơ thiết kế cho loại toa xe này.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Quản lý danh sách
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Gửi chỉ dẫn tới toàn bộ phương tiện trong danh sách
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Thay phương tiện
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Gửi tới dịch vụ sửa chữa
 
-STR_AVAILABLE_TRAINS                                            :{BLACK}Tàu sẵn có
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Xe sẵn có
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Máy bay sẵn có
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Tàu sẵn có
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Xe sẵn có
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Máy bay sẵn có
 
-STR_SEND_TRAIN_TO_DEPOT                                         :Gửi v� xưởng
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Gửi v� xưởng
-STR_SEND_SHIP_TO_DEPOT                                          :Gửi v� xưởng
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Gửi v� Hangar
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Gửi v� xưởng
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Gửi v� xưởng
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Gửi v� xưởng
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Gửi v� Hangar
 
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Tạm dừng trò chơi
 STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Lưu, thoat trò chơi, thoát
@@ -335,14 +335,14 @@ STR_SCENEDIT_TOOLBAR_TOOLTIP_DISPLAY_MAP_TOWN_DIRECTORY         :{BLACK}Hiển t
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Hiển thị thư mục thành phố
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} năm{P "" s} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} năm{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} năm{P "" s} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} năm{P "" s} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Tàu
-STR_VEHICLE_ROAD_VEHICLE                                        :Xe cá»™
-STR_VEHICLE_SHIP                                                :Tàu thủy
-STR_VEHICLE_AIRCRAFT                                            :Máy bay
+STR_REPLACE_VEHICLE_TRAIN                                       :Tàu
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Xe cá»™
+STR_REPLACE_VEHICLE_SHIP                                        :Tàu thủy
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Máy bay
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}{VEHICLE} đang cũ đi
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE}{VEHICLE} đang xuống cấp
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE} đang xuống cấp trầm tr�ng và cần được thay thế ngay lập tức
@@ -382,7 +382,7 @@ STR_MONTH_DEC                                                   :Tháng Mư�i
 
 
 STR_TOOLBAR_SOUND_MUSIC                                         :Âm thanh/aamm nhạc
-STR_MENU_LOAD_HEIGHTMAP                                         :Tải bản đồ độ cao
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Tải bản đồ độ cao
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Thoat kh�i trình biên tập
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Thoát
 
diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt
index 7c7ac9189..513478285 100644
--- a/src/lang/welsh.txt
+++ b/src/lang/welsh.txt
@@ -158,7 +158,7 @@ STR_SMALLMAP_CAPTION                                            :{WHITE}Map - {S
 STR_GAME_OPTIONS_CAPTION                                        :{WHITE}Dewisiadau Gêm
 STR_ERROR_MESSAGE_CAPTION                                       :{YELLOW}Neges
 STR_ERROR_MESSAGE_CAPTION_OTHER_COMPANY                         :{YELLOW}Neges oddi wrth {STRING}
-STR_POPUP_CAUTION_CAPTION                                       :{WHITE}Rhybudd!
+STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Rhybudd!
 STR_ERROR_CAN_T_DO_THIS                                         :{WHITE}Does dim modd gwneud hynny....
 STR_ERROR_CAN_T_CLEAR_THIS_AREA                                 :{WHITE}Does dim modd clirio’r ardal hon....
 STR_ABOUT_ORIGINAL_COPYRIGHT                                    :{BLACK}Hawlfraint Wreiddiol {COPYRIGHT} 1995 Chris Sawyer, Holl cedwir pob hawl
@@ -166,9 +166,9 @@ STR_ABOUT_VERSION                                               :{BLACK}fersiwn
 STR_ABOUT_COPYRIGHT_OPENTTD                                     :{BLACK}OpenTTD {COPYRIGHT}2002-2009 Y tîm OpenTTD
 
 STR_QUIT_CAPTION                                                :{WHITE}Gadael
-STR_YES                                                         :{BLACK}Iawn
-STR_NO                                                          :{BLACK}Na
-STR_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                       :{YELLOW}Ydych chi eisiau gadael y gêm a dychwelyd i {STRING}?
+STR_QUIT_YES                                                    :{BLACK}Iawn
+STR_QUIT_NO                                                     :{BLACK}Na
+STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Ydych chi eisiau gadael y gêm a dychwelyd i {STRING}?
 
 STR_JUST_NOTHING                                                :Dim
 STR_COLOUR_DARK_BLUE                                            :Glas Tywyll
@@ -229,11 +229,11 @@ STR_SMALLMAP_LEGENDA_INDUSTRIES                                 :{TINYFONT}{BLAC
 STR_SMALLMAP_LEGENDA_DESERT                                     :{TINYFONT}{BLACK}Anialwch
 STR_SMALLMAP_LEGENDA_SNOW                                       :{TINYFONT}{BLACK}Eira
 STR_NEWS_MESSAGE_CAPTION                                        :{WHITE}Neges
-STR_QUERY_CAPTION                                               :{WHITE}{STRING}
-STR_DEFAULT                                                     :{BLACK}Rhagosodiad
-STR_QUERY_CANCEL                                                :{BLACK}Diddymu
-STR_QUERY_OK                                                    :{BLACK}Iawn
-STR_QUERY_RENAME                                                :{BLACK}Ailenwi
+STR_WHITE_STRINGN                                               :{WHITE}{STRING}
+STR_BUTTON_DEFAULT                                              :{BLACK}Rhagosodiad
+STR_BUTTON_CANCEL                                               :{BLACK}Diddymu
+STR_BUTTON_OK                                                   :{BLACK}Iawn
+STR_BUTTON_RENAME                                               :{BLACK}Ailenwi
 
 STR_OSNAME_WINDOWS                                              :Windows
 STR_OSNAME_DOS                                                  :DOS
@@ -250,16 +250,16 @@ STR_VEHICLE_DETAIL_TAB_CARGO                                    :{BLACK}Llwyth
 STR_VEHICLE_DETAIL_TAB_INFORMATION                              :{BLACK}Gwybodaeth
 STR_VEHICLE_DETAIL_TAB_CAPACITIES                               :{BLACK}Cyfansymau Gallu Cludo
 STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO                              :{BLACK}Cyfanswm Cargo
-STR_TOTAL_CAPACITY_TEXT                                         :{BLACK}Cyfanswm cynhwysedd cargo y trên hwn:
-STR_TOTAL_CAPACITY                                              :{LTBLUE}- {CARGO} ({SHORTCARGO})
-STR_TOTAL_CAPACITY_MULT                                         :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT                   :{BLACK}Cyfanswm cynhwysedd cargo y trên hwn:
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY                        :{LTBLUE}- {CARGO} ({SHORTCARGO})
+STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT                   :{LTBLUE}- {CARGO} ({SHORTCARGO}) (x{NUM})
 STR_INTRO_NEW_GAME                                              :{BLACK}Gêm Newydd
 STR_INTRO_LOAD_GAME                                             :{BLACK}Llwytho Gêm
 STR_INTRO_MULTIPLAYER                                           :{BLACK}Amlchwaraewr
 STR_INTRO_SCENARIO_EDITOR                                       :{BLACK}Golygydd Senario
 
-STR_MAPSIZE                                                     :{BLACK}Maint Map:
-STR_BY                                                          :{BLACK}*
+STR_MAPGEN_MAPSIZE                                              :{BLACK}Maint Map:
+STR_MAPGEN_BY                                                   :{BLACK}*
 STR_INTRO_GAME_OPTIONS                                          :{BLACK}Dewisiadau Gêm
 
 STR_COMPANY_SOMEONE                                             :rhywun{SKIP}{SKIP}
@@ -308,10 +308,10 @@ STR_FILE_MENU_QUIT_GAME                                         :Rhoi'r gorau i'
 STR_FILE_MENU_EXIT                                              :Gadael
 STR_ABANDON_GAME_QUERY                                          :{YELLOW}Ydych chi'n siwr eich bod chi eisiau rhoi'r gorau i'r gêm?
 STR_ABANDON_GAME_CAPTION                                        :{WHITE}Rhoi'r gorau i Gêm
-STR_SORT_ORDER_TIP                                              :{BLACK}Dewiswch drefn trefnu (disgynnol/esgynnol)
-STR_SORT_CRITERIA_TIP                                           :{BLACK}Dewiswch drefn trefnu
-STR_FILTER_CRITERIA_TIP                                         :{BLACK}dewis criteria hidlyr
-STR_SORT_BY                                                     :{BLACK}Trefnu yn ôl
+STR_TOOLTIP_SORT_ORDER                                          :{BLACK}Dewiswch drefn trefnu (disgynnol/esgynnol)
+STR_TOOLTIP_SORT_CRITERIAP                                      :{BLACK}Dewiswch drefn trefnu
+STR_TOOLTIP_FILTER_CRITERIA                                     :{BLACK}dewis criteria hidlyr
+STR_BUTTON_SORT_BY                                              :{BLACK}Trefnu yn ôl
 
 ### The first three are also used as 'Sort by' buttons, the rest only in dropdowns
 STR_SORT_BY_POPULATION                                          :{BLACK}Poblogaeth
@@ -343,24 +343,24 @@ STR_SORT_BY_RUNNING_COST                                        :Côst Rhedeg
 STR_SORT_BY_POWER_VS_RUNNING_COST                               :Côst Pŵer/Rhedeg
 STR_SORT_BY_CARGO_CAPACITY                                      :Gallu cludo Llwyth
 
-STR_NO_WAITING_CARGO                                            :{BLACK}Nid oes llwyth o unrhyw fath yn disgwyl
-STR_SELECT_ALL_FACILITIES                                       :{BLACK}Dewis pob cyfleuster
-STR_SELECT_ALL_TYPES                                            :{BLACK}Dewis pob math llwyth (gan gynnwys llwythi dim aros)
-STR_AVAILABLE_ENGINES_TIP                                       :{BLACK}Gweld rhestr o'r cynlluniau modur sydd ar gael ar gyfer y math cerbyd hwn.
-STR_MANAGE_LIST                                                 :{BLACK}Golygu'r rhestr
-STR_MANAGE_LIST_TIP                                             :{BLACK}Anfon y cyfarwyddiadau at bob cerbyd yn y rhestr
-STR_REPLACE_VEHICLES                                            :Cyfnewid Cerbydau
-STR_SEND_FOR_SERVICING                                          :Gyrru i dderbyn Gwasanaeth
-
-STR_AVAILABLE_TRAINS                                            :{BLACK}Trenau sydd ar gael
-STR_AVAILABLE_ROAD_VEHICLES                                     :{BLACK}Cerbydau sydd ar gael
-STR_AVAILABLE_SHIPS                                             :{BLACK}Llongau sydd ar gael
-STR_AVAILABLE_AIRCRAFT                                          :{BLACK}Awyrennau sydd ar gael
-
-STR_SEND_TRAIN_TO_DEPOT                                         :Gyrru i Ddepo
-STR_SEND_ROAD_VEHICLE_TO_DEPOT                                  :Gyrru i Ddepo
-STR_SEND_SHIP_TO_DEPOT                                          :Gyrru i Ddepo
-STR_SEND_AIRCRAFT_TO_HANGAR                                     :Gyrru i Awyrendy
+STR_STATION_LIST_NO_WAITING_CARGO                               :{BLACK}Nid oes llwyth o unrhyw fath yn disgwyl
+STR_STATION_LIST_SELECT_ALL_FACILITIES                          :{BLACK}Dewis pob cyfleuster
+STR_STATION_LIST_SELECT_ALL_TYPES                               :{BLACK}Dewis pob math llwyth (gan gynnwys llwythi dim aros)
+STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP                      :{BLACK}Gweld rhestr o'r cynlluniau modur sydd ar gael ar gyfer y math cerbyd hwn.
+STR_VEHICLE_LIST_MANAGE_LIST                                    :{BLACK}Golygu'r rhestr
+STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP                            :{BLACK}Anfon y cyfarwyddiadau at bob cerbyd yn y rhestr
+STR_VEHICLE_LIST_REPLACE_VEHICLES                               :Cyfnewid Cerbydau
+STR_VEHICLE_LIST_SEND_FOR_SERVICING                             :Gyrru i dderbyn Gwasanaeth
+
+STR_VEHICLE_LIST_AVAILABLE_TRAINS                               :{BLACK}Trenau sydd ar gael
+STR_VEHICLE_LIST_AVAILABLE_ROAD_VEHICLES                        :{BLACK}Cerbydau sydd ar gael
+STR_VEHICLE_LIST_AVAILABLE_SHIPS                                :{BLACK}Llongau sydd ar gael
+STR_VEHICLE_LIST_AVAILABLE_AIRCRAFT                             :{BLACK}Awyrennau sydd ar gael
+
+STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT                            :Gyrru i Ddepo
+STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT                     :Gyrru i Ddepo
+STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT                             :Gyrru i Ddepo
+STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR                        :Gyrru i Awyrendy
 
 STR_GRAPH_X_LABEL_MONTH                                         :{TINYFONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINYFONT}{STRING}{} {STRING}{}{NUM}
@@ -390,12 +390,12 @@ STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Dewisiad
 STR_ERROR_CAN_T_CHANGE_SERVICING                                :{WHITE}Methu newid hyd y cyfnod rhwng pob gwasanaeth...
 STR_TOOLTIP_CLOSE_WINDOW                                        :{BLACK}Clau Ffenestr
 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS                              :{BLACK}Teitl ffenestr - llusgwch hwn i symud ffenestr
-STR_STICKY_BUTTON                                               :{BLACK}Peri na fydd y fysell 'cau pob Ffenestr' yn cau'r ffenestr hon
-STR_RESIZE_BUTTON                                               :{BLACK}Cliciwch a llusgo er mwyn newid maint y ffenestr
+STR_TOOLTIP_STICKY                                              :{BLACK}Peri na fydd y fysell 'cau pob Ffenestr' yn cau'r ffenestr hon
+STR_TOOLTIP_RESIZE                                              :{BLACK}Cliciwch a llusgo er mwyn newid maint y ffenestr
 STR_SAVELOAD_HOME_BUTTON                                        :{BLACK}Cliciwch yma i newid i'r cyfeiriadur cadw/llwytho diofyn cyfredol
 STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC                              :{BLACK}Dymchwel adeiladau ayb. ar sgwâr o dir
-STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND                    :{BLACK}Gostwng cornel o dir
-STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND                    :{BLACK}Codi cornel o dir
+STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND                  :{BLACK}Gostwng cornel o dir
+STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND                  :{BLACK}Codi cornel o dir
 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bar sgrolio - sgrolio'r rhestr i fyny neu i lawr
 STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST                            :{BLACK}Bar sgrolio - sgrolio'r rhestr i'r chwith neu i'r dde
 STR_SMALLMAP_TOOLTIP_SHOW_LAND_CONTOURS_ON_MAP                  :{BLACK}Dangos cyfuchlinau tir ar y map
@@ -408,21 +408,21 @@ STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF                   :{BLACK}Toglu da
 STR_VEHICLE_LIST_PROFIT_THIS_YEAR_LAST_YEAR                     :{TINYFONT}{BLACK}Elw eleni: {CURRENCY} (llynedd: {CURRENCY})
 
 ############ range for service numbers starts
-STR_AGE                                                         :{COMMA} b{P "lwyddyn" lynyddoedd} ({COMMA})
-STR_AGE_RED                                                     :{RED}{COMMA} b{P "" lynyddoedd} ({COMMA})
+STR_VEHICLE_INFO_AGE                                            :{COMMA} b{P "lwyddyn" lynyddoedd} ({COMMA})
+STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} b{P "" lynyddoedd} ({COMMA})
 ############ range for service numbers ends
 
-STR_VEHICLE_TRAIN                                               :Mae Trên
-STR_VEHICLE_ROAD_VEHICLE                                        :Mae Cerbyd Ffordd
-STR_VEHICLE_SHIP                                                :Mae Llong
-STR_VEHICLE_AIRCRAFT                                            :Mae Awyren
+STR_REPLACE_VEHICLE_TRAIN                                       :Mae Trên
+STR_REPLACE_VEHICLE_ROAD_VEHICLE                                :Mae Cerbyd Ffordd
+STR_REPLACE_VEHICLE_SHIP                                        :Mae Llong
+STR_REPLACE_VEHICLE_AIRCRAFT                                    :Mae Awyren
 STR_NEWS_VEHICLE_IS_GETTING_OLD                                 :{WHITE}Mae {VEHICLE} yn heneiddio
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD                            :{WHITE} Mae {VEHICLE} yn hynod o hen
 STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE} Mae {VEHICLE} yn hynod o hen ac angen ei ddisodli
 STR_LAND_AREA_INFORMATION_CAPTION                               :{WHITE}Gwybodath Ardal Tir
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR_N_A                     :{BLACK}Côst i'w glirio: {LTBLUE}N/A
 STR_LAND_AREA_INFORMATION_COST_TO_CLEAR                         :{BLACK}Côst i'w glirio: {RED}{CURRENCY}
-STR_REVENUE_WHEN_CLEARED                                        :{BLACK}Elw o'i glirio: {LTBLUE}{CURRENCY}
+STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED                  :{BLACK}Elw o'i glirio: {LTBLUE}{CURRENCY}
 STR_LAND_AREA_INFORMATION_OWNER_N_A                             :N/A
 STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Perchennog: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Perchennog ffordd: {LTBLUE}{STRING}
@@ -431,7 +431,7 @@ STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Perchenn
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Awdurdod Lleol: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Dim
 STR_VEHICLE_NAME_BUTTON                                         :{BLACK}Enw
-STR_VEHICLE_NAME_SMALL                                          :{TINYFONT}{BLACK}{VEHICLE}
+STR_TINY_BLACK_VEHICLE                                          :{TINYFONT}{BLACK}{VEHICLE}
 
 ############ range for days starts (also used for the place in the highscore window)
 STR_ORDINAL_NUMBER_1ST                                          :1af
@@ -543,7 +543,7 @@ STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK                         :{BLACK}Cliciwch
 STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK                      :{BLACK}Cliciwch i dynnu trac cerddoriaeth o'r rhaglen gyfredol (Cyfaddas 1 Neu Cyfaddas 2 yn unig)
 STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE                        :{BLACK}Togu cymysgu trefn raglen ymlaen neu i ffwrdd
 STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION                    :{BLACK}Dangos y ffenestr dewis traciau cerddoriaeth
-STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                  :{BLACK}Cliciwch ar y gwasanaeth i ganoli'r olygfa ar y diwydiant neu dref
+STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                :{BLACK}Cliciwch ar y gwasanaeth i ganoli'r olygfa ar y diwydiant neu dref
 STR_INTRO_DIFFICULTY                                            :{BLACK}Anhawster ({STRING})
 STR_DATE_LONG_SMALL                                             :{TINYFONT}{BLACK}{DATE_LONG}
 STR_NEWS_MENU_LAST_MESSAGE_NEWS_REPORT                          :Neges/Adroddiad newyddion ddiwethaf
@@ -592,7 +592,7 @@ STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA                :{BLACK}Lleihau'
 STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND                      :{BLACK}Cynhyrchu Tir ar Hap
 STR_TERRAFORM_RESET_LANDSCAPE                                   :{BLACK}Ailosod Tirwedd
 STR_QUERY_RESET_LANDSCAPE_CAPTION                               :{WHITE}Ailosod Tirwedd
-STR_RESET_LANDSCAPE_TOOLTIP                                     :{BLACK}Dileu holl eiddo'r chwaraewr o'r map
+STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP                           :{BLACK}Dileu holl eiddo'r chwaraewr o'r map
 STR_RESET_LANDSCAPE_CONFIRMATION_TEXT                           :{WHITE}Ydych chi'n siwr eich bod chi eisiau dileu holl eiddo'r chwaraewr o'r map?
 STR_SCENEDIT_TOOLBAR_LANDSCAPE_GENERATION                       :{BLACK}Cynhyrchu tirwedd
 STR_SCENEDIT_TOOLBAR_TOWN_GENERATION                            :{BLACK}Cynhyrchu Trefi
@@ -606,11 +606,11 @@ STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB                          :{WHITE}...rhy a
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN                             :{WHITE}...rhy agos i dref arall
 STR_ERROR_SITE_UNSUITABLE                                       :{WHITE}...safle anaddas
 STR_ERROR_TOO_MANY_TOWNS                                        :{WHITE}...gormod o drefi
-STR_CANNOT_GENERATE_TOWN                                        :{WHITE}Methu adeiladu unrhyw drefi
-STR_NO_SPACE_FOR_TOWN                                           :{WHITE}...nid oes mwy o le ar y map
+STR_ERROR_CAN_T_GENERATE_TOWN                                   :{WHITE}Methu adeiladu unrhyw drefi
+STR_ERROR_NO_SPACE_FOR_TOWN                                     :{WHITE}...nid oes mwy o le ar y map
 STR_TOWN_VIEW_EXPAND_TOOLTIP                                    :{BLACK}Cynyddu maint tref
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Ehangu
-STR_TOWN_EXPAND_WARN_NO_ROADS                                   :{WHITE}Ni fydd y dref yn adeiladu ffyrdd. Gallwch alluogi adeiladu ffyrdd yn  Gosodiadau Uwch->Economi->Trefi.
+STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS                             :{WHITE}Ni fydd y dref yn adeiladu ffyrdd. Gallwch alluogi adeiladu ffyrdd yn  Gosodiadau Uwch->Economi->Trefi.
 STR_FOUND_TOWN_RANDOM_TOWN_BUTTON                               :{BLACK}Tref ar hap
 STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP                              :{BLACK}Adeiladu tref mewn safle ar hap
 STR_ERROR_CAN_T_BUILD_HERE                                      :{WHITE}Ni ellir adeiladu {STRING} yma...
@@ -624,13 +624,13 @@ STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE            :{BLACK}Gosod ar
 STR_TERRAFORM_TOOLTIP_PLACE_LIGHTHOUSE                          :{BLACK}Gosod goleudu
 STR_TERRAFORM_TOOLTIP_PLACE_TRANSMITTER                         :{BLACK}Gosod mast darlledu
 STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA                        :{BLACK}Pennu ardal anialwch.{}Gwasgwch a dal CTRL i lawr i gael gwared ohono
-STR_CREATE_LAKE                                                 :{BLACK}Pennu ardal Dŵr.{}Creu camlas, oni bai fod CTRL yn cael ei ddal i lawr ar lefel y  môr, fydd yn gorlifo'r ardal o'i gwmpas yn lle
-STR_CREATE_RIVER                                                :{BLACK}Creu afonydd.
+STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP                       :{BLACK}Pennu ardal Dŵr.{}Creu camlas, oni bai fod CTRL yn cael ei ddal i lawr ar lefel y  môr, fydd yn gorlifo'r ardal o'i gwmpas yn lle
+STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP                      :{BLACK}Creu afonydd.
 STR_TOWN_VIEW_DELETE_BUTTON                                     :{BLACK}Dileu
 STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Dileu'r dref hon yn llwyr
 STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Cadw senario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Llwytho senario
-STR_MENU_LOAD_HEIGHTMAP                                         :Llwytho heightmap
+STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Llwytho heightmap
 STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Gadael golygydd
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Gadael
@@ -640,7 +640,7 @@ STR_SAVELOAD_SAVE_SCENARIO                                      :{WHITE}Cadw Sen
 STR_INTRO_PLAY_SCENARIO                                         :{BLACK}Chwarae Senario
 STR_INTRO_PLAY_HEIGHTMAP                                        :{BLACK}Chwarae Map Uchder
 STR_INTRO_TOOLTIP_PLAY_HEIGHTMAP                                :{BLACK}Dechrau gêm newydd, gan ddefnyddio'r map uchder fel tirwedd
-STR_QUIT_SCENARIO_QUERY                                         :{YELLOW}Ydych chi'n siwr eich bod chi eisiau gadael y senario hwn?
+STR_ABANDOM_SCENARIO_QUERY                                      :{YELLOW}Ydych chi'n siwr eich bod chi eisiau gadael y senario hwn?
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}...gellir ei adeiladu'n unig mewn trefi gyda phoblogaeth o 1200 neu fwy
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Symud y dyddiad cychwyn yn ôl 1 blwyddyn
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD     :{BLACK}Symud y dyddiad cychwyn ymlaen 2 flynedd
@@ -648,21 +648,21 @@ STR_ERROR_ENDS_OF_BRIDGE_MUST_BOTH                              :{WHITE}...rhaid
 STR_FOUND_TOWN_INITIAL_SIZE_SMALL_BUTTON                        :{BLACK}Bach
 STR_FOUND_TOWN_INITIAL_SIZE_MEDIUM_BUTTON                       :{BLACK}Canolig
 STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON                        :{BLACK}Mawr
-STR_SELECT_TOWN_SIZE_RANDOM                                     :{BLACK}Ar hap
+STR_FOUND_TOWN_SIZE_RANDOM                                      :{BLACK}Ar hap
 STR_FOUND_TOWN_CITY                                             :{BLACK}Dinas
 STR_FOUND_TOWN_CITY_TOOLTIP                                     :{BLACK}Mae dinasoedd yn tyfu'n gynt na threfi arferol{}Yn dibynnu ar y gosodiadau, maent hefyd yn fwy pan gânt eu sefydlu
 STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP                             :{BLACK}Dewiswch maint y dref
 STR_FOUND_TOWN_INITIAL_SIZE_TITLE                               :{YELLOW}Maint tref:
 
-STR_TOWN_ROAD_LAYOUT                                            :{YELLOW}Cynllun ffyrdd tref
-STR_SELECT_TOWN_ROAD_LAYOUT                                     :{BLACK}Dewiswch y cynllun ffyrdd i'w ddefnyddio ar gyfer y dref hon
-STR_SELECT_LAYOUT_ORIGINAL                                      :{BLACK}Gwreiddiol
-STR_SELECT_LAYOUT_BETTER_ROADS                                  :{BLACK}Gwell ffyrdd
-STR_SELECT_LAYOUT_2X2_GRID                                      :{BLACK}Grid 2x2
-STR_SELECT_LAYOUT_3X3_GRID                                      :{BLACK}Grid 3x3
-STR_SELECT_LAYOUT_RANDOM                                        :{BLACK}Ar hap
+STR_FOUND_TOWN_ROAD_LAYOUT                                      :{YELLOW}Cynllun ffyrdd tref
+STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT                          :{BLACK}Dewiswch y cynllun ffyrdd i'w ddefnyddio ar gyfer y dref hon
+STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL                           :{BLACK}Gwreiddiol
+STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS                       :{BLACK}Gwell ffyrdd
+STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID                           :{BLACK}Grid 2x2
+STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID                           :{BLACK}Grid 3x3
+STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM                             :{BLACK}Ar hap
 
-STR_NEWS_MESSAGE                                                :{STRING}  -  {STRING}
+STR_MESSAGE_NEWS_FORMAT                                         :{STRING}  -  {STRING}
 STR_STATUSBAR_TOOLTIP_SHOW_LAST_NEWS                            :{BLACK}Dangos y neges neu'r adroddiad newyddion ddiwethaf...
 STR_NEWS_MESSAGES_OFF                                           :I Ffwrdd
 STR_NEWS_MESSAGES_SUMMARY                                       :Crynodeb
@@ -762,10 +762,10 @@ STR_STATUSBAR_PAUSED                                            :{YELLOW}* *  WE
 STR_MESSAGE_SCREENSHOT_SUCCESSFULLY                             :{WHITE}Cadwyd y ciplun yn llwyddiannus fel '{STRING}'
 STR_ERROR_SCREENSHOT_FAILED                                     :{WHITE}Methodd y ciplun!
 
-STR_TERRAFORM_TOOLTIP_PURCHASE_LAND                             :{BLACK}Prynu tir ar gyfer defnydd yn y dyfodol
+STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND                           :{BLACK}Prynu tir ar gyfer defnydd yn y dyfodol
 STR_STATUSBAR_AUTOSAVE                                          :{RED}AWTOGADW
 STR_STATUSBAR_SAVING_GAME                                       :{RED}*  *  CADW GÊM  *  *
-STR_SAVE_STILL_IN_PROGRESS                                      :{WHITE}Mae'r gêm wrthi'n cael ei chadw,{}Arhoswch nes y bydd y broses wedi'i chwblhau!
+STR_ERROR_SAVE_STILL_IN_PROGRESS                                :{WHITE}Mae'r gêm wrthi'n cael ei chadw,{}Arhoswch nes y bydd y broses wedi'i chwblhau!
 STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE                       :{BLACK}Dewis y rhaglen 'Ezy Scoedent style music'
 
 ############ start of townname region
@@ -828,7 +828,7 @@ STR_GAME_OPTIONS_LANGUAGE_TOOLTIP                               :{BLACK}Dewiswch
 
 STR_GAME_OPTIONS_FULLSCREEN                                     :{BLACK}Sgrin Llawn
 STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP                             :{BLACK}Marciwch y blwch hwn i chwarae Open TTD gyda Sgrin Llawn
-STR_FULLSCREEN_FAILED                                           :{WHITE}Methodd y modd sgrin llawn
+STR_ERROR_FULLSCREEN_FAILED                                     :{WHITE}Methodd y modd sgrin llawn
 
 STR_GAME_OPTIONS_RESOLUTION                                     :{BLACK}Cydraniad Sgrin
 STR_GAME_OPTIONS_RESOLUTION_TOOLTIP                             :{BLACK}Dewiswch y cydraniad sgrin i'w defnyddio
@@ -841,12 +841,12 @@ STR_GAME_OPTIONS_BASE_GRF_TOOLTIP                               :{BLACK}Dewiswch
 STR_GAME_OPTIONS_BASE_GRF_STATUS                                :{RED}{NUM} ar goll/corrupted file{P "" iau}
 STR_GAME_OPTIONS_BASE_GRF_DESCRIPTION_TOOLTIP                   :{BLACK}gwybodaeth ychwanegol am y set sall graffeg
 
-STR_AUTOSAVE_FAILED                                             :{WHITE}Methodd yr Awtogadw
+STR_ERROR_AUTOSAVE_FAILED                                       :{WHITE}Methodd yr Awtogadw
 
-STR_HEADING_FOR_STATION                                         :{LTBLUE}Ar ei ffordd i {STATION}
-STR_HEADING_FOR_STATION_VEL                                     :{LTBLUE}Ar ei ffordd i {STATION}, {VELOCITY}
-STR_NO_ORDERS                                                   :{LTBLUE}Dim gorchmynion
-STR_NO_ORDERS_VEL                                               :{LTBLUE}Dim gorchmynion, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION                          :{LTBLUE}Ar ei ffordd i {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_STATION_VEL                      :{LTBLUE}Ar ei ffordd i {STATION}, {VELOCITY}
+STR_VEHICLE_STATUS_NO_ORDERS                                    :{LTBLUE}Dim gorchmynion
+STR_VEHICLE_STATUS_NO_ORDERS_VEL                                :{LTBLUE}Dim gorchmynion, {VELOCITY}
 
 STR_PASSENGERS                                                  :teithiwr
 STR_BAGS                                                        :bag
@@ -857,9 +857,9 @@ STR_CRATES                                                      :crât
 STR_RES_OTHER                                                   :arall
 STR_NOTHING                                                     :
 
-STR_CANT_SHARE_ORDER_LIST                                       :{WHITE}Does dim modd rhannu'r rhestr gorchmynion...
-STR_CANT_COPY_ORDER_LIST                                        :{WHITE}Does dim modd copïo'r rhestr gorchmynion...
-STR_END_OF_SHARED_ORDERS                                        :{SETX 10}- - Diwedd y Gorchmynion sydd wedi'u Rhannu - -
+STR_ERROR_CAN_T_SHARE_ORDER_LIST                                :{WHITE}Does dim modd rhannu'r rhestr gorchmynion...
+STR_ERROR_CAN_T_COPY_ORDER_LIST                                 :{WHITE}Does dim modd copïo'r rhestr gorchmynion...
+STR_ORDERS_END_OF_SHARED_ORDERS                                 :{SETX 10}- - Diwedd y Gorchmynion sydd wedi'u Rhannu - -
 
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}Mae {VEHICLE} yn methu dod o hyd i lwybr er mwyn parhau.
 STR_NEWS_TRAIN_IS_LOST                                          :{WHITE} Mae {VEHICLE} ar goll.
@@ -1128,15 +1128,15 @@ STR_CONFIG_SETTING_MAP_Y                                        :{LTBLUE}Y-faint
 
 ############ generic strings for settings
 STR_CONFIG_SETTING_DISABLED                                     :analluogwyd
-STR_CONFIG_SETTING_QUERY_CAPT                                   :{WHITE}Newid gwerth gosodiad
+STR_CONFIG_SETTING_QUERY_CAPTION                                :{WHITE}Newid gwerth gosodiad
 
-STR_TEMPERATE_LANDSCAPE                                         :Tirwedd Tymherus
-STR_SUB_ARCTIC_LANDSCAPE                                        :Tirwedd Is-arctig
-STR_SUB_TROPICAL_LANDSCAPE                                      :Tirwedd Is-drofannol
-STR_TOYLAND_LANDSCAPE                                           :Tirwedd Teganau
+STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE                    :Tirwedd Tymherus
+STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE                   :Tirwedd Is-arctig
+STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE                 :Tirwedd Is-drofannol
+STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE                      :Tirwedd Teganau
 
 STR_CHEATS                                                      :{WHITE}Twyllo
-STR_CHEATS_TIP                                                  :{BLACK}Mae'r blychau marcio'n dangos os ydych chi wedi twyllo neu beidio, gan nodi sut
+STR_CHEATS_TOOLTIP                                              :{BLACK}Mae'r blychau marcio'n dangos os ydych chi wedi twyllo neu beidio, gan nodi sut
 STR_CHEATS_WARNING                                              :{BLACK}Rhybudd! Rydych chi ar fin bradychu eich cydgystadleuwyr. Cofiwch y bydd y fath gywilydd yn cael ei gofio hyd tragwyddoldeb.
 STR_CHEAT_MONEY                                                 :{LTBLUE}Cynyddu arian {CURRENCY}
 STR_CHEAT_CHANGE_COMPANY                                        :{LTBLUE}Chwarae fel cwmni: {ORANGE}{COMMA}
@@ -1148,177 +1148,177 @@ STR_CHEAT_SWITCH_CLIMATE                                        :{LTBLUE}Newid h
 STR_CHEAT_CHANGE_DATE                                           :{LTBLUE}Newid dyddiad: {ORANGE} {DATE_SHORT}
 STR_CHEAT_SETUP_PROD                                            :{LTBLUE}Galluogi newid graddfeydd cynhyrchu: {ORANGE}{STRING}
 
-STR_HEADING_FOR_WAYPOINT                                        :{LTBLUE}Mynd am {WAYPOINT}
-STR_HEADING_FOR_WAYPOINT_VEL                                    :{LTBLUE}Mynd am {WAYPOINT}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT                         :{LTBLUE}Mynd am {WAYPOINT}
+STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT_VEL                     :{LTBLUE}Mynd am {WAYPOINT}, {VELOCITY}
 
-STR_GO_TO_WAYPOINT                                              :Mynd trwy {WAYPOINT}
-STR_GO_NON_STOP_TO_WAYPOINT                                     :Mynd heb stopio drwy {WAYPOINT}
+STR_ORDER_GO_TO_WAYPOINT                                        :Mynd trwy {WAYPOINT}
+STR_ORDER_GO_NON_STOP_TO_WAYPOINT                               :Mynd heb stopio drwy {WAYPOINT}
 
-STR_WAYPOINTNAME_CITY                                           :Pwynt Llwybr {TOWN}
-STR_WAYPOINTNAME_CITY_SERIAL                                    :Pwynt Llwybr {TOWN} #{COMMA}
-STR_LANDINFO_WAYPOINT                                           :Pwynt Llwybr
+STR_FORMAT_WAYPOINT_NAME                                        :Pwynt Llwybr {TOWN}
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Pwynt Llwybr {TOWN} #{COMMA}
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Pwynt Llwybr
 
-STR_WAYPOINT                                                    :{WHITE}Pwynt Llwybr
-STR_WAYPOINT_GRAPHICS_TIP                                       :{BLACK}Dewiswch math Pwynt Llwybr
+STR_WAYPOINT_CAPTION                                            :{WHITE}Pwynt Llwybr
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Dewiswch math Pwynt Llwybr
 
-STR_WAYPOINT_VIEWPORT                                           :{WAYPOINT}
-STR_WAYPOINT_VIEWPORT_TINY                                      :{TINYFONT}{WAYPOINT}
+STR_VIEWPORT_WAYPOINT                                           :{WAYPOINT}
+STR_VIEWPORT_WAYPOINT_TINY                                      :{TINYFONT}{WAYPOINT}
 STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Golygu enw Pwynt Llwybr
 
-STR_CANT_CHANGE_WAYPOINT_NAME                                   :{WHITE}Does dim modd newid enw Pwynt Llwybr...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Does dim modd newid enw Pwynt Llwybr...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Newid rheilffordd yn bwynt llwybr
-STR_CANT_BUILD_TRAIN_WAYPOINT                                   :{WHITE}Does dim modd adeiladu pwynt llwybr trên yma...
-STR_CANT_REMOVE_TRAIN_WAYPOINT                                  :{WHITE}Does dim modd tynnu'r pwynt llwybr trên yma...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Does dim modd adeiladu pwynt llwybr trên yma...
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Does dim modd tynnu'r pwynt llwybr trên yma...
 
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Adeiladu trac yn defnyddio'r modd Awtoreilffordd
 
-STR_NO_TOWN_IN_SCENARIO                                         :{WHITE}...nid oes tref yn y senario hwn
-STR_COULD_NOT_CREATE_TOWN                                       :{WHITE}Ataliwyd creu map...{}...nid oedd lleoliadau addas ar gyfer trefi
+STR_ERROR_NO_TOWN_IN_SCENARIO                                   :{WHITE}...nid oes tref yn y senario hwn
+STR_ERROR_COULD_NOT_CREATE_TOWN                                 :{WHITE}Ataliwyd creu map...{}...nid oedd lleoliadau addas ar gyfer trefi
 
-STR_MANY_RANDOM_TOWNS                                           :{BLACK}Llawer o drefi ar hap
-STR_RANDOM_TOWNS_TIP                                            :{BLACK}Gorchuddio'r map gyda threfi wedi'i lleoli ar hap
-STR_MANY_RANDOM_INDUSTRIES                                      :Llawer o ddiwydiannau ar hap
-STR_RANDOM_INDUSTRIES_TIP                                       :{BLACK}Gorchuddio'r map gyda diwydiannau wedi'i lleoli ar hap
-STR_CAN_T_GENERATE_INDUSTRIES                                   :{WHITE}Doedd dim modd cynhyrchu diwydiannau...
+STR_FOUND_TOWN_MANY_RANDOM_TOWNS                                :{BLACK}Llawer o drefi ar hap
+STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP                             :{BLACK}Gorchuddio'r map gyda threfi wedi'i lleoli ar hap
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES                        :Llawer o ddiwydiannau ar hap
+STR_FUND_INDUSTRY_MANY_RANDOM_INDUSTRIES_TOOLTIP                :{BLACK}Gorchuddio'r map gyda diwydiannau wedi'i lleoli ar hap
+STR_ERROR_CAN_T_GENERATE_INDUSTRIES                             :{WHITE}Doedd dim modd cynhyrchu diwydiannau...
 
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Agor y bar offer tirweddu er mwyn codi neu ostwng tir, plannu coed ayb.
 STR_LANDSCAPING_TOOLBAR                                         :{WHITE}Tirweddu
-STR_LEVEL_LAND_TOOLTIP                                          :{BLACK}Gwastatáu Tir
+STR_LANDSCAPING_LEVEL_LAND_TOOLTIP                              :{BLACK}Gwastatáu Tir
 
 
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Coed o fath ar hap
-STR_TREES_RANDOM_TYPE_TIP                                       :{BLACK}Gosod coed o fath ar hap
+STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Gosod coed o fath ar hap
 
-STR_CANT_BUILD_CANALS                                           :{WHITE}Methu adeiladu camlesi yma...
+STR_ERROR_CAN_T_BUILD_CANALS                                    :{WHITE}Methu adeiladu camlesi yma...
 STR_WATERWAYS_TOOLBAR_BUILD_CANALS_TOOLTIP                      :{BLACK}Adeiladu camlesi.
-STR_LANDINFO_CANAL                                              :Camlas
+STR_LAI_WATER_DESCRIPTION_CANAL                                 :Camlas
 
-STR_CANT_BUILD_LOCKS                                            :{WHITE}Methu adeiladu lociau yma...
+STR_ERROR_CAN_T_BUILD_LOCKS                                     :{WHITE}Methu adeiladu lociau yma...
 STR_WATERWAYS_TOOLBAR_BUILD_LOCKS_TOOLTIP                       :{BLACK}Adeiladu lociau
-STR_LANDINFO_LOCK                                               :Loc
+STR_LAI_WATER_DESCRIPTION_LOCK                                  :Loc
 
-STR_CANT_PLACE_RIVERS                                           :{WHITE}Methu gosod afonydd yma...
-STR_LANDINFO_RIVER                                              :Afon
+STR_ERROR_CAN_T_PLACE_RIVERS                                    :{WHITE}Methu gosod afonydd yma...
+STR_LAI_WATER_DESCRIPTION_RIVER                                 :Afon
 
-STR_BUOY_IS_IN_USE                                              :{WHITE}...bwi mewn defnydd!
+STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}...bwi mewn defnydd!
 
-STR_LANDINFO_COORDS                                             :{BLACK}Cyfeirnodau: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
+STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Cyfeirnodau: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
 
-STR_CANT_REMOVE_PART_OF_STATION                                 :{WHITE}Methu tynnu rhan o orsaf...
-STR_CANT_CONVERT_RAIL                                           :{WHITE}Methu trosi'r math rheilffordd hwn...
+STR_ERROR_CAN_T_REMOVE_PART_OF_STATION                          :{WHITE}Methu tynnu rhan o orsaf...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Methu trosi'r math rheilffordd hwn...
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Trosi/Diweddaru math y rheilffordd
 
-STR_DRAG_WHOLE_TRAIN_TO_SELL_TIP                                :{BLACK}Llusgwch injan y trên yma i werthu'r holl drên
+STR_DEPOT_DRAG_WHOLE_TRAIN_TO_SELL_TOOLTIP                      :{BLACK}Llusgwch injan y trên yma i werthu'r holl drên
 
 STR_STATION_BUILD_DRAG_DROP                                     :{BLACK}Llusgo a Gollwng
 STR_STATION_BUILD_DRAG_DROP_TOOLTIP                             :{BLACK}Adeiladu gorsaf gan ddefnyddio llusgo a gollwng
-STR_SELECT_STATION_CLASS_TIP                                    :{BLACK}Dewiswch y dosbarth o orsaf i'w dangos
-STR_SELECT_STATION_TYPE_TIP                                     :{BLACK}Dewiswch y math o orsaf i'w hadeiladu
+STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Dewiswch y dosbarth o orsaf i'w dangos
+STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Dewiswch y math o orsaf i'w hadeiladu
 
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Cyflymu'r gêm
 STR_MESSAGE_HISTORY                                             :{WHITE}Hanes Negeseuon
-STR_MESSAGE_HISTORY_TIP                                         :{BLACK}Rhestr o'r negeseuon newyddion diweddaraf
-STR_MESSAGES_DISABLE_ALL                                        :{BLACK}Analluogi popeth
-STR_MESSAGES_ENABLE_ALL                                         :{BLACK}Galluogi popeth
+STR_MESSAGE_HISTORY_TOOLTIP                                     :{BLACK}Rhestr o'r negeseuon newyddion diweddaraf
+STR_SMALLMAP_DISABLE_ALL                                        :{BLACK}Analluogi popeth
+STR_SMALLMAP_ENABLE_ALL                                         :{BLACK}Galluogi popeth
 
-STR_INDUSTRYDIR_CAPTION                                         :{WHITE}Diwydiannau
-STR_INDUSTRYDIR_ITEM                                            :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% wedi'i gludo)
-STR_INDUSTRYDIR_ITEM_TWO                                        :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% wedi'i gludo)
-STR_INDUSTRYDIR_ITEM_NOPROD                                     :{ORANGE}{INDUSTRY}
-STR_INDUSTRYDIR_LIST_CAPTION                                    :{BLACK}Enwau diwydiannau - cliciwch ar enw i ganoli'r sgrin ar ddiwydiant
+STR_INDUSTRY_DIRECTORY_CAPTION                                  :{WHITE}Diwydiannau
+STR_INDUSTRY_DIRECTORY_ITEM                                     :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}){YELLOW} ({COMMA}% wedi'i gludo)
+STR_INDUSTRY_DIRECTORY_ITEM_TWO                                 :{ORANGE}{INDUSTRY}{BLACK} ({CARGO}{STRING}/{CARGO}{STRING}){YELLOW} ({COMMA}%/{COMMA}% wedi'i gludo)
+STR_INDUSTRY_DIRECTORY_ITEM_NOPROD                              :{ORANGE}{INDUSTRY}
+STR_INDUSTRY_DIRECTORY_LIST_CAPTION                             :{BLACK}Enwau diwydiannau - cliciwch ar enw i ganoli'r sgrin ar ddiwydiant
 
-STR_INDUSTRY_TOO_CLOSE                                          :{WHITE}...rhy agos i ddiwydiant arall
+STR_ERROR_INDUSTRY_TOO_CLOSE                                    :{WHITE}...rhy agos i ddiwydiant arall
 
 STR_CONFIG_GAME_PRODUCTION                                      :{WHITE}Newid cynnyrch
 
 ############ network gui strings
 
-STR_NETWORK_MULTIPLAYER                                         :{WHITE}Amlchwaraewr
-
-STR_NETWORK_PLAYER_NAME                                         :{BLACK}Enw chwaraewr:
-STR_NETWORK_ENTER_NAME_TIP                                      :{BLACK}Byddwch chi'n ymddangos i'r chwaraewyr eraill dan yr enw hwn
-STR_NETWORK_PLAYER_NAME_OSKTITLE                                :{BLACK}Rhowch eich enw
-STR_NETWORK_CONNECTION                                          :{BLACK}Cysylltiad:
-STR_NETWORK_CONNECTION_TIP                                      :{BLACK}Dewiswch rhwng gêm rhyngrwyd neu gêm Rwydwaith Ardal Leol (LAN)
-
-STR_NETWORK_START_SERVER                                        :{BLACK}Dechrau'r gweinydd
-STR_NETWORK_START_SERVER_TIP                                    :{BLACK}Dechrau eich gweinydd eich hun
-
-STR_NETWORK_GAME_NAME                                           :{BLACK}Enw
-STR_NETWORK_GAME_NAME_TIP                                       :{BLACK}Enwi'r gêm
-STR_NETWORK_INFO_ICONS_TIP                                      :{BLACK}Iaith, fersiwn gweinydd, ayb.
-STR_NETWORK_CLICK_GAME_TO_SELECT                                :{BLACK}Cliciwch gêm o'r rhestr i'w ddewis
-STR_NETWORK_LAST_JOINED_SERVER                                  :{BLACK}Y gweinydd yr ymunoch chi ag o ddiwethaf:
-STR_NETWORK_CLICK_TO_SELECT_LAST                                :{BLACK}Cliciwch i ddewis y gweinydd y chwaraeoch chi ddiwethaf
-
-STR_NETWORK_FIND_SERVER                                         :{BLACK}Canfod gweinydd
-STR_NETWORK_FIND_SERVER_TIP                                     :{BLACK}Chwilio'r rhwydwaith am weinydd
-STR_NETWORK_ADD_SERVER                                          :{BLACK}Ychwanegu gweinydd
-STR_NETWORK_ADD_SERVER_TIP                                      :{BLACK}Ychwanegu gweinydd i'r rhestr a fydd yn cael ei wirio bob tro am gemau sy'n rhedeg
-STR_NETWORK_ENTER_IP                                            :{BLACK}Rhowch gyfeiriad y gwesteiwr
-
-STR_NETWORK_GENERAL_ONLINE                                      :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
-STR_NETWORK_CLIENTS_CAPTION                                     :{BLACK}Cleientiaid
-STR_NETWORK_CLIENTS_CAPTION_TIP                                 :{BLACK}Cleientiaid ar-lein / uchafswm cleientiaid{}Cwmnïau ar-lein / uchafswm cwmnïau
-
-STR_NETWORK_MAP_SIZE_SHORT                                      :{BLACK}{COMMA}x{COMMA}
-STR_NETWORK_MAP_SIZE_CAPTION                                    :{BLACK}Maint map
-STR_NETWORK_MAP_SIZE_CAPTION_TIP                                :{BLACK}Maint map y gêm{}Cliciwch i drefnu'n ôl ardal
-
-STR_NETWORK_DATE_CAPTION                                        :{BLACK}Dyddiadau
-STR_NETWORK_DATE_CAPTION_TIP                                    :{BLACK}Dyddiad cyfredol
-
-STR_NETWORK_YEARS_CAPTION                                       :{BLACK}Blynyddoedd
-STR_NETWORK_YEARS_CAPTION_TIP                                   :{BLACK}Nifer y blynyddoedd{}y bu'r gêm yn rhedeg
-
-STR_NETWORK_GAME_INFO                                           :{SILVER}GWYBODAETH AM Y GÊM
-STR_NETWORK_CLIENTS                                             :{SILVER}Cleientiaid:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
-STR_NETWORK_LANGUAGE                                            :{SILVER}Iaith:  {WHITE}{STRING}
-STR_NETWORK_TILESET                                             :{SILVER}Set Teils:  {WHITE}{STRING}
-STR_NETWORK_MAP_SIZE                                            :{SILVER}Maint Map:  {WHITE}{COMMA}x{COMMA}
-STR_NETWORK_SERVER_VERSION                                      :{SILVER}Fersiwn Gweinydd:  {WHITE}{STRING}
-STR_NETWORK_SERVER_ADDRESS                                      :{SILVER}Cyfeiriad Gweinydd:  {WHITE}{STRING}
-STR_NETWORK_START_DATE                                          :{SILVER}Dyddiad Cychwyn:  {WHITE}{DATE_SHORT}
-STR_NETWORK_CURRENT_DATE                                        :{SILVER}Dyddiad Presennol:  {WHITE}{DATE_SHORT}
-STR_NETWORK_PASSWORD                                            :{SILVER}Wedi'i Ddiogelu gan Gyfrinair!
-STR_NETWORK_SERVER_OFFLINE                                      :{SILVER}GWEINYDD ALL-LEIN
-STR_NETWORK_SERVER_FULL                                         :{SILVER}GWEINYDD LLAWN
-STR_NETWORK_VERSION_MISMATCH                                    :{SILVER}FERSIWN ANGHYDNAWS
-STR_NETWORK_GRF_MISMATCH                                        :{SILVER}NEWGRF ANGHYDNAWS
-
-STR_NETWORK_JOIN_GAME                                           :{BLACK}Ymuno â gêm
-
-
-STR_NETWORK_START_GAME_WINDOW                                   :{WHITE}Dechrau gêm newydd amlchwaraewr
-
-STR_NETWORK_NEW_GAME_NAME                                       :{BLACK}Enw gêm:
-STR_NETWORK_NEW_GAME_NAME_TIP                                   :{BLACK}Bydd y gêm yn weladwy i chwaraewyr amlchwaraewr eraill yn y ddewislen dewis gêm
-STR_NETWORK_NEW_GAME_NAME_OSKTITLE                              :{BLACK}Rhowch enw ar gyfer y gêm rhwydwaith
-STR_NETWORK_SET_PASSWORD                                        :{BLACK}Gosod cyfrinair
-STR_NETWORK_PASSWORD_TIP                                        :{BLACK}Diogelwch eich gêm â chyfrinair os nad ydych am i fynediad ato fod yn gyhoeddus
-STR_NETWORK_SELECT_MAP                                          :{BLACK}Dewiswch fap:
-STR_NETWORK_SELECT_MAP_TIP                                      :{BLACK}Pa fap hoffech chi chwarae?
-STR_NETWORK_LAN_INTERNET_COMBO                                  :{BLACK}{SKIP}{STRING}
-STR_NETWORK_LAN                                                 :LAN
-STR_NETWORK_INTERNET                                            :Rhyngrwyd
-STR_NETWORK_LAN_INTERNET                                        :LAN / Rhyngrwyd
-STR_NETWORK_INTERNET_ADVERTISE                                  :Rhyngrwyd (hysbysebu)
-STR_NETWORK_CLIENTS_SELECT                                      :{BLACK}{SKIP}{SKIP}{NUM} cleient{P "" iau}
-STR_NETWORK_NUMBER_OF_CLIENTS                                   :{BLACK}Uchafswm cleientiaid:
-STR_NETWORK_NUMBER_OF_CLIENTS_TIP                               :{BLACK}Dewiswch uchafswm y cleientiaid. Does dim rhaid llanw pob slot
-STR_NETWORK_COMPANIES_SELECT                                    :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} cwmn{P i ïau}
-STR_NETWORK_NUMBER_OF_COMPANIES                                 :{BLACK}Uchafswm cwmnïau:
-STR_NETWORK_NUMBER_OF_COMPANIES_TIP                             :{BLACK}rhoi cyfyngiad penodol ar sawl cwmni mae'r gweinydd yn ei ganiatáu
-STR_NETWORK_SPECTATORS_SELECT                                   :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} gwyl{P iwr wyr}
-STR_NETWORK_NUMBER_OF_SPECTATORS                                :{BLACK}Uchafswm gwylwyr:
-STR_NETWORK_NUMBER_OF_SPECTATORS_TIP                            :{BLACK}rhoi cyfyngiad penodol ar sawl gwyliwr mae'r gweinydd yn ei ganiatáu
-STR_NETWORK_LANGUAGE_SPOKEN                                     :{BLACK}Iaith i'w siarad:
-STR_NETWORK_LANGUAGE_TIP                                        :{BLACK}Rhoi gwybod i'r chwaraewyr pa iaith y dylid ei siarad ar y gweinydd
-STR_NETWORK_LANGUAGE_COMBO                                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
-STR_NETWORK_START_GAME                                          :{BLACK}Dechrau Gêm
-STR_NETWORK_START_GAME_TIP                                      :{BLACK}Dechrau gêm rwydwaith newydd gyda map ar hap neu senario
-STR_NETWORK_LOAD_GAME                                           :{BLACK}Llwytho Gêm
-STR_NETWORK_LOAD_GAME_TIP                                       :{BLACK}Parhau gyda gêm amlchwaraewr sydd wedi'i chadw (sicrhewch eich bod yn cysylltu fel y chwaraewr cywir)
+STR_NETWORK_SERVER_LIST_CAPTION                                 :{WHITE}Amlchwaraewr
+
+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
+STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE                    :{BLACK}Rhowch eich enw
+STR_NETWORK_SERVER_LIST_CONNECTION                              :{BLACK}Cysylltiad:
+STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP                      :{BLACK}Dewiswch rhwng gêm rhyngrwyd neu gêm Rwydwaith Ardal Leol (LAN)
+
+STR_NETWORK_SERVER_LIST_START_SERVER                            :{BLACK}Dechrau'r gweinydd
+STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP                    :{BLACK}Dechrau eich gweinydd eich hun
+
+STR_NETWORK_SERVER_LIST_GAME_NAME                               :{BLACK}Enw
+STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP                       :{BLACK}Enwi'r gêm
+STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP                      :{BLACK}Iaith, fersiwn gweinydd, ayb.
+STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT                    :{BLACK}Cliciwch gêm o'r rhestr i'w ddewis
+STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER                      :{BLACK}Y gweinydd yr ymunoch chi ag o ddiwethaf:
+STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST                    :{BLACK}Cliciwch i ddewis y gweinydd y chwaraeoch chi ddiwethaf
+
+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 fydd yn cael ei wirio bob tro am gemau sy'n rhedeg
+STR_NETWORK_SERVER_LIST_ENTER_IP                                :{BLACK}Rhowch gyfeiriad y gwesteiwr
+
+STR_NETWORK_SERVER_LIST_GENERAL_ONLINE                          :{BLACK}{COMMA}/{COMMA} - {COMMA}/{COMMA}
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION                         :{BLACK}Cleientiaid
+STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP                 :{BLACK}Cleientiaid ar-lein / uchafswm cleientiaid{}Cwmnïau ar-lein / uchafswm cwmnïau
+
+STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT                          :{BLACK}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION                        :{BLACK}Maint map
+STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP                :{BLACK}Maint map y gêm{}Cliciwch i drefnu'n ôl ardal
+
+STR_NETWORK_SERVER_LIST_DATE_CAPTION                            :{BLACK}Dyddiadau
+STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP                    :{BLACK}Dyddiad cyfredol
+
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION                           :{BLACK}Blynyddoedd
+STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP                   :{BLACK}Nifer y blynyddoedd{}y bu'r gêm yn rhedeg
+
+STR_NETWORK_SERVER_LIST_GAME_INFO                               :{SILVER}GWYBODAETH AM Y GÊM
+STR_NETWORK_SERVER_LIST_CLIENTS                                 :{SILVER}Cleientiaid:  {WHITE}{COMMA} / {COMMA} - {COMMA} / {COMMA}
+STR_NETWORK_SERVER_LIST_LANGUAGE                                :{SILVER}Iaith:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_TILESET                                 :{SILVER}Set Teils:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_MAP_SIZE                                :{SILVER}Maint Map:  {WHITE}{COMMA}x{COMMA}
+STR_NETWORK_SERVER_LIST_SERVER_VERSION                          :{SILVER}Fersiwn Gweinydd:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_SERVER_ADDRESS                          :{SILVER}Cyfeiriad Gweinydd:  {WHITE}{STRING}
+STR_NETWORK_SERVER_LIST_START_DATE                              :{SILVER}Dyddiad Cychwyn:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_CURRENT_DATE                            :{SILVER}Dyddiad Presennol:  {WHITE}{DATE_SHORT}
+STR_NETWORK_SERVER_LIST_PASSWORD                                :{SILVER}Wedi'i Ddiogelu gan Gyfrinair!
+STR_NETWORK_SERVER_LIST_SERVER_OFFLINE                          :{SILVER}GWEINYDD ALL-LEIN
+STR_NETWORK_SERVER_LIST_SERVER_FULL                             :{SILVER}GWEINYDD LLAWN
+STR_NETWORK_SERVER_LIST_VERSION_MISMATCH                        :{SILVER}FERSIWN ANGHYDNAWS
+STR_NETWORK_SERVER_LIST_GRF_MISMATCH                            :{SILVER}NEWGRF ANGHYDNAWS
+
+STR_NETWORK_SERVER_LIST_JOIN_GAME                               :{BLACK}Ymuno â gêm
+
+
+STR_NETWORK_START_SERVER_CAPTION                                :{WHITE}Dechrau gêm newydd amlchwaraewr
+
+STR_NETWORK_START_SERVER_NEW_GAME_NAME                          :{BLACK}Enw gêm:
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP                  :{BLACK}Bydd y gêm yn weladwy i chwaraewyr amlchwaraewr eraill yn y ddewislen dewis gêm
+STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE                 :{BLACK}Rhowch enw ar gyfer y gêm rhwydwaith
+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_SELECT_MAP                             :{BLACK}Dewiswch fap:
+STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP                     :{BLACK}Pa fap hoffech chi chwarae?
+STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO                     :{BLACK}{SKIP}{STRING}
+STR_NETWORK_SERVER_LIST_LAN                                     :LAN
+STR_NETWORK_SERVER_LIST_INTERNET                                :Rhyngrwyd
+STR_NETWORK_START_SERVER_LAN_INTERNET                           :LAN / Rhyngrwyd
+STR_NETWORK_START_SERVER_INTERNET_ADVERTISE                     :Rhyngrwyd (hysbysebu)
+STR_NETWORK_START_SERVER_CLIENTS_SELECT                         :{BLACK}{SKIP}{SKIP}{NUM} cleient{P "" iau}
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS                      :{BLACK}Uchafswm cleientiaid:
+STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP              :{BLACK}Dewiswch uchafswm y cleientiaid. Does dim rhaid llanw pob slot
+STR_NETWORK_START_SERVER_COMPANIES_SELECT                       :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} cwmn{P i ïau}
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES                    :{BLACK}Uchafswm cwmnïau:
+STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP            :{BLACK}rhoi cyfyngiad penodol ar sawl cwmni mae'r gweinydd yn ei ganiatáu
+STR_NETWORK_START_SERVER_SPECTATORS_SELECT                      :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} gwyl{P iwr wyr}
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS                   :{BLACK}Uchafswm gwylwyr:
+STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP           :{BLACK}rhoi cyfyngiad penodol ar sawl gwyliwr mae'r gweinydd yn ei ganiatáu
+STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN                        :{BLACK}Iaith i'w siarad:
+STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP                       :{BLACK}Rhoi gwybod i'r chwaraewyr pa iaith y dylid ei siarad ar y gweinydd
+STR_NETWORK_START_SERVER_LANGUAGE_COMBO                         :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
+STR_NETWORK_START_SERVER_START_GAME                             :{BLACK}Dechrau Gêm
+STR_NETWORK_START_SERVER_START_GAME_TOOLTIP                     :{BLACK}Dechrau gêm rwydwaith newydd gyda map ar hap neu senario
+STR_NETWORK_START_SERVER_LOAD_GAME                              :{BLACK}Llwytho Gêm
+STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP                      :{BLACK}Parhau gyda gêm amlchwaraewr sydd wedi'i chadw (sicrhewch eich bod yn cysylltu fel y chwaraewr cywir)
 
 ############ Leave those lines in this order!!
 STR_NETWORK_LANG_ANY                                            :Unrhyw
@@ -1359,33 +1359,33 @@ STR_NETWORK_LANG_GREEK                                          :Groeg
 STR_NETWORK_LANG_LATVIAN                                        :Latfieg
 ############ End of leave-in-this-order
 
-STR_NETWORK_GAME_LOBBY                                          :{WHITE}Cyntedd Gemau Amlchwaraewr
+STR_NETWORK_GAME_LOBBY_CAPTION                                  :{WHITE}Cyntedd Gemau Amlchwaraewr
 
-STR_NETWORK_PREPARE_TO_JOIN                                     :{BLACK}Paratoi i ymuno:   {ORANGE}{STRING}
-STR_NETWORK_COMPANY_LIST_TIP                                    :{BLACK}Rhestr o'r holl gwmnïau yn y gêm. Gellwch unai ymuno ag un neu ddechrau un newydd os oes slot cwmni'n rhydd
-STR_NETWORK_NEW_COMPANY                                         :{BLACK}Cwmni newydd
-STR_NETWORK_NEW_COMPANY_TIP                                     :{BLACK}Creu cwmni newydd
-STR_NETWORK_SPECTATE_GAME                                       :{BLACK}Gwylio gêm
-STR_NETWORK_SPECTATE_GAME_TIP                                   :{BLACK}Gwylio'r gêm fel gwyliwr
-STR_NETWORK_JOIN_COMPANY                                        :{BLACK}Ymuno â chwmni
-STR_NETWORK_JOIN_COMPANY_TIP                                    :{BLACK}Helpu rheoli'r cwmni hwn
-STR_NETWORK_REFRESH                                             :{BLACK}Adnewyddu'r gweinydd
-STR_NETWORK_REFRESH_TIP                                         :{BLACK}Adnewyddu'r wybodaeth am y gweinydd
+STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN                          :{BLACK}Paratoi i ymuno:   {ORANGE}{STRING}
+STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP                     :{BLACK}Rhestr o'r holl gwmnïau yn y gêm. Gellwch unai ymuno ag un neu ddechrau un newydd os oes slot cwmni'n rhydd
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY                              :{BLACK}Cwmni newydd
+STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP                      :{BLACK}Creu cwmni newydd
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME                            :{BLACK}Gwylio gêm
+STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP                    :{BLACK}Gwylio'r gêm fel gwyliwr
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY                             :{BLACK}Ymuno â chwmni
+STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP                     :{BLACK}Helpu rheoli'r cwmni hwn
+STR_NETWORK_SERVER_LIST_REFRESH                                 :{BLACK}Adnewyddu'r gweinydd
+STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP                         :{BLACK}Adnewyddu'r wybodaeth am y gweinydd
 
-STR_NETWORK_COMPANY_INFO                                        :{SILVER}GWYBODAETH CWMNI
+STR_NETWORK_GAME_LOBBY_COMPANY_INFO                             :{SILVER}GWYBODAETH CWMNI
 
-STR_NETWORK_COMPANY_NAME                                        :{SILVER}Company name:  {WHITE}{STRING}
-STR_NETWORK_INAUGURATION_YEAR                                   :{SILVER}Inauguration:  {WHITE}{NUM}
-STR_NETWORK_VALUE                                               :{SILVER}Company Gwerth:  {WHITE}{CURRENCY}
-STR_NETWORK_CURRENT_BALANCE                                     :{SILVER}Current balance:  {WHITE}{CURRENCY}
-STR_NETWORK_LAST_YEARS_INCOME                                   :{SILVER}Last year's incwm:  {WHITE}{CURRENCY}
-STR_NETWORK_PERFORMANCE                                         :{SILVER}Performance:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_COMPANY_NAME                             :{SILVER}Company name:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR                        :{SILVER}Inauguration:  {WHITE}{NUM}
+STR_NETWORK_GAME_LOBBY_VALUE                                    :{SILVER}Company Gwerth:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE                          :{SILVER}Current balance:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME                        :{SILVER}Last year's incwm:  {WHITE}{CURRENCY}
+STR_NETWORK_GAME_LOBBY_PERFORMANCE                              :{SILVER}Performance:  {WHITE}{NUM}
 
-STR_NETWORK_VEHICLES                                            :{SILVER}Cerbydau:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_STATIONS                                            :{SILVER}Gorsafoedd:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
-STR_NETWORK_PLAYERS                                             :{SILVER}Chwaraewyr:  {WHITE}{STRING}
+STR_NETWORK_GAME_LOBBY_VEHICLES                                 :{SILVER}Cerbydau:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_STATIONS                                 :{SILVER}Gorsafoedd:  {WHITE}{NUM} {TRAIN}, {NUM} {LORRY}, {NUM} {BUS}, {NUM} {PLANE}, {NUM} {SHIP}
+STR_NETWORK_GAME_LOBBY_PLAYERS                                  :{SILVER}Chwaraewyr:  {WHITE}{STRING}
 
-STR_NETWORK_CONNECTING                                          :{WHITE}Wrthi'n Cysylltu...
+STR_NETWORK_CONNECTING_CAPTION                                  :{WHITE}Wrthi'n Cysylltu...
 
 ############ Leave those lines in this order!!
 STR_NETWORK_CONNECTING_1                                        :{BLACK}(1/6) Wrthi'n Cysylltu..
@@ -1401,49 +1401,49 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Estyn gw
 STR_NETWORK_CONNECTING_WAITING                                  :{BLACK}{NUM} cleient{P "" iau}o'ch blaen
 STR_NETWORK_CONNECTING_DOWNLOADING                              :{BLACK}{BYTES} / {BYTES} wedi eu llwytho i lawr hyd yn hyn
 
-STR_NETWORK_DISCONNECT                                          :{BLACK}Datgysylltu
+STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Datgysylltu
 
 STR_NETWORK_GIVE_MONEY_CAPTION                                  :{WHITE}Nodwch faint o arian yr hoffech chi ei roi
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Mae'r gweinydd wedi'i ddiogelu. Rhowch y cyfrinair.
 STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Mae'r cwmni wedi'i ddiogelu. rhowch y cyfrinair.
-STR_NETWORK_CLIENT_LIST                                         :{WHITE}Rhestr Cleientiaid
+STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :{WHITE}Rhestr Cleientiaid
 STR_NETWORK_COMPANY_LIST_SPECTATE                               :{WHITE}Gwylio
 STR_NETWORK_COMPANY_LIST_NEW_COMPANY                            :{WHITE}Cwmni Newydd
 
-STR_NETWORK_ERR_NOTAVAILABLE                                    :{WHITE} Ni ddaethpwyd o hyd i ddyfeisiau rhwydwaith, neu ni chafodd y gêm ei chrynhoi gyda ENABLE_NETWORK
-STR_NETWORK_ERR_NOSERVER                                        :{WHITE} Methu darganfod unrhyw gemau rhwydwaith
-STR_NETWORK_ERR_NOCONNECTION                                    :{WHITE} Ni atebodd y gweinydd y cais
-STR_NETWORK_ERR_NEWGRF_MISMATCH                                 :{WHITE} Doedd dim modd cysylltu oherwydd nid oedd y NewGRF yn cyfateb
-STR_NETWORK_ERR_DESYNC                                          :{WHITE} Methodd y cydamseru rhwng y rhwydwaith a'r gêm
-STR_NETWORK_ERR_LOSTCONNECTION                                  :{WHITE} Collwyd y cysylltiad rhwng y rhwydwaith a'r gêm
-STR_NETWORK_ERR_SAVEGAMEERROR                                   :{WHITE} Doedd dim modd llwytho'r gêm a gadwyd
-STR_NETWORK_ERR_SERVER_START                                    :{WHITE} Methwyd a chychwyn y gweinydd
-STR_NETWORK_ERR_CLIENT_START                                    :{WHITE} Doedd dim modd cysylltu
-STR_NETWORK_ERR_TIMEOUT                                         :{WHITE} Daeth cyfnod cyswllt #{NUM} i ben
-STR_NETWORK_ERR_SERVER_ERROR                                    :{WHITE} Caewyd y cyswllt oherwydd gwall protocol
-STR_NETWORK_ERR_WRONG_REVISION                                  :{WHITE} Nid y fersiwn y cleient yn cyfateb i fersiwn y gweinydd
-STR_NETWORK_ERR_WRONG_PASSWORD                                  :{WHITE} Cyfrinair anghywir
-STR_NETWORK_ERR_SERVER_FULL                                     :{WHITE} Mae'r gweinydd yn llawn
-STR_NETWORK_ERR_SERVER_BANNED                                   :{WHITE} Rydych chi wedi'ch gwahardd o'r gweinydd hwn
-STR_NETWORK_ERR_KICKED                                          :{WHITE} YCafoch chi eich cicio o'r gêm
-STR_NETWORK_ERR_CHEATER                                         :{WHITE} Ni chaniateir twyllo ar y gweinydd hwn
+STR_NETWORK_ERROR_NOTAVAILABLE                                  :{WHITE} Ni ddaethpwyd o hyd i ddyfeisiau rhwydwaith, neu ni chafodd y gêm ei chrynhoi gyda ENABLE_NETWORK
+STR_NETWORK_ERROR_NOSERVER                                      :{WHITE} Methu darganfod unrhyw gemau rhwydwaith
+STR_NETWORK_ERROR_NOCONNECTION                                  :{WHITE} Ni atebodd y gweinydd y cais
+STR_NETWORK_ERROR_NEWGRF_MISMATCH                               :{WHITE} Doedd dim modd cysylltu oherwydd nid oedd y NewGRF yn cyfateb
+STR_NETWORK_ERROR_DESYNC                                        :{WHITE} Methodd y cydamseru rhwng y rhwydwaith a'r gêm
+STR_NETWORK_ERROR_LOSTCONNECTION                                :{WHITE} Collwyd y cysylltiad rhwng y rhwydwaith a'r gêm
+STR_NETWORK_ERROR_SAVEGAMEERROR                                 :{WHITE} Doedd dim modd llwytho'r gêm a gadwyd
+STR_NETWORK_ERROR_SERVER_START                                  :{WHITE} Methwyd a chychwyn y gweinydd
+STR_NETWORK_ERROR_CLIENT_START                                  :{WHITE} Doedd dim modd cysylltu
+STR_NETWORK_ERROR_TIMEOUT                                       :{WHITE} Daeth cyfnod cyswllt #{NUM} i ben
+STR_NETWORK_ERROR_SERVER_ERROR                                  :{WHITE} Caewyd y cyswllt oherwydd gwall protocol
+STR_NETWORK_ERROR_WRONG_REVISION                                :{WHITE} Nid y fersiwn y cleient yn cyfateb i fersiwn y gweinydd
+STR_NETWORK_ERROR_WRONG_PASSWORD                                :{WHITE} Cyfrinair anghywir
+STR_NETWORK_ERROR_SERVER_FULL                                   :{WHITE} Mae'r gweinydd yn llawn
+STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE} Rydych chi wedi'ch gwahardd o'r gweinydd hwn
+STR_NETWORK_ERROR_KICKED                                        :{WHITE} YCafoch chi eich cicio o'r gêm
+STR_NETWORK_ERROR_CHEATER                                       :{WHITE} Ni chaniateir twyllo ar y gweinydd hwn
 
 ############ Leave those lines in this order!!
-STR_NETWORK_ERR_CLIENT_GENERAL                                  :gwall cyffredinol
-STR_NETWORK_ERR_CLIENT_DESYNC                                   :gwall dadgydamseru
-STR_NETWORK_ERR_CLIENT_SAVEGAME                                 :methwyd llwytho'r map
-STR_NETWORK_ERR_CLIENT_CONNECTION_LOST                          :collwyd y cyswllt
-STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR                           :gwall protocol
-STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH                          :NewGRF ddim yn cyfateb
-STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED                           :heb ei awdurdodi
-STR_NETWORK_ERR_CLIENT_NOT_EXPECTED                             :wedi derbyn paced od
-STR_NETWORK_ERR_CLIENT_WRONG_REVISION                           :fersiwn anghywir
-STR_NETWORK_ERR_CLIENT_NAME_IN_USE                              :enw eisoes mewn defnydd
-STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD                           :cyfrinair anghywir
-STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH                         :id-cwmni anghywir yn DoCommand
-STR_NETWORK_ERR_CLIENT_KICKED                                   :wedi cael cic gan y gweinydd
-STR_NETWORK_ERR_CLIENT_CHEATER                                  :yn ceisio twyllo
-STR_NETWORK_ERR_CLIENT_SERVER_FULL                              :gweinydd llawn
+STR_NETWORK_ERROR_CLIENT_GENERAL                                :gwall cyffredinol
+STR_NETWORK_ERROR_CLIENT_DESYNC                                 :gwall dadgydamseru
+STR_NETWORK_ERROR_CLIENT_SAVEGAME                               :methwyd llwytho'r map
+STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST                        :collwyd y cyswllt
+STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR                         :gwall protocol
+STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH                        :NewGRF ddim yn cyfateb
+STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED                         :heb ei awdurdodi
+STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED                           :wedi derbyn paced od
+STR_NETWORK_ERROR_CLIENT_WRONG_REVISION                         :fersiwn anghywir
+STR_NETWORK_ERROR_CLIENT_NAME_IN_USE                            :enw eisoes mewn defnydd
+STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD                         :cyfrinair anghywir
+STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH                       :id-cwmni anghywir yn DoCommand
+STR_NETWORK_ERROR_CLIENT_KICKED                                 :wedi cael cic gan y gweinydd
+STR_NETWORK_ERROR_CLIENT_CHEATER                                :yn ceisio twyllo
+STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :gweinydd llawn
 ############ End of leave-in-this-order
 STR_NETWORK_SERVER_MESSAGE                                      :*** {2:STRING}
 ############ Leave those lines in this order!!
@@ -1453,15 +1453,15 @@ STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT                  :Gêm wedi'i sei
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT                :Gêm wedi'i ddadseibio (wedi cysylltu â chleient)
 STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT_FAIL           :Gêm wedi'i ddadseibio (wedi methu cysylltu â chleient)
 ############ End of leave-in-this-order
-STR_NETWORK_CLIENT_LEAVING                                      :wrthi'n gadael
-STR_NETWORK_CLIENT_JOINED                                       :*** Mae {STRING} wedi ymuno â'r gêm
-STR_NETWORK_CLIENT_COMPANY_JOIN                                 :*** Mae {STRING} wedi ymuno â chwmni #{2:NUM}
-STR_NETWORK_CLIENT_COMPANY_SPECTATE                             :*** Mae {STRING} wedi ymuno â'r gwylwyr
-STR_NETWORK_CLIENT_COMPANY_NEW                                  :*** Mae {STRING} wedi dechrau cwmni newydd (#{2:NUM})
-STR_NETWORK_CLIENT_LEFT                                         :*** Mae {STRING} wedi gadael y gêm ({2:STRING})
-STR_NETWORK_NAME_CHANGE                                         :*** Mae {STRING} wedi newid ei (h)enw i {STRING}
-STR_NETWORK_GIVE_MONEY                                          :*** Rhoddodd {STRING} {2:CURRENCY} i'ch cwmni
-STR_NETWORK_GAVE_MONEY_AWAY                                     :*** Fe roddoch chi {2:CURRENCY} {1:STRING}
+STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :wrthi'n gadael
+STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** Mae {STRING} wedi ymuno â'r gêm
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** Mae {STRING} wedi ymuno â chwmni #{2:NUM}
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** Mae {STRING} wedi ymuno â'r gwylwyr
+STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** Mae {STRING} wedi dechrau cwmni newydd (#{2:NUM})
+STR_NETWORK_MESSAGE_CLIENT_LEFT                                 :*** Mae {STRING} wedi gadael y gêm ({2:STRING})
+STR_NETWORK_MESSAGE_NAME_CHANGE                                 :*** Mae {STRING} wedi newid ei (h)enw i {STRING}
+STR_NETWORK_MESSAGE_GIVE_MONEY                                  :*** Rhoddodd {STRING} {2:CURRENCY} i'ch cwmni
+STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY                             :*** Fe roddoch chi {2:CURRENCY} {1:STRING}
 STR_NETWORK_CHAT_COMPANY_CAPTION                                :[Tîm] :
 STR_NETWORK_CHAT_COMPANY                                        :[Tîm] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_TO_COMPANY                                     :[Tîm] i {STRING}: {WHITE}{STRING}
@@ -1471,8 +1471,8 @@ STR_NETWORK_CHAT_TO_CLIENT                                      :[Preifat] To {S
 STR_NETWORK_CHAT_ALL_CAPTION                                    :[Pawb] :
 STR_NETWORK_CHAT_ALL                                            :[Pawb] {STRING}: {WHITE}{STRING}
 STR_NETWORK_CHAT_OSKTITLE                                       :{BLACK}teipiwch destun ar gyfer sgwrs rwydwaith
-STR_NETWORK_SERVER_SHUTDOWN                                     :{WHITE} caeodd y gweinydd y sesiwn
-STR_NETWORK_SERVER_REBOOT                                       :{WHITE} Mae'r gweinydd yn ailgychwyn...{}Arhoswch...
+STR_NETWORK_MESSAGE_SERVER_SHUTDOWN                             :{WHITE} caeodd y gweinydd y sesiwn
+STR_NETWORK_MESSAGE_SERVER_REBOOT                               :{WHITE} Mae'r gweinydd yn ailgychwyn...{}Arhoswch...
 
 STR_NETWORK_SERVER                                              :Gweinydd
 STR_NETWORK_CLIENT                                              :Cleient
@@ -1486,19 +1486,19 @@ STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY                         :Speak â chwmni
 STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT                          :Neges breifat
 
 
-STR_NETWORK_SEND                                                :{BLACK}Anfon
+STR_NETWORK_CHAT_SEND                                           :{BLACK}Anfon
 
 ############ end network gui strings
 
 ##### PNG-MAP-Loader
 
-STR_PNGMAP_ERROR                                                :{WHITE}Methwyd llwytho tirwedd o PNG...
-STR_PNGMAP_ERR_FILE_NOT_FOUND                                   :{WHITE}...ni ddaethpwyd o hyd i'r ffeil.
-STR_PNGMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nid oedd modd trosi math y ddelwedd. rhaid cael delwedd PNG 8 neu 24-bit.
-STR_PNGMAP_ERR_MISC                                             :{WHITE}...aeth rhywbeth o'i le (mwy na thebyg roedd y ffeil wedi'i llygru)
+STR_ERROR_PNGMAP                                                :{WHITE}Methwyd llwytho tirwedd o PNG...
+STR_ERROR_PNGMAP_FILE_NOT_FOUND                                 :{WHITE}...ni ddaethpwyd o hyd i'r ffeil.
+STR_ERROR_PNGMAP_IMAGE_TYPE                                     :{WHITE}...nid oedd modd trosi math y ddelwedd. rhaid cael delwedd PNG 8 neu 24-bit.
+STR_ERROR_PNGMAP_MISC                                           :{WHITE}...aeth rhywbeth o'i le (mwy na thebyg roedd y ffeil wedi'i llygru)
 
-STR_BMPMAP_ERROR                                                :{WHITE}Methu llwytho delwedd o BMP...
-STR_BMPMAP_ERR_IMAGE_TYPE                                       :{WHITE}...nid oedd modd trosi math y ddelwedd.
+STR_ERROR_BMPMAP                                                :{WHITE}Methu llwytho delwedd o BMP...
+STR_ERROR_BMPMAP_IMAGE_TYPE                                     :{WHITE}...nid oedd modd trosi math y ddelwedd.
 
 ##id 0x0800
 STR_INCOME_FLOAT_COST_SMALL                                     :{TINYFONT}{RED}Côst: {CURRENCY}
@@ -1512,13 +1512,13 @@ STR_MESSAGE_ESTIMATED_INCOME                                    :{WHITE}Amcangyf
 STR_ERROR_CAN_T_RAISE_LAND_HERE                                 :{WHITE}Does dim modd codi tir yma...
 STR_ERROR_CAN_T_LOWER_LAND_HERE                                 :{WHITE}Does dim modd gostwng tir yma...
 STR_ERROR_CAN_T_LEVEL_LAND_HERE                                 :{WHITE}Does dim modd lefelu tir yma...
-STR_CLEAR_LAND_DESCRIPTION_ROCKS                                :Creigiau
-STR_CLEAR_LAND_DESCRIPTION_ROUGH_LAND                           :Tir garw
-STR_CLEAR_LAND_DESCRIPTION_BARE_LAND                            :Tir moel
-STR_CLEAR_LAND_DESCRIPTION_GRASS                                :Gwair
-STR_CLEAR_LAND_DESCRIPTION_FIELDS                               :Caeau
-STR_CLEAR_LAND_DESCRIPTION_SNOW_COVERED_LAND                    :Tir ag eira
-STR_CLEAR_LAND_DESCRIPTION_DESERT                               :Anialdir
+STR_LAI_CLEAR_DESCRIPTION_ROCKS                                 :Creigiau
+STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND                            :Tir garw
+STR_LAI_CLEAR_DESCRIPTION_BARE_LAND                             :Tir moel
+STR_LAI_CLEAR_DESCRIPTION_GRASS                                 :Gwair
+STR_LAI_CLEAR_DESCRIPTION_FIELDS                                :Caeau
+STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Tir ag eira
+STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Anialdir
 
 ##id 0x1000
 STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION                        :{WHITE}Mae'r tir yn goleddu i'r cyfeiriad anghywir
@@ -1526,11 +1526,11 @@ STR_ERROR_IMPOSSIBLE_TRACK_COMBINATION                          :{WHITE}Cyfuniad
 STR_ERROR_EXCAVATION_WOULD_DAMAGE                               :{WHITE}Byddai cloddio yno'n difrodi twnnel
 STR_ERROR_ALREADY_AT_SEA_LEVEL                                  :{WHITE}Eisoes ar lefel y môr
 STR_ERROR_TOO_HIGH                                              :{WHITE}Rhy uchel
-STR_ALREADY_LEVELLED                                            :{WHITE}... mae eisoes yn fflat
+STR_ERROR_ALREADY_LEVELLED                                      :{WHITE}... mae eisoes yn fflat
 STR_ERROR_NO_SUITABLE_RAILROAD_TRACK                            :{WHITE}Dim trac rheilffordd addas
 STR_ERROR_ALREADY_BUILT                                         :{WHITE}...eisoes wedi'i adeiladu
 STR_ERROR_MUST_REMOVE_RAILROAD_TRACK                            :{WHITE}Rhaid tynnu'r trac rheilffordd yn gyntaf
-STR_ERR_CROSSING_ON_ONEWAY_ROAD                                 :{WHITE}Mae'r ffordd yn ffordd un-ffordd, neu wedi'i blocio
+STR_ERROR_CROSSING_ON_ONEWAY_ROAD                               :{WHITE}Mae'r ffordd yn ffordd un-ffordd, neu wedi'i blocio
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :{WHITE}Adeiladu Rheilffyrdd
 STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION                    :{WHITE}Adeiladu Rheilffyrdd Trydan
 STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION                  :{WHITE}Adeiladu Monoreilffyrdd
@@ -1554,41 +1554,41 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Adeiladu
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Adeiladu pont reilffordd
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Adeiladu twnnel rheilffordd
 STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Toglu adeiladu/tynnu ar gyfer traciau a signalau
-STR_BUILD_BRIDGE_SELECTION_TOOLTIP                              :{BLACK}Dewi pont - cliciwch ar y bont rydych chi'n dymuno ei hadeiladu
+STR_SELECT_BRIDGE_SELECTION_TOOLTIP                             :{BLACK}Dewi pont - cliciwch ar y bont rydych chi'n dymuno ei hadeiladu
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Dewiswch gyfeiriad depo rheilffordd
-STR_RAILROAD_TRACK                                              :Trac rheilffordd
-STR_RAILROAD_TRAIN_DEPOT                                        :Rheilffordd trên depo
+STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Trac rheilffordd
+STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Rheilffordd trên depo
 STR_ERROR_AREA_IS_OWNED_BY_ANOTHER                              :{WHITE}...mae'r ardal yn eiddo i gwmni arall
-STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS                          :Trac rheilffordd gyda signalau cyffredin
-STR_RAILROAD_TRACK_WITH_PRESIGNALS                              :Trac rheilffordd gyda chynsignalau
-STR_RAILROAD_TRACK_WITH_EXITSIGNALS                             :Trac rheilffordd gyda allsignalau
-STR_RAILROAD_TRACK_WITH_COMBOSIGNALS                            :Trac rheilffordd gyda chyfunsignalau
-STR_RAILROAD_TRACK_WITH_PBSSIGNALS                              :Trac rheilffordd gyda signalau llwybr
-STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS                          :Trac rheilffordd gyda signalau llwybr un-ffordd
-STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS                       :Trac rheilffordd gyda signalau bloc a rhagsignalau
-STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS                      :Trac rheilffordd gyda signalau bloc a signalau gadael
-STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS                     :Trac rheilffordd gyda signalau bloc a signalau cyfun
-STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS                       :Trac rheilffordd gyda signalau bloc a signalau llwybr
-STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS                   :Trac rheilffordd gyda signalau bloc a signalau llwybr un-ffordd
-STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS                         :Trac rheilffordd gyda rhagsignalau a signalau gadael
-STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS                        :Trac rheilffordd gyda rhagsignalau a signalau cyfun
-STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS                          :Trac rheilffordd gyda rhagsignalau a signalau llwybr
-STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS                      :Trac rheilffordd gyda rhagsignalau a signalau llwybr un-ffordd
-STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS                       :Trac rheilffordd gyda signalau gadael a signalau cyfun
-STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS                         :Trac rheilffordd gyda signalau gadaela signalau llwybr
-STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS                     :Trac rheilffordd gyda signalau gadael a signalau llwybr un-ffordd
-STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS                        :Trac rheilffordd gyda signalau cyfun a signalau llwybr
-STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS                    :Trac rheilffordd gyda signalau cyfuna signalau llwybr un-ffordd
-STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS                      :Trac rheilffordd gyda signalau llwybr a signalau llwybr un-ffordd
-STR_MUST_REMOVE_RAILWAY_STATION_FIRST                           :{WHITE}Rhaid dymchwel yr orsaf yn gyntaf
-STR_CREATE_SPLITTED_STATION                                     :{YELLOW}Adeiladu gorsaf ar wahân
-STR_SELECT_STATION_TO_JOIN                                      :{BLACK}Uno gorsaf
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Trac rheilffordd gyda signalau cyffredin
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Trac rheilffordd gyda chynsignalau
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Trac rheilffordd gyda allsignalau
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Trac rheilffordd gyda chyfunsignalau
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Trac rheilffordd gyda signalau llwybr
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Trac rheilffordd gyda signalau llwybr un-ffordd
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Trac rheilffordd gyda signalau bloc a rhagsignalau
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Trac rheilffordd gyda signalau bloc a signalau gadael
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Trac rheilffordd gyda signalau bloc a signalau cyfun
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Trac rheilffordd gyda signalau bloc a signalau llwybr
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Trac rheilffordd gyda signalau bloc a signalau llwybr un-ffordd
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Trac rheilffordd gyda rhagsignalau a signalau gadael
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Trac rheilffordd gyda rhagsignalau a signalau cyfun
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Trac rheilffordd gyda rhagsignalau a signalau llwybr
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Trac rheilffordd gyda rhagsignalau a signalau llwybr un-ffordd
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Trac rheilffordd gyda signalau gadael a signalau cyfun
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Trac rheilffordd gyda signalau gadaela signalau llwybr
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Trac rheilffordd gyda signalau gadael a signalau llwybr un-ffordd
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Trac rheilffordd gyda signalau cyfun a signalau llwybr
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Trac rheilffordd gyda signalau cyfuna signalau llwybr un-ffordd
+STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Trac rheilffordd gyda signalau llwybr a signalau llwybr un-ffordd
+STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST                     :{WHITE}Rhaid dymchwel yr orsaf yn gyntaf
+STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Adeiladu gorsaf ar wahân
+STR_JOIN_STATION_CAPTION                                        :{BLACK}Uno gorsaf
 
 
 
 ##id 0x1800
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Rhaid clirio'r ffordd yn gyntaf
-STR_ROAD_WORKS_IN_PROGRESS                                      :{WHITE}Mae gwaith yn cael ei wneud ar y ffordd
+STR_ERROR_ROAD_WORKS_IN_PROGRESS                                :{WHITE}Mae gwaith yn cael ei wneud ar y ffordd
 STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION                      :{WHITE}Adeiladu Ffyrdd
 STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION                      :{WHITE}Adeiladu Tramffordd
 STR_SELECT_ROAD_BRIDGE_CAPTION                                  :{WHITE}Dewiswch Bont Ffordd
@@ -1624,14 +1624,14 @@ STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL                   :{BLACK}Adeiladu
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD                    :{BLACK}Gweithredu/dadweithredu ffyrdd un-ffordd
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD           :{BLACK}toglu adeiladu/clirio ar gyfer adeiladu ffyrdd
 STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS       :{BLACK}Toglu adeiladu/dileu ar gyfer adeiladu tramffordd
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT              :{BLACK}Dewiswch gyfeiriad depo cerbyd ffordd
-STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT              :{BLACK}Dewis cyfeiriad y garej cerbyd tram
-STR_ROAD_DESCRIPTION_ROAD                                       :Ffordd
-STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                     :Ffordd gyda goleuadau stryd
-STR_ROAD_DESCRIPTION_TREE_LINED_ROAD                            :Ffordd gyda coed wedi'i plannu
-STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                         :Depo cerbyd ffordd
-STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING                   :Croesfan wastad ffordd/rheilffordd
-STR_ROAD_DESCRIPTION_TRAMWAY                                    :Tramffordd
+STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Dewiswch gyfeiriad depo cerbyd ffordd
+STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP                 :{BLACK}Dewis cyfeiriad y garej cerbyd tram
+STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Ffordd
+STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Ffordd gyda goleuadau stryd
+STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD                        :Ffordd gyda coed wedi'i plannu
+STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT                     :Depo cerbyd ffordd
+STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING               :Croesfan wastad ffordd/rheilffordd
+STR_LAI_ROAD_DESCRIPTION_TRAMWAY                                :Tramffordd
 STR_ERROR_CAN_T_REMOVE_BUS_STATION                              :{WHITE}Methu dileu gorsaf fysiau...
 STR_ERROR_CAN_T_REMOVE_TRUCK_STATION                            :{WHITE}Methu dileu gorsaf lorïau...
 STR_ERROR_CAN_T_REMOVE_PASSENGER_TRAM_STATION                   :{WHITE}Methu dileu gorsaf tramiau teithwyr...
@@ -1639,12 +1639,12 @@ STR_ERROR_CAN_T_REMOVE_CARGO_TRAM_STATION                       :{WHITE}Methu di
 
 ##id 0x2000
 STR_TOWN_DIRECTORY_CAPTION                                      :{WHITE}Trefi
-STR_TOWN_LABEL_POP                                              :{WHITE}{TOWN} ({COMMA})
-STR_TOWN_LABEL                                                  :{WHITE}{TOWN}
-STR_TOWN_LABEL_TINY_BLACK                                       :{TINYFONT}{BLACK}{TOWN}
-STR_TOWN_LABEL_TINY_WHITE                                       :{TINYFONT}{WHITE}{TOWN}
-STR_SIGN_SMALL_BLACK                                            :{TINYFONT}{BLACK}{SIGN}
-STR_SIGN_SMALL_WHITE                                            :{TINYFONT}{WHITE}{SIGN}
+STR_VIEWPORT_TOWN_POP                                           :{WHITE}{TOWN} ({COMMA})
+STR_VIEWPORT_TOWN                                               :{WHITE}{TOWN}
+STR_VIEWPORT_TOWN_TINY_BLACK                                    :{TINYFONT}{BLACK}{TOWN}
+STR_VIEWPORT_TOWN_TINY_WHITE                                    :{TINYFONT}{WHITE}{TOWN}
+STR_VIEWPORT_SIGN_SMALL_BLACK                                   :{TINYFONT}{BLACK}{SIGN}
+STR_VIEWPORT_SIGN_SMALL_WHITE                                   :{TINYFONT}{WHITE}{SIGN}
 STR_ERROR_BUILDING_MUST_BE_DEMOLISHED                           :{WHITE}Rhaid dymchwel adeilad yn gyntaf
 STR_TOWN_VIEW_TOWN_CAPTION                                      :{WHITE}{TOWN}
 STR_TOWN_VIEW_CITY_CAPTION                                      :{WHITE}{TOWN} (Dinas)
@@ -1657,9 +1657,9 @@ STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Canoli'r
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}newid enw'r dref
 STR_TOWN_VIEW_PASSENGERS_LAST_MONTH_MAX                         :{BLACK}teithiwr mis diwethaf: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
 STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Post mis diwethaf: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
-STR_CARGO_FOR_TOWNGROWTH                                        :{BLACK}Cargo angen i tyfi'r tref:
-STR_CARGO_FOR_TOWNGROWTH_REQUIRED                               :{SETX 20}{ORANGE}{STRING}{BLACK} angen
-STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH                             :{SETX 20}{ORANGE}{CARGO}{BLACK} dosbarthu mis diwethaf
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Cargo angen i tyfi'r tref:
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{SETX 20}{ORANGE}{STRING}{BLACK} angen
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH                   :{SETX 20}{ORANGE}{CARGO}{BLACK} dosbarthu mis diwethaf
 STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1                      :Bloc swyddfa uchel
 STR_TOWN_BUILDING_NAME_OFFICE_BLOCK_1                           :Bloc swyddfa
 STR_TOWN_BUILDING_NAME_SMALL_BLOCK_OF_FLATS_1                   :Bloc bach o fflatiau
@@ -1696,7 +1696,7 @@ STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIGFONT}{BLACK
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STATION} i {STATION} yn talu teirgwaith yn fwy am y flwyddyn nesaf!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE                      :{BIGFONT}{BLACK}Cymhorthdal wedi ei ddyfarnu i {STRING}! Bydd y gwasanaeth {}{}{STRING} o {STATION} i {STATION} yn talu pedair gwaith yn fwy am y flwyddyn nesaf!
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}Mae awdurdod lleol {TOWN} yn gwrthod caniatáu i faes awyr arall gael ei adeiladu ger y dref hon
-STR_LOCAL_AUTHORITY_REFUSES_NOISE                               :{WHITE}Mae awdurdod lleol {TOWN} wedi gwrthod caniatâd ar gyfer maes awyr oherwydd pryderon ynglŷn â sw^n
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}Mae awdurdod lleol {TOWN} wedi gwrthod caniatâd ar gyfer maes awyr oherwydd pryderon ynglŷn â sw^n
 STR_TOWN_BUILDING_NAME_COTTAGES_1                               :Bythynnod
 STR_TOWN_BUILDING_NAME_HOUSES_1                                 :Tai
 STR_TOWN_BUILDING_NAME_FLATS_1                                  :Fflatiau
@@ -1732,7 +1732,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{WHITE}{STRING}
 STR_NEWS_ROAD_REBUILDING                                        :{BIGFONT}{BLACK}Anrhefn traffig yn {TOWN}!{}{}Daw gwaith ffordd a ariannwyd gan {STRING} â 6 mis o boen i deithwyr ffordd y dref!
 STR_SMALLMAP_TOWN                                               :{TINYFONT}{WHITE}{TOWN}
 STR_TOWN_DIRECTORY_TOWN                                         :{ORANGE}{TOWN}{BLACK} ({COMMA})
-STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION                         :{STRING} (wrthi'n cael ei adeiladu)
+STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION            :{STRING} (wrthi'n cael ei adeiladu)
 STR_TOWN_BUILDING_NAME_IGLOO_1                                  :Iglw
 STR_TOWN_BUILDING_NAME_TEPEES_1                                 :Tipi
 STR_TOWN_BUILDING_NAME_TEAPOT_HOUSE_1                           :TÅ· Tebot
@@ -1745,17 +1745,17 @@ STR_LANDSCAPING_MENU_PLACE_SIGN                                 :Gosod arwydd
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Coed
 STR_ERROR_TREE_ALREADY_HERE                                     :{WHITE}...coeden eisoes yma
 STR_ERROR_CAN_T_PLANT_TREE_HERE                                 :{WHITE}Methu plannu coeden yma...
-STR_SIGN_WHITE                                                  :{WHITE}{SIGN}
+STR_WHITE_SIGN                                                  :{WHITE}{SIGN}
 STR_ERROR_TOO_MANY_SIGNS                                        :{WHITE}...gormod o arwyddion
 STR_ERROR_CAN_T_PLACE_SIGN_HERE                                 :{WHITE}Methu gosod arwydd yma...
-STR_SIGN_DEFAULT                                                :Arwydd
+STR_DEFAULT_SIGN_NAME                                           :Arwydd
 STR_EDIT_SIGN_CAPTION                                           :{WHITE}Golygu testun arwydd
 STR_ERROR_CAN_T_CHANGE_SIGN_NAME                                :{WHITE}Methu newid enw arwydd...
 STR_ERROR_CAN_T_DELETE_SIGN                                     :{WHITE}Methu dileu arwydd...
 STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Dewiswch y math o goeden i'w phlannu
-STR_TREE_NAME_TREES                                             :Coed
-STR_TREE_NAME_RAINFOREST                                        :Coedwig law
-STR_TREE_NAME_CACTUS_PLANTS                                     :Planhigion Cactws
+STR_LAI_TREE_NAME_TREES                                         :Coed
+STR_LAI_TREE_NAME_RAINFOREST                                    :Coedwig law
+STR_LAI_TREE_NAME_CACTUS_PLANTS                                 :Planhigion Cactws
 
 ##id 0x3000
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Dewiswch Orsaf Reilffordd
@@ -1775,7 +1775,7 @@ STR_ERROR_MUST_DEMOLISH_RAILROAD                                :{WHITE}Rhaid dy
 STR_ERROR_TOO_CLOSE_TO_ANOTHER_AIRPORT                          :{WHITE}Rhy agos i faes awyr arall
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Rhaid dymchwel maes awyr yn gyntaf
 
-STR_QUERY_RENAME_STATION_CAPTION                                :Ailenwi gorsaf/ardal lwytho
+STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Ailenwi gorsaf/ardal lwytho
 STR_ERROR_CAN_T_RENAME_STATION                                  :{WHITE}Methu ailenwi gorsaf...
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Perfformiad
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Derbyn
@@ -1793,10 +1793,10 @@ STR_CARGO_RATING_OUTSTANDING                                    :Rhagorol
 ############ range for rating ends
 
 ### station view strings
-STR_SCHEDULED_TRAINS_TIP                                        :{BLACK}Dangos pob trên sydd â'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_ROAD_VEHICLES_TIP                                 :{BLACK}Dangos pob cerbyd ffordd sydd â'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_AIRCRAFT_TIP                                      :{BLACK}Dangos pob awyren sydd â'r orsaf hon yn eu hamserlen
-STR_SCHEDULED_SHIPS_TIP                                         :{BLACK}Dangos pob llong sydd â'r orsaf hon yn eu hamserlen
+STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP                       :{BLACK}Dangos pob trên sydd â'r orsaf hon yn eu hamserlen
+STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP                :{BLACK}Dangos pob cerbyd ffordd sydd â'r orsaf hon yn eu hamserlen
+STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP                     :{BLACK}Dangos pob awyren sydd â'r orsaf hon yn eu hamserlen
+STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP                        :{BLACK}Dangos pob llong sydd â'r orsaf hon yn eu hamserlen
 
 STR_STATION_VIEW_CARGO_RATING                                   :{WHITE}{STRING}: {YELLOW}{STRING} ({COMMA}%)
 STR_NEWS_STATION_NO_LONGER_ACCEPTS_CARGO                        :{WHITE}Nid yw {STATION} bellach yn derbyn {STRING}
@@ -1829,47 +1829,47 @@ STR_STATION_VIEW_RENAME_TOOLTIP                                 :{BLACK}Newid en
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Dangos rhestr o'r llwythi sy'n cael eu derbyn
 STR_STATION_LIST_TOOLTIP                                        :{BLACK}Enwau Gorsafoedd - cliciwch ar enw i ganoli'r brif olygfa ar yr orsaf
 STR_STATION_BUILD_AIRPORT_TOOLTIP                               :{BLACK}Dewiswch maint/math y maes awyr
-STR_STATION_SIGN                                                :{STATION} {STATIONFEATURES}
-STR_STATION_SIGN_TINY                                           :{TINYFONT}{STATION}
-STR_STATION_DESCRIPTION_RAILROAD_STATION                        :Gorsaf reilffordd
-STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR                         :Awyrendy
-STR_STATION_DESCRIPTION_AIRPORT                                 :Maes awyr
-STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA                      :Ardal llwytho lorïau
-STR_STATION_DESCRIPTION_BUS_STATION                             :Gorsaf fysiau
-STR_STATION_DESCRIPTION_SHIP_DOCK                               :Doc llongau
+STR_VIEWPORT_STATION                                            :{STATION} {STATIONFEATURES}
+STR_VIEWPORT_STATION_TINY                                       :{TINYFONT}{STATION}
+STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION                    :Gorsaf reilffordd
+STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR                     :Awyrendy
+STR_LAI_STATION_DESCRIPTION_AIRPORT                             :Maes awyr
+STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Ardal llwytho lorïau
+STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Gorsaf fysiau
+STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Doc llongau
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Amlygu'r ardal fydd yn cael ei ddylanwadu
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Peidio amlygu'r ardal fydd yn cael ei ddylanwadu
 STR_STATION_BUILD_COVERAGE_AREA_TITLE                           :{BLACK}Amlygu ardal ddylanwad
 STR_STATION_BUILD_DOCK_CAPTION                                  :{WHITE}Doc
-STR_STATION_DESCRIPTION_BUOY                                    :Bwi
+STR_LAI_STATION_DESCRIPTION_BUOY                                :Bwi
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}...bwi yn y ffordd
 STR_ERROR_STATION_TOO_SPREAD_OUT                                :{WHITE}...mae'r orsaf yn rhy wasgaredig
-STR_NONUNIFORM_STATIONS_DISALLOWED                              :{WHITE}...analluogwyd gorsafoedd anunffurf
-STR_USE_CTRL_TO_SELECT_MORE                                     :{BLACK}Gwasgwch a daliwch CTRL i ddewis mwy nag un
+STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED                        :{WHITE}...analluogwyd gorsafoedd anunffurf
+STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE                        :{BLACK}Gwasgwch a daliwch CTRL i ddewis mwy nag un
 
 STR_UNDEFINED                                                   :(llinyn anniffiniedig)
-STR_STAT_CLASS_DFLT                                             :Gorsaf Ddiofyn
-STR_STAT_CLASS_WAYP                                             :Pwyntiau llwybr
+STR_STATION_CLASS_DFLT                                          :Gorsaf Ddiofyn
+STR_STATION_CLASS_WAYP                                          :Pwyntiau llwybr
 
 ##id 0x3800
 STR_DEPOT_BUILD_SHIP_CAPTION                                    :{WHITE}Cyfeiriad Depo Llong
 STR_ERROR_MUST_BE_BUILT_ON_WATER                                :{WHITE}...rhaid ei adeiladu ar ddŵr
 STR_ERROR_CAN_T_BUILD_SHIP_DEPOT                                :{WHITE}Methu adeiladu depo llong yma...
 STR_DEPOT_BUILD_SHIP_ORIENTATION_TOOLTIP                        :{BLACK}Dewiswch gyfeiriad y depo llong
-STR_WATER_DESCRIPTION_WATER                                     :Dŵr
-STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK                        :Arfordir neu lan afon
-STR_WATER_DESCRIPTION_SHIP_DEPOT                                :Depo Llong
-STR_BRIDGE_DESCRIPTION_AQUEDUCT                                 :Traphont
+STR_LAI_WATER_DESCRIPTION_WATER                                 :Dŵr
+STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK                    :Arfordir neu lan afon
+STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT                            :Depo Llong
+STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT                             :Traphont
 STR_ERROR_CAN_T_BUILD_ON_WATER                                  :{WHITE}...Methu adeiladu ar ddŵr
-STR_MUST_DEMOLISH_CANAL_FIRST                                   :{WHITE}Rhaid dymchwel camlas yn gyntaf
+STR_ERROR_MUST_DEMOLISH_CANAL_FIRST                             :{WHITE}Rhaid dymchwel camlas yn gyntaf
 
 ##id 0x4000
 STR_SAVELOAD_SAVE_CAPTION                                       :{WHITE}Cadw Gêm
 STR_SAVELOAD_LOAD_CAPTION                                       :{WHITE}Llwytho Gêm
 STR_SAVELOAD_SAVE_BUTTON                                        :{BLACK}Cadw
 STR_SAVELOAD_DELETE_BUTTON                                      :{BLACK}Dileu
-STR_DEFAULT_SAVEGAME_NAME                                       :{COMPANY}, {STRING}
-STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME                            :Gwyliwr, {SKIP}{STRING}
+STR_SAVEGAME_NAME_DEFAULT                                       :{COMPANY}, {STRING}
+STR_SAVEGAME_NAME_SPECTATOR                                     :Gwyliwr, {SKIP}{STRING}
 STR_SAVELOAD_BYTES_FREE                                         :{BLACK}{BYTES} yn rhydd
 STR_ERROR_UNABLE_TO_READ_DRIVE                                  :{BLACK}Methu darllen y gyriant
 STR_ERROR_GAME_SAVE_FAILED                                      :{WHITE}Methwyd â Chadw Gêm{}{STRING}
@@ -1885,12 +1885,12 @@ STR_SAVELOAD_LIST_TOOLTIP                                       :{BLACK}Rhestr o
 STR_SAVELOAD_EDITBOX_TOOLTIP                                    :{BLACK}Enw sydd wedi'i dewis ar gyfer gêm wedi'i chadw
 STR_SAVELOAD_DELETE_TOOLTIP                                     :{BLACK}Dileu'r gêm wedi'i chadw sydd wedi'i dewis
 STR_SAVELOAD_SAVE_TOOLTIP                                       :{BLACK}Cadw'r gêm hwn gan ddefnyddio'r enw sydd wedi'i dewis
-STR_NETWORK_SERVER_RANDOM_GAME                                  :Cynhyrchu gêm newydd ar hap
-STR_LOAD_HEIGHTMAP                                              :{WHITE}Llwytho Heightmap
-STR_SAVE_OSKTITLE                                               :{BLACK}Rhowch enw ar gyfer y gêm a gadwyd
+STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME                     :Cynhyrchu gêm newydd ar hap
+STR_SAVELOAD_LOAD_HEIGHTMAP                                     :{WHITE}Llwytho Heightmap
+STR_SAVELOAD_OSKTITLE                                           :{BLACK}Rhowch enw ar gyfer y gêm a gadwyd
 
 ##id 0x4800
-STR_OBJECT_IN_THE_WAY                                           :{WHITE}{STRING} yn y ffordd
+STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY                           :{WHITE}{STRING} yn y ffordd
 STR_INDUSTRY_VIEW_CAPTION                                       :{WHITE}{INDUSTRY}
 STR_INDUSTRY_NAME_COAL_MINE                                     :Gorsaf Lo
 STR_INDUSTRY_NAME_POWER_STATION                                 :Gorsaf Bŵer
@@ -1948,7 +1948,7 @@ STR_INDUSTRY_VIEW_TRANSPORTED                                   :{YELLOW}{CARGO}
 STR_INDUSTRY_VIEW_LOCATION_TOOLTIP                              :{BLACK}Canoli'r brif olygfa ar y diwydiant
 STR_NEWS_INDUSTRY_CONSTRUCTION                                  :{BIGFONT}{BLACK}{STRING} newydd wrthi'n cael ei adeiladu wrth {TOWN}!
 STR_NEWS_INDUSTRY_PLANTED                                       :{BIGFONT}{BLACK}{STRING} newydd wrthi'n cael ei phlannu wrth {TOWN}!
-STR_INDUSTRY_BUILD_COST                                         :{BLACK}Côst: {YELLOW}{CURRENCY}
+STR_FUND_INDUSTRY_INDUSTRY_BUILD_COST                           :{BLACK}Côst: {YELLOW}{CURRENCY}
 STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY                         :{WHITE}Does dim modd adeiladu diwydiant o'r math hwn yma...
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}...dim ond uwch ben y llinell eira mae modd plannu fforest
 STR_NEWS_INDUSTRY_CLOSURE_GENERAL                               :{BIGFONT}{BLACK}Mae {STRING} yn datgan eu bod ar fin cau!
@@ -1966,16 +1966,16 @@ STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_SMOOTH                    :{BIGFONT}{BLACK
 
 ##id 0x5000
 STR_ERROR_ANOTHER_TUNNEL_IN_THE_WAY                             :{WHITE}mae twnnel arall yn y ffordd
-STR_TUNNEL_THROUGH_MAP_BORDER                                   :{WHITE}Byddai'r twnel yn gorffen y tu allan i'r map
+STR_ERROR_TUNNEL_THROUGH_MAP_BORDER                             :{WHITE}Byddai'r twnel yn gorffen y tu allan i'r map
 STR_ERROR_UNABLE_TO_EXCAVATE_LAND                               :{WHITE}Does dim modd cloddio'r tir ar ben arall y twnnel
 STR_ERROR_MUST_DEMOLISH_TUNNEL_FIRST                            :{WHITE}Rhaid dymchwel twnnel yn gyntaf
 STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST                            :{WHITE}Rhaid dymchwel pont yn gyntaf
-STR_ERROR_CANNOT_START_AND_END_ON                               :{WHITE}Does dim modd cychwyn a gorffen yn yr un man
-STR_BRIDGEHEADS_NOT_SAME_HEIGHT                                 :{WHITE}Nid yw dau ben y bont ar yr un lefel
-STR_BRIDGE_TOO_LOW_FOR_TERRAIN                                  :{WHITE}Mae'r bont yn rhy isel ar gyfer y tirwedd
+STR_ERROR_CAN_T_START_AND_END_ON                                :{WHITE}Does dim modd cychwyn a gorffen yn yr un man
+STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT                           :{WHITE}Nid yw dau ben y bont ar yr un lefel
+STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN                            :{WHITE}Mae'r bont yn rhy isel ar gyfer y tirwedd
 STR_ERROR_START_AND_END_MUST_BE_IN                              :{WHITE}Rhaid i'r cychwyn a'r diwedd fod mewn llinell
 STR_ERROR_SITE_UNSUITABLE_FOR_TUNNEL                            :{WHITE}Mae'r safle'n anaddas ar gyfer mynedfa twnnel
-STR_BUILD_BRIDGE_INFO                                           :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
+STR_SELECT_BRIDGE_INFO                                          :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
 STR_BRIDGE_NAME_SUSPENSION_STEEL                                :Crog, Dur
 STR_BRIDGE_NAME_GIRDER_STEEL                                    :Hytrawst, Dur
 STR_BRIDGE_NAME_CANTILEVER_STEEL                                :Canttilifer, Dur
@@ -1986,30 +1986,30 @@ STR_BRIDGE_NAME_TUBULAR_STEEL                                   :Tiwbaidd, Dur
 STR_BRIDGE_TUBULAR_SILICON                                      :Tiwbaidd, Silicon
 STR_ERROR_CAN_T_BUILD_BRIDGE_HERE                               :{WHITE}Methu adeiladu pont yma...
 STR_ERROR_CAN_T_BUILD_TUNNEL_HERE                               :{WHITE}Methu adeiladu twnnel yma...
-STR_TUNNEL_DESCRIPTION_RAILROAD                                 :Twnnel rheilffordd
-STR_TUNNEL_DESCRIPTION_ROAD                                     :Twnnel ffordd
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                    :Pont reilffordd grog o ddur
-STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                       :Pont reilffordd hytrawst o ddur
-STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                    :Pont reilffordd cantilifer o ddur
-STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE                 :Pont reilffordd grog o goncrit cyfnerth
-STR_BRIDGE_DESCRIPTION_RAIL_WOODEN                              :Pont reilffordd bren
-STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE                            :Pont reilffordd goncrit
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                    :Pont ffordd grog o ddur
-STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                        :Pont ffordd hytrawst o ddur
-STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                    :Pont ffordd cantilifer o ddur
-STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE                 :Pont ffordd grog o goncrit cyfnerth
-STR_BRIDGE_DESCRIPTION_ROAD_WOODEN                              :Pont ffordd bren
-STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE                            :Pont ffordd goncrit
-STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                       :Pont reilffordd diwbaidd
-STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                       :Pont ffordd diwbaidd
+STR_LAI_TUNNEL_DESCRIPTION_RAILROAD                             :Twnnel rheilffordd
+STR_LAI_TUNNEL_DESCRIPTION_ROAD                                 :Twnnel ffordd
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL                :Pont reilffordd grog o ddur
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE                   :Pont reilffordd hytrawst o ddur
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL                :Pont reilffordd cantilifer o ddur
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE             :Pont reilffordd grog o goncrit cyfnerth
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN                          :Pont reilffordd bren
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE                        :Pont reilffordd goncrit
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL                :Pont ffordd grog o ddur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL                    :Pont ffordd hytrawst o ddur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL                :Pont ffordd cantilifer o ddur
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE             :Pont ffordd grog o goncrit cyfnerth
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN                          :Pont ffordd bren
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE                        :Pont ffordd goncrit
+STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL                   :Pont reilffordd diwbaidd
+STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL                   :Pont ffordd diwbaidd
 
 ##id 0x5800
 STR_ERROR_OBJECT_IN_THE_WAY                                     :{WHITE}Gwrthrych yn y ffordd
-STR_UNMOVABLE_DESCRIPTION_TRANSMITTER                           :Darlledydd
-STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                            :Goleudy
-STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS                  :Pencadlys Cwmni
+STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER                       :Darlledydd
+STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE                        :Goleudy
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS              :Pencadlys Cwmni
 STR_ERROR_COMPANY_HEADQUARTERS_IN                               :{WHITE}...pencadlys cwmni yn y ffordd
-STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                    :Tir mae cwmni berchen
+STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND                :Tir mae cwmni berchen
 STR_ERROR_CAN_T_PURCHASE_THIS_LAND                              :{WHITE}Does dim modd prynu'r darn yma o dir...
 STR_ERROR_YOU_ALREADY_OWN_IT                                    :{WHITE}...rydych chi eisoes yn berchen arno!
 
@@ -2055,7 +2055,7 @@ STR_SV_STNAME_FALLBACK                                          :{STRING} Gorsaf
 
 ##id 0x6800
 STR_DIFFICULTY_LEVEL_CAPTION                                    :{WHITE}Lefel Anhawster
-STR_OPTIONS_SAVE_CHANGES                                        :{BLACK}Cadw
+STR_DIFFICULTY_LEVEL_SAVE                                       :{BLACK}Cadw
 
 ############ range for difficulty levels starts
 STR_DIFFICULTY_LEVEL_EASY                                       :{BLACK}Hawdd
@@ -2128,8 +2128,8 @@ STR_COMPANY_VIEW_COLOUR_SCHEME_TITLE                            :{GOLD}Cynllun L
 STR_LIVERY_CAPTION                                              :{WHITE}Cynllun Lliw Newydd
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Enw Cwmni
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Enw Rheolwr
-STR_QUERY_COMPANY_NAME_CAPTION                                  :Enw Cwmni
-STR_QUERY_PRESIDENT_S_NAME_CAPTION                              :Enw Rheolwr
+STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Enw Cwmni
+STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Enw Rheolwr
 STR_ERROR_CAN_T_CHANGE_COMPANY_NAME                             :{WHITE}Does dim modd newid enw'r cwmni...
 STR_ERROR_CAN_T_CHANGE_PRESIDENT                                :{WHITE}Does dim modd newid enw'r rheolwr...
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Cyllid {BLACK}{COMPANYNUM}
@@ -2153,11 +2153,11 @@ STR_FINANCES_POSITIVE_INCOME                                    :{BLACK}+{CURREN
 STR_FINANCES_TOTAL_CAPTION                                      :{WHITE}Cyfanswm:
 STR_COMPANY_NAME_COMPANY_NUM                                    :{COMPANY}{COMPANYNUM}
 STR_GRAPH_INCOME_CAPTION                                        :{WHITE}Graff Incwm
-STR_CURRCOMPACT                                                 :{CURRCOMPACT}
+STR_JUST_CURRCOMPACT                                            :{CURRCOMPACT}
 STR_GRAPH_OPERATING_PROFIT_CAPTION                              :{WHITE}Graff Elw Gweithredu
 STR_FINANCES_BANK_BALANCE_TITLE                                 :{WHITE}Balans Banc
 STR_FINANCES_LOAN_TITLE                                         :{WHITE}Benthyciad
-STR_MAX_LOAN                                                    :{WHITE}Uchafswm Benthyciad:  {BLACK}{CURRENCY}
+STR_FINANCES_MAX_LOAN                                           :{WHITE}Uchafswm Benthyciad:  {BLACK}{CURRENCY}
 STR_FINANCES_TOTAL_CURRENCY                                     :{BLACK}{CURRENCY}
 STR_FINANCES_BORROW_BUTTON                                      :{BLACK}Benthyg {SKIP}{SKIP}{CURRENCY}
 STR_FINANCES_REPAY_BUTTON                                       :{BLACK}Ad-dalu {SKIP}{SKIP}{CURRENCY}
@@ -2166,7 +2166,7 @@ STR_ERROR_CAN_T_BORROW_ANY_MORE_MONEY                           :{WHITE}Does dim
 STR_ERROR_LOAN_ALREADY_REPAYED                                  :{WHITE}...nid oes benthyciad i'w ad-dalu
 STR_ERROR_CURRENCY_REQUIRED                                     :{WHITE}...angen {CURRENCY}
 STR_ERROR_CAN_T_REPAY_LOAN                                      :{WHITE}Does dim modd ad-dalu benthyciad...
-STR_INSUFFICIENT_FUNDS                                          :{WHITE}Does dim modd rhoi arian sydd wedi ei fenthyg gan y banc i ffwrdd...
+STR_ERROR_INSUFFICIENT_FUNDS                                    :{WHITE}Does dim modd rhoi arian sydd wedi ei fenthyg gan y banc i ffwrdd...
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Dewiswch wyneb newydd ar gyfer y rheolwr
 STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Newid lifrau cerbydau'r cwmni
 STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Newid enw'r rheolwr
@@ -2176,10 +2176,10 @@ STR_FINANCES_REPAY_TOOLTIP                                      :{BLACK}Ad-dalu
 STR_COMPANY_VIEW_PRESIDENT_MANAGER_TITLE                        :{WHITE}{PRESIDENTNAME}{}{GOLD}(Rheolwr)
 STR_COMPANY_VIEW_INAUGURATED_TITLE                              :{GOLD}Sefydlwyd: {WHITE}{NUM}
 STR_COMPANY_VIEW_VEHICLES_TITLE                                 :{GOLD}Cerbydau:
-STR_TRAINS                                                      :{WHITE}{COMMA} tr{P "ên" enau}
-STR_ROAD_VEHICLES                                               :{WHITE}{COMMA} cerbyd{P "" au} ffordd
-STR_AIRCRAFT                                                    :{WHITE}{COMMA} awyren{P "" nau}
-STR_SHIPS                                                       :{WHITE}{COMMA} llong{P "" au}
+STR_COMPANY_VIEW_TRAINS                                         :{WHITE}{COMMA} tr{P "ên" enau}
+STR_COMPANY_VIEW_ROAD_VEHICLES                                  :{WHITE}{COMMA} cerbyd{P "" au} ffordd
+STR_COMPANY_VIEW_AIRCRAFT                                       :{WHITE}{COMMA} awyren{P "" nau}
+STR_COMPANY_VIEW_SHIPS                                          :{WHITE}{COMMA} llong{P "" au}
 STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Dim
 STR_FACE_CAPTION                                                :{WHITE}Dewiswch Wyneb
 STR_FACE_MALE_BUTTON                                            :{BLACK}Gwrywaidd
@@ -2192,9 +2192,9 @@ STR_FACE_FEMALE_TOOLTIP                                         :{BLACK}Dewis wy
 STR_FACE_NEW_FACE_TOOLTIP                                       :{BLACK}Cynhyrchu wyneb newydd ar hap
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Allwedd
 STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Dangos allwedd i'r graffiau
-STR_SHOW_DETAILED_PERFORMANCE_RATINGS                           :{BLACK}Dangos manwl amcangyfrif perfformiad
+STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP                            :{BLACK}Dangos manwl amcangyfrif perfformiad
 STR_GRAPH_KEY_CAPTION                                           :{WHITE}Allwedd i'r graffiau cwmni
-STR_GRAPH_KEY_COMPANY_SELECTION                                 :{BLACK}Cliciwch yma i doglu cofnod cwmni ymlaen neu i ffwrdd
+STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP                         :{BLACK}Cliciwch yma i doglu cofnod cwmni ymlaen neu i ffwrdd
 STR_GRAPH_CARGO_DELIVERED_CAPTION                               :{WHITE}Llwythi wedi'u cludo (mewn unedau)
 STR_GRAPH_COMPANY_PERFORMANCE_RATINGS_CAPTION                   :{WHITE}Graddfeydd Perfformiad Cwmni (gradd uchaf=1000)
 STR_GRAPH_COMPANY_VALUES_CAPTION                                :{WHITE}Gwerth Cwmnïau
@@ -2228,23 +2228,23 @@ STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_PRESIDENT                  :Llywydd
 STR_COMPANY_LEAGUE_PERFORMANCE_TITLE_TYCOON                     :Teicŵn
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Adeiladu Pencadlys
 STR_COMPANY_VIEW_BUILD_HQ_TOOLTIP                               :{BLACK}Adeiladu pencadlys cwmni
-STR_RELOCATE_COMPANY_HEADQUARTERS                               :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni
+STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS                  :{BLACK}Ailadeiladu pencadlys cwmni mewn man arall am 1% o werth y cwmni
 STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS                      :{WHITE}Methu adeiladu pencadlys cwmni...
 STR_COMPANY_VIEW_VIEW_HQ_BUTTON                                 :{BLACK}Gweld pencadlys cwmni
-STR_RELOCATE_HQ                                                 :{BLACK}Ail-leoli pencadlys cwmni
-STR_COMPANY_JOIN                                                :{BLACK}Ymuno
-STR_COMPANY_JOIN_TIP                                            :{BLACK}Ymuno a chwarae fel y cwmni hwn
-STR_COMPANY_PASSWORD                                            :{BLACK}Cyfrinair
-STR_COMPANY_PASSWORD_TOOLTIP                                    :{BLACK}Cyfrinair - diogelwch eich cwmni er mwyn rhwystro defnyddwyr heb awdurdod rhag ymuno.
-STR_SET_COMPANY_PASSWORD                                        :{BLACK}Gosod cyfrinair cwmni
+STR_COMPANY_VIEW_RELOCATE_HQ                                    :{BLACK}Ail-leoli pencadlys cwmni
+STR_COMPANY_VIEW_JOIN                                           :{BLACK}Ymuno
+STR_COMPANY_VIEW_JOIN_TOOLTIP                                   :{BLACK}Ymuno a chwarae fel y cwmni hwn
+STR_COMPANY_VIEW_PASSWORD                                       :{BLACK}Cyfrinair
+STR_COMPANY_VIEW_PASSWORD_TOOLTIP                               :{BLACK}Cyfrinair - diogelwch eich cwmni er mwyn rhwystro defnyddwyr heb awdurdod rhag ymuno.
+STR_COMPANY_VIEW_SET_PASSWORD                                   :{BLACK}Gosod cyfrinair cwmni
 STR_COMPANY_PASSWORD_CANCEL                                     :{BLACK}Peidio cadw'r cyfrinair a roddwyd
 STR_COMPANY_PASSWORD_OK                                         :{BLACK}Rhoi'r cyfrinair newydd i'r cwmni
 STR_COMPANY_PASSWORD_CAPTION                                    :{WHITE}Cyfrinair cwmni
-STR_MAKE_DEFAULT_COMPANY_PASSWORD                               :{BLACK}Cyfrinair rhagosodedig cwmni
-STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP                           :{BLACK}Defnyddio'r cyfrinair cwmni hwn fel y rhagosodiad ar gyfer cwmnïau
+STR_COMPANY_PASSWORD_MAKE_DEFAULT                               :{BLACK}Cyfrinair rhagosodedig cwmni
+STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP                       :{BLACK}Defnyddio'r cyfrinair cwmni hwn fel y rhagosodiad ar gyfer cwmnïau
 STR_NEWS_BEGIN_OF_RECESSION                                     :{BIGFONT}{BLACK}Dirwasgiad Byd-eang!{}{}Mae arbenigwyr ariannol yn ofni'r gwaethaf wrth i'r economi gwympo!
 STR_NEWS_END_OF_RECESSION                                       :{BIGFONT}{BLACK}Dirwasgiad ar Ben!{}{}Mae cynnydd mewn masnach yn rhoi hyder i ddiwydiant wrth i'r economi gryfhau!
-STR_TOGGLE_LARGE_SMALL_WINDOW                                   :{BLACK}Toglu maint ffenestri mawr/bach
+STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW                           :{BLACK}Toglu maint ffenestri mawr/bach
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}: {WHITE}{CURRENCY}
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Prynu cyfran o 25% o'r cwmni
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Gwerthu cyfran o 25% o'r cwmni
@@ -2254,7 +2254,7 @@ STR_ERROR_CAN_T_BUY_25_SHARE_IN_THIS                            :{WHITE}Methu pr
 STR_ERROR_CAN_T_SELL_25_SHARE_IN                                :{WHITE}Methu gwerthu cyfran o 25% o'r cwmni ...
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% yn eiddo {COMPANY})
 STR_NEWS_MERGER_TAKEOVER_TITLE                                  :{BIGFONT}{BLACK}Mae {STRING} wedi cael ei brynu gan {STRING}!
-STR_PROTECTED                                                   :{WHITE}Nid yw'r cwmni hwn yn ddigon da ar gyfer cyfnewid cyfrandaliadau eto...
+STR_ERROR_PROTECTED                                             :{WHITE}Nid yw'r cwmni hwn yn ddigon da ar gyfer cyfnewid cyfrandaliadau eto...
 
 STR_LIVERY_DEFAULT                                              :Lifrau cyffredin
 STR_LIVERY_STEAM                                                :Injan Stêm
@@ -2280,14 +2280,14 @@ STR_LIVERY_LARGE_PLANE                                          :Awyren Fawr
 STR_LIVERY_PASSENGER_TRAM                                       :Tram teithwyr
 STR_LIVERY_FREIGHT_TRAM                                         :Tram Nwyddau
 
-STR_LIVERY_GENERAL_TIP                                          :{BLACK}Dangos cynllun lliw cyffredinol
-STR_LIVERY_TRAIN_TIP                                            :{BLACK}Dangos cynllun lliw trenau
-STR_LIVERY_ROAD_VEHICLE_TIP                                     :{BLACK}Dangos cynllun lliw cerbydau ffordd
-STR_LIVERY_SHIP_TIP                                             :{BLACK}Dangos cynllun lliw llongau
-STR_LIVERY_AIRCRAFT_TIP                                         :{BLACK}Dangos cynllun lliw awyrennau
-STR_LIVERY_PRIMARY_TIP                                          :{BLACK}Dewiswch brif lliw y cynllun sydd wedi'i ddewis
-STR_LIVERY_SECONDARY_TIP                                        :{BLACK}Dewiswch ail liw y cynllun sydd wedi'i ddewis
-STR_LIVERY_PANEL_TIP                                            :{BLACK}Dewiswch gynllun lliw i'w newid, neu nifer o gynlluniau lliw trwy glicio ar CTRL+clic. Cliciwch ar y bocs i doglu defnydd y cynllun
+STR_LIVERY_GENERAL_TOOLTIP                                      :{BLACK}Dangos cynllun lliw cyffredinol
+STR_LIVERY_TRAIN_TOOLTIP                                        :{BLACK}Dangos cynllun lliw trenau
+STR_LIVERY_ROAD_VEHICLE_TOOLTIP                                 :{BLACK}Dangos cynllun lliw cerbydau ffordd
+STR_LIVERY_SHIP_TOOLTIP                                         :{BLACK}Dangos cynllun lliw llongau
+STR_LIVERY_AIRCRAFT_TOOLTIP                                     :{BLACK}Dangos cynllun lliw awyrennau
+STR_LIVERY_PRIMARY_TOOLTIP                                      :{BLACK}Dewiswch brif lliw y cynllun sydd wedi'i ddewis
+STR_LIVERY_SECONDARY_TOOLTIP                                    :{BLACK}Dewiswch ail liw y cynllun sydd wedi'i ddewis
+STR_LIVERY_PANEL_TOOLTIP                                        :{BLACK}Dewiswch gynllun lliw i'w newid, neu nifer o gynlluniau lliw trwy glicio ar CTRL+clic. Cliciwch ar y bocs i doglu defnydd y cynllun
 
 ##id 0x8000
 STR_VEHICLE_NAME_TRAIN_ENGINE_RAIL_KIRBY_PAUL_TANK_STEAM        :Kirby Paul Tank (Stêm)
@@ -2595,9 +2595,9 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY                               :(Dim dadlwytho,
 STR_ORDER_TOOLTIP_NON_STOP                                      :{BLACK}Newid ymddygiad stopio o'r gorchymyn a amlygwyd
 STR_ORDER_TOOLTIP_FULL_LOAD                                     :{BLACK}Newid ymddygiad llwytho'r gorchymyn a amlygwyd
 STR_ORDER_TOOLTIP_UNLOAD                                        :{BLACK}Newid ymddygiad dadlwythio'r gorchymyn a amlygwyd
-STR_GO_TO_STATION                                               :{STRING} {STATION} {STRING}
+STR_ORDER_GO_TO_STATION                                         :{STRING} {STATION} {STRING}
 
-STR_ORDER_GO_TO_DROPDOWN_TOOLTIP                                :{BLACK}Mewnosod gorchymyn uwch
+STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP                               :{BLACK}Mewnosod gorchymyn uwch
 STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Mynd i'r depo agosaf
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Mynd i'r awyrendy agosaf
 STR_ORDER_NEAREST_DEPOT                                         :yr agosaf
@@ -2607,9 +2607,9 @@ STR_ORDER_SERVICE_NON_STOP_AT                                   :Gwasanaethu heb
 STR_ORDER_TRAIN_DEPOT                                           :Depo Trên
 STR_ORDER_ROAD_VEHICLE_DEPOT                                    :Depo Cerbydau Ffordd
 STR_ORDER_SHIP_DEPOT                                            :Depo Llongau
-STR_GO_TO_DEPOT                                                 :{STRING} {TOWN} {STRING}
-STR_GO_TO_NEAREST_DEPOT                                         :{STRING} {STRING} {STRING}
-STR_GO_TO_HANGAR                                                :{STRING} {STATION} Awyrendy
+STR_ORDER_GO_TO_DEPOT_FORMAT                                    :{STRING} {TOWN} {STRING}
+STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT                            :{STRING} {STRING} {STRING}
+STR_ORDER_GO_TO_HANGAR_FORMAT                                   :{STRING} {STATION} Awyrendy
 
 STR_ORDER_DROP_GO_ALWAYS_DEPOT                                  :Mynd bob tro
 STR_ORDER_DROP_SERVICE_DEPOT                                    :Gwasanaethu os oes angen
@@ -2634,10 +2634,10 @@ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN                      :yn fwy na
 STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS                    :yn fwy neu'n llai na
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE                        :yn wir
 STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE                       :yn anghywir
-STR_CONDITIONAL_VALUE                                           :{SKIP}{BLACK}{COMMA}
-STR_CONDITIONAL_UNCONDITIONAL                                   :Neidio i orchymyn {COMMA}
-STR_CONDITIONAL_NUM                                             :Neidio i orchymyn {COMMA} pan {STRING} {STRING} {COMMA}
-STR_CONDITIONAL_TRUE_FALSE                                      :Neidio i orchymyn {COMMA} pan {STRING} {STRING}
+STR_ORDER_CONDITIONAL_VALUE                                     :{SKIP}{BLACK}{COMMA}
+STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Neidio i orchymyn {COMMA}
+STR_ORDER_CONDITIONAL_NUM                                       :Neidio i orchymyn {COMMA} pan {STRING} {STRING} {COMMA}
+STR_ORDER_CONDITIONAL_TRUE_FALSE                                :Neidio i orchymyn {COMMA} pan {STRING} {STRING}
 
 STR_TIMETABLE_NO_TRAVEL                                         :{SETX 30}Dim teithio
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :{SETX 30}Teithio (heb ei amserlenu)
@@ -2660,18 +2660,18 @@ STR_ERROR_TRAINS_CAN_ONLY_BE_ALTERED_INSIDE_A_DEPOT             :{WHITE}Gellir n
 STR_ORDERS_SKIP_BUTTON                                          :{BLACK}Hepgor
 STR_ORDERS_DELETE_BUTTON                                        :{BLACK}Dileu
 STR_ORDERS_GO_TO_BUTTON                                         :{BLACK}Mynd i
-STR_REFIT                                                       :{BLACK}Ailffitio
-STR_REFIT_TIP                                                   :{BLACK}Dewiswch y math o lwyth yr hoffech chi ailffitio gyda'r gorchymyn hwn. Cliciwch Ctrl-clic er mwyn diddymu'r cyfarwyddyd hwn.
-STR_REFIT_ORDER                                                 :(Ailffitio i {STRING})
-STR_REFIT_STOP_ORDER                                            :(Ailfitio i {STRING} a stopio)
-STR_STOP_ORDER                                                  :(Stopio)
-STR_TIMETABLE_VIEW                                              :{BLACK}Amserlen
-STR_TIMETABLE_VIEW_TOOLTIP                                      :{BLACK}Newid i'r golwg amserlen
-STR_ORDER_VIEW                                                  :{BLACK}Gorchmynion
-STR_ORDER_VIEW_TOOLTIP                                          :{BLACK}Newid i'r golwg gorchmynion
+STR_ORDER_REFIT                                                 :{BLACK}Ailffitio
+STR_ORDER_REFIT_TOOLTIP                                         :{BLACK}Dewiswch y math o lwyth yr hoffech chi ailffitio gyda'r gorchymyn hwn. Cliciwch Ctrl-clic er mwyn diddymu'r cyfarwyddyd hwn.
+STR_ORDER_REFIT_ORDER                                           :(Ailffitio i {STRING})
+STR_ORDER_REFIT_STOP_ORDER                                      :(Ailfitio i {STRING} a stopio)
+STR_ORDER_STOP_ORDER                                            :(Stopio)
+STR_ORDERS_TIMETABLE_VIEW                                       :{BLACK}Amserlen
+STR_ORDERS_TIMETABLE_VIEW_TOOLTIP                               :{BLACK}Newid i'r golwg amserlen
+STR_TIMETABLE_ORDER_VIEW                                        :{BLACK}Gorchmynion
+STR_TIMETABLE_ORDER_VIEW_TOOLTIP                                :{BLACK}Newid i'r golwg gorchmynion
 STR_ORDERS_CAPTION                                              :{WHITE}{VEHICLE} (Gorchmynion)
 STR_ORDERS_END_OF_ORDERS                                        :{SETX 10}- - Diwedd Gorchmynion - -
-STR_SERVICE                                                     :{BLACK}Gwasanaeth
+STR_ORDER_SERVICE                                               :{BLACK}Gwasanaeth
 STR_VEHICLE_DETAILS_TRAIN_ENGINE_BUILT_AND_VALUE                :{LTBLUE}{ENGINE}{BLACK}   Adeiladwyd: {LTBLUE}{NUM}{BLACK} Gwerth: {LTBLUE}{CURRENCY}
 STR_VEHICLE_DETAILS_TRAIN_WAGON_VALUE                           :{LTBLUE}{ENGINE}{BLACK}   Gwerth: {LTBLUE}{CURRENCY}
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
@@ -2691,7 +2691,7 @@ STR_ERROR_CAN_T_ADD_ORDER                                       :{WHITE}ni all y
 STR_ERROR_CAN_T_ADD_ORDER_SHARED                                :{WHITE}ni all cerbyd sy'n rhannu'r gorchymyn hwn fynd i'r orsaf honno
 STR_ERROR_CAN_T_MOVE_VEHICLE                                    :{WHITE}Methu symud y cerbyd...
 STR_ERROR_REAR_ENGINE_FOLLOW_FRONT                              :{WHITE}Bydd yr injan ôl wastad yn dilyn ei gymar blaen
-STR_CARGO_N_A                                                   :N/A{SKIP}
+STR_QUANTITY_N_A                                                :N/A{SKIP}
 STR_ERROR_UNABLE_TO_FIND_ROUTE_TO                               :{WHITE}Methu dod o hyd i ffordd i'r depo lleol
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_DAYS                     :{BLACK}Bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}days{BLACK}   Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
 STR_VEHICLE_DETAILS_SERVICING_INTERVAL_PERCENT                  :{BLACK}bwlch rhwng gwasanaeth: {LTBLUE}{COMMA}%{BLACK}  Gwasanaeth diwethaf: {LTBLUE}{DATE_LONG}
@@ -2711,10 +2711,10 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Amserlen
 STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Newid faint o amser y dylai'r gorchymyn a amlygwyd ei gymryd
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Clirio faint o amser y dylai'r gorchymyn a amlygwyd ei gymryd.
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Ailosod y mesurydd hwyrni, fel y bydd y cerbyd ar amser
-STR_SERVICE_HINT                                                :{BLACK}Hepgor y gorchymyn hwn os nad oes angen gwasanaeth
-STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER                        :{BLACK}Côst: {CURRENCY} Pwysau: {WEIGHT_S}{}Cyflymder: {VELOCITY}  Pŵer: {POWER}{}Côst Rhedeg: {CURRENCY}/bl{}Gallu cludo: {CARGO}
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST       :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}, {CARGO}{}Côst Rhedfa: {CURRENCY}/yr
-STR_VEHICLE_INFO_COST_MAX_SPEED_CAPACITY_RUNCOST                :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}{}Cost Rhedfa: {CURRENCY}/bl
+STR_ORDER_SERVICE_TOOLTIP                                       :{BLACK}Hepgor y gorchymyn hwn os nad oes angen gwasanaeth
+STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Côst: {CURRENCY} Pwysau: {WEIGHT_S}{}Cyflymder: {VELOCITY}  Pŵer: {POWER}{}Côst Rhedeg: {CURRENCY}/bl{}Gallu cludo: {CARGO}
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}, {CARGO}{}Côst Rhedfa: {CURRENCY}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Côst: {CURRENCY} Cyflym. Max: {VELOCITY}{}Cynhwysedd: {CARGO}{}Cost Rhedfa: {CURRENCY}/bl
 STR_VEHICLE_INFO_AGE_RUNNING_COST_YR                            :{BLACK}Oed: {LTBLUE}{STRING}{BLACK}   Cost Rhedfa: {LTBLUE}{CURRENCY}/bl.
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}cyflymder uchaf: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Pwys: {LTBLUE}{WEIGHT_S} {BLACK}Pŵer: {LTBLUE}{POWER}{BLACK} Cyflym. Max: {LTBLUE}{VELOCITY}
@@ -2734,27 +2734,27 @@ STR_NEWS_TRAIN_CRASH                                            :{BIGFONT}{BLACK
 STR_ERROR_CAN_T_REVERSE_DIRECTION_TRAIN                         :{WHITE}Methu gwrthdroi cyfeiriad  trên...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE                  :{WHITE}ddim yn medru reversio'r cerbyd...
 STR_ERROR_CAN_T_REVERSE_DIRECTION_RAIL_VEHICLE_MULTIPLE_UNITS   :{WHITE}Methu troi cerbydau sy'n meddu ar sawl uned
-STR_CLEAR_TIME                                                  :{BLACK}Clirio Amser
-STR_RESET_LATENESS                                              :{BLACK}Ailosod Mesurydd Hwyrni
-STR_CHANGE_WAYPOINT_NAME                                        :{BLACK}Newid enw pwynt llwybro
+STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Clirio Amser
+STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Ailosod Mesurydd Hwyrni
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Newid enw pwynt llwybro
 
-STR_TRAIN_STOPPING                                              :{RED}Wrthi'n stopio
-STR_TRAIN_STOPPING_VEL                                          :{RED}Wrthi'n stopio {VELOCITY}
-STR_INCOMPATIBLE_RAIL_TYPES                                     :Mathau rheilffordd anghydnaws
-STR_TRAIN_NO_POWER                                              :{RED}Dim Pŵer
-STR_TRAIN_START_NO_CATENARY                                     :Does gan y trac ddim catena felly does dim modd i't trên gychwyn
-STR_TRAIN_STUCK                                                 :{ORANGE}Aros am lwybr clir
+STR_VEHICLE_STATUS_TRAIN_STOPPING                               :{RED}Wrthi'n stopio
+STR_VEHICLE_STATUS_TRAIN_STOPPING_VEL                           :{RED}Wrthi'n stopio {VELOCITY}
+STR_ERROR_INCOMPATIBLE_RAIL_TYPES                               :Mathau rheilffordd anghydnaws
+STR_VEHICLE_STATUS_TRAIN_NO_POWER                               :{RED}Dim Pŵer
+STR_ERROR_TRAIN_START_NO_CATENARY                               :Does gan y trac ddim catena felly does dim modd i't trên gychwyn
+STR_VEHICLE_STATUS_TRAIN_STUCK                                  :{ORANGE}Aros am lwybr clir
 
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE                              :{BIGFONT}{BLACK}{STRING} newydd yn awr ar gael!
 STR_NEWS_NEW_VEHICLE_TYPE                                       :{BIGFONT}{BLACK}{ENGINE}
 STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE                    :{BLACK}New {STRING} ar gael yn awr!  -  {ENGINE}
 
-STR_CAN_T_SELL_DESTROYED_VEHICLE                                :{WHITE}Methu gwerthu cerbyd sydd wedi'i ddinistrio...
-STR_CAN_T_REFIT_DESTROYED_VEHICLE                               :{WHITE}Methu ailffitio'r cerbyd sydd wedi'i ddinistrio...
+STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE                          :{WHITE}Methu gwerthu cerbyd sydd wedi'i ddinistrio...
+STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE                         :{WHITE}Methu ailffitio'r cerbyd sydd wedi'i ddinistrio...
 
-STR_CAN_T_TIMETABLE_VEHICLE                                     :{WHITE}Methu amserlennu cerbyd...
-STR_TIMETABLE_ONLY_WAIT_AT_STATIONS                             :{WHITE}Dim ond mewn gorsafoedd y gall cerbydau aros.
-STR_TIMETABLE_NOT_STOPPING_HERE                                 :{WHITE}Nid yw'r cerbyd hwn yn aros yn yr orsaf hon.
+STR_ERROR_CAN_T_TIMETABLE_VEHICLE                               :{WHITE}Methu amserlennu cerbyd...
+STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS                       :{WHITE}Dim ond mewn gorsafoedd y gall cerbydau aros.
+STR_ERROR_TIMETABLE_NOT_STOPPING_HERE                           :{WHITE}Nid yw'r cerbyd hwn yn aros yn yr orsaf hon.
 STR_TIMETABLE_CHANGE_TIME                                       :{BLACK}Newid Amser
 STR_TIMETABLE_STATUS_ON_TIME                                    :{BLACK}Mae'r cerbyd hwn yn rhedeg ar hyn o bryd
 STR_TIMETABLE_STATUS_LATE                                       :{BLACK}Mae'r cerbyd hwn yn rhedeg {STRING} yn hwyr ar hyn o bryd
@@ -2768,7 +2768,7 @@ STR_TIMETABLE_AUTOFILL_TOOLTIP                                  :{BLACK}Llenwch
 STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT             :{WHITE}...rhaid iddo fod wedi'i stopio mewn depo cerbyd ffordd
 STR_ERROR_UNABLE_TO_FIND_LOCAL_DEPOT                            :{WHITE}Methu dod o hyd i'r depo lleol
 STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP                   :{BLACK}Gorfodi cerbyd i droi rownd
-STR_ARTICULATED_RV_CAPACITY                                     :{BLACK}Cynhwysedd: {LTBLUE}
+STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Cynhwysedd: {LTBLUE}
 STR_DEPOT_VEHICLE_TOOLTIP                                       :{BLACK}{ENGINE}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CHAIN                                 :{BLACK}{NUM} cerbyd{P "" au}{STRING}
 STR_DEPOT_VEHICLE_TOOLTIP_CARGO                                 :{}{CARGO} ({SHORTCARGO})
@@ -2795,11 +2795,11 @@ STR_NEWS_FIRST_SHIP_ARRIVAL                                     :{BIGFONT}{BLACK
 STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP                              :{BLACK}Gosod bwi a ellir ei ddefnyddio fel pwynt llwybr
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Methu gosod bwi yma...
 STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP                    :{BLACK}Adeiladu traphont
-STR_CAN_T_BUILD_AQUEDUCT_HERE                                   :{WHITE}Methu adeiladu traphont yma...
+STR_ERROR_CAN_T_BUILD_AQUEDUCT_HERE                             :{WHITE}Methu adeiladu traphont yma...
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ailffitio)
 STR_REFIT_TITLE                                                 :{GOLD}Dewiswch y math o lwyth i'w  gario:
 STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}bellach yn gallu cario: {GOLD}{CARGO}{}{BLACK}Côst o ailffitio: {GOLD}{CURRENCY}
-STR_REFITTABLE                                                  :(gallu ailffitio)
+STR_PURCHASE_INFO_REFITTABLE                                    :(gallu ailffitio)
 
 ##id 0xA000
 STR_TOOLBAR_AIRCRAFT_CAPTION                                    :{WHITE}Meysydd Awyr
@@ -2812,7 +2812,7 @@ STR_TOOLBAR_AIRCRAFT_BUILD_AIRPORT_TOOLTIP                      :{BLACK}Adeiladu
 STR_NEWS_FIRST_AIRCRAFT_ARRIVAL                                 :{BIGFONT}{BLACK}Mae'r trigolion yn dathlu . . .{}Mae'r awyren gyntaf wedi cyrraedd {STATION}!
 STR_NEWS_AIRCRAFT_CRASH                                         :{BIGFONT}{BLACK}Damwain Awyren!{}Bu farw {COMMA} mewn tanchwa yn {STATION}
 STR_NEWS_PLANE_CRASH_OUT_OF_FUEL                                :{BIGFONT}{BLACK}Awyren wedi syrthio!{}Rhedodd yr awyren allan o danwydd, bu farw {COMMA} yn y ddamwain!
-STR_ORDER_STATION_SMALL                                         :{TINYFONT}{BLACK}{STATION}
+STR_TINY_BLACK_STATIONL                                         :{TINYFONT}{BLACK}{STATION}
 
 STR_TIMETABLE_TITLE                                             :{WHITE}{VEHICLE} (Amserlen)
 
@@ -2825,13 +2825,13 @@ STR_NEWS_DISASTER_BIG_UFO                                       :{BIGFONT}{BLACK
 STR_NEWS_DISASTER_COAL_MINE_SUBSIDENCE                          :{BIGFONT}{BLACK}Ymsuddiant mwynglawdd glo ger {TOWN} yn creu llanast!
 STR_NEWS_DISASTER_FLOOD_VEHICLE                                 :{BIGFONT}{BLACK}Llifogydd!{}O leiaf {COMMA} ar goll, wedi'i tybio'n farw wedi glaw mawr!
 
-STR_BRIBE_FAILED                                                :{WHITE}Cafodd eich ymgais i lwgrwobrwyo ei
-STR_BRIBE_FAILED_2                                              :{WHITE}ddarganfod gan ymchwilydd ardal
-STR_BUILD_DATE                                                  :{BLACK}Adeiladwyd: {LTBLUE}{DATE_LONG}
+STR_ERROR_BRIBE_FAILED                                          :{WHITE}Cafodd eich ymgais i lwgrwobrwyo ei
+STR_ERROR_BRIBE_FAILED_2                                        :{WHITE}ddarganfod gan ymchwilydd ardal
+STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Adeiladwyd: {LTBLUE}{DATE_LONG}
 
-STR_TILEDESC_STATION_CLASS                                      :{BLACK}Dosbarth gorsaf: {LTBLUE}{STRING}
-STR_TILEDESC_STATION_TYPE                                       :{BLACK}Math gorsaf: {LTBLUE}{STRING}
-STR_TILEDESC_NEWGRF_NAME                                        :{BLACK}NewGRF: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_CLASS                         :{BLACK}Dosbarth gorsaf: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_STATION_TYPE                          :{BLACK}Math gorsaf: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{STRING}
 
 STR_PERFORMANCE_DETAIL                                          :{WHITE}Graddio perfformiad manwl
 STR_PERFORMANCE_DETAIL_KEY                                      :{BLACK}Allwedd
@@ -2851,28 +2851,28 @@ STR_PERFORMANCE_DETAIL_MONEY                                    :{BLACK}Arian:
 STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Benthyciad:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Cyfanswm:
 ############ End of order list
-STR_PERFORMANCE_DETAIL_VEHICLES_TIP                             :{BLACK}Nifer y cerbydau; mae hyn yn cynnwys cerbydau ffordd, trenau, llongau ac awyrennau
-STR_PERFORMANCE_DETAIL_STATIONS_TIP                             :{BLACK}Nifer y rhannau gorsaf. Mae pob rhan o orsaf (e.e. gorsaf drenau, gorsaf fysiau a meysydd awyr) yn cael eu cyfrif, hyd yn oed os ydyn nhw wedi'u cysylltu fel un gorsaf
-STR_PERFORMANCE_DETAIL_MIN_PROFIT_TIP                           :{BLACK}Elw'r cerbyd gyda'r incwm lleiaf (o bob cerbyd dros 2 flwydd oed)
-STR_PERFORMANCE_DETAIL_MIN_INCOME_TIP                           :{BLACK}Cyfanswm yr arian a enillwyd yn y mis gyda'r elw isaf o'r 12 chwarter ddiwethaf
-STR_PERFORMANCE_DETAIL_MAX_INCOME_TIP                           :{BLACK}Cyfanswm yr arian a enillwyd yn y mis gyda'r elw isaf o'r 12 chwarter ddiwethaf
-STR_PERFORMANCE_DETAIL_DELIVERED_TIP                            :{BLACK}Cyfanswm yr unedau llwyth a gludwyd yn y 4 chwarter diwethaf
-STR_PERFORMANCE_DETAIL_CARGO_TIP                                :{BLACK}Nifer y mathau gwahanol o lwythi a gludwyd yn y chwarter diwethaf
-STR_PERFORMANCE_DETAIL_MONEY_TIP                                :{BLACK}Cyfanswm yr arian sydd gan y cwmni hwn yn y banc
-STR_PERFORMANCE_DETAIL_LOAN_TIP                                 :{BLACK}Cyfanswm yr arian mae'r cwmni hwn wedi ei fenthyg ar hyn o bryd
-STR_PERFORMANCE_DETAIL_TOTAL_TIP                                :{BLACK}Cyfanswm y pwyntiau allan o'r pwyntiau posib
+STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Nifer y cerbydau; mae hyn yn cynnwys cerbydau ffordd, trenau, llongau ac awyrennau
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Nifer y rhannau gorsaf. Mae pob rhan o orsaf (e.e. gorsaf drenau, gorsaf fysiau a meysydd awyr) yn cael eu cyfrif, hyd yn oed os ydyn nhw wedi'u cysylltu fel un gorsaf
+STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Elw'r cerbyd gyda'r incwm lleiaf (o bob cerbyd dros 2 flwydd oed)
+STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Cyfanswm yr arian a enillwyd yn y mis gyda'r elw isaf o'r 12 chwarter ddiwethaf
+STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Cyfanswm yr arian a enillwyd yn y mis gyda'r elw isaf o'r 12 chwarter ddiwethaf
+STR_PERFORMANCE_DETAIL_DELIVERED_TOOLTIP                        :{BLACK}Cyfanswm yr unedau llwyth a gludwyd yn y 4 chwarter diwethaf
+STR_PERFORMANCE_DETAIL_CARGO_TOOLTIP                            :{BLACK}Nifer y mathau gwahanol o lwythi a gludwyd yn y chwarter diwethaf
+STR_PERFORMANCE_DETAIL_MONEY_TOOLTIP                            :{BLACK}Cyfanswm yr arian sydd gan y cwmni hwn yn y banc
+STR_PERFORMANCE_DETAIL_LOAN_TOOLTIP                             :{BLACK}Cyfanswm yr arian mae'r cwmni hwn wedi ei fenthyg ar hyn o bryd
+STR_PERFORMANCE_DETAIL_TOTAL_TOOLTIP                            :{BLACK}Cyfanswm y pwyntiau allan o'r pwyntiau posib
 
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Gosodiadau NewGRF
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Dangos gosodiadau NewGRF
 STR_NEWGRF_SETTINGS_CAPTION                                     :{WHITE}Gosodiadau NewGRF
-STR_NEWGRF_APPLY_CHANGES                                        :{BLACK}Gweithredu newidiadau
-STR_NEWGRF_TOGGLE_PALETTE                                       :{BLACK}Toglu palet
-STR_NEWGRF_TOGGLE_PALETTE_TIP                                   :{BLACK}Toglu palet y NewGRFa ddewiswyd.{}Gwnech hyn pan fo graffegau'r NewGRF yn edrych yn binc yn y gêm
-STR_NEWGRF_SET_PARAMETERS                                       :{BLACK}Gosod paramedrau
-STR_NEWGRF_FILENAME                                             :{BLACK}Enw Ffeil: {SILVER}{STRING}
-STR_NEWGRF_PALETTE                                              :{BLACK}Palet: {SILVER}{STRING}
-STR_NEWGRF_GRF_ID                                               :{BLACK}GRF ID: {SILVER}{STRING}
-STR_NEWGRF_MD5SUM                                               :{BLACK}MD5sum: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Gweithredu newidiadau
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Toglu palet
+STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Toglu palet y NewGRFa ddewiswyd.{}Gwnech hyn pan fo graffegau'r NewGRF yn edrych yn binc yn y gêm
+STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Gosod paramedrau
+STR_NEWGRF_SETTINGS_FILENAME                                    :{BLACK}Enw Ffeil: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PALETTE                                     :{BLACK}Palet: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_GRF_ID                                      :{BLACK}GRF ID: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_MD5SUM                                      :{BLACK}MD5sum: {SILVER}{STRING}
 STR_NEWGRF_CONFIRMATION_TEXT                                    :{YELLOW}Rydych ar fin gwneud newidiadau i gêm sy'n rhedeg; all hyn beri i OpenTTD grashio.{}Ydych chi'n siŵr eich bod chi eisiau gwneud hyn?
 
 STR_NEWGRF_ERROR_MSG_INFO                                       :{SILVER}{STRING}
@@ -2895,34 +2895,34 @@ STR_NEWGRF_ERROR_INVALID_ID                                     :Ceisio defnyddi
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}Mae'r {STRING} yn cynnwys corlun llygredig. Bydd corluniaid llygredig yn cael eu dangos gyda mark cwestiwn coch (?).
 STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Mae'n cynnwys nifer o gofnodion Gweithred 8.
 
-STR_NEWGRF_PRESET_LIST_TIP                                      :{BLACK}Llwytho'r rhagosodiad a ddewiswyd
-STR_NEWGRF_PRESET_SAVE                                          :{BLACK}Cadw rhagosodiad
-STR_NEWGRF_PRESET_SAVE_TIP                                      :{BLACK}Cadw'r rhestr gyfredol fel rhagosodiad
-STR_NEWGRF_PRESET_SAVE_QUERY                                    :{BLACK}Rhoi enw ar gyfer y rhagosodiad
-STR_NEWGRF_PRESET_DELETE                                        :{BLACK}Dileu rhagosodiad
-STR_NEWGRF_PRESET_DELETE_TIP                                    :{BLACK}Dileu'r rhagosodiad a ddewiswyd
-STR_NEWGRF_ADD                                                  :{BLACK}Ychwanegu
-STR_NEWGRF_ADD_TIP                                              :{BLACK}ychwanegu ffeil NewGRF i'r rhestr
-STR_NEWGRF_REMOVE                                               :{BLACK}Tynnu
-STR_NEWGRF_REMOVE_TIP                                           :{BLACK}Tynnu'r ffeil NewGRF sydd wedi'i ddewis o'r rhestr
-STR_NEWGRF_MOVEUP                                               :{BLACK}Symud i Fyny
-STR_NEWGRF_MOVEUP_TIP                                           :{BLACK}Symud y ffeil NewGRF sydd wedi'i ddewis i fyny'r rhestr
-STR_NEWGRF_MOVEDOWN                                             :{BLACK}Symud i Lawr
-STR_NEWGRF_MOVEDOWN_TIP                                         :{BLACK}Symud y ffeil NewGRF sydd wedi'i ddewis i lawr y rhestr
-STR_NEWGRF_FILE_TIP                                             :{BLACK}Rhestr o bob ffeil NewGRF sydd wedi'u gosod. Cliciwch ar ffeil i newid ei baramedrau
-STR_NEWGRF_PARAMETER                                            :{BLACK}Paramedrau: {SILVER}{STRING}
-STR_NEWGRF_PARAMETER_QUERY                                      :{BLACK}Rhoi paramedrau NewGRF newydd
-STR_NEWGRF_NO_INFO                                              :{BLACK}Dim gwybodaeth newydd ar gael
+STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP                         :{BLACK}Llwytho'r rhagosodiad a ddewiswyd
+STR_NEWGRF_SETTINGS_PRESET_SAVE                                 :{BLACK}Cadw rhagosodiad
+STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP                         :{BLACK}Cadw'r rhestr gyfredol fel rhagosodiad
+STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY                           :{BLACK}Rhoi enw ar gyfer y rhagosodiad
+STR_NEWGRF_SETTINGS_PRESET_DELETE                               :{BLACK}Dileu rhagosodiad
+STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP                       :{BLACK}Dileu'r rhagosodiad a ddewiswyd
+STR_NEWGRF_SETTINGS_ADD                                         :{BLACK}Ychwanegu
+STR_NEWGRF_SETTINGS_ADD_TOOLTIP                                 :{BLACK}ychwanegu ffeil NewGRF i'r rhestr
+STR_NEWGRF_SETTINGS_REMOVE                                      :{BLACK}Tynnu
+STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP                              :{BLACK}Tynnu'r ffeil NewGRF sydd wedi'i ddewis o'r rhestr
+STR_NEWGRF_SETTINGS_MOVEUP                                      :{BLACK}Symud i Fyny
+STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP                              :{BLACK}Symud y ffeil NewGRF sydd wedi'i ddewis i fyny'r rhestr
+STR_NEWGRF_SETTINGS_MOVEDOWN                                    :{BLACK}Symud i Lawr
+STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Symud y ffeil NewGRF sydd wedi'i ddewis i lawr y rhestr
+STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Rhestr o bob ffeil NewGRF sydd wedi'u gosod. Cliciwch ar ffeil i newid ei baramedrau
+STR_NEWGRF_SETTINGS_PARAMETER                                   :{BLACK}Paramedrau: {SILVER}{STRING}
+STR_NEWGRF_SETTINGS_PARAMETER_QUERY                             :{BLACK}Rhoi paramedrau NewGRF newydd
+STR_NEWGRF_SETTINGS_NO_INFO                                     :{BLACK}Dim gwybodaeth newydd ar gael
 
 STR_NEWGRF_ADD_CAPTION                                          :{WHITE}Ffeiliau NewGRF sydd ar gael
 STR_NEWGRF_ADD_FILE                                             :{BLACK}Ychwanegu
-STR_NEWGRF_ADD_FILE_TIP                                         :{BLACK}Ychwanegu'r ffeil NewGRF a ddewiswyd i'ch ffurfwedd
-STR_NEWGRF_RESCAN_FILES                                         :{BLACK}Ailsganio ffeiliau
-STR_NEWGRF_RESCAN_FILES_TIP                                     :{BLACK}Diweddaru'r rhestr o ffeiliau NewGRF sydd ar gael
+STR_NEWGRF_ADD_FILE_TOOLTIP                                     :{BLACK}Ychwanegu'r ffeil NewGRF a ddewiswyd i'ch ffurfwedd
+STR_NEWGRF_ADD_RESCAN_FILES                                     :{BLACK}Ailsganio ffeiliau
+STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP                             :{BLACK}Diweddaru'r rhestr o ffeiliau NewGRF sydd ar gael
 STR_NEWGRF_DUPLICATE_GRFID                                      :{WHITE}Does dim modd ychwanegu'r ffeil: ID GRF dyblyg
 
-STR_NEWGRF_NOT_FOUND                                            :{RED}Ni ddarganfuwyd ffeil sy'n cyfateb
-STR_NEWGRF_DISABLED                                             :{RED}Analluogwyd
+STR_NEWGRF_SETTINGS_NOT_FOUND                                   :{RED}Ni ddarganfuwyd ffeil sy'n cyfateb
+STR_NEWGRF_SETTINGS_DISABLED                                    :{RED}Analluogwyd
 STR_NEWGRF_COMPATIBLE_LOADED                                    :{ORANGE}Ni ddarganfuwyd ffeil sy'n cyfateb (GRF cytûn wedi'i lwytho)
 
 STR_NEWGRF_COMPATIBLE_LOAD_WARNING                              :{WHITE}Llwythwyd GRF(au) cytûn yn lle'r rhai coll
@@ -2938,7 +2938,7 @@ STR_NEWGRF_BUGGY                                                :{WHITE}Mae NewG
 STR_NEWGRF_BUGGY_ARTICULATED_CARGO                              :{WHITE}Mae'r wybodaeth cargo/ailffitio ar gyfer '{1:ENGINE}' yn wahanol i'r rhestr brynu wedi'r adeiladu. Gall hyn beri i awtoadnewyddy/-ddisodli fethu ag ailfitio'n gywir.
 STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK                    :{WHITE}'{1:STRING}' creu lwp anorffen yn y production callback.
 
-STR_LOADGAME_REMOVED_TRAMS                                      :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu.
+STR_WARNING_LOADGAME_REMOVED_TRAMS                              :{WHITE}Cafodd y gêm ei gadw mewn fersiwn heb dram. Cafodd y tramiau eu dileu.
 
 STR_CURRENCY_WINDOW                                             :{WHITE}Arian cyfaddas
 STR_CURRENCY_EXCHANGE_RATE                                      :{LTBLUE}Cyfradd gyfnewid: {ORANGE}{0:CURRENCY} = £ {1:COMMA}
@@ -2949,16 +2949,16 @@ STR_CURRENCY_SWITCH_TO_EURO                                     :{LTBLUE}Newid i
 STR_CURRENCY_SWITCH_TO_EURO_NEVER                               :{LTBLUE}Newid i'r Ewro: {ORANGE}byth
 STR_CURRENCY_PREVIEW                                            :{LTBLUE}Rhagolwg: {ORANGE}{6:CURRENCY}
 STR_CURRENCY_CHANGE_PARAMETER                                   :{BLACK}Newid paramedrau arian cyfaddas
-STR_TOOLTIP_DECREASE_EXCHANGE_RATE                              :{BLACK}Llehad yr swm o eich arian cyfred am un Punt (£)
-STR_TOOLTIP_INCREASE_EXCHANGE_RATE                              :{BLACK}amlhau yr swm o eich arian cyfred am un Punt (£)
-STR_TOOLTIP_SET_EXCHANGE_RATE                                   :{BLACK}newid y raddfa gyfnewid o eich arian cyfred i un Punt (£)
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR                       :{BLACK}Creu yr ysgar i eich arian Cyfred
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX                          :{BLACK}Creu yr rhagddodiad i eich arian Cyfred
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX                          :{BLACK}Creu yr olddodiad i eich arian Cyfred
-STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Newid i'r Ewro yn gynnar.
-STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO                    :{BLACK}Newid i'r Ewro yn hwyrach
-STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO                         :{BLACK}Set yr blwyddyn i newid i'r Ewro
-STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW                             :{BLACK}10000 Punt (£) yn eich arian cyfaddas
+STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}Llehad yr swm o eich arian cyfred am un Punt (£)
+STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP                     :{BLACK}amlhau yr swm o eich arian cyfred am un Punt (£)
+STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP                          :{BLACK}newid y raddfa gyfnewid o eich arian cyfred i un Punt (£)
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP              :{BLACK}Creu yr ysgar i eich arian Cyfred
+STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP                 :{BLACK}Creu yr rhagddodiad i eich arian Cyfred
+STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP                 :{BLACK}Creu yr olddodiad i eich arian Cyfred
+STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Newid i'r Ewro yn gynnar.
+STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP           :{BLACK}Newid i'r Ewro yn hwyrach
+STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP                :{BLACK}Set yr blwyddyn i newid i'r Ewro
+STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP                    :{BLACK}10000 Punt (£) yn eich arian cyfaddas
 
 STR_TRAIN                                                       :{BLACK}{TRAIN}
 STR_BUS                                                         :{BLACK}{BUS}
@@ -2977,8 +2977,8 @@ STR_VEHICLE_LIST_ROAD_VEHICLE_CAPTION                           :{WHITE}{STRING}
 STR_VEHICLE_LIST_SHIP_CAPTION                                   :{WHITE}{STRING} - {COMMA} Llong{P "" au}
 STR_VEHICLE_LIST_AIRCRAFT_CAPTION                               :{WHITE}{STRING} - {COMMA} Awyrennau
 
-STR_VEH_WITH_SHARED_ORDERS_LIST                                 :{WHITE}Rhestr wedi'i rhannu {COMMA} Cerbyd{P "" au}
-STR_VEH_WITH_SHARED_ORDERS_LIST_TIP                             :{BLACK}Dangos pob cerbydau sy'n rhannu'r amserlen hon
+STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION                     :{WHITE}Rhestr wedi'i rhannu {COMMA} Cerbyd{P "" au}
+STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Dangos pob cerbydau sy'n rhannu'r amserlen hon
 
 STR_NEWS_TRAIN_IS_WAITING                                       :{WHITE}Mae {VEHICLE} yn aros yn y depo
 STR_NEWS_ROAD_VEHICLE_IS_WAITING                                :{WHITE}Mae {VEHICLE} yn aros yn y depo
@@ -3085,39 +3085,39 @@ STR_VEHICLE_VIEW_ROAD_VEHICLE_REFIT_TOOLTIP                     :{BLACK}Ailffiti
 STR_VEHICLE_VIEW_SHIP_REFIT_TOOLTIP                             :{BLACK}Ailffitio cargo llong i gario llwyth o fath gwahanol
 STR_VEHICLE_VIEW_AIRCRAFT_REFIT_TOOLTIP                         :{BLACK}Ailffitio awyren i gario llwyth o fath gwahanol
 
-STR_HEADING_FOR_TRAIN_DEPOT                                     :{ORANGE}Mynd am Ddepo Trên {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_VEL                                 :{ORANGE}Mynd am Ddepo Trên {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT                              :{ORANGE}Mynd am Ddepo Ffordd {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL                          :{ORANGE}Mynd am Ddepo Ffordd {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT                                      :{ORANGE}Mynd am Ddepo Llong {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_VEL                                  :{ORANGE}Mynd am Ddepo Llong{TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR                                          :{ORANGE}Mynd am Awyrendy {STATION}
-STR_HEADING_FOR_HANGAR_VEL                                      :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
-
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE                             :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}
-STR_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL                         :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}, {VELOCITY}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE                      :{LTBLUE}Mynd am wasanaeth Ddepo Ffordd {TOWN}
-STR_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL                  :{LTBLUE}Mynd am wasanaeth i Ddepo Ffordd {TOWN}, {VELOCITY}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE                              :{LTBLUE}Mynd am wasanaeth i Ddepo Llong {TOWN}
-STR_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL                          :{LTBLUE}Mynd am wasanaeth i Depo Llong {TOWN}, {VELOCITY}
-STR_HEADING_FOR_HANGAR_SERVICE                                  :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}
-STR_HEADING_FOR_HANGAR_SERVICE_VEL                              :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}, {VELOCITY}
-
-
-STR_CLONE_TRAIN                                                 :{BLACK}Dyblygu Trên
-STR_CLONE_ROAD_VEHICLE                                          :{BLACK}Dyblygu Cerbyd
-STR_CLONE_SHIP                                                  :{BLACK}Dyblygu Llong
-STR_CLONE_AIRCRAFT                                              :{BLACK}Dyblygu Awyren
-
-STR_CLONE_TRAIN_INFO                                            :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob un o'i gerbydau. Bydd Ctrl-clic yn rhannu'r gorchmynion.
-STR_CLONE_ROAD_VEHICLE_INFO                                     :{BLACK}Bydd hyn yn adeiladu copi o the cerbyd ffordd. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_CLONE_SHIP_INFO                                             :{BLACK}Bydd hyn yn adeiladu copi o'r llong. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_CLONE_AIRCRAFT_INFO                                         :{BLACK}Bydd hyn yn adeiladu copi o'r awyren. Bydd Ctrl-clic yn rhannu'r gorchmynion
-
-STR_CLONE_TRAIN_DEPOT_INFO                                      :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob cerbyd. Cliciwch ar y botwm hwn ac yna ar drên sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
-STR_CLONE_ROAD_VEHICLE_DEPOT_INFO                               :{BLACK}Bydd hyn yn adeiladu copi o a cerbyd ffordd. Cliciwch ar y botwm hwn ac yna ar gerbyd ffordd sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
-STR_CLONE_SHIP_DEPOT_INFO                                       :{BLACK}Bydd hyn yn adeiladu copi o a llong. Cliciwch a y botwm hwn ac yna ar long tu mewn neu tu allan i'r depo. Bydd Ctrl-clic yn rhannu'r gorchmynion
-STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                           :{BLACK}Bydd hyn yn adeiladu copi o awyren. Cliciwch ar y botwm hwn ac yna ar awyren sydd unai tu mewn neu tu allan i'r awyrendy. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT                      :{ORANGE}Mynd am Ddepo Trên {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_VEL                  :{ORANGE}Mynd am Ddepo Trên {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT               :{ORANGE}Mynd am Ddepo Ffordd {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_VEL           :{ORANGE}Mynd am Ddepo Ffordd {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT                       :{ORANGE}Mynd am Ddepo Llong {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_VEL                   :{ORANGE}Mynd am Ddepo Llong{TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR                           :{ORANGE}Mynd am Awyrendy {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_VEL                       :{ORANGE}Mynd am Awyrendy {STATION}, {VELOCITY}
+
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE              :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE_VEL          :{LTBLUE}Gwasanaeth yn Nepo Trên {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE       :{LTBLUE}Mynd am wasanaeth Ddepo Ffordd {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_ROAD_VEHICLE_DEPOT_SERVICE_VEL   :{LTBLUE}Mynd am wasanaeth i Ddepo Ffordd {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE               :{LTBLUE}Mynd am wasanaeth i Ddepo Llong {TOWN}
+STR_VEHICLE_STATUS_HEADING_FOR_SHIP_DEPOT_SERVICE_VEL           :{LTBLUE}Mynd am wasanaeth i Depo Llong {TOWN}, {VELOCITY}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE                   :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}
+STR_VEHICLE_STATUS_HEADING_FOR_HANGAR_SERVICE_VEL               :{LTBLUE}Mynd am wasanaeth i Awyrendy {STATION}, {VELOCITY}
+
+
+STR_DEPOT_CLONE_TRAIN                                           :{BLACK}Dyblygu Trên
+STR_DEPOT_CLONE_ROAD_VEHICLE                                    :{BLACK}Dyblygu Cerbyd
+STR_DEPOT_CLONE_SHIP                                            :{BLACK}Dyblygu Llong
+STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Dyblygu Awyren
+
+STR_VEHICLE_VIEW_CLONE_TRAIN_INFO                               :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob un o'i gerbydau. Bydd Ctrl-clic yn rhannu'r gorchmynion.
+STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO                        :{BLACK}Bydd hyn yn adeiladu copi o the cerbyd ffordd. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_VEHICLE_VIEW_CLONE_SHIP_INFO                                :{BLACK}Bydd hyn yn adeiladu copi o'r llong. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO                            :{BLACK}Bydd hyn yn adeiladu copi o'r awyren. Bydd Ctrl-clic yn rhannu'r gorchmynion
+
+STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Bydd hyn yn adeiladu copi o'r trên gan gynnwys pob cerbyd. Cliciwch ar y botwm hwn ac yna ar drên sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Bydd hyn yn adeiladu copi o a cerbyd ffordd. Cliciwch ar y botwm hwn ac yna ar gerbyd ffordd sydd unai tu allan neu tu mewn y depo. Bydd Ctrl-clic yn rhannu'r gorchmynion.
+STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Bydd hyn yn adeiladu copi o a llong. Cliciwch a y botwm hwn ac yna ar long tu mewn neu tu allan i'r depo. Bydd Ctrl-clic yn rhannu'r gorchmynion
+STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Bydd hyn yn adeiladu copi o awyren. Cliciwch ar y botwm hwn ac yna ar awyren sydd unai tu mewn neu tu allan i'r awyrendy. Bydd Ctrl-clic yn rhannu'r gorchmynion
 
 STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION                            :{WHITE}Cerbydau Rheilffordd Newydd
 STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION                          :{WHITE}Cerbydau Rheilffordd Trydan Newydd
@@ -3187,28 +3187,28 @@ STR_DEPOT_AIRCRAFT_LOCATION_TOOLTIP                             :{BLACK}Canoli'r
 
 ### depot strings
 STR_DEPOT_SELL_CONFIRMATION_TEXT                                :{YELLOW}Rydych chi ar fin gwerthu pob cerbyd yn y depo. Ydych chi'n siwr?
-STR_DEPOT_WRONG_DEPOT_TYPE                                      :math depo anghywir
+STR_ERROR_DEPOT_WRONG_DEPOT_TYPE                                :math depo anghywir
 
-STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP                             :{BLACK}Gwerthu pob trên yn y depo
-STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TIP                      :{BLACK}Gwerthu pob cerbyd ffordd yn y depo
-STR_DEPOT_SELL_ALL_BUTTON_SHIP_TIP                              :{BLACK}Gwerthu pob llong yn y depo
-STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TIP                          :{BLACK}Gwerthu pob awyren yn yr awyrendy
+STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TOOLTIP                         :{BLACK}Gwerthu pob trên yn y depo
+STR_DEPOT_SELL_ALL_BUTTON_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Gwerthu pob cerbyd ffordd yn y depo
+STR_DEPOT_SELL_ALL_BUTTON_SHIP_TOOLTIP                          :{BLACK}Gwerthu pob llong yn y depo
+STR_DEPOT_SELL_ALL_BUTTON_AIRCRAFT_TOOLTIP                      :{BLACK}Gwerthu pob awyren yn yr awyrendy
 
-STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TIP                          :{BLACK}Dangos rhestr o bob trên gyda'r depo presennol yn eu gorchmynion
-STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TIP                   :{BLACK}Dangos rhestr o bob cerbyd ffordd gyda'r depo presennol yn eu gorchmynion
-STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TIP                           :{BLACK}Dangos rhestr o bob llong gyda'r depo presennol yn eu gorchmynion
-STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TIP                       :{BLACK}Dangos rhestr o bob awyren gyda unrhyw awyrendy yn y maes awyr hwn yn eu gorchmynion
+STR_DEPOT_VEHICLE_ORDER_LIST_TRAIN_TOOLTIP                      :{BLACK}Dangos rhestr o bob trên gyda'r depo presennol yn eu gorchmynion
+STR_DEPOT_VEHICLE_ORDER_LIST_ROAD_VEHICLE_TOOLTIP               :{BLACK}Dangos rhestr o bob cerbyd ffordd gyda'r depo presennol yn eu gorchmynion
+STR_DEPOT_VEHICLE_ORDER_LIST_SHIP_TOOLTIP                       :{BLACK}Dangos rhestr o bob llong gyda'r depo presennol yn eu gorchmynion
+STR_DEPOT_VEHICLE_ORDER_LIST_AIRCRAFT_TOOLTIP                   :{BLACK}Dangos rhestr o bob awyren gyda unrhyw awyrendy yn y maes awyr hwn yn eu gorchmynion
 
-STR_DEPOT_AUTOREPLACE_TRAIN_TIP                                 :{BLACK}Awtoddisodli pob trên yn y depo
-STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TIP                          :{BLACK}Awtoddisodli pob cerbyd ffordd yn y depo
-STR_DEPOT_AUTOREPLACE_SHIP_TIP                                  :{BLACK}Awtoddisodli pob llong yn y depo
-STR_DEPOT_AUTOREPLACE_AIRCRAFT_TIP                              :{BLACK}Awtoddisodli pob awyren yn yr awyrendy
+STR_DEPOT_AUTOREPLACE_TRAIN_TOOLTIP                             :{BLACK}Awtoddisodli pob trên yn y depo
+STR_DEPOT_AUTOREPLACE_ROAD_VEHICLE_TOOLTIP                      :{BLACK}Awtoddisodli pob cerbyd ffordd yn y depo
+STR_DEPOT_AUTOREPLACE_SHIP_TOOLTIP                              :{BLACK}Awtoddisodli pob llong yn y depo
+STR_DEPOT_AUTOREPLACE_AIRCRAFT_TOOLTIP                          :{BLACK}Awtoddisodli pob awyren yn yr awyrendy
 
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Disodli {STRING}
 STR_REPLACE_VEHICLES_START                                      :{BLACK}Dechrau Disodli Cerbydau
 STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Dechrau Disodli Cerbydau
-STR_NOT_REPLACING                                               :{BLACK}Ddim yn disodli
-STR_NOT_REPLACING_VEHICLE_SELECTED                              :{BLACK}Dim cerbyd wedi'i ddewis
+STR_REPLACE_NOT_REPLACING                                       :{BLACK}Ddim yn disodli
+STR_REPLACE_NOT_REPLACING_VEHICLE_SELECTED                      :{BLACK}Dim cerbyd wedi'i ddewis
 STR_REPLACE_HELP_LEFT_ARRAY                                     :{BLACK}Dewiswch y math injan i'w ddisodli
 STR_REPLACE_HELP_RIGHT_ARRAY                                    :{BLACK}Dewiswch y math injan newydd yr hoffech chi ei ddefnyddio yn lle'r math injan ar y chwith
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Gwasgwch i atal disodli'r math injan sydd wedi'i ddewis ar y chwith
@@ -3220,26 +3220,26 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Gwneud i
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Disodli: {ORANGE}{SKIP}{SKIP}{STRING}
 STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Newid rhwng y sgrin ddisodli wagenni a'r un injans.
 
-STR_RAIL_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Nid yw'r cerbyd ar gael
-STR_ROAD_VEHICLE_NOT_AVAILABLE                                  :{WHITE}Nid yw'r cerbyd ar gael
-STR_SHIP_NOT_AVAILABLE                                          :{WHITE}Nid yw'r llong ar gael
-STR_AIRCRAFT_NOT_AVAILABLE                                      :{WHITE}Nid yw'r awyren ar gael
+STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE                            :{WHITE}Nid yw'r cerbyd ar gael
+STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE                            :{WHITE}Nid yw'r cerbyd ar gael
+STR_ERROR_SHIP_NOT_AVAILABLE                                    :{WHITE}Nid yw'r llong ar gael
+STR_ERROR_AIRCRAFT_NOT_AVAILABLE                                :{WHITE}Nid yw'r awyren ar gael
 
-STR_ENGINES                                                     :Injanau
-STR_WAGONS                                                      :Wagenni
+STR_REPLACE_ENGINES                                             :Injanau
+STR_REPLACE_WAGONS                                              :Wagenni
 
-STR_MASS_STOP_DEPOT_TRAIN_TIP                                   :{BLACK}Clicio i stopio pob trên sydd tu mewn i'r depo
-STR_MASS_STOP_DEPOT_ROAD_VEHICLE_TIP                            :{BLACK}Clicio i stopio pob cerbyd ffordd sydd tu mewn i'r depo
-STR_MASS_STOP_DEPOT_SHIP_TIP                                    :{BLACK}Clicio i stopio pob llong sydd tu mewn i'r depo
-STR_MASS_STOP_HANGAR_TIP                                        :{BLACK}Clicio i stopio pob awyren sydd tu mewn i'r awyrendy
+STR_DEPOT_MASS_STOP_DEPOT_TRAIN_TOOLTIP                         :{BLACK}Clicio i stopio pob trên sydd tu mewn i'r depo
+STR_DEPOT_MASS_STOP_DEPOT_ROAD_VEHICLE_TOOLTIP                  :{BLACK}Clicio i stopio pob cerbyd ffordd sydd tu mewn i'r depo
+STR_DEPOT_MASS_STOP_DEPOT_SHIP_TOOLTIP                          :{BLACK}Clicio i stopio pob llong sydd tu mewn i'r depo
+STR_DEPOT_MASS_STOP_HANGAR_TOOLTIP                              :{BLACK}Clicio i stopio pob awyren sydd tu mewn i'r awyrendy
 
-STR_MASS_START_DEPOT_TRAIN_TIP                                  :{BLACK}Clicio i gychwyn pob trên sydd tu mewn i'r depo
-STR_MASS_START_DEPOT_ROAD_VEHICLE_TIP                           :{BLACK}Clicio i gychwyn pob cerbyd ffordd sydd tu mewn i'r depo
-STR_MASS_START_DEPOT_SHIP_TIP                                   :{BLACK}Clicio i gychwyn pob llong sydd tu mewn i'r depo
-STR_MASS_START_HANGAR_TIP                                       :{BLACK}Clicio i gychwyn pob awyren sydd tu mewn i'r awyrendy
+STR_DEPOT_MASS_START_DEPOT_TRAIN_TOOLTIP                        :{BLACK}Clicio i gychwyn pob trên sydd tu mewn i'r depo
+STR_DEPOT_MASS_START_DEPOT_ROAD_VEHICLE_TOOLTIP                 :{BLACK}Clicio i gychwyn pob cerbyd ffordd sydd tu mewn i'r depo
+STR_DEPOT_MASS_START_DEPOT_SHIP_TOOLTIP                         :{BLACK}Clicio i gychwyn pob llong sydd tu mewn i'r depo
+STR_DEPOT_MASS_START_HANGAR_TOOLTIP                             :{BLACK}Clicio i gychwyn pob awyren sydd tu mewn i'r awyrendy
 
-STR_MASS_STOP_LIST_TIP                                          :{BLACK}Clicio i stopio pob cerbyd yn y rhestr
-STR_MASS_START_LIST_TIP                                         :{BLACK}Clicio i gychwyn pob cerbyd yn y rhestr
+STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP                         :{BLACK}Clicio i stopio pob cerbyd yn y rhestr
+STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP                        :{BLACK}Clicio i gychwyn pob cerbyd yn y rhestr
 
 STR_SHORT_DATE                                                  :{WHITE}{DATE_TINY}
 STR_SIGN_LIST_CAPTION                                           :{WHITE}Rhestr Arwyddion - {COMMA} Arwydd{P "" ion}
@@ -3248,14 +3248,14 @@ STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}Stopiodd
 
 ############ Lists rail types
 
-STR_RAIL_VEHICLES                                               :Cerbydau Rheilffordd
-STR_ELRAIL_VEHICLES                                             :Cerbydau Rheilffordd Drydan
-STR_MONORAIL_VEHICLES                                           :Cerbydau Monoreilffordd
-STR_MAGLEV_VEHICLES                                             :Cerbydau Maglef
+STR_REPLACE_RAIL_VEHICLES                                       :Cerbydau Rheilffordd
+STR_REPLACE_ELRAIL_VEHICLES                                     :Cerbydau Rheilffordd Drydan
+STR_REPLACE_MONORAIL_VEHICLES                                   :Cerbydau Monoreilffordd
+STR_REPLACE_MAGLEV_VEHICLES                                     :Cerbydau Maglef
 
 ############ End of list of rail types
 
-STR_TINY_BLACK                                                  :{TINYFONT}{BLACK}{COMMA}
+STR_TINY_BLACK_COMA                                             :{TINYFONT}{BLACK}{COMMA}
 
 STR_PURCHASE_INFO_COST_WEIGHT                                   :{BLACK}Côst: {GOLD}{CURRENCY}{BLACK} Pwysau: {GOLD}{WEIGHT_S}
 STR_PURCHASE_INFO_SPEED_POWER                                   :{BLACK}Cyflymder: {GOLD}{VELOCITY}{BLACK}   Pŵer: {GOLD}{POWER}
@@ -3282,70 +3282,70 @@ STR_NUM_3                                                       :{BLACK}{SKIP}{S
 
 ########### String for New Landscape Generator
 
-STR_GENERATE                                                    :{WHITE}Cynhyrchu
-STR_RANDOM                                                      :{BLACK}Ar hap
-STR_RANDOM_HELP                                                 :{BLACK}Newid yr hedyn hap syn cael ei ddefnyddio ar gyfer Cynhyrchu Tirwedd
-STR_WORLD_GENERATION_CAPTION                                    :{WHITE}Cynhyrchu Byd
-STR_RANDOM_SEED                                                 :{BLACK}Hedyn Hap
-STR_RANDOM_SEED_HELP                                            :{BLACK}Cliciwch i fewnbynnu hedyn hap
-STR_RANDOM_SEED_OSKTITLE                                        :{BLACK}Rhowch hedyn hap
-STR_LAND_GENERATOR                                              :{BLACK}Cynhyrchydd Tir:
-STR_TREE_PLACER                                                 :{BLACK}Algorithm Coed:
-STR_HEIGHTMAP_ROTATION                                          :{BLACK}Cylchdro Map Uchder:
-STR_TERRAIN_TYPE                                                :{BLACK}Math Tirwedd:
-STR_QUANTITY_OF_SEA_LAKES                                       :{BLACK}Lefel y Môr:
-STR_SMOOTHNESS                                                  :{BLACK}Llyfnder:
-STR_SNOW_LINE_HEIGHT                                            :{BLACK}Uchder Llinell Eira:
-STR_DATE                                                        :{BLACK}Dyddiad:
-STR_NUMBER_OF_TOWNS                                             :{BLACK}Nifer trefi:
-STR_NUMBER_OF_INDUSTRIES                                        :{BLACK}Nifer diwydiannau:
-STR_GENERATE_DATE                                               :{BLACK}{DATE_LONG}
-STR_SNOW_LINE_UP                                                :{BLACK}Symud y llinell eira un yn uwch
-STR_SNOW_LINE_DOWN                                              :{BLACK}Symud y llinell eira un yn is
-STR_SNOW_LINE_QUERY_CAPT                                        :{WHITE}Newid uchder Llinell Eira
-STR_START_DATE_QUERY_CAPT                                       :{WHITE}Newid y flwyddyn gychwyn
-STR_HEIGHTMAP_SCALE_WARNING_CAPTION                             :{WHITE}Rhybudd Graddfa
-STR_HEIGHTMAP_SCALE_WARNING_MESSAGE                             :{YELLOW}Ni argymhellir newid gormod ar faint y map gwreiddiol. Parhau gyda'r cynhyrchu?
-STR_HEIGHTMAP_NAME                                              :{BLACK}Enw'r Map Uchder
-STR_HEIGHTMAP_SIZE                                              :{BLACK}Maint: {ORANGE}{NUM} x {NUM}
+STR_MAPGEN_GENERATE                                             :{WHITE}Cynhyrchu
+STR_MAPGEN_RANDOM                                               :{BLACK}Ar hap
+STR_MAPGEN_RANDOM_HELP                                          :{BLACK}Newid yr hedyn hap syn cael ei ddefnyddio ar gyfer Cynhyrchu Tirwedd
+STR_MAPGEN_WORLD_GENERATION_CAPTION                             :{WHITE}Cynhyrchu Byd
+STR_MAPGEN_RANDOM_SEED                                          :{BLACK}Hedyn Hap
+STR_MAPGEN_RANDOM_SEED_HELP                                     :{BLACK}Cliciwch i fewnbynnu hedyn hap
+STR_MAPGEN_RANDOM_SEED_OSKTITLE                                 :{BLACK}Rhowch hedyn hap
+STR_MAPGEN_LAND_GENERATOR                                       :{BLACK}Cynhyrchydd Tir:
+STR_MAPGEN_TREE_PLACER                                          :{BLACK}Algorithm Coed:
+STR_MAPGEN_HEIGHTMAP_ROTATION                                   :{BLACK}Cylchdro Map Uchder:
+STR_MAPGEN_TERRAIN_TYPE                                         :{BLACK}Math Tirwedd:
+STR_MAPGEN_QUANTITY_OF_SEA_LAKES                                :{BLACK}Lefel y Môr:
+STR_MAPGEN_SMOOTHNESS                                           :{BLACK}Llyfnder:
+STR_MAPGEN_SNOW_LINE_HEIGHT                                     :{BLACK}Uchder Llinell Eira:
+STR_MAPGEN_DATE                                                 :{BLACK}Dyddiad:
+STR_MAPGEN_NUMBER_OF_TOWNS                                      :{BLACK}Nifer trefi:
+STR_MAPGEN_NUMBER_OF_INDUSTRIES                                 :{BLACK}Nifer diwydiannau:
+STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
+STR_MAPGEN_SNOW_LINE_UP                                         :{BLACK}Symud y llinell eira un yn uwch
+STR_MAPGEN_SNOW_LINE_DOWN                                       :{BLACK}Symud y llinell eira un yn is
+STR_MAPGEN_SNOW_LINE_QUERY_CAPT                                 :{WHITE}Newid uchder Llinell Eira
+STR_MAPGEN_START_DATE_QUERY_CAPT                                :{WHITE}Newid y flwyddyn gychwyn
+STR_WARNING_HEIGHTMAP_SCALE_CAPTION                             :{WHITE}Rhybudd Graddfa
+STR_WARNING_HEIGHTMAP_SCALE_MESSAGE                             :{YELLOW}Ni argymhellir newid gormod ar faint y map gwreiddiol. Parhau gyda'r cynhyrchu?
+STR_MAPGEN_HEIGHTMAP_NAME                                       :{BLACK}Enw'r Map Uchder
+STR_MAPGEN_HEIGHTMAP_SIZE                                       :{BLACK}Maint: {ORANGE}{NUM} x {NUM}
 STR_GENERATION_WORLD                                            :{WHITE}Wrthi'n cynhyrchu'r byd...
 STR_GENERATION_ABORT                                            :{BLACK}Diddymu
 STR_GENERATION_ABORT_CAPTION                                    :{WHITE}Diddymu Cynhyrchu Byd
 STR_GENERATION_ABORT_MESSAGE                                    :{YELLOW}Ydych chi eisiau diddymu cynhyrchu'r byd?
-STR_PROGRESS                                                    :{WHITE}{NUM}% cyflawn
-STR_GENERATION_PROGRESS                                         :{BLACK}{NUM} / {NUM}
-STR_WORLD_GENERATION                                            :{BLACK}Cynhyrchu Byd
-STR_TREE_GENERATION                                             :{BLACK}Cynhyrchu Coed
-STR_UNMOVABLE_GENERATION                                        :{BLACK}Cynhyrchu Nodweddion Ansymudol
-STR_CLEARING_TILES                                              :{BLACK}Cynhyrchu ardaloedd creigiog a chnapiog
-STR_SETTINGUP_GAME                                              :{BLACK}Gosod gêm yn ei le
-STR_PREPARING_TILELOOP                                          :{BLACK}Rhedeg dolen teiliau
-STR_PREPARING_GAME                                              :{BLACK}Paratoi gêm
-STR_DIFFICULTY_TO_CUSTOM                                        :{WHITE}Newidiodd y weithred hon y gêm i un personol
-STR_SE_FLAT_WORLD                                               :{WHITE}Tir Gwastad
-STR_SE_FLAT_WORLD_TIP                                           :{BLACK}Cynhyrchu Tir Gwastad
-STR_SE_RANDOM_LAND                                              :{WHITE}Tir ar hap
-STR_SE_NEW_WORLD                                                :{BLACK}Creu senario newydd
-STR_SE_CAPTION                                                  :{WHITE}math senario
-STR_FLAT_WORLD_HEIGHT_DOWN                                      :{BLACK}Symud uchder tir gwastad un yn uwch
-STR_FLAT_WORLD_HEIGHT_UP                                        :{BLACK}Symud uchder tir gwastad un yn is
-STR_FLAT_WORLD_HEIGHT_QUERY_CAPT                                :{WHITE}Newid uchder tir gwastad
-STR_FLAT_WORLD_HEIGHT                                           :{BLACK}uchder tir gwastad:
+STR_GENERATION_PROGRESS                                         :{WHITE}{NUM}% cyflawn
+STR_GENERATION_PROGRESS_NUM                                     :{BLACK}{NUM} / {NUM}
+STR_GENERATION_WORLD_GENERATION                                 :{BLACK}Cynhyrchu Byd
+STR_GENERATION_TREE_GENERATION                                  :{BLACK}Cynhyrchu Coed
+STR_GENERATION_UNMOVABLE_GENERATION                             :{BLACK}Cynhyrchu Nodweddion Ansymudol
+STR_GENERATION_CLEARING_TILES                                   :{BLACK}Cynhyrchu ardaloedd creigiog a chnapiog
+STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Gosod gêm yn ei le
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Rhedeg dolen teiliau
+STR_GENERATION_PREPARING_GAME                                   :{BLACK}Paratoi gêm
+STR_WARNING_DIFFICULTY_TO_CUSTOM                                :{WHITE}Newidiodd y weithred hon y gêm i un personol
+STR_SE_MAPGEN_FLAT_WORLD                                        :{WHITE}Tir Gwastad
+STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP                                :{BLACK}Cynhyrchu Tir Gwastad
+STR_SE_MAPGEN_RANDOM_LAND                                       :{WHITE}Tir ar hap
+STR_TERRAFORM_SE_NEW_WORLD                                      :{BLACK}Creu senario newydd
+STR_SE_MAPGEN_CAPTION                                           :{WHITE}math senario
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN                            :{BLACK}Symud uchder tir gwastad un yn uwch
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP                              :{BLACK}Symud uchder tir gwastad un yn is
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT                      :{WHITE}Newid uchder tir gwastad
+STR_SE_MAPGEN_FLAT_WORLD_HEIGHT                                 :{BLACK}uchder tir gwastad:
 
 STR_SMALLMAP_CENTER                                             :{BLACK}Canoli'r map bach ar y lleoliad presennol
 STR_SMALLMAP_INDUSTRY                                           :{TINYFONT}{STRING} ({NUM})
 
 # Strings for map borders at game generation
-STR_BORDER_TYPE                                                 :{BLACK}Ymylon mapiau:
-STR_NORTHWEST                                                   :{BLACK}Gog. Orllewin
-STR_NORTHEAST                                                   :{BLACK}Gog. Ddwyrain
-STR_SOUTHEAST                                                   :{BLACK}De Ddwyrain
-STR_SOUTHWEST                                                   :{BLACK}De Orllewin
-STR_BORDER_FREEFORM                                             :{BLACK}Ffurfrydd
-STR_BORDER_WATER                                                :{BLACK}Dw^r
-STR_BORDER_RANDOM                                               :{BLACK}Ar hap
-STR_BORDER_RANDOMIZE                                            :{BLACK}Ar hap
-STR_BORDER_MANUAL                                               :{BLACK}Â Llaw
+STR_MAPGEN_BORDER_TYPE                                          :{BLACK}Ymylon mapiau:
+STR_MAPGEN_NORTHWEST                                            :{BLACK}Gog. Orllewin
+STR_MAPGEN_NORTHEAST                                            :{BLACK}Gog. Ddwyrain
+STR_MAPGEN_SOUTHEAST                                            :{BLACK}De Ddwyrain
+STR_MAPGEN_SOUTHWEST                                            :{BLACK}De Orllewin
+STR_MAPGEN_BORDER_FREEFORM                                      :{BLACK}Ffurfrydd
+STR_MAPGEN_BORDER_WATER                                         :{BLACK}Dw^r
+STR_MAPGEN_BORDER_RANDOM                                        :{BLACK}Ar hap
+STR_MAPGEN_BORDER_RANDOMIZE                                     :{BLACK}Ar hap
+STR_MAPGEN_BORDER_MANUAL                                        :{BLACK}Â Llaw
 
 ########### String for new airports
 STR_STATION_BUILD_AIRPORT_SMALL_AIRPORT                         :{BLACK}Bach
@@ -3370,21 +3370,21 @@ STR_MEASURE_AREA                                                :{BLACK}Ardal: {
 STR_MEASURE_LENGTH_HEIGHTDIFF                                   :{BLACK}Hyd: {NUM}{}Gwahaniaeth uchder: {NUM} m
 STR_MEASURE_AREA_HEIGHTDIFF                                     :{BLACK}Ardal: {NUM} x {NUM}{}Gwahaniaeth uchder: {NUM} m
 
-STR_FEEDER_CARGO_VALUE                                          :{BLACK}Credydau Trosi: {LTBLUE}{CURRENCY}
-STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD                            :{WHITE}...mae'r ffordd hon yn eiddo i dref
-STR_DRIVE_THROUGH_ERROR_DIRECTION                               :{WHITE}...mae'r ffordd yn gorwedd yn y cyfeiriad anghywir
-
-STR_TRANSPARENCY_TOOLB                                          :{WHITE}Dewisiadau Tryloywder
-STR_TRANSPARENT_SIGNS_DESC                                      :{BLACK}Toglu tryloywder ar gyfer arwyddion gorsafoedd. Ctrl+Clic i gloi.
-STR_TRANSPARENT_TREES_DESC                                      :{BLACK}Toglu tryloywder ar gyfer coed. Ctrl+Clic i gloi.
-STR_TRANSPARENT_HOUSES_DESC                                     :{BLACK}Toglu tryloywder ar gyfer tai. Ctrl+Clic i gloi.
-STR_TRANSPARENT_INDUSTRIES_DESC                                 :{BLACK}Toglu tryloywder ar gyfer diwydiannau. Ctrl+Clic i gloi.
-STR_TRANSPARENT_BUILDINGS_DESC                                  :{BLACK}Toglu tryloywder ar gyfer eitemau adeiladwy fel gorsafoedd, depos a pwyntiau llwybro. Ctrl+Clic i gloi.
-STR_TRANSPARENT_BRIDGES_DESC                                    :{BLACK}Toglu tryloywder ar gyfer pontydd. Ctrl+Clic i gloi.
-STR_TRANSPARENT_STRUCTURES_DESC                                 :{BLACK}Toglu tryloywder ar gyfer adeiledau fel goleudai ac antenau. Ctrl+Clic i gloi.
-STR_TRANSPARENT_CATENARY_DESC                                   :{BLACK}Toglu tryloywder ar gyfer catenâu. Ctrl+Clic i gloi.
-STR_TRANSPARENT_LOADING_DESC                                    :{BLACK}Toglu tryloywder ar gyfer dangosyddion llwytho. Ctrl+Clic i gloi.
-STR_TRANSPARENT_INVISIBLE_DESC                                  :{BLACK}Gosod gwrthrychau'n anweledig yn hytrach nac yn dryloyw
+STR_VEHICLE_INFO_FEEDER_CARGO_VALUE                             :{BLACK}Credydau Trosi: {LTBLUE}{CURRENCY}
+STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD                            :{WHITE}...mae'r ffordd hon yn eiddo i dref
+STR_ERROR_DRIVE_THROUGH_DIRECTION                               :{WHITE}...mae'r ffordd yn gorwedd yn y cyfeiriad anghywir
+
+STR_TRANSPARENCY_CAPTION                                        :{WHITE}Dewisiadau Tryloywder
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Toglu tryloywder ar gyfer arwyddion gorsafoedd. Ctrl+Clic i gloi.
+STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Toglu tryloywder ar gyfer coed. Ctrl+Clic i gloi.
+STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Toglu tryloywder ar gyfer tai. Ctrl+Clic i gloi.
+STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Toglu tryloywder ar gyfer diwydiannau. Ctrl+Clic i gloi.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Toglu tryloywder ar gyfer eitemau adeiladwy fel gorsafoedd, depos a pwyntiau llwybro. Ctrl+Clic i gloi.
+STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Toglu tryloywder ar gyfer pontydd. Ctrl+Clic i gloi.
+STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Toglu tryloywder ar gyfer adeiledau fel goleudai ac antenau. Ctrl+Clic i gloi.
+STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Toglu tryloywder ar gyfer catenâu. Ctrl+Clic i gloi.
+STR_TRANSPARENT_LOADING_TOOLTIP                                 :{BLACK}Toglu tryloywder ar gyfer dangosyddion llwytho. Ctrl+Clic i gloi.
+STR_TRANSPARENT_INVISIBLE_TOOLTIP                               :{BLACK}Gosod gwrthrychau'n anweledig yn hytrach nac yn dryloyw
 
 STR_PERCENT_UP_SMALL                                            :{TINYFONT}{WHITE}{NUM}%{UPARROW}
 STR_PERCENT_UP                                                  :{WHITE}{NUM}%{UPARROW}
@@ -3394,7 +3394,7 @@ STR_PERCENT_UP_DOWN_SMALL                                       :{TINYFONT}{WHIT
 STR_PERCENT_UP_DOWN                                             :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
 
 ##### Mass Order
-STR_GROUP_TINY_NAME                                             :{TINYFONT}{GROUP}
+STR_TINT_GROUP                                                  :{TINYFONT}{GROUP}
 STR_GROUP_ALL_TRAINS                                            :Pob trên
 STR_GROUP_ALL_ROAD_VEHICLES                                     :Pob cerbyd ffordd
 STR_GROUP_ALL_SHIPS                                             :Pob llong
@@ -3403,24 +3403,24 @@ STR_GROUP_DEFAULT_TRAINS                                        :Trenau heb eu g
 STR_GROUP_DEFAULT_ROAD_VEHICLES                                 :Cerbydau ffordd heb eu grwpio
 STR_GROUP_DEFAULT_SHIPS                                         :Llongau heb eu grwpio
 STR_GROUP_DEFAULT_AIRCRAFTS                                     :Awyrenau heb eu grwpio
-STR_GROUP_TINY_NUM                                              :{TINYFONT}{COMMA}
+STR_TINY_COMMA                                                  :{TINYFONT}{COMMA}
 STR_GROUP_ADD_SHARED_VEHICLE                                    :Ychwanegu cerbyd a rennir
 STR_GROUP_REMOVE_ALL_VEHICLES                                   :Dileu pob cerbyd
 
 STR_GROUP_RENAME_CAPTION                                        :{BLACK}Ailenwi grw^p
 
-STR_GROUP_CAN_T_CREATE                                          :{WHITE}Methu creu grw^p
-STR_GROUP_CAN_T_DELETE                                          :{WHITE}Methu dileu'r grw^p hwn...
-STR_GROUP_CAN_T_RENAME                                          :{WHITE}Methu ailenwi'r grw^p...
-STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                             :{WHITE}Methu dileu pob cerbyd o'r grw^p hwn...
-STR_GROUP_CAN_T_ADD_VEHICLE                                     :{WHITE}Methu ychawnegu'r cerbyd i'r grw^p hwn...
-STR_GROUP_CAN_T_ADD_SHARED_VEHICLE                              :{WHITE}Methu ychwanegu cerbyd a rennir i'r grw^p...
+STR_ERROR_GROUP_CAN_T_CREATE                                    :{WHITE}Methu creu grw^p
+STR_ERROR_GROUP_CAN_T_DELETE                                    :{WHITE}Methu dileu'r grw^p hwn...
+STR_ERROR_GROUP_CAN_T_RENAME                                    :{WHITE}Methu ailenwi'r grw^p...
+STR_ERROR_GROUP_CAN_T_REMOVE_ALL_VEHICLES                       :{WHITE}Methu dileu pob cerbyd o'r grw^p hwn...
+STR_ERROR_GROUP_CAN_T_ADD_VEHICLE                               :{WHITE}Methu ychawnegu'r cerbyd i'r grw^p hwn...
+STR_ERROR_GROUP_CAN_T_ADD_SHARED_VEHICLE                        :{WHITE}Methu ychwanegu cerbyd a rennir i'r grw^p...
 
-STR_GROUPS_CLICK_ON_GROUP_FOR_TIP                               :{BLACK}Grw^p - cliciwch ar grw^p i restru pob cerbyd yn y grw^p hwn
-STR_GROUP_CREATE_TIP                                            :{BLACK}Cliciwch i greu grw^p
-STR_GROUP_DELETE_TIP                                            :{BLACK}Dileu'r grŵp a ddewiswyd
-STR_GROUP_RENAME_TIP                                            :{BLACK}Ailenwi'r grw^p a ddewiswyd
-STR_GROUP_REPLACE_PROTECTION_TIP                                :{BLACK}Cliciwch i amddiffyn y grw^p rhag awtoddisodli gêm-eang
+STR_GROUPS_CLICK_ON_GROUP_FOR_TOOLTIP                           :{BLACK}Grw^p - cliciwch ar grw^p i restru pob cerbyd yn y grw^p hwn
+STR_GROUP_CREATE_TOOLTIP                                        :{BLACK}Cliciwch i greu grw^p
+STR_GROUP_DELETE_TOOLTIP                                        :{BLACK}Dileu'r grŵp a ddewiswyd
+STR_GROUP_RENAME_TOOLTIP                                        :{BLACK}Ailenwi'r grw^p a ddewiswyd
+STR_GROUP_REPLACE_PROTECTION_TOOLTIP                            :{BLACK}Cliciwch i amddiffyn y grw^p rhag awtoddisodli gêm-eang
 
 #### String control codes and their formatting
 STR_COMPANY_NAME                                                :{COMPANY}
@@ -3481,35 +3481,35 @@ STR_BLACK_5                                                     :{BLACK}5
 STR_BLACK_6                                                     :{BLACK}6
 STR_BLACK_7                                                     :{BLACK}7
 
-STR_NAME_MUST_BE_UNIQUE                                         :{WHITE}Rhaid i'r enw fod yn unigryw
+STR_ERROR_NAME_MUST_BE_UNIQUE                                   :{WHITE}Rhaid i'r enw fod yn unigryw
 
 #### Improved sign GUI
-STR_NEXT_SIGN_TOOLTIP                                           :{BLACK}Mynd i'r arwydd nesaf
-STR_PREVIOUS_SIGN_TOOLTIP                                       :{BLACK}Mynd i'r arwydd blaenorol
-STR_SIGN_OSKTITLE                                               :{BLACK}Rhowch enw ar gyfer yr arwydd
+STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP                                 :{BLACK}Mynd i'r arwydd nesaf
+STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP                             :{BLACK}Mynd i'r arwydd blaenorol
+STR_EDIT_SIGN_SIGN_OSKTITLE                                     :{BLACK}Rhowch enw ar gyfer yr arwydd
 
 ########
 
-STR_FUND_NEW_INDUSTRY                                           :{BLACK}Ariannu
-STR_PROSPECT_NEW_INDUSTRY                                       :{BLACK}Archwilio
-STR_BUILD_NEW_INDUSTRY                                          :{BLACK}Adeiladu
-STR_INDUSTRY_SELECTION_HINT                                     :{BLACK}Dewiswch ddiwydiant o'r rhestr
+STR_FUND_INDUSTRY_FUND_NEW_INDUSTRY                             :{BLACK}Ariannu
+STR_FUND_INDUSTRY_PROSPECT_NEW_INDUSTRY                         :{BLACK}Archwilio
+STR_FUND_INDUSTRY_BUILD_NEW_INDUSTRY                            :{BLACK}Adeiladu
+STR_FUND_INDUSTRY_SELECTION_TOOLTIP                             :{BLACK}Dewiswch ddiwydiant o'r rhestr
 
 ############ Face formatting
 STR_FACE_ADVANCED                                               :{BLACK}Uwch
-STR_FACE_ADVANCED_TIP                                           :{BLACK}Dewis wyneb uwch.
+STR_FACE_ADVANCED_TOOLTIP                                       :{BLACK}Dewis wyneb uwch.
 STR_FACE_SIMPLE                                                 :{BLACK}Syml
-STR_FACE_SIMPLE_TIP                                             :{BLACK}Dewis wyneb symln.
+STR_FACE_SIMPLE_TOOLTIP                                         :{BLACK}Dewis wyneb symln.
 STR_FACE_LOAD                                                   :{BLACK}Llwytho
-STR_FACE_LOAD_TIP                                               :{BLACK}Llwytho hoff wyneb
+STR_FACE_LOAD_TOOLTIP                                           :{BLACK}Llwytho hoff wyneb
 STR_FACE_LOAD_DONE                                              :{WHITE}Cafodd eich hoff wyneb ei lwytho o'r ffeil ffurfweddu OpenTTD.
 STR_FACE_FACECODE                                               :{BLACK}Wyneb chwaraewr rhif:
-STR_FACE_FACECODE_TIP                                           :{BLACK}Gweld ac/neu osod rhif wyneb chwaraewr
+STR_FACE_FACECODE_TOOLTIP                                       :{BLACK}Gweld ac/neu osod rhif wyneb chwaraewr
 STR_FACE_FACECODE_CAPTION                                       :{WHITE}Gweld ac/neu osod rhif wyneb chwaraewr
 STR_FACE_FACECODE_SET                                           :{WHITE}Cafodd rhif wyneb newydd ei osod.
 STR_FACE_FACECODE_ERR                                           :{WHITE}Doedd dim modd gosod rhif wyneb chwaraewr - rhaid iddo dod yn rhif rhwng 0 a 4,294,967,295!
 STR_FACE_SAVE                                                   :{BLACK}Cadw
-STR_FACE_SAVE_TIP                                               :{BLACK}Cadw hoff wyneb
+STR_FACE_SAVE_TOOLTIP                                           :{BLACK}Cadw hoff wyneb
 STR_FACE_SAVE_DONE                                              :{WHITE}bydd yr wyneb hwn yn cael ei gadw fel eich ffefryn yn y ffeil ffurfweddu OpenTTD.
 STR_FACE_EUROPEAN                                               :{BLACK}Ewropeiaidd
 STR_FACE_SELECT_EUROPEAN                                        :{BLACK}Dewis o blith wynebau ewropeaidd
@@ -3517,51 +3517,51 @@ STR_FACE_AFRICAN                                                :{BLACK}Affrican
 STR_FACE_SELECT_AFRICAN                                         :{BLACK}Dewis gwynebau affricanaidd
 STR_FACE_YES                                                    :Iawn
 STR_FACE_NO                                                     :Na
-STR_FACE_MOUSTACHE_EARRING_TIP                                  :{BLACK}Galluogi mwstásh neu glustdlws
+STR_FACE_MOUSTACHE_EARRING_TOOLTIP                              :{BLACK}Galluogi mwstásh neu glustdlws
 STR_FACE_HAIR                                                   :Gwallt:
-STR_FACE_HAIR_TIP                                               :{BLACK}Newid gwallt
+STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Newid gwallt
 STR_FACE_EYEBROWS                                               :Aeliau:
-STR_FACE_EYEBROWS_TIP                                           :{BLACK}Newid aeliau
+STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Newid aeliau
 STR_FACE_EYECOLOUR                                              :Lliw llygaid
-STR_FACE_EYECOLOUR_TIP                                          :{BLACK}Newid lliw llygaid
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Newid lliw llygaid
 STR_FACE_GLASSES                                                :Sbectol:
-STR_FACE_GLASSES_TIP                                            :{BLACK}Galluogi sbectol
-STR_FACE_GLASSES_TIP_2                                          :{BLACK}Newid sbectol
+STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Galluogi sbectol
+STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Newid sbectol
 STR_FACE_NOSE                                                   :Trwyn:
-STR_FACE_NOSE_TIP                                               :{BLACK}Newid trwyn
+STR_FACE_NOSE_TOOLTIP                                           :{BLACK}Newid trwyn
 STR_FACE_LIPS                                                   :Gwefusau:
 STR_FACE_MOUSTACHE                                              :Mwstásh:
-STR_FACE_LIPS_MOUSTACHE_TIP                                     :{BLACK}Newid gwefusau neu fwstásh
+STR_FACE_LIPS_MOUSTACHE_TOOLTIP                                 :{BLACK}Newid gwefusau neu fwstásh
 STR_FACE_CHIN                                                   :Gen:
-STR_FACE_CHIN_TIP                                               :{BLACK}Newid gen
+STR_FACE_CHIN_TOOLTIP                                           :{BLACK}Newid gen
 STR_FACE_JACKET                                                 :Siaced:
-STR_FACE_JACKET_TIP                                             :{BLACK}Newid siaced
+STR_FACE_JACKET_TOOLTIP                                         :{BLACK}Newid siaced
 STR_FACE_COLLAR                                                 :Coler:
-STR_FACE_COLLAR_TIP                                             :{BLACK}Newid coler
+STR_FACE_COLLAR_TOOLTIP                                         :{BLACK}Newid coler
 STR_FACE_TIE                                                    :Tei:
 STR_FACE_EARRING                                                :Clustlws:
-STR_FACE_TIE_EARRING_TIP                                        :{BLACK}Newid tei neu glustlws
+STR_FACE_TIE_EARRING_TOOLTIP                                    :{BLACK}Newid tei neu glustlws
 ########
 
 ############ signal GUI
-STR_SIGNAL_SELECTION                                            :{WHITE}Dewis Signal
-STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                           :{WHITE}Methu trosi signalau yma...
-STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP                             :{BLACK}Signal Blocio (semaffor){}Dyma'r math mwyaf sylfaenol o signal, sy'n caniatáu dimond un trên yn yr un sgwâr ar yr un pryd.
-STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP                            :{BLACK}Signal-Mynediad (semaffor){}Gwyrdd cyhyd a bod un neu fwy o signalau gadael yn wyrdd yn y rhan o'r trac sy'n dilyn. Fel arall bydd yn dangos yn goch.
-STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP                             :{BLACK}Signal Gadael (semaffor){}Ymddwyn yn yr un ffordd â signal bloc ond yn angenrheidiol ar gyfer gweithredu'r lliw cywir ar rag-signalau mynediad a chyfun
-STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP                            :{BLACK}Signal Cyfun (semaffor){}Mae'r signal cyfun yn gweithredu fel signal mynediad ac fel signal gadael. Mae hyn yn eich galluogi i adeiladu "coed" o ragsignalau,
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP                              :{BLACK}Signal Llwybr (semaffor){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Gellir pasio signalau llwybro cyffredin o'r ochr gefn.
-STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP                         :{BLACK}Signal Llwybr Un-ffordd (semaffor){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Ni ellir pasio signalau llwybr un-ffordd o'r ochr gefn.
-STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP                              :{BLACK}Signal Bloc (trydan){}Dyma'r math mwyaf sylfaenol o signal, sy'n caniatáu i un trên yn unig fod yn yr un bloc ar yr un pryd.
-STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP                             :{BLACK}Signal mynediad (trydan){}Bydd yn dangos golau gwyrdd cyhyd â bod un neu fwy o Signalau Gadael gwyrdd ar y darn o drac sy'n dilyn. Fel arall bydd yn dangos golau coch.
-STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP                              :{BLACK}Signal Gadael (trydan){}Ymddwyn yn yr un ffordd â signal bloc ond yn angenrheidiol ar gyfer gweithredu'r lliw cywir ar rag-signalau mynediad a chyfun
-STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP                             :{BLACK}Signal Cyfun (trydan){}Mae'r signal cyfun yn gweithredu fel signal mynediad ac fel signal gadael. Mae hyn yn eich galluogi i adeiladu "coed" o ragsignalau,
-STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP                               :{BLACK}Signal Llwybr (trydan){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Gellir pasio signalau llwybro cyffredin o'r ochr gefn.
-STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP                          :{BLACK}Signal Llwybr Un-ffordd (trydan){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Ni ellir pasio signalau llwybr un-ffordd o'r ochr gefn.
-STR_SIGNAL_CONVERT_TIP                                          :{BLACK}Trosi Signal{}Pan fydd wedi'i ddewis, bydd clicio ar signal sydd eisoes yn bodoli yn ei drosi i'r math a'r amrywiad signal a ddewiswyd, Bydd Ctrl+Clic yn toglu'r amrywiad sy'n bodoli.
-STR_DRAG_SIGNALS_DENSITY_TIP                                    :{BLACK}Dwysedd llusgo signalau
-STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP                           :{BLACK}Cynyddu dwysedd llusgo signalau
-STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP                           :{BLACK}Cynyddu amlder y signalau wrth lusgo
+STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Dewis Signal
+STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Methu trosi signalau yma...
+STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP                         :{BLACK}Signal Blocio (semaffor){}Dyma'r math mwyaf sylfaenol o signal, sy'n caniatáu dimond un trên yn yr un sgwâr ar yr un pryd.
+STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP                        :{BLACK}Signal-Mynediad (semaffor){}Gwyrdd cyhyd a bod un neu fwy o signalau gadael yn wyrdd yn y rhan o'r trac sy'n dilyn. Fel arall bydd yn dangos yn goch.
+STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP                         :{BLACK}Signal Gadael (semaffor){}Ymddwyn yn yr un ffordd â signal bloc ond yn angenrheidiol ar gyfer gweithredu'r lliw cywir ar rag-signalau mynediad a chyfun
+STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP                        :{BLACK}Signal Cyfun (semaffor){}Mae'r signal cyfun yn gweithredu fel signal mynediad ac fel signal gadael. Mae hyn yn eich galluogi i adeiladu "coed" o ragsignalau,
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP                          :{BLACK}Signal Llwybr (semaffor){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Gellir pasio signalau llwybro cyffredin o'r ochr gefn.
+STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP                     :{BLACK}Signal Llwybr Un-ffordd (semaffor){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Ni ellir pasio signalau llwybr un-ffordd o'r ochr gefn.
+STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP                          :{BLACK}Signal Bloc (trydan){}Dyma'r math mwyaf sylfaenol o signal, sy'n caniatáu i un trên yn unig fod yn yr un bloc ar yr un pryd.
+STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP                         :{BLACK}Signal mynediad (trydan){}Bydd yn dangos golau gwyrdd cyhyd â bod un neu fwy o Signalau Gadael gwyrdd ar y darn o drac sy'n dilyn. Fel arall bydd yn dangos golau coch.
+STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP                          :{BLACK}Signal Gadael (trydan){}Ymddwyn yn yr un ffordd â signal bloc ond yn angenrheidiol ar gyfer gweithredu'r lliw cywir ar rag-signalau mynediad a chyfun
+STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP                         :{BLACK}Signal Cyfun (trydan){}Mae'r signal cyfun yn gweithredu fel signal mynediad ac fel signal gadael. Mae hyn yn eich galluogi i adeiladu "coed" o ragsignalau,
+STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP                           :{BLACK}Signal Llwybr (trydan){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Gellir pasio signalau llwybro cyffredin o'r ochr gefn.
+STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP                      :{BLACK}Signal Llwybr Un-ffordd (trydan){}Mae signal llwybr yn caniatáu i fwy nag un trên symud i mewn i floc signal ar yr un pryd, os oes modd i'r trên gadw llwybr yn glir at fan aros diogel. Ni ellir pasio signalau llwybr un-ffordd o'r ochr gefn.
+STR_BUILD_SIGNAL_CONVERT_TOOLTIP                                :{BLACK}Trosi Signal{}Pan fydd wedi'i ddewis, bydd clicio ar signal sydd eisoes yn bodoli yn ei drosi i'r math a'r amrywiad signal a ddewiswyd, Bydd Ctrl+Clic yn toglu'r amrywiad sy'n bodoli.
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP                   :{BLACK}Dwysedd llusgo signalau
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP          :{BLACK}Cynyddu dwysedd llusgo signalau
+STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP          :{BLACK}Cynyddu amlder y signalau wrth lusgo
 ########
 
 ############ on screen keyboard
@@ -3573,36 +3573,36 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS                                    :~!@#$%^&*()_+|Q
 STR_INTRO_AI_SETTINGS                                           :{BLACK}Gosodiadau Ai
 STR_INTRO_TOOLTIP_AI_SETTINGS                                   :{BLACK}Dangos Gosodiadau AI
 STR_AI_DEBUG                                                    :{WHITE}Dadfygio AI
-STR_AI_DEBUG_NAME_TIP                                           :{BLACK}Enw'r AI
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Enw'r AI
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Ail-lwytho AI
-STR_AI_DEBUG_RELOAD_TIP                                         :{BLACK}lladd yr AI, ail-lwytho'r sgript ac ailgychwyn yr AI
-STR_AI_DEBUG_SERVER_ONLY                                        :{YELLOW}Mae'r Ffenestr Ddadfygio AI ar gael yn unig ar gyfer y gweinydd
+STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}lladd yr AI, ail-lwytho'r sgript ac ailgychwyn yr AI
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Mae'r Ffenestr Ddadfygio AI ar gael yn unig ar gyfer y gweinydd
 STR_AI_CONFIG_CAPTION                                           :{WHITE}Ffurfweddiad AI
-STR_AI_CHANGE                                                   :{BLACK}Dewis AI
-STR_AI_CONFIGURE                                                :{BLACK}Ffurfweddu
-STR_AI_CHANGE_TIP                                               :{BLACK}Llwytho AI arall
-STR_AI_CONFIGURE_TIP                                            :{BLACK}ffurfweddu paramedrau'r AI
-STR_AI_LIST_TIP                                                 :{BLACK}Pob AIau a gaiff eu llwytho ar gyfer y gem nesaf
+STR_AI_CONFIG_CHANGE                                            :{BLACK}Dewis AI
+STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Ffurfweddu
+STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Llwytho AI arall
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}ffurfweddu paramedrau'r AI
+STR_AI_CONFIG_LIST_TOOLTIP                                      :{BLACK}Pob AIau a gaiff eu llwytho ar gyfer y gem nesaf
 STR_AI_LIST_CAPTION                                             :{WHITE}AIau sydd ar gael
-STR_AI_AILIST_TIP                                               :{BLACK}Cliciwch i ddewis AI
-STR_AI_ACCEPT                                                   :{BLACK}Derbyn
-STR_AI_ACCEPT_TIP                                               :{BLACK}Dewis yr AI a amlygwyd
-STR_AI_CANCEL                                                   :{BLACK}Canslo
-STR_AI_CANCEL_TIP                                               :{BLACK}Peidio newid AI
-STR_AI_CLOSE                                                    :{BLACK}Cau
-STR_AI_RESET                                                    :{BLACK}Ailosod
-STR_AI_HUMAN_PLAYER                                             :Chwaraewr dynol
-STR_AI_RANDOM_AI                                                :AI ar hap
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Cliciwch i ddewis AI
+STR_AI_LIST_ACCEPT                                              :{BLACK}Derbyn
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Dewis yr AI a amlygwyd
+STR_AI_LIST_CANCEL                                              :{BLACK}Canslo
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Peidio newid AI
+STR_AI_SETTINGS_CLOSE                                           :{BLACK}Cau
+STR_AI_SETTINGS_RESET                                           :{BLACK}Ailosod
+STR_AI_CONFIG_HUMAN_PLAYER                                      :Chwaraewr dynol
+STR_AI_CONFIG_RANDOM_AI                                         :AI ar hap
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}Paramedrau AI
-STR_AI_AUTHOR                                                   :{BLACK}Awdur: {STRING}
-STR_AI_VERSION                                                  :{BLACK}Fersiwn: {NUM}
-STR_AI_URL                                                      :{BLACK}URL: {STRING}
-STR_AI_PLEASE_REPORT_CRASH                                      :{WHITE}Mae un o'r AIau a oedd yn rhedeg wedi crashio. Gyrrwch adroddiad am hyn i awdur yr AI ynghyd á llun sgrin o'r Ffenestr Ddadfygio.
+STR_AI_LIST_AUTHOR                                              :{BLACK}Awdur: {STRING}
+STR_AI_LIST_VERSION                                             :{BLACK}Fersiwn: {NUM}
+STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Mae un o'r AIau a oedd yn rhedeg wedi crashio. Gyrrwch adroddiad am hyn i awdur yr AI ynghyd á llun sgrin o'r Ffenestr Ddadfygio.
 ########
 
 ############ town controlled noise level
-STR_NOISE_IN_TOWN                                               :{BLACK}Uchafswm swn mewn trefi: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
-STR_STATION_NOISE                                               :{BLACK}Swn a gynhyrchir: {GOLD}{COMMA}
+STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Uchafswm swn mewn trefi: {ORANGE}{COMMA}{BLACK}  uchafswm: {ORANGE}{COMMA}
+STR_STATION_BUILD_NOISE                                         :{BLACK}Swn a gynhyrchir: {GOLD}{COMMA}
 ########
 
 ############ Downloading of content from the central server
@@ -3616,21 +3616,21 @@ STR_CONTENT_TYPE_SCENARIO                                       :Senario
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Map Uchder
 STR_CONTENT_TITLE                                               :{WHITE}Cynnwys wrthi'n llwytho i lawr
 STR_CONTENT_TYPE_CAPTION                                        :{BLACK}Math
-STR_CONTENT_TYPE_CAPTION_TIP                                    :{BLACK}Math y cynnwys
+STR_CONTENT_TYPE_CAPTION_TOOLTIP                                :{BLACK}Math y cynnwys
 STR_CONTENT_NAME_CAPTION                                        :{BLACK}Enw
-STR_CONTENT_NAME_CAPTION_TIP                                    :{BLACK}Enw'r cynnwys
-STR_CONTENT_MATRIX_TIP                                          :{BLACK}Cliciwch ar linell  i weld ei fanylion{}Cliciwch ar flwch ticio i'w ddewis er mwyn ei lwytho i lawr
+STR_CONTENT_NAME_CAPTION_TOOLTIP                                :{BLACK}Enw'r cynnwys
+STR_CONTENT_MATRIX_TOOLTIP                                      :{BLACK}Cliciwch ar linell  i weld ei fanylion{}Cliciwch ar flwch ticio i'w ddewis er mwyn ei lwytho i lawr
 STR_CONTENT_SELECT_ALL_CAPTION                                  :{BLACK}Dewis y cyfan
-STR_CONTENT_SELECT_ALL_CAPTION_TIP                              :{BLACK}Marcio'r cynnwys i gyd er mwyn cael ei lwytho i lawr
+STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP                          :{BLACK}Marcio'r cynnwys i gyd er mwyn cael ei lwytho i lawr
 STR_CONTENT_SELECT_UPDATES_CAPTION                              :{BLACK}Dewis uwchraddiadau
-STR_CONTENT_SELECT_UPDATES_CAPTION_TIP                          :{BLACK}Marcio'r holl gynnwys sydd yn uwchraddiad ar gyfer cynnwys sydd eisioes yn bodoli ac i'w lwytho i lawr
+STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP                      :{BLACK}Marcio'r holl gynnwys sydd yn uwchraddiad ar gyfer cynnwys sydd eisioes yn bodoli ac i'w lwytho i lawr
 STR_CONTENT_UNSELECT_ALL_CAPTION                                :{BLACK}Dad-ddewis y cyfan
-STR_CONTENT_UNSELECT_ALL_CAPTION_TIP                            :{BLACK}Marcio'r holl gynnwys nad yw i'w lwytho i lawr
+STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP                        :{BLACK}Marcio'r holl gynnwys nad yw i'w lwytho i lawr
 STR_CONTENT_FILTER_OSKTITLE                                     :{BLACK}Rhowch linyn hidlydd
-STR_CONTENT_FILTER_TIP                                          :{BLACK}Rhowch allweddair er mwyn ei ddefnyddio i hidlo'r rhestr
+STR_CONTENT_FILTER_TOOLTIP                                      :{BLACK}Rhowch allweddair er mwyn ei ddefnyddio i hidlo'r rhestr
 STR_CONTENT_FILTER_TITLE                                        :{BLACK}Hidlydd enw/tag:
 STR_CONTENT_DOWNLOAD_CAPTION                                    :{BLACK}Llwytho i lawr
-STR_CONTENT_DOWNLOAD_CAPTION_TIP                                :{BLACK}Dechrau lwytho'r cynnwys a ddewiswyd i lawr
+STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP                            :{BLACK}Dechrau lwytho'r cynnwys a ddewiswyd i lawr
 STR_CONTENT_TOTAL_DOWNLOAD_SIZE                                 :{SILVER}Cyfanswm maint y llwyth: {WHITE}{BYTES}
 STR_CONTENT_DETAIL_TITLE                                        :{SILVER}GWYBODAETH AM Y CYNNWYS
 STR_CONTENT_DETAIL_SUBTITLE_UNSELECTED                          :{SILVER}Ni ddewisoch chi hwn i'w lwytho i lawr
@@ -3663,6 +3663,6 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Doedd di
 
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Gwirio Cynnwys Ar-lein
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Gwirio am gynnwys newydd neu wedi'i ddiweddaru i'w lwytho i lawr
-STR_CONTENT_INTRO_MISSING_BUTTON                                :{BLACK}Canfod cynnwys coll arlein
-STR_CONTENT_INTRO_MISSING_BUTTON_TIP                            :{BLACK}Gwirio a ellir cael hyd i'r cynnwys coll arlein
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON                 :{BLACK}Canfod cynnwys coll arlein
+STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP                :{BLACK}Gwirio a ellir cael hyd i'r cynnwys coll arlein
 ########
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 0e04b6045..c8f4413a0 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -67,7 +67,7 @@ void HandleOnEditText(const char *str)
 		uint32 money_c = Clamp(ClampToI32(money), 0, 20000000); // Clamp between 20 million and 0
 
 		/* Give 'id' the money, and substract it from ourself */
-		DoCommandP(0, money_c, _rename_id, CMD_GIVE_MONEY | CMD_MSG(STR_INSUFFICIENT_FUNDS), CcGiveMoney, str);
+		DoCommandP(0, money_c, _rename_id, CMD_GIVE_MONEY | CMD_MSG(STR_ERROR_INSUFFICIENT_FUNDS), CcGiveMoney, str);
 	} break;
 #endif /* ENABLE_NETWORK */
 		default: NOT_REACHED();
diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp
index 1e5365d0c..d6c9a3446 100644
--- a/src/misc_cmd.cpp
+++ b/src/misc_cmd.cpp
@@ -238,7 +238,7 @@ CommandCost CmdRenameCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_COMPANY_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniqueCompanyName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniqueCompanyName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
@@ -274,7 +274,7 @@ CommandCost CmdRenamePresident(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_PRESIDENT_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniquePresidentName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniquePresidentName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 9efa302cd..b75223f1f 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -162,7 +162,7 @@ public:
 				Money cost = costclear.GetCost();
 				if (cost < 0) {
 					cost = -cost; // Negate negative cost to a positive revenue
-					str = STR_REVENUE_WHEN_CLEARED;
+					str = STR_LAND_AREA_INFORMATION_REVENUE_WHEN_CLEARED;
 				} else {
 					str = STR_LAND_AREA_INFORMATION_COST_TO_CLEAR;
 				}
@@ -179,7 +179,7 @@ public:
 		SetDParam(1, TileY(tile));
 		SetDParam(2, TileHeight(tile));
 		SetDParamStr(3, tmp);
-		GetString(this->landinfo_data[line_nr], STR_LANDINFO_COORDS, lastof(this->landinfo_data[line_nr]));
+		GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_LANDINFO_COORDS, lastof(this->landinfo_data[line_nr]));
 		line_nr++;
 
 		/* Local authority */
@@ -194,28 +194,28 @@ public:
 		/* Build date */
 		if (td.build_date != INVALID_DATE) {
 			SetDParam(0, td.build_date);
-			GetString(this->landinfo_data[line_nr], STR_BUILD_DATE, lastof(this->landinfo_data[line_nr]));
+			GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_BUILD_DATE, lastof(this->landinfo_data[line_nr]));
 			line_nr++;
 		}
 
 		/* Station class */
 		if (td.station_class != STR_NULL) {
 			SetDParam(0, td.station_class);
-			GetString(this->landinfo_data[line_nr], STR_TILEDESC_STATION_CLASS, lastof(this->landinfo_data[line_nr]));
+			GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_STATION_CLASS, lastof(this->landinfo_data[line_nr]));
 			line_nr++;
 		}
 
 		/* Station type name */
 		if (td.station_name != STR_NULL) {
 			SetDParam(0, td.station_name);
-			GetString(this->landinfo_data[line_nr], STR_TILEDESC_STATION_TYPE, lastof(this->landinfo_data[line_nr]));
+			GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_STATION_TYPE, lastof(this->landinfo_data[line_nr]));
 			line_nr++;
 		}
 
 		/* NewGRF name */
 		if (td.grf != NULL) {
 			SetDParamStr(0, td.grf);
-			GetString(this->landinfo_data[line_nr], STR_TILEDESC_NEWGRF_NAME, lastof(this->landinfo_data[line_nr]));
+			GetString(this->landinfo_data[line_nr], STR_LAND_AREA_INFORMATION_NEWGRF_NAME, lastof(this->landinfo_data[line_nr]));
 			line_nr++;
 		}
 
@@ -1289,27 +1289,27 @@ struct QueryStringWindow : public QueryStringBaseWindow
 
 static const Widget _query_string_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,   STR_TOOLTIP_CLOSE_WINDOW}, // QUERY_STR_WIDGET_CLOSEBOX
-{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   259,     0,    13, STR_QUERY_CAPTION, STR_NULL},              // QUERY_STR_WIDGET_CAPTION
+{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   259,     0,    13, STR_WHITE_STRINGN, STR_NULL},              // QUERY_STR_WIDGET_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   259,    14,    29, 0x0,               STR_NULL},              // QUERY_STR_WIDGET_BACKGROUND
 {    WWT_EDITBOX,   RESIZE_NONE,  COLOUR_GREY,     2,   257,    16,    27, 0x0,               STR_NULL},              // QUERY_STR_WIDGET_TEXT
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    86,    30,    41, STR_DEFAULT,       STR_NULL},              // QUERY_STR_WIDGET_DEFAULT
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    87,   172,    30,    41, STR_QUERY_CANCEL,  STR_NULL},              // QUERY_STR_WIDGET_CANCEL
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   173,   259,    30,    41, STR_QUERY_OK,      STR_NULL},              // QUERY_STR_WIDGET_OK
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    86,    30,    41, STR_BUTTON_DEFAULT,       STR_NULL},              // QUERY_STR_WIDGET_DEFAULT
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    87,   172,    30,    41, STR_BUTTON_CANCEL,  STR_NULL},              // QUERY_STR_WIDGET_CANCEL
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,   173,   259,    30,    41, STR_BUTTON_OK,      STR_NULL},              // QUERY_STR_WIDGET_OK
 {   WIDGETS_END},
 };
 
 static const NWidgetPart _nested_query_string_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, QUERY_STR_WIDGET_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_STR_WIDGET_CAPTION), SetDataTip(STR_QUERY_CAPTION, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_STR_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRINGN, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, QUERY_STR_WIDGET_BACKGROUND),
 		NWidget(WWT_EDITBOX, COLOUR_GREY, QUERY_STR_WIDGET_TEXT), SetMinimalSize(256, 12), SetPadding(2, 2, 2, 2),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_DEFAULT), SetMinimalSize(87, 12), SetDataTip(STR_DEFAULT, STR_NULL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_CANCEL), SetMinimalSize(86, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_OK), SetMinimalSize(87, 12), SetDataTip(STR_QUERY_OK, STR_NULL),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_DEFAULT), SetMinimalSize(87, 12), SetDataTip(STR_BUTTON_DEFAULT, STR_NULL),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_CANCEL), SetMinimalSize(86, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_STR_WIDGET_OK), SetMinimalSize(87, 12), SetDataTip(STR_BUTTON_OK, STR_NULL),
 	EndContainer(),
 };
 
@@ -1450,8 +1450,8 @@ static const Widget _query_widgets[] = {
 {  WWT_CLOSEBOX, RESIZE_NONE,  COLOUR_RED,      0,  10,   0,  13, STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW}, // QUERY_WIDGET_CLOSEBOX
 {   WWT_CAPTION, RESIZE_NONE,  COLOUR_RED,     11, 209,   0,  13, STR_NULL,        STR_NULL},              // QUERY_WIDGET_CAPTION
 {     WWT_PANEL, RESIZE_NONE,  COLOUR_RED,      0, 209,  14,  81, 0x0, /*OVERRIDE*/STR_NULL},              // QUERY_WIDGET_BACKGROUND
-{WWT_PUSHTXTBTN, RESIZE_NONE,  COLOUR_YELLOW,  20,  90,  62,  73, STR_NO,          STR_NULL},              // QUERY_WIDGET_NO
-{WWT_PUSHTXTBTN, RESIZE_NONE,  COLOUR_YELLOW, 120, 190,  62,  73, STR_YES,         STR_NULL},              // QUERY_WIDGET_YES
+{WWT_PUSHTXTBTN, RESIZE_NONE,  COLOUR_YELLOW,  20,  90,  62,  73, STR_QUIT_NO,          STR_NULL},              // QUERY_WIDGET_NO
+{WWT_PUSHTXTBTN, RESIZE_NONE,  COLOUR_YELLOW, 120, 190,  62,  73, STR_QUIT_YES,         STR_NULL},              // QUERY_WIDGET_YES
 {   WIDGETS_END },
 };
 
@@ -1463,8 +1463,8 @@ static const NWidgetPart _nested_query_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_RED, QUERY_WIDGET_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 48),
 		NWidget(NWID_HORIZONTAL), SetPIP(20, 29, 19),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, QUERY_WIDGET_NO), SetMinimalSize(71, 12), SetDataTip(STR_NO, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, QUERY_WIDGET_YES), SetMinimalSize(71, 12), SetDataTip(STR_YES, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, QUERY_WIDGET_NO), SetMinimalSize(71, 12), SetDataTip(STR_QUIT_NO, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, QUERY_WIDGET_YES), SetMinimalSize(71, 12), SetDataTip(STR_QUIT_YES, STR_NULL),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 	EndContainer(),
@@ -1512,8 +1512,8 @@ enum SaveLoadWindowWidgets {
 static const Widget _load_dialog_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,          STR_TOOLTIP_CLOSE_WINDOW},             // SLWW_CLOSE
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   256,     0,    13, STR_NULL,                 STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // SLWW_WINDOWTITLE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   127,    14,    25, STR_SORT_BY_NAME,         STR_SORT_ORDER_TIP},                   // SLWW_SORT_BYNAME
-{ WWT_PUSHTXTBTN,  RESIZE_RIGHT,  COLOUR_GREY,   128,   256,    14,    25, STR_SORT_BY_DATE,         STR_SORT_ORDER_TIP},                   // SLWW_SORT_BYDATE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   127,    14,    25, STR_SORT_BY_NAME,         STR_TOOLTIP_SORT_ORDER},                   // SLWW_SORT_BYNAME
+{ WWT_PUSHTXTBTN,  RESIZE_RIGHT,  COLOUR_GREY,   128,   256,    14,    25, STR_SORT_BY_DATE,         STR_TOOLTIP_SORT_ORDER},                   // SLWW_SORT_BYDATE
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,     0,   256,    26,    47, 0x0,                      STR_NULL},                             // SLWW_BACKGROUND
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   256,    48,   153, 0x0,                      STR_NULL},                             // SLWW_FILE_BACKGROUND
 { WWT_PUSHIMGBTN,     RESIZE_LR,  COLOUR_GREY,   245,   256,    48,    59, SPR_HOUSE_ICON,           STR_SAVELOAD_HOME_BUTTON},             // SLWW_HOME_BUTTON
@@ -1523,7 +1523,7 @@ static const Widget _load_dialog_widgets[] = {
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                      STR_NULL},                             // SLWW_SAVE_OSK_TITLE
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                      STR_NULL},                             // SLWW_DELETE_SELECTION
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                      STR_NULL},                             // SLWW_SAVE_GAME
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   245,   256,   142,   153, 0x0,                      STR_RESIZE_BUTTON},                    // SLWW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   245,   256,   142,   153, 0x0,                      STR_TOOLTIP_RESIZE},                    // SLWW_RESIZE
 {   WIDGETS_END},
 };
 
@@ -1535,8 +1535,8 @@ static const NWidgetPart _nested_load_dialog_widgets[] = {
 				NWidget(WWT_CAPTION, COLOUR_GREY, SLWW_WINDOWTITLE),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYNAME), SetMinimalSize(128, 12), SetDataTip(STR_SORT_BY_NAME, STR_SORT_ORDER_TIP),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYDATE), SetMinimalSize(129, 12), SetDataTip(STR_SORT_BY_DATE, STR_SORT_ORDER_TIP), SetResize(1, 0),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYNAME), SetMinimalSize(128, 12), SetDataTip(STR_SORT_BY_NAME, STR_TOOLTIP_SORT_ORDER),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYDATE), SetMinimalSize(129, 12), SetDataTip(STR_SORT_BY_DATE, STR_TOOLTIP_SORT_ORDER), SetResize(1, 0),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY, SLWW_BACKGROUND), SetMinimalSize(257, 22), SetResize(1, 0), EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY, SLWW_FILE_BACKGROUND),
@@ -1572,18 +1572,18 @@ static const NWidgetPart _nested_load_dialog_widgets[] = {
 static const Widget _save_dialog_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},             // SLWW_CLOSE
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   256,     0,    13, STR_NULL,                   STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // SLWW_WINDOWTITLE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   127,    14,    25, STR_SORT_BY_NAME,           STR_SORT_ORDER_TIP},                   // SLWW_SORT_BYNAME
-{ WWT_PUSHTXTBTN,  RESIZE_RIGHT,  COLOUR_GREY,   128,   256,    14,    25, STR_SORT_BY_DATE,           STR_SORT_ORDER_TIP},                   // SLWW_SORT_BYDATE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,   127,    14,    25, STR_SORT_BY_NAME,           STR_TOOLTIP_SORT_ORDER},                   // SLWW_SORT_BYNAME
+{ WWT_PUSHTXTBTN,  RESIZE_RIGHT,  COLOUR_GREY,   128,   256,    14,    25, STR_SORT_BY_DATE,           STR_TOOLTIP_SORT_ORDER},                   // SLWW_SORT_BYDATE
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,     0,   256,    26,    47, 0x0,                        STR_NULL},                             // SLWW_BACKGROUND
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   256,    48,   167, 0x0,                        STR_NULL},                             // SLWW_FILE_BACKGROUND
 { WWT_PUSHIMGBTN,     RESIZE_LR,  COLOUR_GREY,   245,   256,    48,    59, SPR_HOUSE_ICON,             STR_SAVELOAD_HOME_BUTTON},             // SLWW_HOME_BUTTON
 {      WWT_INSET,     RESIZE_RB,  COLOUR_GREY,     2,   243,    50,   150, 0x0,                        STR_SAVELOAD_LIST_TOOLTIP},            // SLWW_DRIVES_DIRECTORIES_LIST
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   245,   256,    60,   150, 0x0,                        STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // SLWW_SCROLLBAR
 {      WWT_EMPTY,   RESIZE_NONE,  COLOUR_GREY,     0,     0,     0,     0, 0x0,                        STR_NULL},                             // SLWW_CONTENT_DOWNLOAD
-{    WWT_EDITBOX,    RESIZE_RTB,  COLOUR_GREY,     2,   254,   154,   165, STR_SAVE_OSKTITLE,          STR_SAVELOAD_EDITBOX_TOOLTIP},         // SLWW_SAVE_OSK_TITLE
+{    WWT_EDITBOX,    RESIZE_RTB,  COLOUR_GREY,     2,   254,   154,   165, STR_SAVELOAD_OSKTITLE,          STR_SAVELOAD_EDITBOX_TOOLTIP},         // SLWW_SAVE_OSK_TITLE
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   127,   168,   179, STR_SAVELOAD_DELETE_BUTTON, STR_SAVELOAD_DELETE_TOOLTIP},          // SLWW_DELETE_SELECTION
 { WWT_PUSHTXTBTN,    RESIZE_RTB,  COLOUR_GREY,   128,   244,   168,   179, STR_SAVELOAD_SAVE_BUTTON,   STR_SAVELOAD_SAVE_TOOLTIP},            // SLWW_SAVE_GAME
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   245,   256,   168,   179, 0x0,                        STR_RESIZE_BUTTON},                    // SLWW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   245,   256,   168,   179, 0x0,                        STR_TOOLTIP_RESIZE},                    // SLWW_RESIZE
 {   WIDGETS_END},
 };
 
@@ -1595,8 +1595,8 @@ static const NWidgetPart _nested_save_dialog_widgets[] = {
 				NWidget(WWT_CAPTION, COLOUR_GREY, SLWW_WINDOWTITLE),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYNAME), SetMinimalSize(128, 12), SetDataTip(STR_SORT_BY_NAME, STR_SORT_ORDER_TIP),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYDATE), SetMinimalSize(129, 12), SetDataTip(STR_SORT_BY_DATE, STR_SORT_ORDER_TIP), SetResize(1, 0),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYNAME), SetMinimalSize(128, 12), SetDataTip(STR_SORT_BY_NAME, STR_TOOLTIP_SORT_ORDER),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_SORT_BYDATE), SetMinimalSize(129, 12), SetDataTip(STR_SORT_BY_DATE, STR_TOOLTIP_SORT_ORDER), SetResize(1, 0),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY, SLWW_BACKGROUND), SetMinimalSize(257, 22), SetResize(1, 0), EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_GREY, SLWW_FILE_BACKGROUND),
@@ -1609,7 +1609,7 @@ static const NWidgetPart _nested_save_dialog_widgets[] = {
 					EndContainer(),
 				EndContainer(),
 				NWidget(WWT_EDITBOX, COLOUR_GREY, SLWW_SAVE_OSK_TITLE), SetMinimalSize(253, 12), SetPadding(3, 2, 2, 2), SetResize(1, 0),
-												SetDataTip(STR_SAVE_OSKTITLE, STR_SAVELOAD_EDITBOX_TOOLTIP),
+												SetDataTip(STR_SAVELOAD_OSKTITLE, STR_SAVELOAD_EDITBOX_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SLWW_DELETE_SELECTION), SetMinimalSize(128, 12),
@@ -1711,7 +1711,7 @@ public:
 			STR_SAVELOAD_LOAD_SCENARIO,
 			STR_SAVELOAD_SAVE_CAPTION,
 			STR_SAVELOAD_SAVE_SCENARIO,
-			STR_LOAD_HEIGHTMAP,
+			STR_SAVELOAD_LOAD_HEIGHTMAP,
 		};
 
 		this->vscroll.cap = 10;
@@ -1886,7 +1886,7 @@ public:
 
 			case SLWW_CONTENT_DOWNLOAD:
 				if (!_network_available) {
-					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERROR_NOTAVAILABLE, 0, 0);
 				} else {
 #if defined(ENABLE_NETWORK)
 					switch (_saveload_mode) {
diff --git a/src/network/core/tcp_game.cpp b/src/network/core/tcp_game.cpp
index 58447ad68..ea8cad7b9 100644
--- a/src/network/core/tcp_game.cpp
+++ b/src/network/core/tcp_game.cpp
@@ -57,7 +57,7 @@ NetworkRecvStatus NetworkClientSocket::CloseConnection(bool error)
 		_switch_mode = SM_MENU;
 		_networking = false;
 		extern StringID _switch_mode_errorstr;
-		_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION;
+		_switch_mode_errorstr = STR_NETWORK_ERROR_LOSTCONNECTION;
 
 		return NETWORK_RECV_STATUS_CONN_LOST;
 	}
diff --git a/src/network/network.cpp b/src/network/network.cpp
index cff0f456c..bbf26f74d 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -210,20 +210,20 @@ void NetworkTextMessage(NetworkAction action, ConsoleColour colour, bool self_se
 			break;
 		case NETWORK_ACTION_COMPANY_SPECTATOR:
 			colour = CC_DEFAULT;
-			strid = STR_NETWORK_CLIENT_COMPANY_SPECTATE;
+			strid = STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE;
 			break;
 		case NETWORK_ACTION_COMPANY_JOIN:
 			colour = CC_DEFAULT;
-			strid = STR_NETWORK_CLIENT_COMPANY_JOIN;
+			strid = STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN;
 			break;
 		case NETWORK_ACTION_COMPANY_NEW:
 			colour = CC_DEFAULT;
-			strid = STR_NETWORK_CLIENT_COMPANY_NEW;
+			strid = STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW;
 			break;
-		case NETWORK_ACTION_JOIN:           strid = STR_NETWORK_CLIENT_JOINED; break;
-		case NETWORK_ACTION_LEAVE:          strid = STR_NETWORK_CLIENT_LEFT; break;
-		case NETWORK_ACTION_NAME_CHANGE:    strid = STR_NETWORK_NAME_CHANGE; break;
-		case NETWORK_ACTION_GIVE_MONEY:     strid = self_send ? STR_NETWORK_GAVE_MONEY_AWAY : STR_NETWORK_GIVE_MONEY;   break;
+		case NETWORK_ACTION_JOIN:           strid = STR_NETWORK_MESSAGE_CLIENT_JOINED; break;
+		case NETWORK_ACTION_LEAVE:          strid = STR_NETWORK_MESSAGE_CLIENT_LEFT; break;
+		case NETWORK_ACTION_NAME_CHANGE:    strid = STR_NETWORK_MESSAGE_NAME_CHANGE; break;
+		case NETWORK_ACTION_GIVE_MONEY:     strid = self_send ? STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY : STR_NETWORK_MESSAGE_GIVE_MONEY;   break;
 		case NETWORK_ACTION_CHAT_COMPANY:   strid = self_send ? STR_NETWORK_CHAT_TO_COMPANY : STR_NETWORK_CHAT_COMPANY; break;
 		case NETWORK_ACTION_CHAT_CLIENT:    strid = self_send ? STR_NETWORK_CHAT_TO_CLIENT  : STR_NETWORK_CHAT_CLIENT;  break;
 		default:                            strid = STR_NETWORK_CHAT_ALL; break;
@@ -266,7 +266,7 @@ static void NetworkError(StringID error_string)
 static void ServerStartError(const char *error)
 {
 	DEBUG(net, 0, "[server] could not start network: %s",error);
-	NetworkError(STR_NETWORK_ERR_SERVER_START);
+	NetworkError(STR_NETWORK_ERROR_SERVER_START);
 }
 
 static void NetworkClientError(NetworkRecvStatus res, NetworkClientSocket *cs)
@@ -313,21 +313,21 @@ StringID GetNetworkErrorMsg(NetworkErrorCode err)
 	/* List of possible network errors, used by
 	 * PACKET_SERVER_ERROR and PACKET_CLIENT_ERROR */
 	static const StringID network_error_strings[] = {
-		STR_NETWORK_ERR_CLIENT_GENERAL,
-		STR_NETWORK_ERR_CLIENT_DESYNC,
-		STR_NETWORK_ERR_CLIENT_SAVEGAME,
-		STR_NETWORK_ERR_CLIENT_CONNECTION_LOST,
-		STR_NETWORK_ERR_CLIENT_PROTOCOL_ERROR,
-		STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH,
-		STR_NETWORK_ERR_CLIENT_NOT_AUTHORIZED,
-		STR_NETWORK_ERR_CLIENT_NOT_EXPECTED,
-		STR_NETWORK_ERR_CLIENT_WRONG_REVISION,
-		STR_NETWORK_ERR_CLIENT_NAME_IN_USE,
-		STR_NETWORK_ERR_CLIENT_WRONG_PASSWORD,
-		STR_NETWORK_ERR_CLIENT_COMPANY_MISMATCH,
-		STR_NETWORK_ERR_CLIENT_KICKED,
-		STR_NETWORK_ERR_CLIENT_CHEATER,
-		STR_NETWORK_ERR_CLIENT_SERVER_FULL
+		STR_NETWORK_ERROR_CLIENT_GENERAL,
+		STR_NETWORK_ERROR_CLIENT_DESYNC,
+		STR_NETWORK_ERROR_CLIENT_SAVEGAME,
+		STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST,
+		STR_NETWORK_ERROR_CLIENT_PROTOCOL_ERROR,
+		STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH,
+		STR_NETWORK_ERROR_CLIENT_NOT_AUTHORIZED,
+		STR_NETWORK_ERROR_CLIENT_NOT_EXPECTED,
+		STR_NETWORK_ERROR_CLIENT_WRONG_REVISION,
+		STR_NETWORK_ERROR_CLIENT_NAME_IN_USE,
+		STR_NETWORK_ERROR_CLIENT_WRONG_PASSWORD,
+		STR_NETWORK_ERROR_CLIENT_COMPANY_MISMATCH,
+		STR_NETWORK_ERROR_CLIENT_KICKED,
+		STR_NETWORK_ERROR_CLIENT_CHEATER,
+		STR_NETWORK_ERROR_CLIENT_SERVER_FULL
 	};
 
 	if (err >= (ptrdiff_t)lengthof(network_error_strings)) err = NETWORK_ERROR_GENERAL;
@@ -456,7 +456,7 @@ void NetworkCloseClient(NetworkClientSocket *cs, bool error)
 
 		NetworkGetClientName(client_name, sizeof(client_name), cs);
 
-		NetworkTextMessage(NETWORK_ACTION_LEAVE, CC_DEFAULT, false, client_name, NULL, STR_NETWORK_ERR_CLIENT_CONNECTION_LOST);
+		NetworkTextMessage(NETWORK_ACTION_LEAVE, CC_DEFAULT, false, client_name, NULL, STR_NETWORK_ERROR_CLIENT_CONNECTION_LOST);
 
 		/* Inform other clients of this... strange leaving ;) */
 		FOR_ALL_CLIENT_SOCKETS(new_cs) {
@@ -707,7 +707,7 @@ public:
 
 	virtual void OnFailure()
 	{
-		NetworkError(STR_NETWORK_ERR_NOCONNECTION);
+		NetworkError(STR_NETWORK_ERROR_NOCONNECTION);
 	}
 
 	virtual void OnConnect(SOCKET s)
@@ -865,7 +865,7 @@ static bool NetworkReceive()
 #else
 	int n = WaitSelect(FD_SETSIZE, &read_fd, &write_fd, NULL, &tv, NULL);
 #endif
-	if (n == -1 && !_network_server) NetworkError(STR_NETWORK_ERR_LOSTCONNECTION);
+	if (n == -1 && !_network_server) NetworkError(STR_NETWORK_ERROR_LOSTCONNECTION);
 
 	/* accept clients.. */
 	for (SocketList::iterator s = _listensockets.Begin(); s != _listensockets.End(); s++) {
@@ -929,7 +929,7 @@ static bool NetworkDoClientLoop()
 #else
 			if (_sync_seed_1 != _random.state[0]) {
 #endif
-				NetworkError(STR_NETWORK_ERR_DESYNC);
+				NetworkError(STR_NETWORK_ERROR_DESYNC);
 				DEBUG(desync, 1, "sync_err: %d; %d\n", _date, _date_fract);
 				DEBUG(net, 0, "Sync error detected!");
 				NetworkClientError(NETWORK_RECV_STATUS_DESYNC, NetworkClientSocket::Get(0));
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index 8c288bcf5..7a144967f 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -492,7 +492,7 @@ static const Widget _chat_window_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE,   COLOUR_GREY,   0,  10,  0, 13, STR_BLACK_CROSS,           STR_TOOLTIP_CLOSE_WINDOW},
 {      WWT_PANEL, RESIZE_RIGHT,  COLOUR_GREY,  11, 319,  0, 13, 0x0,                       STR_NULL}, // background
 {    WWT_EDITBOX, RESIZE_RIGHT,  COLOUR_GREY,  75, 257,  1, 12, STR_NETWORK_CHAT_OSKTITLE, STR_NULL}, // text box
-{ WWT_PUSHTXTBTN, RESIZE_LR,     COLOUR_GREY, 258, 319,  1, 12, STR_NETWORK_SEND,          STR_NULL}, // send button
+{ WWT_PUSHTXTBTN, RESIZE_LR,     COLOUR_GREY, 258, 319,  1, 12, STR_NETWORK_CHAT_SEND,          STR_NULL}, // send button
 {   WIDGETS_END},
 };
 
@@ -503,7 +503,7 @@ static const NWidgetPart _nested_chat_window_widgets[] = {
 			NWidget(NWID_HORIZONTAL),
 				NWidget(WWT_EDITBOX, COLOUR_GREY, NWCW_TEXTBOX), SetMinimalSize(183, 12), SetPadding(1, 0, 1, 64), SetResize(1, 0),
 															SetDataTip(STR_NETWORK_CHAT_OSKTITLE, STR_NULL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NWCW_SENDBUTTON), SetMinimalSize(62, 12), SetPadding(1, 0, 1, 0), SetDataTip(STR_NETWORK_SEND, STR_NULL),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NWCW_SENDBUTTON), SetMinimalSize(62, 12), SetPadding(1, 0, 1, 0), SetDataTip(STR_NETWORK_CHAT_SEND, STR_NULL),
 			EndContainer(),
 		EndContainer(),
 	EndContainer(),
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index ae1f59530..7b6e99207 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -348,7 +348,7 @@ extern StringID _switch_mode_errorstr;
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FULL)
 {
 	/* We try to join a server which is full */
-	_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_FULL;
+	_switch_mode_errorstr = STR_NETWORK_ERROR_SERVER_FULL;
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 
 	return NETWORK_RECV_STATUS_SERVER_FULL;
@@ -357,7 +357,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_FULL)
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_BANNED)
 {
 	/* We try to join a server where we are banned */
-	_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_BANNED;
+	_switch_mode_errorstr = STR_NETWORK_ERROR_SERVER_BANNED;
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
 
 	return NETWORK_RECV_STATUS_SERVER_BANNED;
@@ -453,25 +453,25 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR)
 		case NETWORK_ERROR_NOT_AUTHORIZED:
 		case NETWORK_ERROR_NOT_EXPECTED:
 		case NETWORK_ERROR_COMPANY_MISMATCH:
-			_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_ERROR;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_SERVER_ERROR;
 			break;
 		case NETWORK_ERROR_FULL:
-			_switch_mode_errorstr = STR_NETWORK_ERR_SERVER_FULL;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_SERVER_FULL;
 			break;
 		case NETWORK_ERROR_WRONG_REVISION:
-			_switch_mode_errorstr = STR_NETWORK_ERR_WRONG_REVISION;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_WRONG_REVISION;
 			break;
 		case NETWORK_ERROR_WRONG_PASSWORD:
-			_switch_mode_errorstr = STR_NETWORK_ERR_WRONG_PASSWORD;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_WRONG_PASSWORD;
 			break;
 		case NETWORK_ERROR_KICKED:
-			_switch_mode_errorstr = STR_NETWORK_ERR_KICKED;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_KICKED;
 			break;
 		case NETWORK_ERROR_CHEATER:
-			_switch_mode_errorstr = STR_NETWORK_ERR_CHEATER;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_CHEATER;
 			break;
 		default:
-			_switch_mode_errorstr = STR_NETWORK_ERR_LOSTCONNECTION;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_LOSTCONNECTION;
 	}
 
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
@@ -505,7 +505,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHECK_NEWGRFS)
 		SEND_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)();
 	} else {
 		/* NewGRF mismatch, bail out */
-		_switch_mode_errorstr = STR_NETWORK_ERR_NEWGRF_MISMATCH;
+		_switch_mode_errorstr = STR_NETWORK_ERROR_NEWGRF_MISMATCH;
 	}
 	return ret;
 }
@@ -576,7 +576,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
 	if (maptype == MAP_PACKET_START) {
 		file_pointer = FioFOpenFile("network_client.tmp", "wb", AUTOSAVE_DIR);;
 		if (file_pointer == NULL) {
-			_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
 		}
 
@@ -603,7 +603,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
 	if (maptype == MAP_PACKET_NORMAL) {
 		/* We are still receiving data, put it to the file */
 		if (fwrite(p->buffer + p->pos, 1, p->size - p->pos, file_pointer) != (size_t)(p->size - p->pos)) {
-			_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
 		}
 
@@ -621,7 +621,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_MAP)
 		/* The map is done downloading, load it */
 		if (!SafeSaveOrLoad("network_client.tmp", SL_LOAD, GM_NORMAL, AUTOSAVE_DIR)) {
 			DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
-			_switch_mode_errorstr = STR_NETWORK_ERR_SAVEGAMEERROR;
+			_switch_mode_errorstr = STR_NETWORK_ERROR_SAVEGAMEERROR;
 			return NETWORK_RECV_STATUS_SAVEGAME;
 		}
 		/* If the savegame has successfully loaded, ALL windows have been removed,
@@ -781,7 +781,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_QUIT)
 
 	ci = NetworkFindClientInfoFromClientID(client_id);
 	if (ci != NULL) {
-		NetworkTextMessage(NETWORK_ACTION_LEAVE, CC_DEFAULT, false, ci->client_name, NULL, STR_NETWORK_CLIENT_LEAVING);
+		NetworkTextMessage(NETWORK_ACTION_LEAVE, CC_DEFAULT, false, ci->client_name, NULL, STR_NETWORK_MESSAGE_CLIENT_LEAVING);
 		delete ci;
 	} else {
 		DEBUG(net, 0, "Unknown client (%d) is leaving the game", client_id);
@@ -808,7 +808,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_JOIN)
 
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_SHUTDOWN)
 {
-	_switch_mode_errorstr = STR_NETWORK_SERVER_SHUTDOWN;
+	_switch_mode_errorstr = STR_NETWORK_MESSAGE_SERVER_SHUTDOWN;
 
 	return NETWORK_RECV_STATUS_SERVER_ERROR;
 }
@@ -820,7 +820,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_NEWGAME)
 	 * COMPANY_SPECTATOR is currently 255, so to avoid long wait periods
 	 *  set the max to 10. */
 	_network_reconnect = min(_local_company + 1, 10);
-	_switch_mode_errorstr = STR_NETWORK_SERVER_REBOOT;
+	_switch_mode_errorstr = STR_NETWORK_MESSAGE_SERVER_REBOOT;
 
 	return NETWORK_RECV_STATUS_SERVER_ERROR;
 }
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 9cfca1571..84fca14ae 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -33,7 +33,7 @@ static const NWidgetPart _nested_network_content_download_status_window_widgets[
 		NWidget(NWID_SPACER), SetMinimalSize(350, 55),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(125, 0),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCDSWW_CANCELOK), SetMinimalSize(101, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCDSWW_CANCELOK), SetMinimalSize(101, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 			NWidget(NWID_SPACER), SetFill(true, false),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 4),
@@ -167,7 +167,7 @@ public:
 
 		/* When downloading is finished change cancel in ok */
 		if (this->downloaded_bytes == this->total_bytes) {
-			this->nested_array[NCDSWW_CANCELOK]->widget_data = STR_QUERY_OK;
+			this->nested_array[NCDSWW_CANCELOK]->widget_data = STR_BUTTON_OK;
 		}
 
 		this->SetDirty();
@@ -398,7 +398,7 @@ public:
 		this->SetWidgetDisabledState(NCLWW_SELECT_ALL, !show_select_all);
 		this->SetWidgetDisabledState(NCLWW_SELECT_UPDATE, !show_select_upgrade);
 
-		this->widget[NCLWW_CANCEL].data = filesize == 0 ? STR_AI_CLOSE : STR_AI_CANCEL;
+		this->widget[NCLWW_CANCEL].data = filesize == 0 ? STR_AI_SETTINGS_CLOSE : STR_AI_LIST_CANCEL;
 
 		this->DrawWidgets();
 
@@ -745,27 +745,27 @@ static const Widget _network_content_list_widgets[] = {
 {    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_LIGHT_BLUE,    11,   449,     0,    13, STR_CONTENT_TITLE,                  STR_NULL},                               // NCLWW_CAPTION
 {      WWT_PANEL,   RESIZE_RB,     COLOUR_LIGHT_BLUE,     0,   449,    14,   277, 0x0,                                STR_NULL},                               // NCLWW_BACKGROUND
 
-{    WWT_EDITBOX,   RESIZE_LR,     COLOUR_LIGHT_BLUE,   210,   440,    20,    31, STR_CONTENT_FILTER_OSKTITLE,        STR_CONTENT_FILTER_TIP},                 // NCLWW_FILTER
+{    WWT_EDITBOX,   RESIZE_LR,     COLOUR_LIGHT_BLUE,   210,   440,    20,    31, STR_CONTENT_FILTER_OSKTITLE,        STR_CONTENT_FILTER_TOOLTIP},                 // NCLWW_FILTER
 
 /* LEFT SIDE */
 { WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,          8,    20,    36,    47, STR_EMPTY,                          STR_NULL},                               // NCLWW_CHECKBOX
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         21,   110,    36,    47, STR_CONTENT_TYPE_CAPTION,           STR_CONTENT_TYPE_CAPTION_TIP},           // NCLWW_TYPE
-{ WWT_PUSHTXTBTN,   RESIZE_RIGHT,  COLOUR_WHITE,        111,   190,    36,    47, STR_CONTENT_NAME_CAPTION,           STR_CONTENT_NAME_CAPTION_TIP},           // NCLWW_NAME
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         21,   110,    36,    47, STR_CONTENT_TYPE_CAPTION,           STR_CONTENT_TYPE_CAPTION_TOOLTIP},           // NCLWW_TYPE
+{ WWT_PUSHTXTBTN,   RESIZE_RIGHT,  COLOUR_WHITE,        111,   190,    36,    47, STR_CONTENT_NAME_CAPTION,           STR_CONTENT_NAME_CAPTION_TOOLTIP},           // NCLWW_NAME
 
-{     WWT_MATRIX,   RESIZE_RB,     COLOUR_LIGHT_BLUE,     8,   190,    48,   244, (14 << 8) | 1,                      STR_CONTENT_MATRIX_TIP},                 // NCLWW_MATRIX
+{     WWT_MATRIX,   RESIZE_RB,     COLOUR_LIGHT_BLUE,     8,   190,    48,   244, (14 << 8) | 1,                      STR_CONTENT_MATRIX_TOOLTIP},                 // NCLWW_MATRIX
 {  WWT_SCROLLBAR,   RESIZE_LRB,    COLOUR_LIGHT_BLUE,   191,   202,    36,   244, 0x0,                                STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},   // NCLWW_SCROLLBAR
 
 /* RIGHT SIDE */
 {      WWT_PANEL,   RESIZE_LRB,    COLOUR_LIGHT_BLUE,   210,   440,    36,   244, 0x0,                                STR_NULL},                               // NCLWW_DETAILS
 
 /* BOTTOM */
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,         10,   110,   252,   263, STR_CONTENT_SELECT_ALL_CAPTION,     STR_CONTENT_SELECT_ALL_CAPTION_TIP},     // NCLWW_SELECT_ALL
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,         10,   110,   252,   263, STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TIP}, // NCLWW_SELECT_UPDATE
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        118,   218,   252,   263, STR_CONTENT_UNSELECT_ALL_CAPTION,   STR_CONTENT_UNSELECT_ALL_CAPTION_TIP},   // NCLWW_UNSELECT
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        226,   326,   252,   263, STR_QUERY_CANCEL,                   STR_NULL},                               // NCLWW_CANCEL
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        334,   434,   252,   263, STR_CONTENT_DOWNLOAD_CAPTION,       STR_CONTENT_DOWNLOAD_CAPTION_TIP},       // NCLWW_DOWNLOAD
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,         10,   110,   252,   263, STR_CONTENT_SELECT_ALL_CAPTION,     STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP},     // NCLWW_SELECT_ALL
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,         10,   110,   252,   263, STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP}, // NCLWW_SELECT_UPDATE
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        118,   218,   252,   263, STR_CONTENT_UNSELECT_ALL_CAPTION,   STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP},   // NCLWW_UNSELECT
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        226,   326,   252,   263, STR_BUTTON_CANCEL,                   STR_NULL},                               // NCLWW_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        334,   434,   252,   263, STR_CONTENT_DOWNLOAD_CAPTION,       STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP},       // NCLWW_DOWNLOAD
 
-{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_LIGHT_BLUE,   438,   449,   266,   277, 0x0,                                STR_RESIZE_BUTTON },                     // NCLWW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_LIGHT_BLUE,   438,   449,   266,   277, 0x0,                                STR_TOOLTIP_RESIZE },                     // NCLWW_RESIZE
 
 {   WIDGETS_END},
 };
@@ -785,12 +785,12 @@ static const NWidgetPart _nested_network_content_list_widgets[] = {
 						NWidget(NWID_HORIZONTAL),
 							NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_CHECKBOX), SetMinimalSize(13, 12), SetDataTip(STR_EMPTY, STR_NULL),
 							NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_TYPE), SetMinimalSize(90, 12),
-											SetDataTip(STR_CONTENT_TYPE_CAPTION, STR_CONTENT_TYPE_CAPTION_TIP),
+											SetDataTip(STR_CONTENT_TYPE_CAPTION, STR_CONTENT_TYPE_CAPTION_TOOLTIP),
 							NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_NAME), SetMinimalSize(80, 12), SetResize(1, 0),
-											SetDataTip(STR_CONTENT_NAME_CAPTION, STR_CONTENT_NAME_CAPTION_TIP),
+											SetDataTip(STR_CONTENT_NAME_CAPTION, STR_CONTENT_NAME_CAPTION_TOOLTIP),
 						EndContainer(),
 						NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, NCLWW_MATRIX), SetMinimalSize(183, 197), SetResize(2, 14),
-											SetDataTip((14 << 8) | 1, STR_CONTENT_MATRIX_TIP),
+											SetDataTip((14 << 8) | 1, STR_CONTENT_MATRIX_TOOLTIP),
 					EndContainer(),
 					NWidget(WWT_SCROLLBAR, COLOUR_LIGHT_BLUE, NCLWW_SCROLLBAR),
 				EndContainer(),
@@ -798,7 +798,7 @@ static const NWidgetPart _nested_network_content_list_widgets[] = {
 			/* Right side. */
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-				NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, NCLWW_FILTER), SetMinimalSize(231, 12), SetDataTip(STR_CONTENT_FILTER_OSKTITLE, STR_CONTENT_FILTER_TIP),
+				NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, NCLWW_FILTER), SetMinimalSize(231, 12), SetDataTip(STR_CONTENT_FILTER_OSKTITLE, STR_CONTENT_FILTER_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
 				NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NCLWW_DETAILS), SetMinimalSize(231, 209), SetResize(0, 1), EndContainer(),
 			EndContainer(),
@@ -809,18 +809,18 @@ static const NWidgetPart _nested_network_content_list_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(10, 0),
 			NWidget(NWID_SELECTION),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_SELECT_ALL), SetMinimalSize(101, 12),
-										SetDataTip(STR_CONTENT_SELECT_ALL_CAPTION, STR_CONTENT_SELECT_ALL_CAPTION_TIP),
+										SetDataTip(STR_CONTENT_SELECT_ALL_CAPTION, STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_SELECT_UPDATE), SetMinimalSize(101, 12),
-										SetDataTip(STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TIP),
+										SetDataTip(STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(7, 0),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_UNSELECT), SetMinimalSize(101, 12),
-										SetDataTip(STR_CONTENT_UNSELECT_ALL_CAPTION, STR_CONTENT_UNSELECT_ALL_CAPTION_TIP),
+										SetDataTip(STR_CONTENT_UNSELECT_ALL_CAPTION, STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(7, 0), SetResize(1, 0),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_CANCEL), SetMinimalSize(101, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_CANCEL), SetMinimalSize(101, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 			NWidget(NWID_SPACER), SetMinimalSize(7, 0),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_DOWNLOAD), SetMinimalSize(101, 12),
-										SetDataTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TIP),
+										SetDataTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(15, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 2), SetResize(1, 0),
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index cb0e8c4f8..8e6ba0c71 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -34,14 +34,14 @@ static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
 extern void SwitchToMode(SwitchMode new_mode);
 
 static const StringID _connection_types_dropdown[] = {
-	STR_NETWORK_LAN_INTERNET,
-	STR_NETWORK_INTERNET_ADVERTISE,
+	STR_NETWORK_START_SERVER_LAN_INTERNET,
+	STR_NETWORK_START_SERVER_INTERNET_ADVERTISE,
 	INVALID_STRING_ID
 };
 
 static const StringID _lan_internet_types_dropdown[] = {
-	STR_NETWORK_LAN,
-	STR_NETWORK_INTERNET,
+	STR_NETWORK_SERVER_LIST_LAN,
+	STR_NETWORK_SERVER_LIST_INTERNET,
 	INVALID_STRING_ID
 };
 
@@ -249,13 +249,13 @@ protected:
 			SetDParam(1, cur_item->info.clients_max);
 			SetDParam(2, cur_item->info.companies_on);
 			SetDParam(3, cur_item->info.companies_max);
-			DrawString(this->widget[NGWW_CLIENTS].left, this->widget[NGWW_CLIENTS].right, y, STR_NETWORK_GENERAL_ONLINE, TC_FROMSTRING, SA_CENTER);
+			DrawString(this->widget[NGWW_CLIENTS].left, this->widget[NGWW_CLIENTS].right, y, STR_NETWORK_SERVER_LIST_GENERAL_ONLINE, TC_FROMSTRING, SA_CENTER);
 
 			/* map size */
 			if (!this->IsWidgetHidden(NGWW_MAPSIZE)) {
 				SetDParam(0, cur_item->info.map_width);
 				SetDParam(1, cur_item->info.map_height);
-				DrawString(this->widget[NGWW_MAPSIZE].left, this->widget[NGWW_MAPSIZE].right, y, STR_NETWORK_MAP_SIZE_SHORT, TC_FROMSTRING, SA_CENTER);
+				DrawString(this->widget[NGWW_MAPSIZE].left, this->widget[NGWW_MAPSIZE].right, y, STR_NETWORK_SERVER_LIST_MAP_SIZE_SHORT, TC_FROMSTRING, SA_CENTER);
 			}
 
 			/* current date */
@@ -384,7 +384,7 @@ public:
 		/* Edit box to set client name */
 		this->DrawEditBox(NGWW_CLIENT);
 
-		DrawString(0, this->widget[NGWW_CLIENT].left - 5, 23, STR_NETWORK_PLAYER_NAME, TC_FROMSTRING, SA_RIGHT);
+		DrawString(0, this->widget[NGWW_CLIENT].left - 5, 23, STR_NETWORK_SERVER_LIST_PLAYER_NAME, TC_FROMSTRING, SA_RIGHT);
 
 		/* Sort based on widgets: name, clients, compatibility */
 		switch (this->servers.SortType()) {
@@ -412,16 +412,16 @@ public:
 		/* Draw the right menu */
 		GfxFillRect(this->widget[NGWW_DETAILS].left + 1, 43, this->widget[NGWW_DETAILS].right - 1, 92, 157);
 		if (sel == NULL) {
-			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 58, STR_NETWORK_GAME_INFO, TC_FROMSTRING, SA_CENTER);
+			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 58, STR_NETWORK_SERVER_LIST_GAME_INFO, TC_FROMSTRING, SA_CENTER);
 		} else if (!sel->online) {
 			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 68, sel->info.server_name, TC_ORANGE, SA_CENTER); // game name
 
-			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 132, STR_NETWORK_SERVER_OFFLINE, TC_FROMSTRING, SA_CENTER); // server offline
+			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 132, STR_NETWORK_SERVER_LIST_SERVER_OFFLINE, TC_FROMSTRING, SA_CENTER); // server offline
 		} else { // show game info
 			uint16 y = 100;
 			const uint16 x = this->widget[NGWW_DETAILS].left + 5;
 
-			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 48, STR_NETWORK_GAME_INFO, TC_FROMSTRING, SA_CENTER);
+			DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, 48, STR_NETWORK_SERVER_LIST_GAME_INFO, TC_FROMSTRING, SA_CENTER);
 
 			DrawString(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 62, sel->info.server_name, TC_ORANGE, SA_CENTER); // game name
 			DrawString(this->widget[NGWW_DETAILS].left, this->widget[NGWW_DETAILS].right, 74, sel->info.map_name, TC_BLACK, SA_CENTER); // map name
@@ -430,47 +430,47 @@ public:
 			SetDParam(1, sel->info.clients_max);
 			SetDParam(2, sel->info.companies_on);
 			SetDParam(3, sel->info.companies_max);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_CLIENTS);
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_CLIENTS);
 			y += 10;
 
 			SetDParam(0, STR_NETWORK_LANG_ANY + sel->info.server_lang);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_LANGUAGE); // server language
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_LANGUAGE); // server language
 			y += 10;
 
-			SetDParam(0, STR_TEMPERATE_LANDSCAPE + sel->info.map_set);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_TILESET); // tileset
+			SetDParam(0, STR_CHEAT_SWITCH_CLIMATE_TEMPERATE_LANDSCAPE + sel->info.map_set);
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_TILESET); // tileset
 			y += 10;
 
 			SetDParam(0, sel->info.map_width);
 			SetDParam(1, sel->info.map_height);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_MAP_SIZE); // map size
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_MAP_SIZE); // map size
 			y += 10;
 
 			SetDParamStr(0, sel->info.server_revision);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_VERSION); // server version
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_SERVER_VERSION); // server version
 			y += 10;
 
 			SetDParamStr(0, sel->address.GetAddressAsString());
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_ADDRESS); // server address
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_SERVER_ADDRESS); // server address
 			y += 10;
 
 			SetDParam(0, sel->info.start_date);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_START_DATE); // start date
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_START_DATE); // start date
 			y += 10;
 
 			SetDParam(0, sel->info.game_date);
-			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_CURRENT_DATE); // current date
+			DrawString(x, this->widget[NGWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_CURRENT_DATE); // current date
 			y += 10;
 
 			y += 2;
 
 			if (!sel->info.compatible) {
-				DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, y, sel->info.version_compatible ? STR_NETWORK_GRF_MISMATCH : STR_NETWORK_VERSION_MISMATCH, TC_FROMSTRING, SA_CENTER); // server mismatch
+				DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, y, sel->info.version_compatible ? STR_NETWORK_SERVER_LIST_GRF_MISMATCH : STR_NETWORK_SERVER_LIST_VERSION_MISMATCH, TC_FROMSTRING, SA_CENTER); // server mismatch
 			} else if (sel->info.clients_on == sel->info.clients_max) {
 				/* Show: server full, when clients_on == max_clients */
-				DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, y, STR_NETWORK_SERVER_FULL, TC_FROMSTRING, SA_CENTER); // server full
+				DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, y, STR_NETWORK_SERVER_LIST_SERVER_FULL, TC_FROMSTRING, SA_CENTER); // server full
 			} else if (sel->info.use_password) {
-				DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, y, STR_NETWORK_PASSWORD, TC_FROMSTRING, SA_CENTER); // password warning
+				DrawString(this->widget[NGWW_DETAILS].left + 1, this->widget[NGWW_DETAILS].right - 1, y, STR_NETWORK_SERVER_LIST_PASSWORD, TC_FROMSTRING, SA_CENTER); // password warning
 			}
 
 			y += 10;
@@ -546,7 +546,7 @@ public:
 				SetDParamStr(0, _settings_client.network.connect_to_ip);
 				ShowQueryString(
 					STR_JUST_RAW_STRING,
-					STR_NETWORK_ENTER_IP,
+					STR_NETWORK_SERVER_LIST_ENTER_IP,
 					NETWORK_HOSTNAME_LENGTH,  // maximum number of characters including '\0'
 					0,                        // no limit in pixels
 					this, CS_ALPHANUMERAL, QSF_ACCEPT_UNCHANGED);
@@ -781,42 +781,42 @@ GUIGameServerList::SortFunction * const NetworkGameWindow::sorter_funcs[] = {
 static const Widget _network_game_window_widgets[] = {
 /* TOP */
 {   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     0,    10,     0,    13, STR_BLACK_CROSS,                  STR_TOOLTIP_CLOSE_WINDOW},         // NGWW_CLOSE
-{    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_LIGHT_BLUE,    11,   449,     0,    13, STR_NETWORK_MULTIPLAYER,          STR_NULL},                         // NGWW_CAPTION
+{    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_LIGHT_BLUE,    11,   449,     0,    13, STR_NETWORK_SERVER_LIST_CAPTION,          STR_NULL},                         // NGWW_CAPTION
 {      WWT_PANEL,   RESIZE_RB,     COLOUR_LIGHT_BLUE,     0,   449,    14,   263, 0x0,                              STR_NULL},                         // NGWW_MAIN
 
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     9,    85,    23,    35, STR_NETWORK_CONNECTION,           STR_NULL},                         // NGWW_CONNECTION
-{   WWT_DROPDOWN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    90,   181,    22,    33, STR_NETWORK_LAN_INTERNET_COMBO,   STR_NETWORK_CONNECTION_TIP},       // NGWW_CONN_BTN
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     9,    85,    23,    35, STR_NETWORK_SERVER_LIST_CONNECTION,           STR_NULL},                         // NGWW_CONNECTION
+{   WWT_DROPDOWN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    90,   181,    22,    33, STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO,   STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP},       // NGWW_CONN_BTN
 
-{    WWT_EDITBOX,   RESIZE_LR,     COLOUR_LIGHT_BLUE,   290,   440,    22,    33, STR_NETWORK_PLAYER_NAME_OSKTITLE, STR_NETWORK_ENTER_NAME_TIP},       // NGWW_CLIENT
+{    WWT_EDITBOX,   RESIZE_LR,     COLOUR_LIGHT_BLUE,   290,   440,    22,    33, STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE, STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP},       // NGWW_CLIENT
 
 /* LEFT SIDE */
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         10,    70,    42,    53, STR_NETWORK_GAME_NAME,            STR_NETWORK_GAME_NAME_TIP},        // NGWW_NAME
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   150,    42,    53, STR_NETWORK_CLIENTS_CAPTION,      STR_NETWORK_CLIENTS_CAPTION_TIP},  // NGWW_CLIENTS
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   150,    42,    53, STR_NETWORK_MAP_SIZE_CAPTION,     STR_NETWORK_MAP_SIZE_CAPTION_TIP}, // NGWW_MAPSIZE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   130,    42,    53, STR_NETWORK_DATE_CAPTION,         STR_NETWORK_DATE_CAPTION_TIP},     // NGWW_DATE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   130,    42,    53, STR_NETWORK_YEARS_CAPTION,        STR_NETWORK_YEARS_CAPTION_TIP},    // NGWW_YEARS
-{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_WHITE,        151,   190,    42,    53, STR_EMPTY,                        STR_NETWORK_INFO_ICONS_TIP},       // NGWW_INFO
-
-{     WWT_MATRIX,   RESIZE_RB,     COLOUR_LIGHT_BLUE,    10,   190,    54,   208, (11 << 8) + 1,                    STR_NETWORK_CLICK_GAME_TO_SELECT}, // NGWW_MATRIX
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         10,    70,    42,    53, STR_NETWORK_SERVER_LIST_GAME_NAME,            STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP},        // NGWW_NAME
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   150,    42,    53, STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION,      STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP},  // NGWW_CLIENTS
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   150,    42,    53, STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION,     STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP}, // NGWW_MAPSIZE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   130,    42,    53, STR_NETWORK_SERVER_LIST_DATE_CAPTION,         STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP},     // NGWW_DATE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         71,   130,    42,    53, STR_NETWORK_SERVER_LIST_YEARS_CAPTION,        STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP},    // NGWW_YEARS
+{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_WHITE,        151,   190,    42,    53, STR_EMPTY,                        STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP},       // NGWW_INFO
+
+{     WWT_MATRIX,   RESIZE_RB,     COLOUR_LIGHT_BLUE,    10,   190,    54,   208, (11 << 8) + 1,                    STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT}, // NGWW_MATRIX
 {  WWT_SCROLLBAR,   RESIZE_LRB,    COLOUR_LIGHT_BLUE,   191,   202,    42,   208, 0x0,                              STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // NGWW_SCROLLBAR
-{       WWT_TEXT,   RESIZE_RTB,    COLOUR_LIGHT_BLUE,    10,   190,   211,   222, STR_NETWORK_LAST_JOINED_SERVER,   STR_NULL},                         // NGWW_LASTJOINED_LABEL
-{      WWT_PANEL,   RESIZE_RTB,    COLOUR_LIGHT_BLUE,    10,   190,   223,   236, 0x0,                              STR_NETWORK_CLICK_TO_SELECT_LAST}, // NGWW_LASTJOINED
+{       WWT_TEXT,   RESIZE_RTB,    COLOUR_LIGHT_BLUE,    10,   190,   211,   222, STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER,   STR_NULL},                         // NGWW_LASTJOINED_LABEL
+{      WWT_PANEL,   RESIZE_RTB,    COLOUR_LIGHT_BLUE,    10,   190,   223,   236, 0x0,                              STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST}, // NGWW_LASTJOINED
 
 /* RIGHT SIDE */
 {      WWT_PANEL,   RESIZE_LRB,    COLOUR_LIGHT_BLUE,   210,   440,    42,   236, 0x0,                              STR_NULL},                         // NGWW_DETAILS
 
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        215,   315,   215,   226, STR_NETWORK_JOIN_GAME,            STR_NULL},                         // NGWW_JOIN
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        330,   435,   215,   226, STR_NETWORK_REFRESH,              STR_NETWORK_REFRESH_TIP},          // NGWW_REFRESH
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        215,   315,   215,   226, STR_NETWORK_SERVER_LIST_JOIN_GAME,            STR_NULL},                         // NGWW_JOIN
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        330,   435,   215,   226, STR_NETWORK_SERVER_LIST_REFRESH,              STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP},          // NGWW_REFRESH
 
 { WWT_PUSHTXTBTN,   RESIZE_LRTB,   COLOUR_WHITE,        330,   435,   197,   208, STR_INTRO_NEWGRF_SETTINGS,        STR_NULL},                         // NGWW_NEWGRF
 
 /* BOTTOM */
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,         10,   110,   246,   257, STR_NETWORK_FIND_SERVER,          STR_NETWORK_FIND_SERVER_TIP},      // NGWW_FIND
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        118,   218,   246,   257, STR_NETWORK_ADD_SERVER,           STR_NETWORK_ADD_SERVER_TIP},       // NGWW_ADD
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        226,   326,   246,   257, STR_NETWORK_START_SERVER,         STR_NETWORK_START_SERVER_TIP},     // NGWW_START
-{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        334,   434,   246,   257, STR_QUERY_CANCEL,                 STR_NULL},                         // NGWW_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,         10,   110,   246,   257, STR_NETWORK_SERVER_LIST_FIND_SERVER,          STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP},      // NGWW_FIND
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        118,   218,   246,   257, STR_NETWORK_SERVER_LIST_ADD_SERVER,           STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP},       // NGWW_ADD
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        226,   326,   246,   257, STR_NETWORK_SERVER_LIST_START_SERVER,         STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP},     // NGWW_START
+{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_WHITE,        334,   434,   246,   257, STR_BUTTON_CANCEL,                 STR_NULL},                         // NGWW_CANCEL
 
-{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_LIGHT_BLUE,   438,   449,   252,   263, 0x0,                              STR_RESIZE_BUTTON },               // NGWW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_LIGHT_BLUE,   438,   449,   252,   263, 0x0,                              STR_TOOLTIP_RESIZE },               // NGWW_RESIZE
 
 {   WIDGETS_END},
 };
@@ -829,7 +829,7 @@ NWidgetPart _nested_network_game_widgets[] = {
 	/* TOP */
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE, NGWW_CLOSE),
-		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NGWW_CAPTION), SetMinimalSize(439, 14), SetDataTip(STR_NETWORK_MULTIPLAYER, STR_NULL), // XXX Add default caption tooltip!
+		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NGWW_CAPTION), SetMinimalSize(439, 14), SetDataTip(STR_NETWORK_SERVER_LIST_CAPTION, STR_NULL), // XXX Add default caption tooltip!
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NGWW_MAIN),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8), SetResize(1, 0),
@@ -837,18 +837,18 @@ NWidgetPart _nested_network_game_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(9, 0),
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_SPACER), SetMinimalSize(0,1), // Text is one pixel further down
-				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NGWW_CONNECTION), SetMinimalSize(77, 13), SetDataTip(STR_NETWORK_CONNECTION, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NGWW_CONNECTION), SetMinimalSize(77, 13), SetDataTip(STR_NETWORK_SERVER_LIST_CONNECTION, STR_NULL),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(4, 0),
 			NWidget(NWID_VERTICAL),
 				NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, NGWW_CONN_BTN), SetMinimalSize(92, 12),
-									SetDataTip(STR_NETWORK_LAN_INTERNET_COMBO, STR_NETWORK_CONNECTION_TIP),
+									SetDataTip(STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO, STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0,2), // Text ends two pixels further down
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(108, 0), SetFill(1,0), SetResize(1,0),
 			NWidget(NWID_VERTICAL),
 				NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, NGWW_CLIENT), SetMinimalSize(151, 12),
-									SetDataTip(STR_NETWORK_PLAYER_NAME_OSKTITLE, STR_NETWORK_ENTER_NAME_TIP),
+									SetDataTip(STR_NETWORK_SERVER_LIST_PLAYER_NAME_OSKTITLE, STR_NETWORK_SERVER_LIST_ENTER_NAME_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0,2), // Text ends two pixels further down
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(9, 0),
@@ -860,23 +860,23 @@ NWidgetPart _nested_network_game_widgets[] = {
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_NAME), SetMinimalSize(61, 12), SetResize(1, 0),
-									SetDataTip(STR_NETWORK_GAME_NAME, STR_NETWORK_GAME_NAME_TIP),
+									SetDataTip(STR_NETWORK_SERVER_LIST_GAME_NAME, STR_NETWORK_SERVER_LIST_GAME_NAME_TOOLTIP),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_CLIENTS), SetMinimalSize(20, 12),
-									SetDataTip(STR_NETWORK_CLIENTS_CAPTION, STR_NETWORK_CLIENTS_CAPTION_TIP),
+									SetDataTip(STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION, STR_NETWORK_SERVER_LIST_CLIENTS_CAPTION_TOOLTIP),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_MAPSIZE), SetMinimalSize(20, 12),
-									SetDataTip(STR_NETWORK_MAP_SIZE_CAPTION, STR_NETWORK_MAP_SIZE_CAPTION_TIP),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_DATE), SetMinimalSize(20, 12), SetDataTip(STR_NETWORK_DATE_CAPTION, STR_NETWORK_DATE_CAPTION_TIP),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_YEARS), SetMinimalSize(20, 12), SetDataTip(STR_NETWORK_YEARS_CAPTION, STR_NETWORK_YEARS_CAPTION_TIP),
+									SetDataTip(STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION, STR_NETWORK_SERVER_LIST_MAP_SIZE_CAPTION_TOOLTIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_DATE), SetMinimalSize(20, 12), SetDataTip(STR_NETWORK_SERVER_LIST_DATE_CAPTION, STR_NETWORK_SERVER_LIST_DATE_CAPTION_TOOLTIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_YEARS), SetMinimalSize(20, 12), SetDataTip(STR_NETWORK_SERVER_LIST_YEARS_CAPTION, STR_NETWORK_SERVER_LIST_YEARS_CAPTION_TOOLTIP),
 					NWidget(NWID_SPACER), SetMinimalSize(0, 0), SetFill(0, 0), SetResize(1, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_INFO), SetMinimalSize(40, 12), SetDataTip(STR_EMPTY, STR_NETWORK_INFO_ICONS_TIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_INFO), SetMinimalSize(40, 12), SetDataTip(STR_EMPTY, STR_NETWORK_SERVER_LIST_INFO_ICONS_TOOLTIP),
 				EndContainer(),
 				NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, NGWW_MATRIX), SetMinimalSize(181, 155), SetResize(1,1),
-									SetDataTip((11 << 8) + 1, STR_NETWORK_CLICK_GAME_TO_SELECT),
+									SetDataTip((11 << 8) + 1, STR_NETWORK_SERVER_LIST_CLICK_GAME_TO_SELECT),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 2), SetResize(1, 0),
 				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NGWW_LASTJOINED_LABEL), SetMinimalSize(181, 12), SetFill(1,0),
-									SetDataTip(STR_NETWORK_LAST_JOINED_SERVER, STR_NULL), SetResize(1, 0),
+									SetDataTip(STR_NETWORK_SERVER_LIST_LAST_JOINED_SERVER, STR_NULL), SetResize(1, 0),
 				NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NGWW_LASTJOINED), SetMinimalSize(181, 14), SetFill(1,0), SetResize(1, 0),
-									SetDataTip(0x0, STR_NETWORK_CLICK_TO_SELECT_LAST),
+									SetDataTip(0x0, STR_NETWORK_SERVER_LIST_CLICK_TO_SELECT_LAST),
 				EndContainer(),
 			EndContainer(),
 			NWidget(NWID_VERTICAL),
@@ -895,9 +895,9 @@ NWidgetPart _nested_network_game_widgets[] = {
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(NWID_SPACER), SetMinimalSize(5, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_JOIN), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_JOIN_GAME, STR_NULL),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_JOIN), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_SERVER_LIST_JOIN_GAME, STR_NULL),
 					NWidget(NWID_SPACER), SetMinimalSize(14, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_REFRESH), SetMinimalSize(106, 12), SetDataTip(STR_NETWORK_REFRESH, STR_NETWORK_REFRESH_TIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_REFRESH), SetMinimalSize(106, 12), SetDataTip(STR_NETWORK_SERVER_LIST_REFRESH, STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP),
 					NWidget(NWID_SPACER), SetMinimalSize(5, 0),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 10),
@@ -910,13 +910,13 @@ NWidgetPart _nested_network_game_widgets[] = {
 			NWidget(NWID_SPACER), SetMinimalSize(10, 0),
 			NWidget(NWID_VERTICAL),
 				NWidget(NWID_HORIZONTAL),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_FIND), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_FIND_SERVER, STR_NETWORK_FIND_SERVER_TIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_FIND), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_SERVER_LIST_FIND_SERVER, STR_NETWORK_SERVER_LIST_FIND_SERVER_TOOLTIP),
 					NWidget(NWID_SPACER), SetMinimalSize(7, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_ADD), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_ADD_SERVER, STR_NETWORK_ADD_SERVER_TIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_ADD), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_SERVER_LIST_ADD_SERVER, STR_NETWORK_SERVER_LIST_ADD_SERVER_TOOLTIP),
 					NWidget(NWID_SPACER), SetMinimalSize(7, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_START), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_START_SERVER, STR_NETWORK_START_SERVER_TIP),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_START), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_SERVER_LIST_START_SERVER, STR_NETWORK_SERVER_LIST_START_SERVER_TOOLTIP),
 					NWidget(NWID_SPACER), SetMinimalSize(7, 0),
-					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_CANCEL), SetMinimalSize(101, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+					NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NGWW_CANCEL), SetMinimalSize(101, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0,6),
 			EndContainer(),
@@ -1043,7 +1043,7 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
 			}
 
 			if (pos == 0) {
-				DrawString(this->widget[NSSW_SELMAP].left + 4, this->widget[NSSW_SELMAP].right - 4, y, STR_NETWORK_SERVER_RANDOM_GAME, TC_DARK_GREEN);
+				DrawString(this->widget[NSSW_SELMAP].left + 4, this->widget[NSSW_SELMAP].right - 4, y, STR_NETWORK_START_SERVER_SERVER_RANDOM_GAME, TC_DARK_GREEN);
 			} else {
 				DrawString(this->widget[NSSW_SELMAP].left + 4, this->widget[NSSW_SELMAP].right - 4, y, item->title, _fios_colours[item->type] );
 			}
@@ -1065,7 +1065,7 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
 			case NSSW_SETPWD: // Set password button
 				this->widget_id = NSSW_SETPWD;
 				SetDParamStr(0, _settings_client.network.server_password);
-				ShowQueryString(STR_JUST_RAW_STRING, STR_NETWORK_SET_PASSWORD, 20, 250, this, CS_ALPHANUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_RAW_STRING, STR_NETWORK_START_SERVER_SET_PASSWORD, 20, 250, this, CS_ALPHANUMERAL, QSF_NONE);
 				break;
 
 			case NSSW_SELMAP: { // Select map
@@ -1108,19 +1108,19 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
 			case NSSW_CLIENTS_TXT:    // Click on number of clients
 				this->widget_id = NSSW_CLIENTS_TXT;
 				SetDParam(0, _settings_client.network.max_clients);
-				ShowQueryString(STR_JUST_INT, STR_NETWORK_NUMBER_OF_CLIENTS,    4, 50, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS,    4, 50, this, CS_NUMERAL, QSF_NONE);
 				break;
 
 			case NSSW_COMPANIES_TXT:  // Click on number of companies
 				this->widget_id = NSSW_COMPANIES_TXT;
 				SetDParam(0, _settings_client.network.max_companies);
-				ShowQueryString(STR_JUST_INT, STR_NETWORK_NUMBER_OF_COMPANIES,  3, 50, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES,  3, 50, this, CS_NUMERAL, QSF_NONE);
 				break;
 
 			case NSSW_SPECTATORS_TXT: // Click on number of spectators
 				this->widget_id = NSSW_SPECTATORS_TXT;
 				SetDParam(0, _settings_client.network.max_spectators);
-				ShowQueryString(STR_JUST_INT, STR_NETWORK_NUMBER_OF_SPECTATORS, 4, 50, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS, 4, 50, this, CS_NUMERAL, QSF_NONE);
 				break;
 
 			case NSSW_LANGUAGE_BTN: { // Language
@@ -1220,45 +1220,45 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
 static const Widget _network_start_server_window_widgets[] = {
 /* Window decoration and background panel */
 {   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     0,    10,     0,    13, STR_BLACK_CROSS,                    STR_TOOLTIP_CLOSE_WINDOW },            // NSSW_CLOSE
-{    WWT_CAPTION,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    11,   419,     0,    13, STR_NETWORK_START_GAME_WINDOW,      STR_NULL},                             // NSSW_CAPTION
+{    WWT_CAPTION,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    11,   419,     0,    13, STR_NETWORK_START_SERVER_CAPTION,      STR_NULL},                             // NSSW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     0,   419,    14,   243, 0x0,                                STR_NULL},                             // NSSW_BACKGROUND
 
 /* Set game name and password widgets */
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,    90,    22,    34, STR_NETWORK_NEW_GAME_NAME,          STR_NULL},                             // NSSW_GAMENAME_LABEL
-{    WWT_EDITBOX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   100,   272,    22,    33, STR_NETWORK_NEW_GAME_NAME_OSKTITLE, STR_NETWORK_NEW_GAME_NAME_TIP},        // NSSW_GAMENAME
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        285,   405,    22,    33, STR_NETWORK_SET_PASSWORD,           STR_NETWORK_PASSWORD_TIP},             // NSSW_SETPWD
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,    90,    22,    34, STR_NETWORK_START_SERVER_NEW_GAME_NAME,          STR_NULL},                             // NSSW_GAMENAME_LABEL
+{    WWT_EDITBOX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   100,   272,    22,    33, STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE, STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP},        // NSSW_GAMENAME
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        285,   405,    22,    33, STR_NETWORK_START_SERVER_SET_PASSWORD,           STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP},             // NSSW_SETPWD
 
 /* List of playable scenarios */
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   110,    43,    55, STR_NETWORK_SELECT_MAP,             STR_NULL},                             // NSSW_SELECT_MAP_LABEL
-{      WWT_INSET,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   271,    62,   216, STR_NULL,                           STR_NETWORK_SELECT_MAP_TIP},           // NSSW_SELMAP
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   110,    43,    55, STR_NETWORK_START_SERVER_SELECT_MAP,             STR_NULL},                             // NSSW_SELECT_MAP_LABEL
+{      WWT_INSET,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   271,    62,   216, STR_NULL,                           STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP},           // NSSW_SELMAP
 {  WWT_SCROLLBAR,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   259,   270,    63,   215, 0x0,                                STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // NSSW_SCROLLBAR
 
 /* Combo/selection boxes to control Connection Type / Max Clients / Max Companies / Max Observers / Language */
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,    63,    75, STR_NETWORK_CONNECTION,             STR_NULL},                             // NSSW_CONNTYPE_LABEL
-{   WWT_DROPDOWN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,    77,    88, STR_NETWORK_LAN_INTERNET_COMBO,     STR_NETWORK_CONNECTION_TIP},           // NSSW_CONNTYPE_BTN
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,    63,    75, STR_NETWORK_SERVER_LIST_CONNECTION,             STR_NULL},                             // NSSW_CONNTYPE_LABEL
+{   WWT_DROPDOWN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,    77,    88, STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO,     STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP},           // NSSW_CONNTYPE_BTN
 
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,    95,   107, STR_NETWORK_NUMBER_OF_CLIENTS,      STR_NULL},                             // NSSW_CLIENTS_LABEL
-{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   291,   109,   120, SPR_ARROW_DOWN,                     STR_NETWORK_NUMBER_OF_CLIENTS_TIP},    // NSSW_CLIENTS_BTND
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   292,   397,   109,   120, STR_NETWORK_CLIENTS_SELECT,         STR_NETWORK_NUMBER_OF_CLIENTS_TIP},    // NSSW_CLIENTS_TXT
-{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   398,   410,   109,   120, SPR_ARROW_UP,                       STR_NETWORK_NUMBER_OF_CLIENTS_TIP},    // NSSW_CLIENTS_BTNU
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,    95,   107, STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS,      STR_NULL},                             // NSSW_CLIENTS_LABEL
+{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   291,   109,   120, SPR_ARROW_DOWN,                     STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP},    // NSSW_CLIENTS_BTND
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   292,   397,   109,   120, STR_NETWORK_START_SERVER_CLIENTS_SELECT,         STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP},    // NSSW_CLIENTS_TXT
+{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   398,   410,   109,   120, SPR_ARROW_UP,                       STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP},    // NSSW_CLIENTS_BTNU
 
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   127,   139, STR_NETWORK_NUMBER_OF_COMPANIES,    STR_NULL},                             // NSSW_COMPANIES_LABEL
-{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   291,   141,   152, SPR_ARROW_DOWN,                     STR_NETWORK_NUMBER_OF_COMPANIES_TIP},  // NSSW_COMPANIES_BTND
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   292,   397,   141,   152, STR_NETWORK_COMPANIES_SELECT,       STR_NETWORK_NUMBER_OF_COMPANIES_TIP},  // NSSW_COMPANIES_TXT
-{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   398,   410,   141,   152, SPR_ARROW_UP,                       STR_NETWORK_NUMBER_OF_COMPANIES_TIP},  // NSSW_COMPANIES_BTNU
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   127,   139, STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES,    STR_NULL},                             // NSSW_COMPANIES_LABEL
+{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   291,   141,   152, SPR_ARROW_DOWN,                     STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP},  // NSSW_COMPANIES_BTND
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   292,   397,   141,   152, STR_NETWORK_START_SERVER_COMPANIES_SELECT,       STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP},  // NSSW_COMPANIES_TXT
+{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   398,   410,   141,   152, SPR_ARROW_UP,                       STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP},  // NSSW_COMPANIES_BTNU
 
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   159,   171, STR_NETWORK_NUMBER_OF_SPECTATORS,   STR_NULL},                             // NSSW_SPECTATORS_LABEL
-{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   291,   173,   184, SPR_ARROW_DOWN,                     STR_NETWORK_NUMBER_OF_SPECTATORS_TIP}, // NSSW_SPECTATORS_BTND
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   292,   397,   173,   184, STR_NETWORK_SPECTATORS_SELECT,      STR_NETWORK_NUMBER_OF_SPECTATORS_TIP}, // NSSW_SPECTATORS_TXT
-{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   398,   410,   173,   184, SPR_ARROW_UP,                       STR_NETWORK_NUMBER_OF_SPECTATORS_TIP}, // NSSW_SPECTATORS_BTNU
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   159,   171, STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS,   STR_NULL},                             // NSSW_SPECTATORS_LABEL
+{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   291,   173,   184, SPR_ARROW_DOWN,                     STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP}, // NSSW_SPECTATORS_BTND
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   292,   397,   173,   184, STR_NETWORK_START_SERVER_SPECTATORS_SELECT,      STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP}, // NSSW_SPECTATORS_TXT
+{     WWT_IMGBTN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   398,   410,   173,   184, SPR_ARROW_UP,                       STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP}, // NSSW_SPECTATORS_BTNU
 
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   191,   203, STR_NETWORK_LANGUAGE_SPOKEN,        STR_NULL},                             // NSSW_LANGUAGE_LABEL
-{   WWT_DROPDOWN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   205,   216, STR_NETWORK_LANGUAGE_COMBO,         STR_NETWORK_LANGUAGE_TIP},             // NSSW_LANGUAGE_BTN
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   191,   203, STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN,        STR_NULL},                             // NSSW_LANGUAGE_LABEL
+{   WWT_DROPDOWN,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   280,   410,   205,   216, STR_NETWORK_START_SERVER_LANGUAGE_COMBO,         STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP},             // NSSW_LANGUAGE_BTN
 
 /* Buttons Start / Load / Cancel */
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         40,   140,   224,   235, STR_NETWORK_START_GAME,             STR_NETWORK_START_GAME_TIP},           // NSSW_START
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        150,   250,   224,   235, STR_NETWORK_LOAD_GAME,              STR_NETWORK_LOAD_GAME_TIP},            // NSSW_LOAD
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        260,   360,   224,   235, STR_QUERY_CANCEL,                   STR_NULL},                             // NSSW_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         40,   140,   224,   235, STR_NETWORK_START_SERVER_START_GAME,             STR_NETWORK_START_SERVER_START_GAME_TOOLTIP},           // NSSW_START
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        150,   250,   224,   235, STR_NETWORK_START_SERVER_LOAD_GAME,              STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP},            // NSSW_LOAD
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        260,   360,   224,   235, STR_BUTTON_CANCEL,                   STR_NULL},                             // NSSW_CANCEL
 
 {   WIDGETS_END},
 };
@@ -1266,28 +1266,28 @@ static const Widget _network_start_server_window_widgets[] = {
 static const NWidgetPart _nested_network_start_server_window_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE, NSSW_CLOSE),
-		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NSSW_CAPTION), SetDataTip(STR_NETWORK_START_GAME_WINDOW, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NSSW_CAPTION), SetDataTip(STR_NETWORK_START_SERVER_CAPTION, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NSSW_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 		/* Set game name and password widgets. */
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 14),
-			NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_GAMENAME_LABEL), SetMinimalSize(81, 13), SetDataTip(STR_NETWORK_NEW_GAME_NAME, STR_NULL),
+			NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_GAMENAME_LABEL), SetMinimalSize(81, 13), SetDataTip(STR_NETWORK_START_SERVER_NEW_GAME_NAME, STR_NULL),
 			NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, NSSW_GAMENAME), SetMinimalSize(173, 12), SetPadding(0, 0, 1, 9),
-												SetDataTip(STR_NETWORK_NEW_GAME_NAME_OSKTITLE, STR_NETWORK_NEW_GAME_NAME_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_NEW_GAME_NAME_OSKTITLE, STR_NETWORK_START_SERVER_NEW_GAME_NAME_TOOLTIP),
 			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_SETPWD), SetMinimalSize(121, 12), SetPadding(0, 0, 1, 12),
-												SetDataTip(STR_NETWORK_SET_PASSWORD, STR_NETWORK_PASSWORD_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_SET_PASSWORD, STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 8, 9),
 			NWidget(NWID_VERTICAL),
 				/* List of playable scenarios. */
 				NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 				NWidget(NWID_HORIZONTAL),
-					NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_SELECT_MAP_LABEL), SetMinimalSize(101, 13), SetDataTip(STR_NETWORK_SELECT_MAP, STR_NULL),
+					NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_SELECT_MAP_LABEL), SetMinimalSize(101, 13), SetDataTip(STR_NETWORK_START_SERVER_SELECT_MAP, STR_NULL),
 					NWidget(NWID_SPACER), SetFill(true, false),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-				NWidget(WWT_INSET, COLOUR_LIGHT_BLUE, NSSW_SELMAP), SetDataTip(STR_NULL, STR_NETWORK_SELECT_MAP_TIP),
+				NWidget(WWT_INSET, COLOUR_LIGHT_BLUE, NSSW_SELMAP), SetDataTip(STR_NULL, STR_NETWORK_START_SERVER_SELECT_MAP_TOOLTIP),
 					NWidget(NWID_HORIZONTAL),
 						NWidget(NWID_SPACER), SetMinimalSize(249, 155),
 						NWidget(WWT_SCROLLBAR, COLOUR_LIGHT_BLUE, NSSW_SCROLLBAR), SetPadding(1, 1, 1, 0),
@@ -1297,61 +1297,61 @@ static const NWidgetPart _nested_network_start_server_window_widgets[] = {
 			NWidget(NWID_VERTICAL),
 				/* Combo/selection boxes to control Connection Type / Max Clients / Max Companies / Max Observers / Language */
 				NWidget(NWID_SPACER), SetMinimalSize(0, 28),
-				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_CONNTYPE_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_CONNECTION, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_CONNTYPE_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_SERVER_LIST_CONNECTION, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 				NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, NSSW_CONNTYPE_BTN), SetMinimalSize(131, 12),
-												SetDataTip(STR_NETWORK_LAN_INTERNET_COMBO, STR_NETWORK_CONNECTION_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_LAN_INTERNET_COMBO, STR_NETWORK_SERVER_LIST_CONNECTION_TOOLTIP),
 
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_CLIENTS_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_NUMBER_OF_CLIENTS, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_CLIENTS_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_IMGBTN, COLOUR_LIGHT_BLUE, NSSW_CLIENTS_BTND), SetMinimalSize(12, 12),
-												SetDataTip(SPR_ARROW_DOWN, STR_NETWORK_NUMBER_OF_CLIENTS_TIP),
+												SetDataTip(SPR_ARROW_DOWN, STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, NSSW_CLIENTS_TXT), SetMinimalSize(106, 12),
-												SetDataTip(STR_NETWORK_CLIENTS_SELECT, STR_NETWORK_NUMBER_OF_CLIENTS_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_CLIENTS_SELECT, STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP),
 					NWidget(WWT_IMGBTN, COLOUR_LIGHT_BLUE, NSSW_CLIENTS_BTNU), SetMinimalSize(13, 12),
-												SetDataTip(SPR_ARROW_UP, STR_NETWORK_NUMBER_OF_CLIENTS_TIP),
+												SetDataTip(SPR_ARROW_UP, STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP),
 				EndContainer(),
 
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_COMPANIES_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_NUMBER_OF_COMPANIES, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_COMPANIES_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_IMGBTN, COLOUR_LIGHT_BLUE, NSSW_COMPANIES_BTND), SetMinimalSize(12, 12),
-												SetDataTip(SPR_ARROW_DOWN, STR_NETWORK_NUMBER_OF_COMPANIES_TIP),
+												SetDataTip(SPR_ARROW_DOWN, STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, NSSW_COMPANIES_TXT), SetMinimalSize(106, 12),
-												SetDataTip(STR_NETWORK_COMPANIES_SELECT, STR_NETWORK_NUMBER_OF_COMPANIES_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_COMPANIES_SELECT, STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP),
 					NWidget(WWT_IMGBTN, COLOUR_LIGHT_BLUE, NSSW_COMPANIES_BTNU), SetMinimalSize(13, 12),
-												SetDataTip(SPR_ARROW_UP, STR_NETWORK_NUMBER_OF_COMPANIES_TIP),
+												SetDataTip(SPR_ARROW_UP, STR_NETWORK_START_SERVER_NUMBER_OF_COMPANIES_TOOLTIP),
 				EndContainer(),
 
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_SPECTATORS_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_NUMBER_OF_SPECTATORS, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_SPECTATORS_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 				NWidget(NWID_HORIZONTAL),
 					NWidget(WWT_IMGBTN, COLOUR_LIGHT_BLUE, NSSW_SPECTATORS_BTND), SetMinimalSize(12, 12),
-												SetDataTip(SPR_ARROW_DOWN, STR_NETWORK_NUMBER_OF_SPECTATORS_TIP),
+												SetDataTip(SPR_ARROW_DOWN, STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP),
 					NWidget(WWT_PUSHTXTBTN, COLOUR_LIGHT_BLUE, NSSW_SPECTATORS_TXT), SetMinimalSize(106, 12),
-												SetDataTip(STR_NETWORK_SPECTATORS_SELECT, STR_NETWORK_NUMBER_OF_SPECTATORS_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_SPECTATORS_SELECT, STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP),
 					NWidget(WWT_IMGBTN, COLOUR_LIGHT_BLUE, NSSW_SPECTATORS_BTNU), SetMinimalSize(13, 12),
-												SetDataTip(SPR_ARROW_UP, STR_NETWORK_NUMBER_OF_SPECTATORS_TIP),
+												SetDataTip(SPR_ARROW_UP, STR_NETWORK_START_SERVER_NUMBER_OF_SPECTATORS_TOOLTIP),
 				EndContainer(),
 
 				NWidget(NWID_SPACER), SetMinimalSize(0, 6),
-				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_LANGUAGE_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_LANGUAGE_SPOKEN, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NSSW_LANGUAGE_LABEL), SetMinimalSize(131, 13), SetDataTip(STR_NETWORK_START_SERVER_LANGUAGE_SPOKEN, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 				NWidget(WWT_DROPDOWN, COLOUR_LIGHT_BLUE, NSSW_LANGUAGE_BTN), SetMinimalSize(131, 12),
-												SetDataTip(STR_NETWORK_LANGUAGE_COMBO, STR_NETWORK_LANGUAGE_TIP),
+												SetDataTip(STR_NETWORK_START_SERVER_LANGUAGE_COMBO, STR_NETWORK_START_SERVER_LANGUAGE_TOOLTIP),
 			EndContainer(),
 		EndContainer(),
 
 		/* Buttons Start / Load / Cancel. */
 		NWidget(NWID_SPACER), SetMinimalSize(0, 7),
 		NWidget(NWID_HORIZONTAL), SetPIP(40, 9, 59),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_START), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_START_GAME, STR_NETWORK_START_GAME_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_LOAD), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_LOAD_GAME, STR_NETWORK_LOAD_GAME_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_CANCEL), SetMinimalSize(101, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_START), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_START_SERVER_START_GAME, STR_NETWORK_START_SERVER_START_GAME_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_LOAD), SetMinimalSize(101, 12), SetDataTip(STR_NETWORK_START_SERVER_LOAD_GAME, STR_NETWORK_START_SERVER_LOAD_GAME_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NSSW_CANCEL), SetMinimalSize(101, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 8),
 	EndContainer(),
@@ -1454,7 +1454,7 @@ struct NetworkLobbyWindow : public Window {
 
 		/* Draw info about selected company when it is selected in the left window */
 		GfxFillRect(174, 39, 403, 75, 157);
-		DrawString(this->widget[NLWW_DETAILS].left + 10, this->widget[NLWW_DETAILS].right - 10, 50, STR_NETWORK_COMPANY_INFO, TC_FROMSTRING, SA_CENTER);
+		DrawString(this->widget[NLWW_DETAILS].left + 10, this->widget[NLWW_DETAILS].right - 10, 50, STR_NETWORK_GAME_LOBBY_COMPANY_INFO, TC_FROMSTRING, SA_CENTER);
 		if (this->company != INVALID_COMPANY && !StrEmpty(this->company_info[this->company].company_name)) {
 			const uint x = this->widget[NLWW_DETAILS].left + 10;
 			y = 80;
@@ -1463,31 +1463,31 @@ struct NetworkLobbyWindow : public Window {
 			SetDParam(1, gi->clients_max);
 			SetDParam(2, gi->companies_on);
 			SetDParam(3, gi->companies_max);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_CLIENTS);
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_SERVER_LIST_CLIENTS);
 			y += 10;
 
 			SetDParamStr(0, this->company_info[this->company].company_name);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_COMPANY_NAME);
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_COMPANY_NAME);
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].inaugurated_year);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_INAUGURATION_YEAR); // inauguration year
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_INAUGURATION_YEAR); // inauguration year
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].company_value);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_VALUE); // company value
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_VALUE); // company value
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].money);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_CURRENT_BALANCE); // current balance
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_CURRENT_BALANCE); // current balance
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].income);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_LAST_YEARS_INCOME); // last year's income
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_LAST_YEARS_INCOME); // last year's income
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].performance);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_PERFORMANCE); // performance
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_PERFORMANCE); // performance
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].num_vehicle[0]);
@@ -1495,7 +1495,7 @@ struct NetworkLobbyWindow : public Window {
 			SetDParam(2, this->company_info[this->company].num_vehicle[2]);
 			SetDParam(3, this->company_info[this->company].num_vehicle[3]);
 			SetDParam(4, this->company_info[this->company].num_vehicle[4]);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_VEHICLES); // vehicles
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_VEHICLES); // vehicles
 			y += 10;
 
 			SetDParam(0, this->company_info[this->company].num_station[0]);
@@ -1503,11 +1503,11 @@ struct NetworkLobbyWindow : public Window {
 			SetDParam(2, this->company_info[this->company].num_station[2]);
 			SetDParam(3, this->company_info[this->company].num_station[3]);
 			SetDParam(4, this->company_info[this->company].num_station[4]);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_STATIONS); // stations
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_STATIONS); // stations
 			y += 10;
 
 			SetDParamStr(0, this->company_info[this->company].clients);
-			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_PLAYERS); // players
+			DrawString(x, this->widget[NLWW_DETAILS].right, y, STR_NETWORK_GAME_LOBBY_PLAYERS); // players
 		}
 	}
 
@@ -1562,24 +1562,24 @@ struct NetworkLobbyWindow : public Window {
 
 static const Widget _network_lobby_window_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     0,    10,     0,    13, STR_BLACK_CROSS,             STR_TOOLTIP_CLOSE_WINDOW },        // NLWW_CLOSE
-{    WWT_CAPTION,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    11,   419,     0,    13, STR_NETWORK_GAME_LOBBY,      STR_NULL},                         // NLWW_CAPTION
+{    WWT_CAPTION,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    11,   419,     0,    13, STR_NETWORK_GAME_LOBBY_CAPTION,      STR_NULL},                         // NLWW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,     0,   419,    14,   234, 0x0,                         STR_NULL},                         // NLWW_BACKGROUND
-{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   419,    22,    34, STR_NETWORK_PREPARE_TO_JOIN, STR_NULL},                         // NLWW_TEXT
+{       WWT_TEXT,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   419,    22,    34, STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN, STR_NULL},                         // NLWW_TEXT
 
 /* company list */
 {      WWT_PANEL,   RESIZE_NONE,   COLOUR_WHITE,         10,   155,    38,    49, 0x0,                         STR_NULL},                         // NLWW_HEADER
-{     WWT_MATRIX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   155,    50,   190, (10 << 8) + 1,               STR_NETWORK_COMPANY_LIST_TIP},     // NLWW_MATRIX
+{     WWT_MATRIX,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,    10,   155,    50,   190, (10 << 8) + 1,               STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP},     // NLWW_MATRIX
 {  WWT_SCROLLBAR,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   156,   167,    38,   190, 0x0,                         STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // NLWW_SCROLLBAR
 
 /* company info */
 {      WWT_PANEL,   RESIZE_NONE,   COLOUR_LIGHT_BLUE,   173,   404,    38,   190, 0x0,                         STR_NULL},                         // NLWW_DETAILS
 
 /* buttons */
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         10,   151,   200,   211, STR_NETWORK_JOIN_COMPANY,    STR_NETWORK_JOIN_COMPANY_TIP},     // NLWW_JOIN
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         10,   151,   215,   226, STR_NETWORK_NEW_COMPANY,     STR_NETWORK_NEW_COMPANY_TIP},      // NLWW_NEW
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        158,   268,   200,   211, STR_NETWORK_SPECTATE_GAME,   STR_NETWORK_SPECTATE_GAME_TIP},    // NLWW_SPECTATE
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        158,   268,   215,   226, STR_NETWORK_REFRESH,         STR_NETWORK_REFRESH_TIP},          // NLWW_REFRESH
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        278,   388,   200,   211, STR_QUERY_CANCEL,            STR_NULL},                         // NLWW_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         10,   151,   200,   211, STR_NETWORK_GAME_LOBBY_JOIN_COMPANY,    STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP},     // NLWW_JOIN
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,         10,   151,   215,   226, STR_NETWORK_GAME_LOBBY_NEW_COMPANY,     STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP},      // NLWW_NEW
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        158,   268,   200,   211, STR_NETWORK_GAME_LOBBY_SPECTATE_GAME,   STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP},    // NLWW_SPECTATE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        158,   268,   215,   226, STR_NETWORK_SERVER_LIST_REFRESH,         STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP},          // NLWW_REFRESH
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,   COLOUR_WHITE,        278,   388,   200,   211, STR_BUTTON_CANCEL,            STR_NULL},                         // NLWW_CANCEL
 
 {   WIDGETS_END},
 };
@@ -1587,16 +1587,16 @@ static const Widget _network_lobby_window_widgets[] = {
 static const NWidgetPart _nested_network_lobby_window_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE, NLWW_CLOSE),
-		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NLWW_CAPTION), SetDataTip(STR_NETWORK_GAME_LOBBY, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE, NLWW_CAPTION), SetDataTip(STR_NETWORK_GAME_LOBBY_CAPTION, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NLWW_BACKGROUND),
-		NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NLWW_TEXT), SetDataTip(STR_NETWORK_PREPARE_TO_JOIN, STR_NULL), SetMinimalSize(410, 13), SetPadding(8, 0, 0, 10),
+		NWidget(WWT_TEXT, COLOUR_LIGHT_BLUE, NLWW_TEXT), SetDataTip(STR_NETWORK_GAME_LOBBY_PREPARE_TO_JOIN, STR_NULL), SetMinimalSize(410, 13), SetPadding(8, 0, 0, 10),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 15),
 			/* Company list. */
 			NWidget(NWID_VERTICAL),
 				NWidget(WWT_PANEL, COLOUR_WHITE, NLWW_HEADER), SetMinimalSize(146, 12), SetFill(false, false), EndContainer(),
-				NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, NLWW_MATRIX), SetMinimalSize(146, 141), SetDataTip((10 << 8) + 1, STR_NETWORK_COMPANY_LIST_TIP),
+				NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, NLWW_MATRIX), SetMinimalSize(146, 141), SetDataTip((10 << 8) + 1, STR_NETWORK_GAME_LOBBY_COMPANY_LIST_TOOLTIP),
 			EndContainer(),
 			NWidget(WWT_SCROLLBAR, COLOUR_LIGHT_BLUE, NLWW_SCROLLBAR),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0),
@@ -1607,17 +1607,17 @@ static const NWidgetPart _nested_network_lobby_window_widgets[] = {
 		/* Buttons. */
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 31),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_JOIN), SetMinimalSize(142, 12), SetDataTip(STR_NETWORK_JOIN_COMPANY, STR_NETWORK_JOIN_COMPANY_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_JOIN), SetMinimalSize(142, 12), SetDataTip(STR_NETWORK_GAME_LOBBY_JOIN_COMPANY, STR_NETWORK_GAME_LOBBY_JOIN_COMPANY_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 3),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_NEW), SetMinimalSize(142, 12), SetDataTip(STR_NETWORK_NEW_COMPANY, STR_NETWORK_NEW_COMPANY_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_NEW), SetMinimalSize(142, 12), SetDataTip(STR_NETWORK_GAME_LOBBY_NEW_COMPANY, STR_NETWORK_GAME_LOBBY_NEW_COMPANY_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_VERTICAL), SetPadding(0, 0, 0, 6),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_SPECTATE), SetMinimalSize(111, 12), SetDataTip(STR_NETWORK_SPECTATE_GAME, STR_NETWORK_SPECTATE_GAME_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_SPECTATE), SetMinimalSize(111, 12), SetDataTip(STR_NETWORK_GAME_LOBBY_SPECTATE_GAME, STR_NETWORK_GAME_LOBBY_SPECTATE_GAME_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 3),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_REFRESH), SetMinimalSize(111, 12), SetDataTip(STR_NETWORK_REFRESH, STR_NETWORK_REFRESH_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_REFRESH), SetMinimalSize(111, 12), SetDataTip(STR_NETWORK_SERVER_LIST_REFRESH, STR_NETWORK_SERVER_LIST_REFRESH_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_VERTICAL), SetPadding(0, 0, 0, 9),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_CANCEL), SetMinimalSize(111, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NLWW_CANCEL), SetMinimalSize(111, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 15),
 			EndContainer(),
 		EndContainer(),
@@ -1682,8 +1682,8 @@ enum ClientListWidgets {
 
 static const Widget _client_list_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,          STR_TOOLTIP_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   237,     0,    13, STR_NETWORK_CLIENT_LIST,  STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   238,   249,     0,    13, STR_NULL,                 STR_STICKY_BUTTON},
+{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,    11,   237,     0,    13, STR_NETWORK_COMPANY_LIST_CLIENT_LIST,  STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_GREY,   238,   249,     0,    13, STR_NULL,                 STR_TOOLTIP_STICKY},
 
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,     0,   249,    14,    14 + CLNWND_ROWSIZE + 1, 0x0, STR_NULL},
 {   WIDGETS_END},
@@ -1692,7 +1692,7 @@ static const Widget _client_list_widgets[] = {
 static const NWidgetPart _nested_client_list_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, CLW_CLOSE),
-		NWidget(WWT_CAPTION, COLOUR_GREY, CLW_CAPTION), SetDataTip(STR_NETWORK_CLIENT_LIST, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_GREY, CLW_CAPTION), SetDataTip(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, CLW_STICKY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, CLW_PANEL), SetMinimalSize(250, CLNWND_ROWSIZE + 2), EndContainer(),
@@ -2140,16 +2140,16 @@ struct NetworkJoinStatusWindow : Window {
 };
 
 static const Widget _network_join_status_window_widget[] = {
-{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,      0,   249,     0,    13, STR_NETWORK_CONNECTING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // NJSW_CAPTION
+{    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,      0,   249,     0,    13, STR_NETWORK_CONNECTING_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // NJSW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,      0,   249,    14,    84, 0x0,                    STR_NULL},                        // NJSW_BACKGROUND
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_WHITE,    75,   175,    69,    80, STR_NETWORK_DISCONNECT, STR_NULL},                        // NJSW_CANCELOK
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_WHITE,    75,   175,    69,    80, STR_NETWORK_CONNECTION_DISCONNECT, STR_NULL},                        // NJSW_CANCELOK
 {   WIDGETS_END},
 };
 
 static const NWidgetPart _nested_network_join_status_window_widgets[] = {
-	NWidget(WWT_CAPTION, COLOUR_GREY, NJSW_CAPTION), SetDataTip(STR_NETWORK_CONNECTING, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+	NWidget(WWT_CAPTION, COLOUR_GREY, NJSW_CAPTION), SetDataTip(STR_NETWORK_CONNECTING_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	NWidget(WWT_PANEL, COLOUR_GREY, NJSW_BACKGROUND),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NJSW_CANCELOK), SetMinimalSize(101, 12), SetPadding(55, 74, 4, 75), SetDataTip(STR_NETWORK_DISCONNECT, STR_NULL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NJSW_CANCELOK), SetMinimalSize(101, 12), SetPadding(55, 74, 4, 75), SetDataTip(STR_NETWORK_CONNECTION_DISCONNECT, STR_NULL),
 	EndContainer(),
 };
 
@@ -2258,11 +2258,11 @@ static const Widget _ncp_window_widgets[] = {
 {   WWT_CLOSEBOX,  RESIZE_NONE,  COLOUR_GREY,   0,  10,  0, 13, STR_BLACK_CROSS,                   STR_TOOLTIP_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_NONE,  COLOUR_GREY,  11, 299,  0, 13, STR_COMPANY_PASSWORD_CAPTION,      STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,  RESIZE_NONE,  COLOUR_GREY,   0, 299, 14, 50, 0x0,                               STR_NULL},
-{       WWT_TEXT,  RESIZE_NONE,  COLOUR_GREY,   5, 100, 19, 30, STR_COMPANY_PASSWORD,              STR_NULL},
-{    WWT_EDITBOX,  RESIZE_NONE,  COLOUR_GREY, 101, 294, 19, 30, STR_SET_COMPANY_PASSWORD,          STR_NULL},
-{    WWT_TEXTBTN,  RESIZE_NONE,  COLOUR_GREY, 101, 294, 35, 46, STR_MAKE_DEFAULT_COMPANY_PASSWORD, STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP},
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_GREY,   0, 149, 51, 62, STR_QUERY_CANCEL,                  STR_COMPANY_PASSWORD_CANCEL},
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_GREY, 150, 299, 51, 62, STR_QUERY_OK,                      STR_COMPANY_PASSWORD_OK},
+{       WWT_TEXT,  RESIZE_NONE,  COLOUR_GREY,   5, 100, 19, 30, STR_COMPANY_VIEW_PASSWORD,              STR_NULL},
+{    WWT_EDITBOX,  RESIZE_NONE,  COLOUR_GREY, 101, 294, 19, 30, STR_COMPANY_VIEW_SET_PASSWORD,          STR_NULL},
+{    WWT_TEXTBTN,  RESIZE_NONE,  COLOUR_GREY, 101, 294, 35, 46, STR_COMPANY_PASSWORD_MAKE_DEFAULT, STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP},
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_GREY,   0, 149, 51, 62, STR_BUTTON_CANCEL,                  STR_COMPANY_PASSWORD_CANCEL},
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_GREY, 150, 299, 51, 62, STR_BUTTON_OK,                      STR_COMPANY_PASSWORD_OK},
 {   WIDGETS_END},
 };
 
@@ -2275,21 +2275,21 @@ static const NWidgetPart _nested_ncp_window_widgets[] = {
 		NWidget(NWID_SPACER), SetMinimalSize(0, 5),
 		NWidget(NWID_HORIZONTAL), SetPIP(5, 0, 5),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_TEXT, COLOUR_GREY, NCPWW_LABEL), SetMinimalSize(96, 12), SetDataTip(STR_COMPANY_PASSWORD, STR_NULL),
+				NWidget(WWT_TEXT, COLOUR_GREY, NCPWW_LABEL), SetMinimalSize(96, 12), SetDataTip(STR_COMPANY_VIEW_PASSWORD, STR_NULL),
 				NWidget(NWID_SPACER), SetFill(false, true),
 			EndContainer(),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_EDITBOX, COLOUR_GREY, NCPWW_PASSWORD), SetMinimalSize(194, 12), SetDataTip(STR_SET_COMPANY_PASSWORD, STR_NULL),
+				NWidget(WWT_EDITBOX, COLOUR_GREY, NCPWW_PASSWORD), SetMinimalSize(194, 12), SetDataTip(STR_COMPANY_VIEW_SET_PASSWORD, STR_NULL),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 4),
 				NWidget(WWT_TEXTBTN, COLOUR_GREY, NCPWW_SAVE_AS_DEFAULT_PASSWORD), SetMinimalSize(194, 12),
-											SetDataTip(STR_MAKE_DEFAULT_COMPANY_PASSWORD, STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP),
+											SetDataTip(STR_COMPANY_PASSWORD_MAKE_DEFAULT, STR_COMPANY_PASSWORD_MAKE_DEFAULT_TOOLTIP),
 			EndContainer(),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 4),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NCPWW_CANCEL), SetMinimalSize(150, 12), SetDataTip(STR_QUERY_CANCEL, STR_COMPANY_PASSWORD_CANCEL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NCPWW_OK), SetMinimalSize(150, 12), SetDataTip(STR_QUERY_OK, STR_COMPANY_PASSWORD_OK),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NCPWW_CANCEL), SetMinimalSize(150, 12), SetDataTip(STR_BUTTON_CANCEL, STR_COMPANY_PASSWORD_CANCEL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NCPWW_OK), SetMinimalSize(150, 12), SetDataTip(STR_BUTTON_OK, STR_COMPANY_PASSWORD_OK),
 	EndContainer(),
 };
 
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 1ae3d64b0..6ea632ff1 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -981,7 +981,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_QUIT)
 
 	NetworkGetClientName(client_name, sizeof(client_name), cs);
 
-	NetworkTextMessage(NETWORK_ACTION_LEAVE, CC_DEFAULT, false, client_name, NULL, STR_NETWORK_CLIENT_LEAVING);
+	NetworkTextMessage(NETWORK_ACTION_LEAVE, CC_DEFAULT, false, client_name, NULL, STR_NETWORK_MESSAGE_CLIENT_LEAVING);
 
 	FOR_ALL_CLIENT_SOCKETS(new_cs) {
 		if (new_cs->status > STATUS_AUTH) {
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index 2cec02245..7f8cfdf68 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -67,18 +67,18 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, uint bott
 	/* Draw filename or not if it is not known (GRF sent over internet) */
 	if (c->filename != NULL) {
 		SetDParamStr(0, c->filename);
-		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_FILENAME);
+		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_FILENAME);
 	}
 
 	/* Prepare and draw GRF ID */
 	snprintf(buff, lengthof(buff), "%08X", BSWAP32(c->grfid));
 	SetDParamStr(0, buff);
-	y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_GRF_ID);
+	y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_GRF_ID);
 
 	/* Prepare and draw MD5 sum */
 	md5sumToString(buff, lastof(buff), c->md5sum);
 	SetDParamStr(0, buff);
-	y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_MD5SUM);
+	y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_MD5SUM);
 
 	/* Show GRF parameter list */
 	if (show_params) {
@@ -89,16 +89,16 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, uint bott
 		} else {
 			SetDParam(0, STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE);
 		}
-		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_PARAMETER);
+		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_PARAMETER);
 
 		/* Draw the palette of the NewGRF */
 		SetDParamStr(0, c->windows_paletted ? "Windows" : "DOS");
-		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_PALETTE);
+		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_PALETTE);
 	}
 
 	/* Show flags */
-	if (c->status == GCS_NOT_FOUND)       y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_NOT_FOUND);
-	if (c->status == GCS_DISABLED)        y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_DISABLED);
+	if (c->status == GCS_NOT_FOUND)       y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_NOT_FOUND);
+	if (c->status == GCS_DISABLED)        y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_DISABLED);
 	if (HasBit(c->flags, GCF_COMPATIBLE)) y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_COMPATIBLE_LOADED);
 
 	/* Draw GRF info if it exists */
@@ -107,7 +107,7 @@ static void ShowNewGRFInfo(const GRFConfig *c, uint x, uint y, uint w, uint bott
 		SetDParamStr(1, c->info);
 		y = DrawStringMultiLine(x, x + w, y, bottom, STR_BLACK_STRING);
 	} else {
-		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_NO_INFO);
+		y = DrawStringMultiLine(x, x + w, y, bottom, STR_NEWGRF_SETTINGS_NO_INFO);
 	}
 }
 
@@ -241,9 +241,9 @@ static const Widget _newgrf_add_dlg_widgets[] = {
 {      WWT_INSET,      RESIZE_RB,  COLOUR_GREY,   2, 292,  16, 119, 0x0,                     STR_NULL },                             // ANGRFW_GRF_LIST
 {  WWT_SCROLLBAR,     RESIZE_LRB,  COLOUR_GREY, 295, 306,  14, 121, 0x0,                     STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST }, // ANGRFW_SCROLLBAR
 {      WWT_PANEL,     RESIZE_RTB,  COLOUR_GREY,   0, 306, 122, 224, 0x0,                     STR_NULL },                             // ANGRFW_GRF_INFO
-{ WWT_PUSHTXTBTN,     RESIZE_RTB,  COLOUR_GREY,   0, 146, 225, 236, STR_NEWGRF_ADD_FILE,     STR_NEWGRF_ADD_FILE_TIP },              // ANGRFW_ADD
-{ WWT_PUSHTXTBTN,    RESIZE_LRTB,  COLOUR_GREY, 147, 294, 225, 236, STR_NEWGRF_RESCAN_FILES, STR_NEWGRF_RESCAN_FILES_TIP },          // ANGRFW_RESCAN
-{  WWT_RESIZEBOX,    RESIZE_LRTB,  COLOUR_GREY, 295, 306, 225, 236, 0x0,                     STR_RESIZE_BUTTON },                    // ANGRFW_RESIZE
+{ WWT_PUSHTXTBTN,     RESIZE_RTB,  COLOUR_GREY,   0, 146, 225, 236, STR_NEWGRF_ADD_FILE,     STR_NEWGRF_ADD_FILE_TOOLTIP },              // ANGRFW_ADD
+{ WWT_PUSHTXTBTN,    RESIZE_LRTB,  COLOUR_GREY, 147, 294, 225, 236, STR_NEWGRF_ADD_RESCAN_FILES, STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP },          // ANGRFW_RESCAN
+{  WWT_RESIZEBOX,    RESIZE_LRTB,  COLOUR_GREY, 295, 306, 225, 236, 0x0,                     STR_TOOLTIP_RESIZE },                    // ANGRFW_RESIZE
 {   WIDGETS_END },
 };
 
@@ -260,8 +260,8 @@ static const NWidgetPart _nested_newgrf_add_dlg_widgets[] = {
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, ANGRFW_GRF_INFO), SetResize(1, 0), SetMinimalSize(307, 103), EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ANGRFW_ADD), SetMinimalSize(147, 12), SetResize(1, 0), SetDataTip(STR_NEWGRF_ADD_FILE, STR_NEWGRF_ADD_FILE_TIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ANGRFW_RESCAN), SetMinimalSize(148, 12), SetDataTip(STR_NEWGRF_RESCAN_FILES, STR_NEWGRF_RESCAN_FILES_TIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ANGRFW_ADD), SetMinimalSize(147, 12), SetResize(1, 0), SetDataTip(STR_NEWGRF_ADD_FILE, STR_NEWGRF_ADD_FILE_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ANGRFW_RESCAN), SetMinimalSize(148, 12), SetDataTip(STR_NEWGRF_ADD_RESCAN_FILES, STR_NEWGRF_ADD_RESCAN_FILES_TOOLTIP),
 		NWidget(WWT_RESIZEBOX, COLOUR_GREY, ANGRFW_RESIZE),
 	EndContainer(),
 };
@@ -416,8 +416,8 @@ struct NewGRFWindow : public Window {
 			has_compatible |= HasBit(c->flags, GCF_COMPATIBLE);
 		}
 		if (has_missing || has_compatible) {
-			this->widget[SNGRFS_CONTENT_DOWNLOAD].data     = STR_CONTENT_INTRO_MISSING_BUTTON;
-			this->widget[SNGRFS_CONTENT_DOWNLOAD].tooltips = STR_CONTENT_INTRO_MISSING_BUTTON_TIP;
+			this->widget[SNGRFS_CONTENT_DOWNLOAD].data     = STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON;
+			this->widget[SNGRFS_CONTENT_DOWNLOAD].tooltips = STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_TOOLTIP;
 		} else {
 			this->widget[SNGRFS_CONTENT_DOWNLOAD].data     = STR_INTRO_ONLINE_CONTENT;
 			this->widget[SNGRFS_CONTENT_DOWNLOAD].tooltips = STR_INTRO_TOOLTIP_ONLINE_CONTENT;
@@ -494,7 +494,7 @@ struct NewGRFWindow : public Window {
 
 			case SNGRFS_PRESET_SAVE:
 				this->query_widget = widget;
-				ShowQueryString(STR_EMPTY, STR_NEWGRF_PRESET_SAVE_QUERY, 32, 100, this, CS_ALPHANUMERAL, QSF_NONE);
+				ShowQueryString(STR_EMPTY, STR_NEWGRF_SETTINGS_PRESET_SAVE_QUERY, 32, 100, this, CS_ALPHANUMERAL, QSF_NONE);
 				break;
 
 			case SNGRFS_PRESET_DELETE:
@@ -584,7 +584,7 @@ struct NewGRFWindow : public Window {
 			case SNGRFS_APPLY_CHANGES: // Apply changes made to GRF list
 				if (this->execute) {
 					ShowQuery(
-						STR_POPUP_CAUTION_CAPTION,
+						STR_NEWGRF_POPUP_CAUTION_CAPTION,
 						STR_NEWGRF_CONFIRMATION_TEXT,
 						this,
 						NewGRFConfirmationCallback
@@ -603,7 +603,7 @@ struct NewGRFWindow : public Window {
 				static char buff[512];
 				GRFBuildParamList(buff, this->sel, lastof(buff));
 				SetDParamStr(0, buff);
-				ShowQueryString(STR_JUST_RAW_STRING, STR_NEWGRF_PARAMETER_QUERY, 63, 250, this, CS_ALPHANUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_RAW_STRING, STR_NEWGRF_SETTINGS_PARAMETER_QUERY, 63, 250, this, CS_ALPHANUMERAL, QSF_NONE);
 				break;
 			}
 
@@ -616,7 +616,7 @@ struct NewGRFWindow : public Window {
 
 			case SNGRFS_CONTENT_DOWNLOAD:
 				if (!_network_available) {
-					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERR_NOTAVAILABLE, 0, 0);
+					ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERROR_NOTAVAILABLE, 0, 0);
 				} else {
 #if defined(ENABLE_NETWORK)
 				/* Only show the things in the current list, or everything when nothing's selected */
@@ -746,22 +746,22 @@ static const Widget _newgrf_widgets[] = {
 {   WWT_CLOSEBOX,  RESIZE_NONE,  COLOUR_MAUVE,    0,  10,   0,  13, STR_BLACK_CROSS,             STR_TOOLTIP_CLOSE_WINDOW },         // SNGRFS_CLOSEBOX
 {    WWT_CAPTION, RESIZE_RIGHT,  COLOUR_MAUVE,   11, 299,   0,  13, STR_NEWGRF_SETTINGS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS }, // SNGRFS_CAPTION
 {      WWT_PANEL, RESIZE_RIGHT,  COLOUR_MAUVE,    0, 299,  14,  29, STR_NULL,                    STR_NULL },                         // SNGRFS_BACKGROUND1
-{   WWT_DROPDOWN, RESIZE_RIGHT,  COLOUR_YELLOW,  10, 103,  16,  27, STR_EMPTY,                   STR_NEWGRF_PRESET_LIST_TIP },       // SNGRFS_PRESET_LIST
-{ WWT_PUSHTXTBTN,    RESIZE_LR,  COLOUR_YELLOW, 104, 196,  16,  27, STR_NEWGRF_PRESET_SAVE,      STR_NEWGRF_PRESET_SAVE_TIP },       // SNGRFS_PRESET_SAVE
-{ WWT_PUSHTXTBTN,    RESIZE_LR,  COLOUR_YELLOW, 197, 289,  16,  27, STR_NEWGRF_PRESET_DELETE,    STR_NEWGRF_PRESET_DELETE_TIP },     // SNGRFS_PRESET_DELETE
+{   WWT_DROPDOWN, RESIZE_RIGHT,  COLOUR_YELLOW,  10, 103,  16,  27, STR_EMPTY,                   STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP },       // SNGRFS_PRESET_LIST
+{ WWT_PUSHTXTBTN,    RESIZE_LR,  COLOUR_YELLOW, 104, 196,  16,  27, STR_NEWGRF_SETTINGS_PRESET_SAVE,      STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP },       // SNGRFS_PRESET_SAVE
+{ WWT_PUSHTXTBTN,    RESIZE_LR,  COLOUR_YELLOW, 197, 289,  16,  27, STR_NEWGRF_SETTINGS_PRESET_DELETE,    STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP },     // SNGRFS_PRESET_DELETE
 {      WWT_PANEL, RESIZE_RIGHT,  COLOUR_MAUVE,    0, 299,  30,  45, STR_NULL,                    STR_NULL },                         // SNGRFS_BACKGROUND2
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_YELLOW,  10,  79,  32,  43, STR_NEWGRF_ADD,              STR_NEWGRF_ADD_TIP },               // SNGRFS_ADD
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_YELLOW,  80, 149,  32,  43, STR_NEWGRF_REMOVE,           STR_NEWGRF_REMOVE_TIP },            // SNGRFS_REMOVE
-{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_YELLOW, 150, 219,  32,  43, STR_NEWGRF_MOVEUP,           STR_NEWGRF_MOVEUP_TIP },            // SNGRFS_MOVE_UP
-{ WWT_PUSHTXTBTN, RESIZE_RIGHT,  COLOUR_YELLOW, 220, 289,  32,  43, STR_NEWGRF_MOVEDOWN,         STR_NEWGRF_MOVEDOWN_TIP },          // SNGRFS_MOVE_DOWN
-{     WWT_MATRIX,    RESIZE_RB,  COLOUR_MAUVE,    0, 287,  46, 115, 0x501,                       STR_NEWGRF_FILE_TIP },              // SNGRFS_FILE_LIST
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_YELLOW,  10,  79,  32,  43, STR_NEWGRF_SETTINGS_ADD,              STR_NEWGRF_SETTINGS_ADD_TOOLTIP },               // SNGRFS_ADD
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_YELLOW,  80, 149,  32,  43, STR_NEWGRF_SETTINGS_REMOVE,           STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP },            // SNGRFS_REMOVE
+{ WWT_PUSHTXTBTN,  RESIZE_NONE,  COLOUR_YELLOW, 150, 219,  32,  43, STR_NEWGRF_SETTINGS_MOVEUP,           STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP },            // SNGRFS_MOVE_UP
+{ WWT_PUSHTXTBTN, RESIZE_RIGHT,  COLOUR_YELLOW, 220, 289,  32,  43, STR_NEWGRF_SETTINGS_MOVEDOWN,         STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP },          // SNGRFS_MOVE_DOWN
+{     WWT_MATRIX,    RESIZE_RB,  COLOUR_MAUVE,    0, 287,  46, 115, 0x501,                       STR_NEWGRF_SETTINGS_FILE_TOOLTIP },              // SNGRFS_FILE_LIST
 {  WWT_SCROLLBAR,   RESIZE_LRB,  COLOUR_MAUVE,  288, 299,  46, 115, 0x0,                         STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST }, // SNGRFS_SCROLLBAR
 {      WWT_PANEL,   RESIZE_RTB,  COLOUR_MAUVE,    0, 299, 116, 238, STR_NULL,                    STR_NULL },                         // SNGRFS_NEWGRF_INFO
-{ WWT_PUSHTXTBTN,    RESIZE_TB,  COLOUR_MAUVE,    0,  99, 239, 250, STR_NEWGRF_SET_PARAMETERS,   STR_NULL },                         // SNGRFS_SET_PARAMETERS
-{ WWT_PUSHTXTBTN,   RESIZE_RTB,  COLOUR_MAUVE,  100, 199, 239, 250, STR_NEWGRF_TOGGLE_PALETTE,   STR_NEWGRF_TOGGLE_PALETTE_TIP },    // SNGRFS_TOGGLE_PALETTE
-{ WWT_PUSHTXTBTN,  RESIZE_LRTB,  COLOUR_MAUVE,  200, 299, 239, 250, STR_NEWGRF_APPLY_CHANGES,    STR_NULL },                         // SNGRFS_APPLY_CHANGES
+{ WWT_PUSHTXTBTN,    RESIZE_TB,  COLOUR_MAUVE,    0,  99, 239, 250, STR_NEWGRF_SETTINGS_SET_PARAMETERS,   STR_NULL },                         // SNGRFS_SET_PARAMETERS
+{ WWT_PUSHTXTBTN,   RESIZE_RTB,  COLOUR_MAUVE,  100, 199, 239, 250, STR_NEWGRF_SETTINGS_TOGGLE_PALETTE,   STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP },    // SNGRFS_TOGGLE_PALETTE
+{ WWT_PUSHTXTBTN,  RESIZE_LRTB,  COLOUR_MAUVE,  200, 299, 239, 250, STR_NEWGRF_SETTINGS_APPLY_CHANGES,    STR_NULL },                         // SNGRFS_APPLY_CHANGES
 { WWT_PUSHTXTBTN,   RESIZE_RTB,  COLOUR_MAUVE,    0, 287, 251, 262, STR_INTRO_ONLINE_CONTENT,    STR_INTRO_TOOLTIP_ONLINE_CONTENT },     // SNGRFS_CONTENT_DOWNLOAD
-{  WWT_RESIZEBOX,  RESIZE_LRTB,  COLOUR_MAUVE,  288, 299, 251, 262, 0x0,                         STR_RESIZE_BUTTON },                // SNGRFS_RESIZE
+{  WWT_RESIZEBOX,  RESIZE_LRTB,  COLOUR_MAUVE,  288, 299, 251, 262, 0x0,                         STR_TOOLTIP_RESIZE },                // SNGRFS_RESIZE
 { WIDGETS_END },
 };
 
@@ -772,29 +772,29 @@ static const NWidgetPart _nested_newgrf_widgets[] = {
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_MAUVE, SNGRFS_BACKGROUND1),
 		NWidget(NWID_HORIZONTAL), SetPadding(2, 10, 2, 10),
-			NWidget(WWT_DROPDOWN, COLOUR_YELLOW, SNGRFS_PRESET_LIST), SetMinimalSize(94, 12), SetResize(1, 0), SetDataTip(STR_EMPTY, STR_NEWGRF_PRESET_LIST_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_PRESET_SAVE), SetMinimalSize(93, 12), SetDataTip(STR_NEWGRF_PRESET_SAVE, STR_NEWGRF_PRESET_SAVE_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_PRESET_DELETE), SetMinimalSize(93, 12), SetDataTip(STR_NEWGRF_PRESET_DELETE, STR_NEWGRF_PRESET_DELETE_TIP),
+			NWidget(WWT_DROPDOWN, COLOUR_YELLOW, SNGRFS_PRESET_LIST), SetMinimalSize(94, 12), SetResize(1, 0), SetDataTip(STR_EMPTY, STR_NEWGRF_SETTINGS_PRESET_LIST_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_PRESET_SAVE), SetMinimalSize(93, 12), SetDataTip(STR_NEWGRF_SETTINGS_PRESET_SAVE, STR_NEWGRF_SETTINGS_PRESET_SAVE_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_PRESET_DELETE), SetMinimalSize(93, 12), SetDataTip(STR_NEWGRF_SETTINGS_PRESET_DELETE, STR_NEWGRF_SETTINGS_PRESET_DELETE_TOOLTIP),
 		EndContainer(),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_MAUVE, SNGRFS_BACKGROUND2),
 		NWidget(NWID_HORIZONTAL), SetPadding(2, 10, 2, 10),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_ADD), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_ADD, STR_NEWGRF_ADD_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_REMOVE), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_REMOVE, STR_NEWGRF_REMOVE_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_MOVE_UP), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_MOVEUP, STR_NEWGRF_MOVEUP_TIP),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_MOVE_DOWN), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_MOVEDOWN, STR_NEWGRF_MOVEDOWN_TIP), SetResize(1, 0),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_ADD), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_SETTINGS_ADD, STR_NEWGRF_SETTINGS_ADD_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_REMOVE), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_SETTINGS_REMOVE, STR_NEWGRF_SETTINGS_REMOVE_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_MOVE_UP), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_SETTINGS_MOVEUP, STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, SNGRFS_MOVE_DOWN), SetMinimalSize(70, 12), SetDataTip(STR_NEWGRF_SETTINGS_MOVEDOWN, STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP), SetResize(1, 0),
 		EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_MATRIX, COLOUR_MAUVE, SNGRFS_FILE_LIST), SetMinimalSize(288, 70), SetDataTip(0x501, STR_NEWGRF_FILE_TIP), SetResize(1, 14),
+		NWidget(WWT_MATRIX, COLOUR_MAUVE, SNGRFS_FILE_LIST), SetMinimalSize(288, 70), SetDataTip(0x501, STR_NEWGRF_SETTINGS_FILE_TOOLTIP), SetResize(1, 14),
 		NWidget(WWT_SCROLLBAR, COLOUR_MAUVE, SNGRFS_SCROLLBAR),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_MAUVE, SNGRFS_NEWGRF_INFO), SetResize(1, 0), SetMinimalSize(300, 123), EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, SNGRFS_SET_PARAMETERS), SetMinimalSize(100, 12), SetDataTip(STR_NEWGRF_SET_PARAMETERS, STR_NULL),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, SNGRFS_SET_PARAMETERS), SetMinimalSize(100, 12), SetDataTip(STR_NEWGRF_SETTINGS_SET_PARAMETERS, STR_NULL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, SNGRFS_TOGGLE_PALETTE), SetMinimalSize(100, 12), SetResize(1, 0),
-													SetDataTip(STR_NEWGRF_TOGGLE_PALETTE, STR_NEWGRF_TOGGLE_PALETTE_TIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, SNGRFS_APPLY_CHANGES), SetMinimalSize(100, 12), SetDataTip(STR_NEWGRF_APPLY_CHANGES, STR_NULL),
+													SetDataTip(STR_NEWGRF_SETTINGS_TOGGLE_PALETTE, STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, SNGRFS_APPLY_CHANGES), SetMinimalSize(100, 12), SetDataTip(STR_NEWGRF_SETTINGS_APPLY_CHANGES, STR_NULL),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_MAUVE, SNGRFS_CONTENT_DOWNLOAD), SetFill(1, 0), SetMinimalSize(288, 12), SetResize(1, 0),
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp
index 964673103..a90c862bc 100644
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@@ -91,13 +91,13 @@ void ResetStationClasses()
 
 	/* Set up initial data */
 	_station_classes[0].id = 'DFLT';
-	_station_classes[0].name = STR_STAT_CLASS_DFLT;
+	_station_classes[0].name = STR_STATION_CLASS_DFLT;
 	_station_classes[0].stations = 1;
 	_station_classes[0].spec = MallocT<StationSpec*>(1);
 	_station_classes[0].spec[0] = NULL;
 
 	_station_classes[1].id = 'WAYP';
-	_station_classes[1].name = STR_STAT_CLASS_WAYP;
+	_station_classes[1].name = STR_STATION_CLASS_WAYP;
 	_station_classes[1].stations = 1;
 	_station_classes[1].spec = MallocT<StationSpec*>(1);
 	_station_classes[1].spec[0] = NULL;
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index b1b99dd2e..86c368e04 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -842,10 +842,10 @@ struct MessageHistoryWindow : Window {
 static const Widget _message_history_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_BROWN,     0,    10,     0,    13, STR_BLACK_CROSS,     STR_TOOLTIP_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_BROWN,    11,   387,     0,    13, STR_MESSAGE_HISTORY, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   388,   399,     0,    13, 0x0,                 STR_STICKY_BUTTON},
-{      WWT_PANEL,     RESIZE_RB,  COLOUR_BROWN,     0,   387,    14,   139, 0x0,                 STR_MESSAGE_HISTORY_TIP},
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   388,   399,     0,    13, 0x0,                 STR_TOOLTIP_STICKY},
+{      WWT_PANEL,     RESIZE_RB,  COLOUR_BROWN,     0,   387,    14,   139, 0x0,                 STR_MESSAGE_HISTORY_TOOLTIP},
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_BROWN,   388,   399,    14,   127, 0x0,                 STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_BROWN,   388,   399,   128,   139, 0x0,                 STR_RESIZE_BUTTON},
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_BROWN,   388,   399,   128,   139, 0x0,                 STR_TOOLTIP_RESIZE},
 {   WIDGETS_END},
 };
 
@@ -853,15 +853,15 @@ static const NWidgetPart _nested_message_history[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN, MHW_CLOSEBOX), SetMinimalSize(11, 14), SetDataTip(STR_BLACK_CROSS, STR_TOOLTIP_CLOSE_WINDOW),
 		NWidget(WWT_CAPTION, COLOUR_BROWN, MHW_CAPTION), SetMinimalSize(377, 14), SetDataTip(STR_MESSAGE_HISTORY, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_STICKYBOX, COLOUR_BROWN, MHW_STICKYBOX), SetMinimalSize(12, 14), SetDataTip(0x0, STR_STICKY_BUTTON),
+		NWidget(WWT_STICKYBOX, COLOUR_BROWN, MHW_STICKYBOX), SetMinimalSize(12, 14), SetDataTip(0x0, STR_TOOLTIP_STICKY),
 	EndContainer(),
 
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PANEL, COLOUR_BROWN, MHW_BACKGROUND), SetMinimalSize(388, 125), SetDataTip(0x0, STR_MESSAGE_HISTORY_TIP), SetResize(1, 12),
+		NWidget(WWT_PANEL, COLOUR_BROWN, MHW_BACKGROUND), SetMinimalSize(388, 125), SetDataTip(0x0, STR_MESSAGE_HISTORY_TOOLTIP), SetResize(1, 12),
 		EndContainer(),
 		NWidget(NWID_VERTICAL),
 			NWidget(WWT_SCROLLBAR, COLOUR_BROWN, MHW_SCROLLBAR), SetMinimalSize(12, 114), SetDataTip(0x0, STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST), SetResize(0, 1),
-			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, MHW_RESIZEBOX), SetMinimalSize(12, 12), SetDataTip(0x0, STR_RESIZE_BUTTON),
+			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, MHW_RESIZEBOX), SetMinimalSize(12, 12), SetDataTip(0x0, STR_TOOLTIP_RESIZE),
 		EndContainer(),
 	EndContainer(),
 };
diff --git a/src/openttd.cpp b/src/openttd.cpp
index df2996b1a..9fddfcb2e 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1175,7 +1175,7 @@ static void DoAutosave()
 
 	DEBUG(sl, 2, "Autosaving to '%s'", buf);
 	if (SaveOrLoad(buf, SL_SAVE, AUTOSAVE_DIR) != SL_OK) {
-		ShowErrorMessage(INVALID_STRING_ID, STR_AUTOSAVE_FAILED, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_AUTOSAVE_FAILED, 0, 0);
 	}
 }
 
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 2d09acb73..306a1f274 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -191,7 +191,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
 			OrderLoadFlags load = order->GetLoadType();
 			OrderUnloadFlags unload = order->GetUnloadType();
 
-			SetDParam(1, STR_GO_TO_STATION);
+			SetDParam(1, STR_ORDER_GO_TO_STATION);
 			SetDParam(2, STR_ORDER_GO_TO + ((v->type == VEH_TRAIN || v->type == VEH_ROAD) ? order->GetNonStopType() : 0));
 			SetDParam(3, order->GetDestination());
 
@@ -213,19 +213,19 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
 		case OT_GOTO_DEPOT:
 			if (v->type == VEH_AIRCRAFT) {
 				if (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
-					SetDParam(1, STR_GO_TO_NEAREST_DEPOT);
+					SetDParam(1, STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT);
 					SetDParam(3, STR_ORDER_NEAREST_HANGAR);
 				} else {
-					SetDParam(1, STR_GO_TO_HANGAR);
+					SetDParam(1, STR_ORDER_GO_TO_HANGAR_FORMAT);
 					SetDParam(3, order->GetDestination());
 				}
 				SetDParam(4, STR_EMPTY);
 			} else {
 				if (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
-					SetDParam(1, STR_GO_TO_NEAREST_DEPOT);
+					SetDParam(1, STR_ORDER_GO_TO_NEAREST_DEPOT_FORMAT);
 					SetDParam(3, STR_ORDER_NEAREST_DEPOT);
 				} else {
-					SetDParam(1, STR_GO_TO_DEPOT);
+					SetDParam(1, STR_ORDER_GO_TO_DEPOT_FORMAT);
 					SetDParam(3, Depot::Get(order->GetDestination())->town_index);
 				}
 
@@ -239,27 +239,27 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
 			}
 
 			if (!timetable && (order->GetDepotActionType() & ODATFB_HALT)) {
-				SetDParam(6, STR_STOP_ORDER);
+				SetDParam(6, STR_ORDER_STOP_ORDER);
 			}
 
 			if (!timetable && order->IsRefit()) {
-				SetDParam(6, (order->GetDepotActionType() & ODATFB_HALT) ? STR_REFIT_STOP_ORDER : STR_REFIT_ORDER);
+				SetDParam(6, (order->GetDepotActionType() & ODATFB_HALT) ? STR_ORDER_REFIT_STOP_ORDER : STR_ORDER_REFIT_ORDER);
 				SetDParam(7, CargoSpec::Get(order->GetRefitCargo())->name);
 			}
 			break;
 
 		case OT_GOTO_WAYPOINT:
-			SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
+			SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO_WAYPOINT : STR_ORDER_GO_TO_WAYPOINT);
 			SetDParam(2, order->GetDestination());
 			break;
 
 		case OT_CONDITIONAL:
 			SetDParam(2, order->GetConditionSkipToOrder() + 1);
 			if (order->GetConditionVariable() == OCV_UNCONDITIONALLY) {
-				SetDParam(1, STR_CONDITIONAL_UNCONDITIONAL);
+				SetDParam(1, STR_ORDER_CONDITIONAL_UNCONDITIONAL);
 			} else {
 				OrderConditionComparator occ = order->GetConditionComparator();
-				SetDParam(1, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_CONDITIONAL_TRUE_FALSE : STR_CONDITIONAL_NUM);
+				SetDParam(1, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_ORDER_CONDITIONAL_TRUE_FALSE : STR_ORDER_CONDITIONAL_NUM);
 				SetDParam(3, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable());
 				SetDParam(4, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ);
 
@@ -437,7 +437,7 @@ private:
 		if (this->vehicle->GetNumOrders() != 0 && _ctrl_pressed == 0) return false;
 
 		if (DoCommandP(this->vehicle->tile, this->vehicle->index | (u->index << 16), _ctrl_pressed ? CO_SHARE : CO_COPY,
-			_ctrl_pressed ? CMD_CLONE_ORDER | CMD_MSG(STR_CANT_SHARE_ORDER_LIST) : CMD_CLONE_ORDER | CMD_MSG(STR_CANT_COPY_ORDER_LIST))) {
+			_ctrl_pressed ? CMD_CLONE_ORDER | CMD_MSG(STR_ERROR_CAN_T_SHARE_ORDER_LIST) : CMD_CLONE_ORDER | CMD_MSG(STR_ERROR_CAN_T_COPY_ORDER_LIST))) {
 			this->selected_order = -1;
 			ResetObjectToPlace();
 		}
@@ -837,7 +837,7 @@ public:
 		}
 
 		if (i - this->vscroll.pos < this->vscroll.cap) {
-			str = shared_orders ? STR_END_OF_SHARED_ORDERS : STR_ORDERS_END_OF_ORDERS;
+			str = shared_orders ? STR_ORDERS_END_OF_SHARED_ORDERS : STR_ORDERS_END_OF_ORDERS;
 			DrawString(this->widget[ORDER_WIDGET_ORDER_LIST].left + 2, this->widget[ORDER_WIDGET_ORDER_LIST].right - 2, y, str, (i == this->selected_order) ? TC_WHITE : TC_BLACK);
 		}
 	}
@@ -1231,8 +1231,8 @@ public:
 static const Widget _orders_train_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},                 // ORDER_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_GREY,    11,   371,     0,    13, STR_ORDERS_CAPTION,         STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},       // ORDER_WIDGET_CAPTION
-	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   311,   371,     0,    13, STR_TIMETABLE_VIEW,         STR_TIMETABLE_VIEW_TOOLTIP},               // ORDER_WIDGET_TIMETABLE_VIEW
-	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   372,   383,     0,    13, STR_NULL,                   STR_STICKY_BUTTON},                        // ORDER_WIDGET_STICKY
+	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   311,   371,     0,    13, STR_ORDERS_TIMETABLE_VIEW,  STR_ORDERS_TIMETABLE_VIEW_TOOLTIP},               // ORDER_WIDGET_TIMETABLE_VIEW
+	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   372,   383,     0,    13, STR_NULL,                   STR_TOOLTIP_STICKY},                        // ORDER_WIDGET_STICKY
 
 	{      WWT_PANEL,   RESIZE_RB,     COLOUR_GREY,     0,   371,    14,    75, 0x0,                        STR_ORDERS_LIST_TOOLTIP},                  // ORDER_WIDGET_ORDER_LIST
 
@@ -1242,23 +1242,23 @@ static const Widget _orders_train_widgets[] = {
 	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    88,    99, STR_ORDERS_DELETE_BUTTON,   STR_ORDERS_DELETE_TOOLTIP},                // ORDER_WIDGET_DELETE
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,     0,   123,    76,    87, STR_NULL,                   STR_ORDER_TOOLTIP_NON_STOP},               // ORDER_WIDGET_NON_STOP_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_TB,     COLOUR_GREY,     0,   111,    76,    87, STR_ORDER_NON_STOP,         STR_ORDER_TOOLTIP_NON_STOP},               // ORDER_WIDGET_NON_STOP
-	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    88,    99, STR_EMPTY,                  STR_ORDER_GO_TO_DROPDOWN_TOOLTIP},         // ORDER_WIDGET_GOTO_DROPDOWN
+	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    88,    99, STR_EMPTY,                  STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP},         // ORDER_WIDGET_GOTO_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   359,    88,    99, STR_ORDERS_GO_TO_BUTTON,    STR_ORDERS_GO_TO_TOOLTIP},                 // ORDER_WIDGET_GOTO
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    76,    87, STR_NULL,                   STR_ORDER_TOOLTIP_FULL_LOAD},              // ORDER_WIDGET_FULL_LOAD_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_TB,     COLOUR_GREY,   124,   235,    76,    87, STR_ORDER_TOGGLE_FULL_LOAD, STR_ORDER_TOOLTIP_FULL_LOAD},              // ORDER_WIDGET_FULL_LOAD
 	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_NULL,                   STR_ORDER_TOOLTIP_UNLOAD},                 // ORDER_WIDGET_UNLOAD_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   359,    76,    87, STR_ORDER_TOGGLE_UNLOAD,    STR_ORDER_TOOLTIP_UNLOAD},                 // ORDER_WIDGET_UNLOAD
-	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    76,    87, STR_REFIT,                  STR_REFIT_TIP},                            // ORDER_WIDGET_REFIT
-	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_NULL,                   STR_SERVICE_HINT},                         // ORDER_WIDGET_SERVICE_DROPDOWN
-	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   359,    76,    87, STR_SERVICE,                STR_SERVICE_HINT},                         // ORDER_WIDGET_SERVICE
+	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    76,    87, STR_ORDER_REFIT,            STR_ORDER_REFIT_TOOLTIP},                            // ORDER_WIDGET_REFIT
+	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_NULL,                   STR_ORDER_SERVICE_TOOLTIP},                         // ORDER_WIDGET_SERVICE_DROPDOWN
+	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   359,    76,    87, STR_ORDER_SERVICE,          STR_ORDER_SERVICE_TOOLTIP},                         // ORDER_WIDGET_SERVICE
 
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,     0,   123,    76,    87, STR_NULL,                   STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP},   // ORDER_WIDGET_COND_VARIABLE
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    76,    87, STR_NULL,                   STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP}, // ORDER_WIDGET_COND_COMPARATOR
-	{ WWT_PUSHTXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_CONDITIONAL_VALUE,      STR_ORDER_CONDITIONAL_VALUE_TOOLTIP},      // ORDER_WIDGET_COND_VALUE
+	{ WWT_PUSHTXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_ORDER_CONDITIONAL_VALUE,STR_ORDER_CONDITIONAL_VALUE_TOOLTIP},      // ORDER_WIDGET_COND_VALUE
 
-	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    76,    87, SPR_SHARED_ORDERS_ICON,     STR_VEH_WITH_SHARED_ORDERS_LIST_TIP},      // ORDER_WIDGET_SHARED_ORDER_LIST
+	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    76,    87, SPR_SHARED_ORDERS_ICON,     STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP},      // ORDER_WIDGET_SHARED_ORDER_LIST
 
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    88,    99, 0x0,                        STR_RESIZE_BUTTON},                        // ORDER_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    88,    99, 0x0,                        STR_TOOLTIP_RESIZE},                        // ORDER_WIDGET_RESIZE
 	{   WIDGETS_END},
 };
 
@@ -1268,7 +1268,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
 		NWidget(NWID_LAYERED),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_TIMETABLE_VIEW), SetMinimalSize(61, 14), SetDataTip(STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_TIMETABLE_VIEW), SetMinimalSize(61, 14), SetDataTip(STR_ORDERS_TIMETABLE_VIEW, STR_ORDERS_TIMETABLE_VIEW_TOOLTIP),
 			EndContainer(),
 			NWidget(WWT_CAPTION, COLOUR_GREY, ORDER_WIDGET_CAPTION), SetDataTip(STR_ORDERS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		EndContainer(),
@@ -1314,15 +1314,15 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
 						EndContainer(),
 					EndContainer(),
 					NWidget(NWID_HORIZONTAL),
-						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_REFIT), SetMinimalSize(124, 12), SetDataTip(STR_REFIT, STR_REFIT_TIP),
+						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_REFIT), SetMinimalSize(124, 12), SetDataTip(STR_ORDER_REFIT, STR_ORDER_REFIT_TOOLTIP),
 						NWidget(NWID_LAYERED),
 							NWidget(NWID_HORIZONTAL),
 								NWidget(WWT_TEXTBTN, COLOUR_GREY, ORDER_WIDGET_SERVICE), SetMinimalSize(112, 12),
-											SetDataTip(STR_SERVICE, STR_SERVICE_HINT), SetResize(1, 0),
+											SetDataTip(STR_ORDER_SERVICE, STR_ORDER_SERVICE_TOOLTIP), SetResize(1, 0),
 								NWidget(NWID_SPACER), SetFill(1, 0),
 							EndContainer(),
 							NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_SERVICE_DROPDOWN), SetMinimalSize(124, 12),
-											SetDataTip(STR_NULL, STR_SERVICE_HINT), SetResize(1, 0),
+											SetDataTip(STR_NULL, STR_ORDER_SERVICE_TOOLTIP), SetResize(1, 0),
 						EndContainer(),
 					EndContainer(),
 				EndContainer(),
@@ -1332,11 +1332,11 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_COND_VARIABLE), SetMinimalSize(124, 12), SetDataTip(STR_NULL, STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_COND_COMPARATOR), SetMinimalSize(124, 12), SetDataTip(STR_NULL, STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_COND_VALUE), SetMinimalSize(124, 12),
-											SetDataTip(STR_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP), SetResize(1, 0),
+											SetDataTip(STR_ORDER_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP), SetResize(1, 0),
 			EndContainer(),
 		EndContainer(),
 
-		NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, ORDER_WIDGET_SHARED_ORDER_LIST), SetMinimalSize(12, 12), SetDataTip(SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP),
+		NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, ORDER_WIDGET_SHARED_ORDER_LIST), SetMinimalSize(12, 12), SetDataTip(SPR_SHARED_ORDERS_ICON, STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP),
 	EndContainer(),
 
 	/* Second button row. */
@@ -1348,7 +1348,7 @@ static const NWidgetPart _nested_orders_train_widgets[] = {
 				NWidget(WWT_TEXTBTN, COLOUR_GREY, ORDER_WIDGET_GOTO), SetMinimalSize(112, 12), SetDataTip(STR_ORDERS_GO_TO_BUTTON, STR_ORDERS_GO_TO_TOOLTIP), SetResize(1, 0),
 				NWidget(NWID_SPACER), SetFill(1, 0),
 			EndContainer(),
-			NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_GOTO_DROPDOWN), SetMinimalSize(124, 12), SetDataTip(STR_EMPTY, STR_ORDER_GO_TO_DROPDOWN_TOOLTIP), SetResize(1, 0),
+			NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_GOTO_DROPDOWN), SetMinimalSize(124, 12), SetDataTip(STR_EMPTY, STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP), SetResize(1, 0),
 		EndContainer(),
 		NWidget(WWT_RESIZEBOX, COLOUR_GREY, ORDER_WIDGET_RESIZE),
 	EndContainer(),
@@ -1367,8 +1367,8 @@ static const WindowDesc _orders_train_desc(
 static const Widget _orders_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},                 // ORDER_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_GREY,    11,   371,     0,    13, STR_ORDERS_CAPTION,         STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},       // ORDER_WIDGET_CAPTION
-	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   311,   371,     0,    13, STR_TIMETABLE_VIEW,         STR_TIMETABLE_VIEW_TOOLTIP},               // ORDER_WIDGET_TIMETABLE_VIEW
-	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   372,   383,     0,    13, STR_NULL,                   STR_STICKY_BUTTON},                        // ORDER_WIDGET_STICKY
+	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   311,   371,     0,    13, STR_ORDERS_TIMETABLE_VIEW,  STR_ORDERS_TIMETABLE_VIEW_TOOLTIP},               // ORDER_WIDGET_TIMETABLE_VIEW
+	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   372,   383,     0,    13, STR_NULL,                   STR_TOOLTIP_STICKY},                        // ORDER_WIDGET_STICKY
 
 	{      WWT_PANEL,   RESIZE_RB,     COLOUR_GREY,     0,   371,    14,    75, 0x0,                        STR_ORDERS_LIST_TOOLTIP},                  // ORDER_WIDGET_ORDER_LIST
 
@@ -1378,23 +1378,23 @@ static const Widget _orders_widgets[] = {
 	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    88,    99, STR_ORDERS_DELETE_BUTTON,   STR_ORDERS_DELETE_TOOLTIP},                // ORDER_WIDGET_DELETE
 	{      WWT_EMPTY,   RESIZE_TB,     COLOUR_GREY,     0,     0,    76,    87, 0x0,                        0x0},                                      // ORDER_WIDGET_NON_STOP_DROPDOWN
 	{      WWT_EMPTY,   RESIZE_TB,     COLOUR_GREY,     0,     0,    76,    87, 0x0,                        0x0},                                      // ORDER_WIDGET_NON_STOP
-	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    88,    99, STR_EMPTY,                  STR_ORDER_GO_TO_DROPDOWN_TOOLTIP},         // ORDER_WIDGET_GOTO_DROPDOWN
+	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    88,    99, STR_EMPTY,                  STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP},         // ORDER_WIDGET_GOTO_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   359,    88,    99, STR_ORDERS_GO_TO_BUTTON,    STR_ORDERS_GO_TO_TOOLTIP},                 // ORDER_WIDGET_GOTO
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,     0,   185,    76,    87, STR_NULL,                   STR_ORDER_TOOLTIP_FULL_LOAD},              // ORDER_WIDGET_FULL_LOAD_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_TB,     COLOUR_GREY,     0,   173,    76,    87, STR_ORDER_TOGGLE_FULL_LOAD, STR_ORDER_TOOLTIP_FULL_LOAD},              // ORDER_WIDGET_FULL_LOAD
 	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   186,   371,    76,    87, STR_NULL,                   STR_ORDER_TOOLTIP_UNLOAD},                 // ORDER_WIDGET_UNLOAD_DROPDOWN
 	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   186,   359,    76,    87, STR_ORDER_TOGGLE_UNLOAD,    STR_ORDER_TOOLTIP_UNLOAD},                 // ORDER_WIDGET_UNLOAD
-	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,     0,   185,    76,    87, STR_REFIT,                  STR_REFIT_TIP},                            // ORDER_WIDGET_REFIT
-	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   186,   371,    76,    87, STR_NULL,                   STR_SERVICE_HINT},                         // ORDER_WIDGET_SERVICE_DROPDOWN
-	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   186,   359,    76,    87, STR_SERVICE,                STR_SERVICE_HINT},                         // ORDER_WIDGET_SERVICE
+	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,     0,   185,    76,    87, STR_ORDER_REFIT,            STR_ORDER_REFIT_TOOLTIP},                            // ORDER_WIDGET_REFIT
+	{   WWT_DROPDOWN,   RESIZE_RTB,    COLOUR_GREY,   186,   371,    76,    87, STR_NULL,                   STR_ORDER_SERVICE_TOOLTIP},                         // ORDER_WIDGET_SERVICE_DROPDOWN
+	{    WWT_TEXTBTN,   RESIZE_RTB,    COLOUR_GREY,   186,   359,    76,    87, STR_ORDER_SERVICE,          STR_ORDER_SERVICE_TOOLTIP},                         // ORDER_WIDGET_SERVICE
 
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,     0,   123,    76,    87, STR_NULL,                   STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP},   // ORDER_WIDGET_COND_VARIABLE
 	{   WWT_DROPDOWN,   RESIZE_TB,     COLOUR_GREY,   124,   247,    76,    87, STR_NULL,                   STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP}, // ORDER_WIDGET_COND_COMPARATOR
-	{ WWT_PUSHTXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_CONDITIONAL_VALUE,      STR_ORDER_CONDITIONAL_VALUE_TOOLTIP},      // ORDER_WIDGET_COND_VALUE
+	{ WWT_PUSHTXTBTN,   RESIZE_RTB,    COLOUR_GREY,   248,   371,    76,    87, STR_ORDER_CONDITIONAL_VALUE,STR_ORDER_CONDITIONAL_VALUE_TOOLTIP},      // ORDER_WIDGET_COND_VALUE
 
-	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    76,    87, SPR_SHARED_ORDERS_ICON,     STR_VEH_WITH_SHARED_ORDERS_LIST_TIP},      // ORDER_WIDGET_SHARED_ORDER_LIST
+	{ WWT_PUSHIMGBTN,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    76,    87, SPR_SHARED_ORDERS_ICON,     STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP},      // ORDER_WIDGET_SHARED_ORDER_LIST
 
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    88,    99, 0x0,                     STR_RESIZE_BUTTON},                           // ORDER_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    88,    99, 0x0,                        STR_TOOLTIP_RESIZE},                           // ORDER_WIDGET_RESIZE
 	{   WIDGETS_END},
 };
 
@@ -1405,7 +1405,7 @@ static const NWidgetPart _nested_orders_widgets[] = {
 			NWidget(NWID_HORIZONTAL),
 				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_TIMETABLE_VIEW), SetMinimalSize(61, 14),
-											SetDataTip(STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP),
+											SetDataTip(STR_ORDERS_TIMETABLE_VIEW, STR_ORDERS_TIMETABLE_VIEW_TOOLTIP),
 			EndContainer(),
 			NWidget(WWT_CAPTION, COLOUR_GREY, ORDER_WIDGET_CAPTION), SetDataTip(STR_ORDERS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		EndContainer(),
@@ -1422,15 +1422,15 @@ static const NWidgetPart _nested_orders_widgets[] = {
 		NWidget(NWID_SELECTION),
 			/* Refit + service buttons. */
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_REFIT), SetMinimalSize(186, 12), SetDataTip(STR_REFIT, STR_REFIT_TIP),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_REFIT), SetMinimalSize(186, 12), SetDataTip(STR_ORDER_REFIT, STR_ORDER_REFIT_TOOLTIP),
 				NWidget(NWID_LAYERED),
 					NWidget(NWID_HORIZONTAL),
 						NWidget(WWT_TEXTBTN, COLOUR_GREY, ORDER_WIDGET_SERVICE), SetMinimalSize(174, 12),
-											SetDataTip(STR_SERVICE, STR_SERVICE_HINT), SetResize(1, 0),
+											SetDataTip(STR_ORDER_SERVICE, STR_ORDER_SERVICE_TOOLTIP), SetResize(1, 0),
 						NWidget(NWID_SPACER), SetFill(1, 0),
 					EndContainer(),
 					NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_SERVICE_DROPDOWN), SetMinimalSize(186, 12),
-											SetDataTip(STR_NULL, STR_SERVICE_HINT), SetResize(1, 0),
+											SetDataTip(STR_NULL, STR_ORDER_SERVICE_TOOLTIP), SetResize(1, 0),
 				EndContainer(),
 			EndContainer(),
 			/* load + unload buttons. */
@@ -1472,11 +1472,11 @@ static const NWidgetPart _nested_orders_widgets[] = {
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_COND_VARIABLE), SetMinimalSize(124, 12), SetDataTip(STR_NULL, STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_COND_COMPARATOR), SetMinimalSize(124, 12), SetDataTip(STR_NULL, STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_COND_VALUE), SetMinimalSize(124, 12), SetResize(1, 0),
-											SetDataTip(STR_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP),
+											SetDataTip(STR_ORDER_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP),
 			EndContainer(),
 		EndContainer(),
 
-		NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, ORDER_WIDGET_SHARED_ORDER_LIST), SetMinimalSize(12, 12), SetDataTip(SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP),
+		NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, ORDER_WIDGET_SHARED_ORDER_LIST), SetMinimalSize(12, 12), SetDataTip(SPR_SHARED_ORDERS_ICON, STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP),
 	EndContainer(),
 
 	/* Second button row. */
@@ -1488,7 +1488,7 @@ static const NWidgetPart _nested_orders_widgets[] = {
 				NWidget(WWT_TEXTBTN, COLOUR_GREY, ORDER_WIDGET_GOTO), SetMinimalSize(112, 12), SetDataTip(STR_ORDERS_GO_TO_BUTTON, STR_ORDERS_GO_TO_TOOLTIP), SetResize(1, 0),
 				NWidget(NWID_SPACER), SetFill(1, 0),
 			EndContainer(),
-			NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_GOTO_DROPDOWN), SetMinimalSize(124, 12), SetDataTip(STR_EMPTY, STR_ORDER_GO_TO_DROPDOWN_TOOLTIP), SetResize(1, 0),
+			NWidget(WWT_DROPDOWN, COLOUR_GREY, ORDER_WIDGET_GOTO_DROPDOWN), SetMinimalSize(124, 12), SetDataTip(STR_EMPTY, STR_ORDERS_GO_TO_DROPDOWN_TOOLTIP), SetResize(1, 0),
 		EndContainer(),
 		NWidget(WWT_RESIZEBOX, COLOUR_GREY, ORDER_WIDGET_RESIZE),
 	EndContainer(),
@@ -1507,8 +1507,8 @@ static const WindowDesc _orders_desc(
 static const Widget _other_orders_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,    STR_TOOLTIP_CLOSE_WINDOW},             // ORDER_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_GREY,    11,   371,     0,    13, STR_ORDERS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // ORDER_WIDGET_CAPTION
-	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   311,   371,     0,    13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP},           // ORDER_WIDGET_TIMETABLE_VIEW
-	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   372,   383,     0,    13, STR_NULL,           STR_STICKY_BUTTON},                    // ORDER_WIDGET_STICKY
+	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   311,   371,     0,    13, STR_ORDERS_TIMETABLE_VIEW, STR_ORDERS_TIMETABLE_VIEW_TOOLTIP},           // ORDER_WIDGET_TIMETABLE_VIEW
+	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   372,   383,     0,    13, STR_NULL,           STR_TOOLTIP_STICKY},                    // ORDER_WIDGET_STICKY
 
 	{      WWT_PANEL,   RESIZE_RB,     COLOUR_GREY,     0,   371,    14,    85, 0x0,                STR_ORDERS_LIST_TOOLTIP},              // ORDER_WIDGET_ORDER_LIST
 
@@ -1534,7 +1534,7 @@ static const Widget _other_orders_widgets[] = {
 
 	{      WWT_EMPTY,   RESIZE_NONE,   COLOUR_GREY,     0,     0,     0,     0, 0x0,                STR_NULL},                             // ORDER_WIDGET_SHARED_ORDER_LIST
 
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    74,    85, 0x0,                STR_RESIZE_BUTTON},                    // ORDER_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   372,   383,    74,    85, 0x0,                STR_TOOLTIP_RESIZE},                    // ORDER_WIDGET_RESIZE
 	{   WIDGETS_END},
 };
 
@@ -1548,7 +1548,7 @@ static const NWidgetPart _nested_other_orders_widgets[] = {
 					NWidget(NWID_HORIZONTAL),
 						NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
 						NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, ORDER_WIDGET_TIMETABLE_VIEW), SetMinimalSize(61, 14),
-											SetDataTip(STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP),
+											SetDataTip(STR_ORDERS_TIMETABLE_VIEW, STR_ORDERS_TIMETABLE_VIEW_TOOLTIP),
 					EndContainer(),
 					NWidget(WWT_CAPTION, COLOUR_GREY, ORDER_WIDGET_CAPTION), SetDataTip(STR_ORDERS_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 				EndContainer(),
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index 302278e6d..e1c9d0e83 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -250,14 +250,14 @@ struct OskWindow : public Window {
 };
 
 static const Widget _osk_widgets[] = {
-{    WWT_CAPTION, RESIZE_NONE,  COLOUR_GREY,     0,   255,     0,    13, STR_QUERY_CAPTION, STR_NULL}, // OSK_WIDGET_CAPTION
+{    WWT_CAPTION, RESIZE_NONE,  COLOUR_GREY,     0,   255,     0,    13, STR_WHITE_STRINGN, STR_NULL}, // OSK_WIDGET_CAPTION
 {      WWT_PANEL, RESIZE_NONE,  COLOUR_GREY,     0,   255,    14,    29, 0x0,               STR_NULL}, // OSK_WIDGET_TEXT_BACKGROUND
 {    WWT_EDITBOX, RESIZE_NONE,  COLOUR_GREY,     2,   253,    16,    27, 0x0,               STR_NULL}, // OSK_WIDGET_TEXT
 
 {      WWT_PANEL, RESIZE_NONE,  COLOUR_GREY,     0,   255,    30,   139, 0x0,               STR_NULL}, // OSK_WIDGET_KEYS_BACKGROUND
 
-{    WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,     3,   108,    35,    46, STR_QUERY_CANCEL,  STR_NULL}, // OSK_WIDGET_CANCEL
-{    WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,   111,   216,    35,    46, STR_QUERY_OK,      STR_NULL}, // OSK_WIDGET_OK
+{    WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,     3,   108,    35,    46, STR_BUTTON_CANCEL, STR_NULL}, // OSK_WIDGET_CANCEL
+{    WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,   111,   216,    35,    46, STR_BUTTON_OK,     STR_NULL}, // OSK_WIDGET_OK
 { WWT_PUSHIMGBTN, RESIZE_NONE,  COLOUR_GREY,   219,   252,    35,    46, SPR_OSK_BACKSPACE, STR_NULL}, // OSK_WIDGET_BACKSPACE
 
 { WWT_PUSHIMGBTN, RESIZE_NONE,  COLOUR_GREY,     3,    27,    67,    82, SPR_OSK_SPECIAL,   STR_NULL}, // OSK_WIDGET_SPECIAL
@@ -367,8 +367,8 @@ static NWidgetBase *MakeTopKeys(int *biggest_index)
 	NWidgetHorizontal *hor = new NWidgetHorizontal;
 	int key_height = 12;
 
-	AddKey(hor, key_height, 6 * 2, WWT_TEXTBTN,    OSK_WIDGET_CANCEL,    STR_QUERY_CANCEL,  biggest_index);
-	AddKey(hor, key_height, 6 * 2, WWT_TEXTBTN,    OSK_WIDGET_OK,        STR_QUERY_OK,      biggest_index);
+	AddKey(hor, key_height, 6 * 2, WWT_TEXTBTN,    OSK_WIDGET_CANCEL,    STR_BUTTON_CANCEL,  biggest_index);
+	AddKey(hor, key_height, 6 * 2, WWT_TEXTBTN,    OSK_WIDGET_OK,        STR_BUTTON_OK,      biggest_index);
 	AddKey(hor, key_height, 2 * 2, WWT_PUSHIMGBTN, OSK_WIDGET_BACKSPACE, SPR_OSK_BACKSPACE, biggest_index);
 	return hor;
 }
@@ -442,7 +442,7 @@ static NWidgetBase *MakeSpacebarKeys(int *biggest_index)
 
 
 static const NWidgetPart _nested_osk_widgets[] = {
-	NWidget(WWT_CAPTION, COLOUR_GREY, OSK_WIDGET_CAPTION), SetDataTip(STR_QUERY_CAPTION, STR_NULL),
+	NWidget(WWT_CAPTION, COLOUR_GREY, OSK_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRINGN, STR_NULL),
 	NWidget(WWT_PANEL, COLOUR_GREY, OSK_WIDGET_TEXT_BACKGROUND),
 		NWidget(WWT_EDITBOX, COLOUR_GREY, OSK_WIDGET_TEXT), SetMinimalSize(252, 12), SetPadding(2, 2, 2, 2),
 	EndContainer(),
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index 05497a898..d1a468492 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -365,9 +365,9 @@ CommandCost CmdBuildSingleRail(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 			if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 
 			if (IsNormalRoad(tile)) {
-				if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
+				if (HasRoadWorks(tile)) return_cmd_error(STR_ERROR_ROAD_WORKS_IN_PROGRESS);
 
-				if (GetDisallowedRoadDirections(tile) != DRD_NONE) return_cmd_error(STR_ERR_CROSSING_ON_ONEWAY_ROAD);
+				if (GetDisallowedRoadDirections(tile) != DRD_NONE) return_cmd_error(STR_ERROR_CROSSING_ON_ONEWAY_ROAD);
 
 				RoadTypes roadtypes = GetRoadTypes(tile);
 				RoadBits road = GetRoadBits(tile, ROADTYPE_ROAD);
@@ -2257,58 +2257,58 @@ static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
 	td->owner[0] = GetTileOwner(tile);
 	switch (GetRailTileType(tile)) {
 		case RAIL_TILE_NORMAL:
-			td->str = STR_RAILROAD_TRACK;
+			td->str = STR_LAI_RAIL_DESCRIPTION_TRACK;
 			break;
 
 		case RAIL_TILE_SIGNALS: {
 			const StringID signal_type[6][6] = {
 				{
-					STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS,
-					STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS,
-					STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS,
-					STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS
 				},
 				{
-					STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRESIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS
 				},
 				{
-					STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXITSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS
 				},
 				{
-					STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_COMBOSIGNALS,
-					STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS
 				},
 				{
-					STR_RAILROAD_TRACK_WITH_NORMAL_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXIT_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_COMBO_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PBSSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS
 				},
 				{
-					STR_RAILROAD_TRACK_WITH_NORMAL_NOENTRYSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PRE_NOENTRYSIGNALS,
-					STR_RAILROAD_TRACK_WITH_EXIT_NOENTRYSIGNALS,
-					STR_RAILROAD_TRACK_WITH_COMBO_NOENTRYSIGNALS,
-					STR_RAILROAD_TRACK_WITH_PBS_NOENTRYSIGNALS,
-					STR_RAILROAD_TRACK_WITH_NOENTRYSIGNALS
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS,
+					STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS
 				}
 			};
 
@@ -2326,7 +2326,7 @@ static void GetTileDesc_Track(TileIndex tile, TileDesc *td)
 		}
 
 		case RAIL_TILE_DEPOT:
-			td->str = STR_RAILROAD_TRAIN_DEPOT;
+			td->str = STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT;
 			break;
 
 		default:
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index af12b1c1a..80f17d936 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -160,7 +160,7 @@ static void PlaceRail_Waypoint(TileIndex tile)
 	} else {
 		/* Tile where we can't build rail waypoints. This is always going to fail,
 		 * but provides the user with a proper error message. */
-		DoCommandP(tile, 1 << 8 | 1 << 16, STAT_CLASS_WAYP | INVALID_STATION << 16, CMD_BUILD_RAIL_WAYPOINT | CMD_MSG(STR_CANT_BUILD_TRAIN_WAYPOINT));
+		DoCommandP(tile, 1 << 8 | 1 << 16, STAT_CLASS_WAYP | INVALID_STATION << 16, CMD_BUILD_RAIL_WAYPOINT | CMD_MSG(STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT));
 	}
 }
 
@@ -240,7 +240,7 @@ static void GenericPlaceSignals(TileIndex tile)
 		}
 
 		DoCommandP(tile, p1, 0, CMD_BUILD_SIGNALS |
-			CMD_MSG((w != NULL && _convert_signal_button) ? STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE : STR_ERROR_CAN_T_BUILD_SIGNALS_HERE),
+			CMD_MSG((w != NULL && _convert_signal_button) ? STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE : STR_ERROR_CAN_T_BUILD_SIGNALS_HERE),
 			CcPlaySound1E);
 	}
 }
@@ -754,7 +754,7 @@ struct BuildRailToolbarWindow : Window {
 					break;
 
 				case DDSP_CONVERT_RAIL:
-					DoCommandP(end_tile, start_tile, _cur_railtype, CMD_CONVERT_RAIL | CMD_MSG(STR_CANT_CONVERT_RAIL), CcPlaySound10);
+					DoCommandP(end_tile, start_tile, _cur_railtype, CMD_CONVERT_RAIL | CMD_MSG(STR_ERROR_CAN_T_CONVERT_RAIL), CcPlaySound10);
 					break;
 
 				case DDSP_REMOVE_STATION:
@@ -762,20 +762,20 @@ struct BuildRailToolbarWindow : Window {
 					if (this->IsWidgetLowered(RTW_BUILD_STATION)) {
 						/* Station */
 						if (_remove_button_clicked) {
-							DoCommandP(end_tile, start_tile, 0, CMD_REMOVE_FROM_RAIL_STATION | CMD_MSG(STR_CANT_REMOVE_PART_OF_STATION), CcPlaySound1E);
+							DoCommandP(end_tile, start_tile, 0, CMD_REMOVE_FROM_RAIL_STATION | CMD_MSG(STR_ERROR_CAN_T_REMOVE_PART_OF_STATION), CcPlaySound1E);
 						} else {
 							HandleStationPlacement(start_tile, end_tile);
 						}
 					} else {
 						/* Waypoint */
 						if (_remove_button_clicked) {
-							DoCommandP(end_tile, start_tile, 0, CMD_REMOVE_FROM_RAIL_WAYPOINT | CMD_MSG(STR_CANT_REMOVE_TRAIN_WAYPOINT), CcPlaySound1E);
+							DoCommandP(end_tile, start_tile, 0, CMD_REMOVE_FROM_RAIL_WAYPOINT | CMD_MSG(STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT), CcPlaySound1E);
 						} else {
 							TileArea ta(start_tile, end_tile);
 							uint32 p1 = _cur_railtype | (select_method == VPM_FIX_X ? AXIS_X : AXIS_Y) << 4 | ta.w << 8 | ta.h << 16 | _ctrl_pressed << 24;
 							uint32 p2 = STAT_CLASS_WAYP | _cur_waypoint_type << 8 | INVALID_STATION << 16;
 
-							CommandContainer cmdcont = { ta.tile, p1, p2, CMD_BUILD_RAIL_WAYPOINT | CMD_MSG(STR_CANT_BUILD_TRAIN_WAYPOINT), CcPlaySound1E, "" };
+							CommandContainer cmdcont = { ta.tile, p1, p2, CMD_BUILD_RAIL_WAYPOINT | CMD_MSG(STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT), CcPlaySound1E, "" };
 							ShowSelectWaypointIfNeeded(cmdcont, ta);
 						}
 					}
@@ -1095,7 +1095,7 @@ public:
 				break;
 			}
 			case BRSW_NEWST_LIST: {
-				Dimension d = GetStringBoundingBox(STR_STAT_CLASS_DFLT);
+				Dimension d = GetStringBoundingBox(STR_STATION_CLASS_DFLT);
 				for (StationClassID statclass = STAT_CLASS_BEGIN; statclass < (StationClassID)GetNumStationClasses(); statclass++) {
 					if (statclass == STAT_CLASS_WAYP) continue;
 					for (uint16 j = 0; j < GetNumCustomStations(statclass); j++) {
@@ -1146,7 +1146,7 @@ public:
 				for (uint16 i = this->vscroll.pos; i < _railstation.station_count && i < (uint)(this->vscroll.pos + this->vscroll.cap); i++) {
 					const StationSpec *statspec = GetCustomStationSpec(_railstation.station_class, i);
 
-					StringID str = STR_STAT_CLASS_DFLT;
+					StringID str = STR_STATION_CLASS_DFLT;
 					if (statspec != NULL && statspec->name != 0) {
 						if (HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) {
 							GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->line_height - 2, 0, FILLRECT_CHECKER);
@@ -1407,9 +1407,9 @@ static const NWidgetPart _nested_newstation_builder_widgets[] = {
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRSW_BACKGROUND),
 		/* begin newstations gui additions. */
-		NWidget(WWT_DROPDOWN, COLOUR_GREY, BRSW_NEWST_DROPDOWN), SetMinimalSize(134, 12), SetFill(1, 0), SetPadding(3, 7, 3, 7), SetDataTip(STR_BLACK_STRING, STR_SELECT_STATION_CLASS_TIP),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, BRSW_NEWST_DROPDOWN), SetMinimalSize(134, 12), SetFill(1, 0), SetPadding(3, 7, 3, 7), SetDataTip(STR_BLACK_STRING, STR_STATION_BUILD_STATION_CLASS_TOOLTIP),
 		NWidget(NWID_HORIZONTAL), SetPIP(7, 0, 7),
-			NWidget(WWT_MATRIX, COLOUR_GREY, BRSW_NEWST_LIST), SetMinimalSize(122, 71), SetFill(1, 0), SetDataTip(0x501, STR_SELECT_STATION_TYPE_TIP),
+			NWidget(WWT_MATRIX, COLOUR_GREY, BRSW_NEWST_LIST), SetMinimalSize(122, 71), SetFill(1, 0), SetDataTip(0x501, STR_STATION_BUILD_STATION_TYPE_TOOLTIP),
 			NWidget(WWT_SCROLLBAR, COLOUR_GREY, BRSW_NEWST_SCROLL),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 1),
@@ -1616,29 +1616,29 @@ public:
 static const NWidgetPart _nested_signal_builder_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN, BSW_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, BSW_CAPTION), SetDataTip( STR_SIGNAL_SELECTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, BSW_CAPTION), SetDataTip( STR_BUILD_SIGNAL_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_NORM), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_ENTRY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_EXIT), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_COMBO), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_PBS), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_PBS_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_PBS_OWAY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TIP), EndContainer(),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, BSW_CONVERT), SetMinimalSize(22, 27), SetDataTip(SPR_IMG_SIGNAL_CONVERT, STR_SIGNAL_CONVERT_TIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_NORM), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_ENTRY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_EXIT), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_COMBO), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_PBS), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_SEMAPHORE_PBS_OWAY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP), EndContainer(),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, BSW_CONVERT), SetMinimalSize(22, 27), SetDataTip(SPR_IMG_SIGNAL_CONVERT, STR_BUILD_SIGNAL_CONVERT_TOOLTIP),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_NORM), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_ENTRY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_EXIT), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_COMBO), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_PBS), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_PBS_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_PBS_OWAY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TIP), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_DRAG_SIGNALS_DENSITY), SetDataTip(STR_NULL, STR_DRAG_SIGNALS_DENSITY_TIP),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_NORM), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_ENTRY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_EXIT), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_COMBO), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_PBS), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_ELECTRIC_PBS_OWAY), SetMinimalSize(22, 27), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BSW_DRAG_SIGNALS_DENSITY), SetDataTip(STR_NULL, STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 13),
 			NWidget(NWID_HORIZONTAL), SetPIP(2, 0, 2),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, BSW_DRAG_SIGNALS_DENSITY_DECREASE), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP),
-				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, BSW_DRAG_SIGNALS_DENSITY_INCREASE), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, BSW_DRAG_SIGNALS_DENSITY_DECREASE), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_LEFT, STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP),
+				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, BSW_DRAG_SIGNALS_DENSITY_INCREASE), SetMinimalSize(9, 12), SetDataTip(SPR_ARROW_RIGHT, STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_INCREASE_TOOLTIP),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(0, 2),
 		EndContainer(),
@@ -1823,16 +1823,16 @@ struct BuildRailWaypointWindow : PickerWindowBase {
 static const NWidgetPart _nested_build_waypoint_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN, BRWW_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, BRWW_CAPTION), SetDataTip(STR_WAYPOINT, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, BRWW_CAPTION), SetDataTip(STR_WAYPOINT_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(NWID_HORIZONTAL), SetPIP(3, 2, 3),
-			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_1), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TIP), EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_2), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TIP), EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_3), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TIP), EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_4), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TIP), EndContainer(),
-			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_5), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TIP), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_1), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_2), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_3), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_4), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), EndContainer(),
+			NWidget(WWT_PANEL, COLOUR_DARK_GREEN, BRWW_WAYPOINT_5), SetMinimalSize(66, 60), SetDataTip(0x0, STR_WAYPOINT_GRAPHICS_TOOLTIP), EndContainer(),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(WWT_HSCROLLBAR, COLOUR_DARK_GREEN, BRWW_SCROLL),
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index f428898b0..a7484d305 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -244,7 +244,7 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
 			const RoadBits other = GetOtherRoadBits(tile, rt);
 			const Foundation f = GetRoadFoundation(tileh, present);
 
-			if (HasRoadWorks(tile) && _current_company != OWNER_WATER) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
+			if (HasRoadWorks(tile) && _current_company != OWNER_WATER) return_cmd_error(STR_ERROR_ROAD_WORKS_IN_PROGRESS);
 
 			/* Autocomplete to a straight road
 			 * @li on steep slopes
@@ -476,7 +476,7 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 		case MP_ROAD:
 			switch (GetRoadTileType(tile)) {
 				case ROAD_TILE_NORMAL: {
-					if (HasRoadWorks(tile)) return_cmd_error(STR_ROAD_WORKS_IN_PROGRESS);
+					if (HasRoadWorks(tile)) return_cmd_error(STR_ERROR_ROAD_WORKS_IN_PROGRESS);
 
 					other_bits = GetOtherRoadBits(tile, rt);
 					if (!HasTileRoadType(tile, rt)) break;
@@ -1458,14 +1458,14 @@ static TrackStatus GetTileTrackStatus_Road(TileIndex tile, TransportType mode, u
 }
 
 static const StringID _road_tile_strings[] = {
-	STR_ROAD_DESCRIPTION_ROAD,
-	STR_ROAD_DESCRIPTION_ROAD,
-	STR_ROAD_DESCRIPTION_ROAD,
-	STR_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS,
-	STR_ROAD_DESCRIPTION_ROAD,
-	STR_ROAD_DESCRIPTION_TREE_LINED_ROAD,
-	STR_ROAD_DESCRIPTION_ROAD,
-	STR_ROAD_DESCRIPTION_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS,
+	STR_LAI_ROAD_DESCRIPTION_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_TREE_LINED_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_ROAD,
+	STR_LAI_ROAD_DESCRIPTION_ROAD,
 };
 
 static void GetTileDesc_Road(TileIndex tile, TileDesc *td)
@@ -1476,7 +1476,7 @@ static void GetTileDesc_Road(TileIndex tile, TileDesc *td)
 
 	switch (GetRoadTileType(tile)) {
 		case ROAD_TILE_CROSSING: {
-			td->str = STR_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING;
+			td->str = STR_LAI_ROAD_DESCRIPTION_ROAD_RAIL_LEVEL_CROSSING;
 			RoadTypes rts = GetRoadTypes(tile);
 			rail_owner = GetTileOwner(tile);
 			if (HasBit(rts, ROADTYPE_ROAD)) road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
@@ -1485,13 +1485,13 @@ static void GetTileDesc_Road(TileIndex tile, TileDesc *td)
 		}
 
 		case ROAD_TILE_DEPOT:
-			td->str = STR_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT;
+			td->str = STR_LAI_ROAD_DESCRIPTION_ROAD_VEHICLE_DEPOT;
 			road_owner = GetTileOwner(tile); // Tile has only one owner, roadtype does not matter
 			break;
 
 		default: {
 			RoadTypes rts = GetRoadTypes(tile);
-			td->str = (HasBit(rts, ROADTYPE_ROAD) ? _road_tile_strings[GetRoadside(tile)] : STR_ROAD_DESCRIPTION_TRAMWAY);
+			td->str = (HasBit(rts, ROADTYPE_ROAD) ? _road_tile_strings[GetRoadside(tile)] : STR_LAI_ROAD_DESCRIPTION_TRAMWAY);
 			if (HasBit(rts, ROADTYPE_ROAD)) road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
 			if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
 			break;
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index c4611a5a7..3480821e7 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -627,7 +627,7 @@ struct BuildRoadToolbarWindow : Window {
 static const Widget _build_road_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},             // RTW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_DARK_GREEN,    11,   250,     0,    13, STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // RTW_CAPTION
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,   251,   262,     0,    13, 0x0,                        STR_STICKY_BUTTON},                 // RTW_STICKY
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,   251,   262,     0,    13, 0x0,                        STR_TOOLTIP_STICKY},                 // RTW_STICKY
 
 {     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    21,    14,    35, SPR_IMG_ROAD_X_DIR,         STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION},       // RTW_ROAD_X
 {     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_DARK_GREEN,    22,    43,    14,    35, SPR_IMG_ROAD_Y_DIR,         STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION},       // RTW_ROAD_Y
@@ -676,7 +676,7 @@ static const WindowDesc _build_road_desc(
 static const Widget _build_tramway_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    10,     0,    13, STR_BLACK_CROSS,                       STR_TOOLTIP_CLOSE_WINDOW},                // RTW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_DARK_GREEN,    11,   228,     0,    13, STR_ROAD_TOOLBAR_TRAM_CONSTRUCTION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},      // RTW_CAPTION
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,   229,   240,     0,    13, 0x0,                            STR_STICKY_BUTTON},                    // RTW_STICKY
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,   229,   240,     0,    13, 0x0,                            STR_TOOLTIP_STICKY},                    // RTW_STICKY
 
 {     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    21,    14,    35, SPR_IMG_TRAMWAY_X_DIR,          STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION},            // RTW_ROAD_X
 {     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_DARK_GREEN,    22,    43,    14,    35, SPR_IMG_TRAMWAY_Y_DIR,          STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION},            // RTW_ROAD_Y
@@ -734,7 +734,7 @@ void ShowBuildRoadToolbar(RoadType roadtype)
 static const Widget _build_road_scen_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},                           // RTW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_DARK_GREEN,    11,   184,     0,    13, STR_ROAD_TOOLBAR_ROAD_CONSTRUCTION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS}, // RTW_CAPTION
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,   185,   196,     0,    13, 0x0,                        STR_STICKY_BUTTON},                                  // RTW_STICKY
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,   185,   196,     0,    13, 0x0,                        STR_TOOLTIP_STICKY},                                  // RTW_STICKY
 
 {     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_DARK_GREEN,     0,    21,    14,    35, SPR_IMG_ROAD_X_DIR,         STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION},        // RTW_ROAD_X
 {     WWT_IMGBTN,   RESIZE_NONE,  COLOUR_DARK_GREEN,    22,    43,    14,    35, SPR_IMG_ROAD_Y_DIR,         STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION},        // RTW_ROAD_Y
@@ -801,7 +801,7 @@ struct BuildRoadDepotWindow : public PickerWindowBase {
 		this->LowerWidget(_road_depot_orientation + BRDW_DEPOT_NE);
 		if ( _cur_roadtype == ROADTYPE_TRAM) {
 			this->widget[BRDW_CAPTION].data = STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION;
-			for (int i = BRDW_DEPOT_NE; i <= BRDW_DEPOT_NW; i++) this->widget[i].tooltips = STR_ROAD_TOOLBAR_TOOLTIP_SELECT_TRAM_VEHICLE_DEPOT;
+			for (int i = BRDW_DEPOT_NE; i <= BRDW_DEPOT_NW; i++) this->widget[i].tooltips = STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP;
 		}
 		this->FindWindowPlacementAndResize(desc);
 	}
@@ -841,10 +841,10 @@ static const Widget _build_road_depot_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_DARK_GREEN,    0,    10,     0,    13, STR_BLACK_CROSS,                          STR_TOOLTIP_CLOSE_WINDOW},                           // BRDW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_DARK_GREEN,   11,   139,     0,    13, STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},                 // BRDW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_DARK_GREEN,    0,   139,    14,   121, 0x0,                                      STR_NULL},                                           // BRDW_BACKGROUND
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,         71,   136,    17,    66, 0x0,                                      STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_NE
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,         71,   136,    69,   118, 0x0,                                      STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_SE
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,          3,    68,    69,   118, 0x0,                                      STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_SW
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,          3,    68,    17,    66, 0x0,                                      STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_NW
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,         71,   136,    17,    66, 0x0,                                      STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP}, // BRDW_DEPOT_NE
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,         71,   136,    69,   118, 0x0,                                      STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP}, // BRDW_DEPOT_SE
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,          3,    68,    69,   118, 0x0,                                      STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP}, // BRDW_DEPOT_SW
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,          3,    68,    17,    66, 0x0,                                      STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP}, // BRDW_DEPOT_NW
 {   WIDGETS_END},
 };
 
@@ -858,18 +858,18 @@ static const NWidgetPart _nested_build_road_depot_widgets[] = {
 		NWidget(NWID_HORIZONTAL_LTR),
 			NWidget(NWID_SPACER), SetMinimalSize(3, 0),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_NW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT),
+				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_NW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 2),
-				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_SW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT),
+				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_SW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP),
 				EndContainer(),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(2, 0),
 			NWidget(NWID_VERTICAL),
-				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_NE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT),
+				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_NE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 2),
-				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_SE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_ROAD_TOOLBAR_TOOLTIP_SELECT_ROAD_VEHICLE_DEPOT),
+				NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_SE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP),
 				EndContainer(),
 			EndContainer(),
 			NWidget(NWID_SPACER), SetMinimalSize(3, 0),
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp
index 7345806c1..958ead338 100644
--- a/src/roadveh_cmd.cpp
+++ b/src/roadveh_cmd.cpp
@@ -181,7 +181,7 @@ void RoadVehUpdateCache(RoadVehicle *v)
  */
 CommandCost CmdBuildRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
-	if (!IsEngineBuildable(p1, VEH_ROAD, _current_company)) return_cmd_error(STR_ROAD_VEHICLE_NOT_AVAILABLE);
+	if (!IsEngineBuildable(p1, VEH_ROAD, _current_company)) return_cmd_error(STR_ERROR_ROAD_VEHICLE_NOT_AVAILABLE);
 
 	const Engine *e = Engine::Get(p1);
 	/* Engines without valid cargo should not be available */
@@ -195,7 +195,7 @@ CommandCost CmdBuildRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 	if (!IsRoadDepotTile(tile)) return CMD_ERROR;
 	if (!IsTileOwner(tile, _current_company)) return CMD_ERROR;
 
-	if (HasTileRoadType(tile, ROADTYPE_TRAM) != HasBit(EngInfo(p1)->misc_flags, EF_ROAD_TRAM)) return_cmd_error(STR_DEPOT_WRONG_DEPOT_TYPE);
+	if (HasTileRoadType(tile, ROADTYPE_TRAM) != HasBit(EngInfo(p1)->misc_flags, EF_ROAD_TRAM)) return_cmd_error(STR_ERROR_DEPOT_WRONG_DEPOT_TYPE);
 
 	uint num_vehicles = 1 + CountArticulatedParts(p1, false);
 
@@ -339,7 +339,7 @@ CommandCost CmdSellRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
 	RoadVehicle *v = RoadVehicle::GetIfValid(p1);
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE);
 
 	if (!v->IsStoppedInDepot()) {
 		return_cmd_error(STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT);
@@ -2019,7 +2019,7 @@ CommandCost CmdRefitRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (!v->IsStoppedInDepot()) return_cmd_error(STR_ERROR_ROAD_VEHICLE_MUST_BE_STOPPED_INSIDE_DEPOT);
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE);
 
 	if (new_cid >= NUM_CARGO) return CMD_ERROR;
 
diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp
index 4107ac608..26a96323e 100644
--- a/src/roadveh_gui.cpp
+++ b/src/roadveh_gui.cpp
@@ -50,7 +50,7 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y)
 			}
 		}
 
-		GetString(capacity, STR_ARTICULATED_RV_CAPACITY, lastof(capacity));
+		GetString(capacity, STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY, lastof(capacity));
 
 		bool first = true;
 		for (CargoID i = 0; i < NUM_CARGO; i++) {
@@ -111,7 +111,7 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y)
 
 	/* Draw Transfer credits text */
 	SetDParam(0, feeder_share);
-	DrawString(left, right, y + 33 + y_offset, STR_FEEDER_CARGO_VALUE);
+	DrawString(left, right, y + 33 + y_offset, STR_VEHICLE_INFO_FEEDER_CARGO_VALUE);
 }
 
 /**
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 6c82203dd..bf067409d 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -472,7 +472,7 @@ bool AfterLoadGame()
 	/* Check if all NewGRFs are present, we are very strict in MP mode */
 	GRFListCompatibility gcf_res = IsGoodGRFConfigList();
 	if (_networking && gcf_res != GLC_ALL_GOOD) {
-		SetSaveLoadError(STR_NETWORK_ERR_CLIENT_NEWGRF_MISMATCH);
+		SetSaveLoadError(STR_NETWORK_ERROR_CLIENT_NEWGRF_MISMATCH);
 		/* Restore the signals */
 		ResetSignalHandlers();
 		return false;
@@ -521,7 +521,7 @@ bool AfterLoadGame()
 
 	/* make sure there is a town in the game */
 	if (_game_mode == GM_NORMAL && !ClosestTownFromTile(0, UINT_MAX)) {
-		SetSaveLoadError(STR_NO_TOWN_IN_SCENARIO);
+		SetSaveLoadError(STR_ERROR_NO_TOWN_IN_SCENARIO);
 		/* Restore the signals */
 		ResetSignalHandlers();
 		return false;
@@ -1601,7 +1601,7 @@ bool AfterLoadGame()
 		FOR_ALL_ROADVEHICLES(v) {
 			if (v->First() == v && HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM)) {
 				if (_switch_mode_errorstr == INVALID_STRING_ID || _switch_mode_errorstr == STR_NEWGRF_COMPATIBLE_LOAD_WARNING) {
-					_switch_mode_errorstr = STR_LOADGAME_REMOVED_TRAMS;
+					_switch_mode_errorstr = STR_WARNING_LOADGAME_REMOVED_TRAMS;
 				}
 				delete v;
 			}
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index a541b2006..88be40d72 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -1783,7 +1783,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb)
 	/* An instance of saving is already active, so don't go saving again */
 	if (_ts.saveinprogress && mode == SL_SAVE) {
 		/* if not an autosave, but a user action, show error message */
-		if (!_do_autosave) ShowErrorMessage(INVALID_STRING_ID, STR_SAVE_STILL_IN_PROGRESS, 0, 0);
+		if (!_do_autosave) ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_SAVE_STILL_IN_PROGRESS, 0, 0);
 		return SL_OK;
 	}
 	WaitTillSaved();
@@ -1988,7 +1988,7 @@ void GenerateDefaultSaveName(char *buf, const char *last)
 	SetDParam(2, _date);
 
 	/* Get the correct string (special string for when there's not company) */
-	GetString(buf, !Company::IsValidID(cid) ? STR_GAME_SAVELOAD_SPECTATOR_SAVEGAME : STR_DEFAULT_SAVEGAME_NAME, last);
+	GetString(buf, !Company::IsValidID(cid) ? STR_SAVEGAME_NAME_SPECTATOR : STR_SAVEGAME_NAME_DEFAULT, last);
 	SanitizeFilename(buf);
 }
 
diff --git a/src/settings.cpp b/src/settings.cpp
index eca75e727..1dcccaef5 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -810,7 +810,7 @@ static bool DifficultyChange(int32)
 {
 	if (_game_mode == GM_MENU) {
 		if (_settings_newgame.difficulty.diff_level != 3) {
-			ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
+			ShowErrorMessage(INVALID_STRING_ID, STR_WARNING_DIFFICULTY_TO_CUSTOM, 0, 0);
 			_settings_newgame.difficulty.diff_level = 3;
 		}
 		InvalidateWindowClasses(WC_SELECT_GAME);
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index e631b34f5..44bbed511 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -277,7 +277,7 @@ struct GameOptionsWindow : Window {
 			case GOW_FULLSCREEN_BUTTON: // Click fullscreen on/off
 				/* try to toggle full-screen on/off */
 				if (!ToggleFullScreen(!_fullscreen)) {
-					ShowErrorMessage(INVALID_STRING_ID, STR_FULLSCREEN_FAILED, 0, 0);
+					ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_FULLSCREEN_FAILED, 0, 0);
 				}
 				this->SetWidgetLoweredState(GOW_FULLSCREEN_BUTTON, _fullscreen);
 				this->SetDirty();
@@ -467,8 +467,8 @@ static const Widget _game_difficulty_widgets[] = {
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREEN,     10,   357,    28,    39, STR_DIFFICULTY_LEVEL_HIGH_SCORE_BUTTON, STR_NULL},                           // GDW_HIGHSCORE
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_MAUVE,      0,   369,    42,   262, 0x0,                                    STR_NULL},                           // GDW_SETTING_BG
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_MAUVE,      0,   369,   263,   278, 0x0,                                    STR_NULL},                           // GDW_LOWER_BG
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,   105,   185,   265,   276, STR_OPTIONS_SAVE_CHANGES,               STR_NULL},                           // GDW_ACCEPT
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,   186,   266,   265,   276, STR_QUERY_CANCEL,                       STR_NULL},                           // GDW_CANCEL
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,   105,   185,   265,   276, STR_DIFFICULTY_LEVEL_SAVE,               STR_NULL},                           // GDW_ACCEPT
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,   186,   266,   265,   276, STR_BUTTON_CANCEL,                       STR_NULL},                           // GDW_CANCEL
 {   WIDGETS_END},
 };
 
@@ -497,8 +497,8 @@ static const NWidgetPart _nested_game_difficulty_widgets[] = {
 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetMinimalSize(105, 0),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, GDW_ACCEPT), SetMinimalSize(81, 12), SetDataTip(STR_OPTIONS_SAVE_CHANGES, STR_NULL),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, GDW_CANCEL), SetMinimalSize(81, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, GDW_ACCEPT), SetMinimalSize(81, 12), SetDataTip(STR_DIFFICULTY_LEVEL_SAVE, STR_NULL),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, GDW_CANCEL), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 			NWidget(NWID_SPACER), SetMinimalSize(103, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
@@ -1505,7 +1505,7 @@ struct GameSettingsWindow : Window {
 
 				this->valuewindow_entry = pe;
 				SetDParam(0, value);
-				ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPT, 10, 100, this, CS_NUMERAL, QSF_NONE);
+				ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, 100, this, CS_NUMERAL, QSF_NONE);
 			}
 		}
 	}
@@ -1555,7 +1555,7 @@ static const Widget _settings_selection_widgets[] = {
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_MAUVE,    11,   411,     0,    13, STR_CONFIG_SETTING_CAPTION,      STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // SETTINGSEL_CAPTION
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_MAUVE,     0,   399,    14,   187, 0x0,                             STR_NULL},                             // SETTINGSEL_OPTIONSPANEL
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_MAUVE,   400,   411,    14,   175, 0x0,                             STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // SETTINGSEL_SCROLLBAR
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_MAUVE,   400,   411,   176,   187, 0x0,                             STR_RESIZE_BUTTON},                    // SETTINGSEL_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_MAUVE,   400,   411,   176,   187, 0x0,                             STR_TOOLTIP_RESIZE},                    // SETTINGSEL_RESIZE
 {   WIDGETS_END},
 };
 
@@ -1791,24 +1791,24 @@ static const Widget _cust_currency_widgets[] = {
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_GREY,      11,   229,     0,    13, STR_CURRENCY_WINDOW,         STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},           // CUSTCURR_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,       0,   229,    14,   119, 0x0,                         STR_NULL},                                     // CUSTCURR_BACKGROUND
 
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    10,    19,    21,    29, STR_BLACK_SMALL_ARROW_LEFT,  STR_TOOLTIP_DECREASE_EXCHANGE_RATE},           // CUSTCURR_RATE_DOWN
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    20,    29,    21,    29, STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_EXCHANGE_RATE},           // CUSTCURR_RATE_UP
-{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    21,    29, STR_CURRENCY_EXCHANGE_RATE,  STR_TOOLTIP_SET_EXCHANGE_RATE},                // CUSTCURR_RATE
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    10,    19,    21,    29, STR_BLACK_SMALL_ARROW_LEFT,  STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP},           // CUSTCURR_RATE_DOWN
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    20,    29,    21,    29, STR_BLACK_SMALL_ARROW_RIGHT, STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP},           // CUSTCURR_RATE_UP
+{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    21,    29, STR_CURRENCY_EXCHANGE_RATE,  STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP},                // CUSTCURR_RATE
 
-{    WWT_PUSHBTN,   RESIZE_NONE,  COLOUR_DARK_BLUE, 10,    29,    33,    41, 0x0,                         STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR},    // CUSTCURR_SEPARATOR_EDIT
-{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    33,    41, STR_CURRENCY_SEPARATOR,      STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR},    // CUSTCURR_SEPARATOR
+{    WWT_PUSHBTN,   RESIZE_NONE,  COLOUR_DARK_BLUE, 10,    29,    33,    41, 0x0,                         STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP},    // CUSTCURR_SEPARATOR_EDIT
+{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    33,    41, STR_CURRENCY_SEPARATOR,      STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP},    // CUSTCURR_SEPARATOR
 
-{    WWT_PUSHBTN,   RESIZE_NONE,  COLOUR_DARK_BLUE, 10,    29,    45,    53, 0x0,                         STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX},       // CUSTCURR_PREFIX_EDIT
-{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    45,    53, STR_CURRENCY_PREFIX,         STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX},       // CUSTCURR_PREFIX
+{    WWT_PUSHBTN,   RESIZE_NONE,  COLOUR_DARK_BLUE, 10,    29,    45,    53, 0x0,                         STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP},       // CUSTCURR_PREFIX_EDIT
+{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    45,    53, STR_CURRENCY_PREFIX,         STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP},       // CUSTCURR_PREFIX
 
-{    WWT_PUSHBTN,   RESIZE_NONE,  COLOUR_DARK_BLUE, 10,    29,    57,    65, 0x0,                         STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX},       // CUSTCURR_SUFFIX_EDIT
-{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    57,    65, STR_CURRENCY_SUFFIX,         STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX},       // CUSTCURR_SUFFIX
+{    WWT_PUSHBTN,   RESIZE_NONE,  COLOUR_DARK_BLUE, 10,    29,    57,    65, 0x0,                         STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP},       // CUSTCURR_SUFFIX_EDIT
+{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    57,    65, STR_CURRENCY_SUFFIX,         STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP},       // CUSTCURR_SUFFIX
 
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    10,    19,    69,    77, STR_BLACK_SMALL_ARROW_LEFT,  STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR_DOWN
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    20,    29,    69,    77, STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO}, // CUSTCURR_YEAR_UP
-{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    69,    77, STR_CURRENCY_SWITCH_TO_EURO, STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO},      // CUSTCURR_YEAR
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    10,    19,    69,    77, STR_BLACK_SMALL_ARROW_LEFT,  STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP}, // CUSTCURR_YEAR_DOWN
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_YELLOW,    20,    29,    69,    77, STR_BLACK_SMALL_ARROW_RIGHT, STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP}, // CUSTCURR_YEAR_UP
+{       WWT_TEXT,   RESIZE_NONE,  COLOUR_BLUE,      35,   227,    69,    77, STR_CURRENCY_SWITCH_TO_EURO, STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP},      // CUSTCURR_YEAR
 
-{      WWT_LABEL,   RESIZE_NONE,  COLOUR_BLUE,       2,   227,    93,   101, STR_CURRENCY_PREVIEW,        STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW},          // CUSTCURR_PREVIEW
+{      WWT_LABEL,   RESIZE_NONE,  COLOUR_BLUE,       2,   227,    93,   101, STR_CURRENCY_PREVIEW,        STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP},          // CUSTCURR_PREVIEW
 
 {   WIDGETS_END},
 };
@@ -1821,43 +1821,43 @@ static const NWidgetPart _nested_cust_currency_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_GREY, CUSTCURR_BACKGROUND),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 7),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_TOOLTIP_DECREASE_EXCHANGE_RATE),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_UP), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_EXCHANGE_RATE),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_CURRENCY_DECREASE_EXCHANGE_RATE_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_RATE_UP), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_CURRENCY_INCREASE_EXCHANGE_RATE_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0),
-			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_RATE), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_EXCHANGE_RATE, STR_TOOLTIP_SET_EXCHANGE_RATE),
+			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_RATE), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_EXCHANGE_RATE, STR_CURRENCY_SET_EXCHANGE_RATE_TOOLTIP),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
-			NWidget(WWT_PUSHBTN, COLOUR_DARK_BLUE, CUSTCURR_SEPARATOR_EDIT), SetMinimalSize(20, 9), SetDataTip(0x0, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR),
+			NWidget(WWT_PUSHBTN, COLOUR_DARK_BLUE, CUSTCURR_SEPARATOR_EDIT), SetMinimalSize(20, 9), SetDataTip(0x0, STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0),
-			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_SEPARATOR), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SEPARATOR, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SEPARATOR),
+			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_SEPARATOR), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SEPARATOR, STR_CURRENCY_SET_CUSTOM_CURRENCY_SEPARATOR_TOOLTIP),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
-			NWidget(WWT_PUSHBTN, COLOUR_DARK_BLUE, CUSTCURR_PREFIX_EDIT), SetMinimalSize(20, 9), SetDataTip(0x0, STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX),
+			NWidget(WWT_PUSHBTN, COLOUR_DARK_BLUE, CUSTCURR_PREFIX_EDIT), SetMinimalSize(20, 9), SetDataTip(0x0, STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0),
-			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_PREFIX), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_PREFIX, STR_TOOLTIP_SET_CUSTOM_CURRENCY_PREFIX),
+			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_PREFIX), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_PREFIX, STR_CURRENCY_SET_CUSTOM_CURRENCY_PREFIX_TOOLTIP),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
-			NWidget(WWT_PUSHBTN, COLOUR_DARK_BLUE, CUSTCURR_SUFFIX_EDIT), SetMinimalSize(20, 9), SetDataTip(0x0, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX),
+			NWidget(WWT_PUSHBTN, COLOUR_DARK_BLUE, CUSTCURR_SUFFIX_EDIT), SetMinimalSize(20, 9), SetDataTip(0x0, STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0),
-			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_SUFFIX), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SUFFIX, STR_TOOLTIP_SET_CUSTOM_CURRENCY_SUFFIX),
+			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_SUFFIX), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SUFFIX, STR_CURRENCY_SET_CUSTOM_CURRENCY_SUFFIX_TOOLTIP),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 2),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_TOOLTIP_DECREASE_CUSTOM_CURRENCY_TO_EURO),
-			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_UP), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_TOOLTIP_INCREASE_CUSTOM_CURRENCY_TO_EURO),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_DOWN), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_CURRENCY_DECREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP),
+			NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, CUSTCURR_YEAR_UP), SetMinimalSize(10, 9), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_CURRENCY_INCREASE_CUSTOM_CURRENCY_TO_EURO_TOOLTIP),
 			NWidget(NWID_SPACER), SetMinimalSize(5, 0),
-			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_YEAR), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SWITCH_TO_EURO, STR_TOOLTIP_SET_CUSTOM_CURRENCY_TO_EURO),
+			NWidget(WWT_TEXT, COLOUR_BLUE, CUSTCURR_YEAR), SetMinimalSize(193, 9), SetDataTip(STR_CURRENCY_SWITCH_TO_EURO, STR_CURRENCY_SET_CUSTOM_CURRENCY_TO_EURO_TOOLTIP),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
 		NWidget(WWT_LABEL, COLOUR_BLUE, CUSTCURR_PREVIEW), SetMinimalSize(226, 9),
-								SetDataTip(STR_CURRENCY_PREVIEW, STR_TOOLTIP_CUSTOM_CURRENCY_PREVIEW), SetPadding(15, 1, 18, 2),
+								SetDataTip(STR_CURRENCY_PREVIEW, STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP), SetPadding(15, 1, 18, 2),
 	EndContainer(),
 };
 
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index 86586ddfe..3a20d9197 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -745,7 +745,7 @@ CommandCost CmdBuildShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 {
 	UnitID unit_num;
 
-	if (!IsEngineBuildable(p1, VEH_SHIP, _current_company)) return_cmd_error(STR_SHIP_NOT_AVAILABLE);
+	if (!IsEngineBuildable(p1, VEH_SHIP, _current_company)) return_cmd_error(STR_ERROR_SHIP_NOT_AVAILABLE);
 
 	const Engine *e = Engine::Get(p1);
 	CommandCost value(EXPENSES_NEW_VEHICLES, e->GetCost());
@@ -845,7 +845,7 @@ CommandCost CmdSellShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p
 	Ship *v = Ship::GetIfValid(p1);
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE);
 
 	if (!v->IsStoppedInDepot()) {
 		return_cmd_error(STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT);
@@ -916,7 +916,7 @@ CommandCost CmdRefitShip(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (!v->IsStoppedInDepot()) return_cmd_error(STR_ERROR_SHIP_MUST_BE_STOPPED_IN_DEPOT);
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE);
 
 	/* Check cargo */
 	if (!ShipVehInfo(v->engine_type)->refittable) return CMD_ERROR;
diff --git a/src/ship_gui.cpp b/src/ship_gui.cpp
index f6ddfa437..d4681acd2 100644
--- a/src/ship_gui.cpp
+++ b/src/ship_gui.cpp
@@ -65,5 +65,5 @@ void DrawShipDetails(const Vehicle *v, int left, int right, int y)
 
 	/* Draw Transfer credits text */
 	SetDParam(0, v->cargo.FeederShare());
-	DrawString(left, right, y + 33, STR_FEEDER_CARGO_VALUE);
+	DrawString(left, right, y + 33, STR_VEHICLE_INFO_FEEDER_CARGO_VALUE);
 }
diff --git a/src/signs.cpp b/src/signs.cpp
index ae5ef4d7c..a02147921 100644
--- a/src/signs.cpp
+++ b/src/signs.cpp
@@ -39,7 +39,7 @@ void Sign::UpdateVirtCoord()
 {
 	Point pt = RemapCoords(this->x, this->y, this->z);
 	SetDParam(0, this->index);
-	this->sign.UpdatePosition(pt.x, pt.y - 6, STR_SIGN_WHITE);
+	this->sign.UpdatePosition(pt.x, pt.y - 6, STR_WHITE_SIGN);
 }
 
 /** Update the coordinates of all signs */
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index d83908cf6..570ca70ae 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -154,10 +154,10 @@ struct SignListWindow : Window, SignList {
 static const Widget _sign_list_widget[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,       STR_TOOLTIP_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   345,     0,    13, STR_SIGN_LIST_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   346,   357,     0,    13, 0x0,                   STR_STICKY_BUTTON},
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   346,   357,     0,    13, 0x0,                   STR_TOOLTIP_STICKY},
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   345,    14,   137, 0x0,                   STR_NULL},
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   346,   357,    14,   125, 0x0,                   STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   346,   357,   126,   137, 0x0,                   STR_RESIZE_BUTTON},
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   346,   357,   126,   137, 0x0,                   STR_TOOLTIP_RESIZE},
 {   WIDGETS_END},
 };
 
@@ -349,33 +349,33 @@ struct SignWindow : QueryStringBaseWindow, SignList {
 
 static const Widget _query_sign_edit_widgets[] = {
 { WWT_CLOSEBOX, RESIZE_NONE,  COLOUR_GREY,   0,  10,   0,  13, STR_BLACK_CROSS,             STR_TOOLTIP_CLOSE_WINDOW},   // QUERY_EDIT_SIGN_WIDGET_CLOSEBOX
-{  WWT_CAPTION, RESIZE_NONE,  COLOUR_GREY,  11, 259,   0,  13, STR_QUERY_CAPTION,           STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_CAPTION
+{  WWT_CAPTION, RESIZE_NONE,  COLOUR_GREY,  11, 259,   0,  13, STR_WHITE_STRINGN,           STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_CAPTION
 {    WWT_PANEL, RESIZE_NONE,  COLOUR_GREY,   0, 259,  14,  29, STR_NULL,                    STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_PANEL
-{  WWT_EDITBOX, RESIZE_NONE,  COLOUR_GREY,   2, 257,  16,  27, STR_SIGN_OSKTITLE,           STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_TEXT (Text field)
-{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,   0,  60,  30,  41, STR_QUERY_OK,                STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_OK
-{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,  61, 120,  30,  41, STR_QUERY_CANCEL,            STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_CANCEL
+{  WWT_EDITBOX, RESIZE_NONE,  COLOUR_GREY,   2, 257,  16,  27, STR_EDIT_SIGN_SIGN_OSKTITLE, STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_TEXT (Text field)
+{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,   0,  60,  30,  41, STR_BUTTON_OK,               STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_OK
+{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY,  61, 120,  30,  41, STR_BUTTON_CANCEL,           STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_CANCEL
 {  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY, 121, 180,  30,  41, STR_TOWN_VIEW_DELETE_BUTTON, STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_DELETE
 {    WWT_PANEL, RESIZE_NONE,  COLOUR_GREY, 181, 237,  30,  41, STR_NULL,                    STR_NULL },                  // QUERY_EDIT_SIGN_WIDGET_FILL
-{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY, 238, 248,  30,  41, STR_BLACK_SMALL_ARROW_LEFT,  STR_PREVIOUS_SIGN_TOOLTIP }, // QUERY_EDIT_SIGN_WIDGET_PREVIOUS
-{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY, 249, 259,  30,  41, STR_BLACK_SMALL_ARROW_RIGHT, STR_NEXT_SIGN_TOOLTIP },     // QUERY_EDIT_SIGN_WIDGET_NEXT
+{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY, 238, 248,  30,  41, STR_BLACK_SMALL_ARROW_LEFT,  STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP }, // QUERY_EDIT_SIGN_WIDGET_PREVIOUS
+{  WWT_TEXTBTN, RESIZE_NONE,  COLOUR_GREY, 249, 259,  30,  41, STR_BLACK_SMALL_ARROW_RIGHT, STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP },     // QUERY_EDIT_SIGN_WIDGET_NEXT
 { WIDGETS_END },
 };
 
 static const NWidgetPart _nested_query_sign_edit_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CAPTION), SetDataTip(STR_QUERY_CAPTION, STR_NULL),
+		NWidget(WWT_CAPTION, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CAPTION), SetDataTip(STR_WHITE_STRINGN, STR_NULL),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_PANEL),
-		NWidget(WWT_EDITBOX, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_TEXT), SetMinimalSize(256, 12), SetDataTip(STR_SIGN_OSKTITLE, STR_NULL), SetPadding(2, 2, 2, 2),
+		NWidget(WWT_EDITBOX, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_TEXT), SetMinimalSize(256, 12), SetDataTip(STR_EDIT_SIGN_SIGN_OSKTITLE, STR_NULL), SetPadding(2, 2, 2, 2),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_OK), SetMinimalSize(61, 12), SetDataTip(STR_QUERY_OK, STR_NULL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CANCEL), SetMinimalSize(60, 12), SetDataTip(STR_QUERY_CANCEL, STR_NULL),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_OK), SetMinimalSize(61, 12), SetDataTip(STR_BUTTON_OK, STR_NULL),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_CANCEL), SetMinimalSize(60, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_DELETE), SetMinimalSize(60, 12), SetDataTip(STR_TOWN_VIEW_DELETE_BUTTON, STR_NULL),
 		NWidget(WWT_PANEL, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_FILL), SetFill(1, 1), EndContainer(),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_PREVIOUS), SetMinimalSize(11, 12), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_PREVIOUS_SIGN_TOOLTIP),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_NEXT), SetMinimalSize(11, 12), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_NEXT_SIGN_TOOLTIP),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_PREVIOUS), SetMinimalSize(11, 12), SetDataTip(STR_BLACK_SMALL_ARROW_LEFT, STR_EDIT_SIGN_PREVIOUS_SIGN_TOOLTIP),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, QUERY_EDIT_SIGN_WIDGET_NEXT), SetMinimalSize(11, 12), SetDataTip(STR_BLACK_SMALL_ARROW_RIGHT, STR_EDIT_SIGN_NEXT_SIGN_TOOLTIP),
 	EndContainer(),
 };
 
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 6f4b1da80..6bad664b5 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -50,7 +50,7 @@ enum SmallMapWindowWidgets {
 static const Widget _smallmap_widgets[] = {
 {  WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_BROWN,     0,    10,     0,    13, STR_BLACK_CROSS,          STR_TOOLTIP_CLOSE_WINDOW},                       // SM_WIDGET_CLOSEBOX
 {   WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_BROWN,    11,   337,     0,    13, STR_SMALLMAP_CAPTION,     STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},             // SM_WIDGET_CAPTION
-{ WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   338,   349,     0,    13, 0x0,                      STR_STICKY_BUTTON},                              // SM_WIDGET_STICKYBOX
+{ WWT_STICKYBOX,     RESIZE_LR,  COLOUR_BROWN,   338,   349,     0,    13, 0x0,                      STR_TOOLTIP_STICKY},                              // SM_WIDGET_STICKYBOX
 {     WWT_PANEL,     RESIZE_RB,  COLOUR_BROWN,     0,   349,    14,   157, 0x0,                      STR_NULL},                                       // SM_WIDGET_MAP_BORDER
 {     WWT_INSET,     RESIZE_RB,  COLOUR_BROWN,     2,   347,    16,   155, 0x0,                      STR_NULL},                                       // SM_WIDGET_MAP
 {     WWT_PANEL,    RESIZE_RTB,  COLOUR_BROWN,     0,   261,   158,   201, 0x0,                      STR_NULL},                                       // SM_WIDGET_LEGEND
@@ -64,9 +64,9 @@ static const Widget _smallmap_widgets[] = {
 {    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   262,   283,   158,   179, SPR_IMG_SMALLMAP,         STR_SMALLMAP_CENTER},                            // SM_WIDGET_CENTERMAP
 {    WWT_IMGBTN,   RESIZE_LRTB,  COLOUR_BROWN,   262,   283,   180,   201, SPR_IMG_TOWN,             STR_SMALLMAP_TOOLTIP_TOGGLE_TOWN_NAMES_ON_OFF},  // SM_WIDGET_TOGGLETOWNNAME
 {     WWT_PANEL,    RESIZE_RTB,  COLOUR_BROWN,     0,   337,   202,   213, 0x0,                      STR_NULL},                                       // SM_WIDGET_BOTTOMPANEL
-{   WWT_TEXTBTN,     RESIZE_TB,  COLOUR_BROWN,     0,    99,   202,   213, STR_MESSAGES_ENABLE_ALL,  STR_NULL},                                       // SM_WIDGET_ENABLEINDUSTRIES
-{   WWT_TEXTBTN,     RESIZE_TB,  COLOUR_BROWN,   100,   201,   202,   213, STR_MESSAGES_DISABLE_ALL, STR_NULL},                                       // SM_WIDGET_DISABLEINDUSTRIES
-{ WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_BROWN,   338,   349,   202,   213, 0x0,                      STR_RESIZE_BUTTON},                              // SM_WIDGET_RESIZEBOX
+{   WWT_TEXTBTN,     RESIZE_TB,  COLOUR_BROWN,     0,    99,   202,   213, STR_SMALLMAP_ENABLE_ALL,  STR_NULL},                                       // SM_WIDGET_ENABLEINDUSTRIES
+{   WWT_TEXTBTN,     RESIZE_TB,  COLOUR_BROWN,   100,   201,   202,   213, STR_SMALLMAP_DISABLE_ALL, STR_NULL},                                       // SM_WIDGET_DISABLEINDUSTRIES
+{ WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_BROWN,   338,   349,   202,   213, 0x0,                      STR_TOOLTIP_RESIZE},                              // SM_WIDGET_RESIZEBOX
 {  WIDGETS_END},
 };
 
@@ -122,8 +122,8 @@ static const NWidgetPart _nested_smallmap_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PANEL, COLOUR_BROWN, SM_WIDGET_BOTTOMPANEL),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_TEXTBTN, COLOUR_BROWN, SM_WIDGET_ENABLEINDUSTRIES), SetMinimalSize(100, 12), SetDataTip(STR_MESSAGES_ENABLE_ALL, STR_NULL),
-				NWidget(WWT_TEXTBTN, COLOUR_BROWN, SM_WIDGET_DISABLEINDUSTRIES), SetMinimalSize(102, 12), SetDataTip(STR_MESSAGES_DISABLE_ALL, STR_NULL),
+				NWidget(WWT_TEXTBTN, COLOUR_BROWN, SM_WIDGET_ENABLEINDUSTRIES), SetMinimalSize(100, 12), SetDataTip(STR_SMALLMAP_ENABLE_ALL, STR_NULL),
+				NWidget(WWT_TEXTBTN, COLOUR_BROWN, SM_WIDGET_DISABLEINDUSTRIES), SetMinimalSize(102, 12), SetDataTip(STR_SMALLMAP_DISABLE_ALL, STR_NULL),
 				NWidget(NWID_SPACER), SetFill(1, 0), SetResize(1, 0),
 			EndContainer(),
 		EndContainer(),
@@ -1144,7 +1144,7 @@ enum ExtraViewportWindowWidgets {
 static const Widget _extra_view_port_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,    0,   13, STR_BLACK_CROSS,                  STR_TOOLTIP_CLOSE_WINDOW},
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   287,    0,   13, STR_EXTRA_VIEW_PORT_TITLE,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   288,   299,    0,   13, 0x0,                              STR_STICKY_BUTTON},
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   288,   299,    0,   13, 0x0,                              STR_TOOLTIP_STICKY},
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   299,   14,   33, 0x0,                              STR_NULL},
 {      WWT_INSET,     RESIZE_RB,  COLOUR_GREY,     2,   297,   16,   31, 0x0,                              STR_NULL},
 { WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,     0,    21,   34,   55, SPR_IMG_ZOOMIN,                   STR_TOOLBAR_TOOLTIP_ZOOM_THE_VIEW_IN},
@@ -1153,7 +1153,7 @@ static const Widget _extra_view_port_widgets[] = {
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,   172,   298,   34,   55, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT},
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,   299,   299,   34,   55, 0x0,                              STR_NULL},
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,     0,   287,   56,   67, 0x0,                              STR_NULL},
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   288,   299,   56,   67, 0x0,                              STR_RESIZE_BUTTON},
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   288,   299,   56,   67, 0x0,                              STR_TOOLTIP_RESIZE},
 {   WIDGETS_END},
 };
 
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 06c3a8c9a..6d007dfcc 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -418,7 +418,7 @@ void Station::UpdateVirtCoord()
 
 	SetDParam(0, this->index);
 	SetDParam(1, this->facilities);
-	this->sign.UpdatePosition(pt.x, pt.y, STR_STATION_SIGN);
+	this->sign.UpdatePosition(pt.x, pt.y, STR_VIEWPORT_STATION);
 }
 
 /** Update the virtual coords needed to draw the station sign for all stations. */
@@ -743,14 +743,14 @@ bool CanExpandRailStation(const BaseStation *st, TileArea &new_ta, Axis axis)
 		 * the uniform-stations code wouldn't handle it well */
 		TILE_LOOP(t, cur_ta.w, cur_ta.h, cur_ta.tile) {
 			if (!st->TileBelongsToRailStation(t)) { // there may be adjoined station
-				_error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
+				_error_message = STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED;
 				return false;
 			}
 		}
 
 		/* check so the orientation is the same */
 		if (GetRailStationAxis(cur_ta.tile) != axis) {
-			_error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
+			_error_message = STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED;
 			return false;
 		}
 
@@ -770,7 +770,7 @@ bool CanExpandRailStation(const BaseStation *st, TileArea &new_ta, Axis axis)
 			new_ta.tile = cur_ta.tile;
 			new_ta.w += cur_ta.w;
 		} else {
-			_error_message = STR_NONUNIFORM_STATIONS_DISALLOWED;
+			_error_message = STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED;
 			return false;
 		}
 	}
@@ -884,7 +884,7 @@ CommandCost FindJoiningBaseStation(StationID existing_station, StationID station
  */
 CommandCost FindJoiningStation(StationID existing_station, StationID station_to_join, bool adjacent, TileArea ta, Station **st)
 {
-	return FindJoiningBaseStation<Station, STR_MUST_REMOVE_RAILWAY_STATION_FIRST>(existing_station, station_to_join, adjacent, ta, st);
+	return FindJoiningBaseStation<Station, STR_ERROR_MUST_REMOVE_RAILWAY_STATION_FIRST>(existing_station, station_to_join, adjacent, ta, st);
 }
 
 /**
@@ -898,7 +898,7 @@ CommandCost FindJoiningStation(StationID existing_station, StationID station_to_
  */
 CommandCost FindJoiningWaypoint(StationID existing_waypoint, StationID waypoint_to_join, bool adjacent, TileArea ta, Waypoint **wp)
 {
-	return FindJoiningBaseStation<Waypoint, STR_MUST_REMOVE_RAILWAYPOINT_FIRST>(existing_waypoint, waypoint_to_join, adjacent, ta, wp);
+	return FindJoiningBaseStation<Waypoint, STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST>(existing_waypoint, waypoint_to_join, adjacent, ta, wp);
 }
 
 /**
@@ -1207,7 +1207,7 @@ CommandCost RemoveFromRailBaseStation(TileArea ta, SmallVector<T *, 4> &affected
 		/* Do not allow removing from stations if non-uniform stations are not enabled
 		 * The check must be here to give correct error message
 		 */
-		if (!_settings_game.station.nonuniform_stations) return_cmd_error(STR_NONUNIFORM_STATIONS_DISALLOWED);
+		if (!_settings_game.station.nonuniform_stations) return_cmd_error(STR_ERROR_NONUNIFORM_STATIONS_DISALLOWED);
 
 		/* If we reached here, the tile is valid so increase the quantity of tiles we will remove */
 		quantity++;
@@ -1490,7 +1490,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	/* If it is a drive-through stop check for valid axis */
 	if (is_drive_through && !IsValidAxis((Axis)p1)) return CMD_ERROR;
 	/* Road bits in the wrong direction */
-	if (build_over_road && (GetAllRoadBits(tile) & ((Axis)p1 == AXIS_X ? ROAD_Y : ROAD_X)) != 0) return_cmd_error(STR_DRIVE_THROUGH_ERROR_DIRECTION);
+	if (build_over_road && (GetAllRoadBits(tile) & ((Axis)p1 == AXIS_X ? ROAD_Y : ROAD_X)) != 0) return_cmd_error(STR_ERROR_DRIVE_THROUGH_DIRECTION);
 
 	if (!CheckIfAuthorityAllowsNewStation(tile, flags)) return CMD_ERROR;
 
@@ -1502,7 +1502,7 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 		if (HasBit(cur_rts, ROADTYPE_ROAD)) {
 			road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
 			if (road_owner == OWNER_TOWN) {
-				if (!_settings_game.construction.road_stop_on_town_road) return_cmd_error(STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD);
+				if (!_settings_game.construction.road_stop_on_town_road) return_cmd_error(STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD);
 			} else if (!_settings_game.construction.road_stop_on_competitor_road && road_owner != OWNER_NONE && !CheckOwnership(road_owner)) {
 				return CMD_ERROR;
 			}
@@ -1865,7 +1865,7 @@ CommandCost CmdBuildAirport(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
 	if (_settings_game.economy.station_noise_level) {
 		/* do not allow to build a new airport if this raise the town noise over the maximum allowed by town */
 		if ((nearest->noise_reached + newnoise_level) > nearest->MaxTownNoise()) {
-			authority_refuse_message = STR_LOCAL_AUTHORITY_REFUSES_NOISE;
+			authority_refuse_message = STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE;
 		}
 	} else {
 		uint num = 0;
@@ -2428,16 +2428,16 @@ static void GetTileDesc_Station(TileIndex tile, TileDesc *td)
 	StringID str;
 	switch (GetStationType(tile)) {
 		default: NOT_REACHED();
-		case STATION_RAIL:     str = STR_STATION_DESCRIPTION_RAILROAD_STATION; break;
+		case STATION_RAIL:     str = STR_LAI_STATION_DESCRIPTION_RAILROAD_STATION; break;
 		case STATION_AIRPORT:
-			str = (IsHangar(tile) ? STR_STATION_DESCRIPTION_AIRCRAFT_HANGAR : STR_STATION_DESCRIPTION_AIRPORT);
+			str = (IsHangar(tile) ? STR_LAI_STATION_DESCRIPTION_AIRCRAFT_HANGAR : STR_LAI_STATION_DESCRIPTION_AIRPORT);
 			break;
-		case STATION_TRUCK:    str = STR_STATION_DESCRIPTION_TRUCK_LOADING_AREA; break;
-		case STATION_BUS:      str = STR_STATION_DESCRIPTION_BUS_STATION; break;
+		case STATION_TRUCK:    str = STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA; break;
+		case STATION_BUS:      str = STR_LAI_STATION_DESCRIPTION_BUS_STATION; break;
 		case STATION_OILRIG:   str = STR_INDUSTRY_NAME_OIL_RIG; break;
-		case STATION_DOCK:     str = STR_STATION_DESCRIPTION_SHIP_DOCK; break;
-		case STATION_BUOY:     str = STR_STATION_DESCRIPTION_BUOY; break;
-		case STATION_WAYPOINT: str = STR_LANDINFO_WAYPOINT; break;
+		case STATION_DOCK:     str = STR_LAI_STATION_DESCRIPTION_SHIP_DOCK; break;
+		case STATION_BUOY:     str = STR_LAI_STATION_DESCRIPTION_BUOY; break;
+		case STATION_WAYPOINT: str = STR_LAI_STATION_DESCRIPTION_WAYPOINT; break;
 	}
 	td->str = str;
 }
@@ -2877,7 +2877,7 @@ CommandCost CmdRenameStation(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_STATION_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniqueStationName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniqueStationName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
@@ -3126,7 +3126,7 @@ CommandCost ClearTile_Station(TileIndex tile, DoCommandFlag flags)
 			case STATION_DOCK:     return_cmd_error(STR_ERROR_MUST_DEMOLISH_DOCK_FIRST);
 			case STATION_OILRIG:
 				SetDParam(0, STR_INDUSTRY_NAME_OIL_RIG);
-				return_cmd_error(STR_OBJECT_IN_THE_WAY);
+				return_cmd_error(STR_ERROR_UNMOVABLE_OBJECT_IN_THE_WAY);
 		}
 	}
 
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index a1e3a6aa9..407cb8182 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -278,7 +278,7 @@ public:
 			wi->top      = 14;
 			wi->bottom   = 24;
 			wi->data     = 0;
-			wi->tooltips = STR_USE_CTRL_TO_SELECT_MORE;
+			wi->tooltips = STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE;
 
 			if (HasBit(this->cargo_filter, cs->Index())) this->LowerWidget(SLW_CARGOSTART + i);
 			i++;
@@ -604,25 +604,25 @@ const StringID CompanyStationsWindow::sorter_names[] = {
 static const Widget _company_stations_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,   STR_TOOLTIP_CLOSE_WINDOW},         // SLW_CLOSEBOX
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   345,     0,    13, STR_STATION_LIST_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},  // SLW_CAPTION
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   346,   357,     0,    13, 0x0,               STR_STICKY_BUTTON},                // SLW_STICKY
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   346,   357,     0,    13, 0x0,               STR_TOOLTIP_STICKY},                // SLW_STICKY
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   345,    37,   161, 0x0,               STR_STATION_LIST_TOOLTIP},         // SLW_LIST
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   346,   357,    37,   149, 0x0,               STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // SLW_SCROLLBAR
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   346,   357,   150,   161, 0x0,               STR_RESIZE_BUTTON},                // SLW_RESIZE
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   346,   357,   150,   161, 0x0,               STR_TOOLTIP_RESIZE},                // SLW_RESIZE
 
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    13,    14,    24, STR_TRAIN,         STR_USE_CTRL_TO_SELECT_MORE},      // SLW_TRAIN
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    14,    27,    14,    24, STR_LORRY,         STR_USE_CTRL_TO_SELECT_MORE},      // SLW_TRUCK
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    28,    41,    14,    24, STR_BUS,           STR_USE_CTRL_TO_SELECT_MORE},      // SLW_BUS
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    42,    55,    14,    24, STR_PLANE,         STR_USE_CTRL_TO_SELECT_MORE},      // SLW_AIRPLANE
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    56,    69,    14,    24, STR_SHIP,          STR_USE_CTRL_TO_SELECT_MORE},      // SLW_SHIP
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    70,    83,    14,    24, 0x0,               STR_SELECT_ALL_FACILITIES},        // SLW_FACILALL
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    13,    14,    24, STR_TRAIN,         STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE},      // SLW_TRAIN
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    14,    27,    14,    24, STR_LORRY,         STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE},      // SLW_TRUCK
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    28,    41,    14,    24, STR_BUS,           STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE},      // SLW_BUS
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    42,    55,    14,    24, STR_PLANE,         STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE},      // SLW_AIRPLANE
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,    56,    69,    14,    24, STR_SHIP,          STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE},      // SLW_SHIP
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    70,    83,    14,    24, 0x0,               STR_STATION_LIST_SELECT_ALL_FACILITIES},        // SLW_FACILALL
 
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    84,    88,    14,    24, 0x0,               STR_NULL},                         // SLW_PAN_BETWEEN
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    89,   102,    14,    24, 0x0,               STR_NO_WAITING_CARGO},             // SLW_NOCARGOWAITING
-{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   103,   116,    14,    24, 0x0,               STR_SELECT_ALL_TYPES},             // SLW_CARGOALL
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,    89,   102,    14,    24, 0x0,               STR_STATION_LIST_NO_WAITING_CARGO},             // SLW_NOCARGOWAITING
+{      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,   103,   116,    14,    24, 0x0,               STR_STATION_LIST_SELECT_ALL_TYPES},             // SLW_CARGOALL
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,   117,   357,    14,    24, 0x0,               STR_NULL},                         // SLW_PAN_RIGHT
 
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    80,    25,    36, STR_SORT_BY,       STR_SORT_ORDER_TIP},               // SLW_SORTBY
-{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_GREY,    81,   243,    25,    36, 0x0,               STR_SORT_CRITERIA_TIP},            // SLW_SORTDROPBTN
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    80,    25,    36, STR_BUTTON_SORT_BY,       STR_TOOLTIP_SORT_ORDER},               // SLW_SORTBY
+{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_GREY,    81,   243,    25,    36, 0x0,               STR_TOOLTIP_SORT_CRITERIAP},            // SLW_SORTDROPBTN
 {      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,   244,   357,    25,    36, 0x0,               STR_NULL},                         // SLW_PAN_SORT_RIGHT
 {   WIDGETS_END},
 };
@@ -634,20 +634,20 @@ static const NWidgetPart _nested_company_stations_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, SLW_STICKY),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_TRAIN), SetMinimalSize(14, 11), SetDataTip(STR_TRAIN, STR_USE_CTRL_TO_SELECT_MORE),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_TRUCK), SetMinimalSize(14, 11), SetDataTip(STR_LORRY, STR_USE_CTRL_TO_SELECT_MORE),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_BUS), SetMinimalSize(14, 11), SetDataTip(STR_BUS, STR_USE_CTRL_TO_SELECT_MORE),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_AIRPLANE), SetMinimalSize(14, 11), SetDataTip(STR_PLANE, STR_USE_CTRL_TO_SELECT_MORE),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_SHIP), SetMinimalSize(14, 11), SetDataTip(STR_SHIP, STR_USE_CTRL_TO_SELECT_MORE),
-		NWidget(WWT_PANEL, COLOUR_GREY, SLW_FACILALL), SetMinimalSize(14, 11), SetDataTip(0x0, STR_SELECT_ALL_FACILITIES), SetFill(false, false), EndContainer(),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_TRAIN), SetMinimalSize(14, 11), SetDataTip(STR_TRAIN, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_TRUCK), SetMinimalSize(14, 11), SetDataTip(STR_LORRY, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_BUS), SetMinimalSize(14, 11), SetDataTip(STR_BUS, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_AIRPLANE), SetMinimalSize(14, 11), SetDataTip(STR_PLANE, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_SHIP), SetMinimalSize(14, 11), SetDataTip(STR_SHIP, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE),
+		NWidget(WWT_PANEL, COLOUR_GREY, SLW_FACILALL), SetMinimalSize(14, 11), SetDataTip(0x0, STR_STATION_LIST_SELECT_ALL_FACILITIES), SetFill(false, false), EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY, SLW_PAN_BETWEEN), SetMinimalSize(5, 11), SetDataTip(0x0, STR_NULL), SetFill(false, false), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_GREY, SLW_NOCARGOWAITING), SetMinimalSize(14, 11), SetDataTip(0x0, STR_NO_WAITING_CARGO), SetFill(false, false), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_GREY, SLW_CARGOALL), SetMinimalSize(14, 11), SetDataTip(0x0, STR_SELECT_ALL_TYPES), SetFill(false, false), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY, SLW_NOCARGOWAITING), SetMinimalSize(14, 11), SetDataTip(0x0, STR_STATION_LIST_NO_WAITING_CARGO), SetFill(false, false), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY, SLW_CARGOALL), SetMinimalSize(14, 11), SetDataTip(0x0, STR_STATION_LIST_SELECT_ALL_TYPES), SetFill(false, false), EndContainer(),
 		NWidget(WWT_PANEL, COLOUR_GREY, SLW_PAN_RIGHT), SetDataTip(0x0, STR_NULL), SetResize(1, 0), SetFill(true, true), EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_SORTBY), SetMinimalSize(81, 12), SetDataTip(STR_SORT_BY, STR_SORT_ORDER_TIP),
-		NWidget(WWT_DROPDOWN, COLOUR_GREY, SLW_SORTDROPBTN), SetMinimalSize(163, 12), SetDataTip(0x0, STR_SORT_CRITERIA_TIP),
+		NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_SORTBY), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, SLW_SORTDROPBTN), SetMinimalSize(163, 12), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIAP),
 		NWidget(WWT_PANEL, COLOUR_GREY, SLW_PAN_SORT_RIGHT), SetDataTip(0x0, STR_NULL), SetResize(1, 0), SetFill(true, true), EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
@@ -681,18 +681,18 @@ void ShowCompanyStations(CompanyID company)
 static const Widget _station_view_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,                 STR_TOOLTIP_CLOSE_WINDOW},             // SVW_CLOSEBOX
 {    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   236,     0,    13, STR_STATION_VIEW_CAPTION,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   237,   248,     0,    13, 0x0,                             STR_STICKY_BUTTON},
+{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   237,   248,     0,    13, 0x0,                             STR_TOOLTIP_STICKY},
 {      WWT_PANEL,     RESIZE_RB,  COLOUR_GREY,     0,   236,    14,    65, 0x0,                             STR_NULL},                             // SVW_WAITING
 {  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   237,   248,    14,    65, 0x0,                             STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},
 {      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,     0,   248,    66,    97, 0x0,                             STR_NULL},                             // SVW_ACCEPTLIST / SVW_RATINGLIST
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,    59,    98,   109, STR_BUTTON_LOCATION,             STR_STATION_VIEW_CENTER_TOOLTIP},      // SVW_LOCATION
 { WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,    60,   120,    98,   109, STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP},     // SVW_RATINGS / SVW_ACCEPTS
-{ WWT_PUSHTXTBTN,    RESIZE_RTB,  COLOUR_GREY,   121,   180,    98,   109, STR_QUERY_RENAME,                STR_STATION_VIEW_RENAME_TOOLTIP},      // SVW_RENAME
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   181,   194,    98,   109, STR_TRAIN,                       STR_SCHEDULED_TRAINS_TIP },            // SVW_TRAINS
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   195,   208,    98,   109, STR_LORRY,                       STR_SCHEDULED_ROAD_VEHICLES_TIP },     // SVW_ROADVEHS
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   209,   222,    98,   109, STR_PLANE,                       STR_SCHEDULED_AIRCRAFT_TIP },          // SVW_PLANES
-{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   223,   236,    98,   109, STR_SHIP,                        STR_SCHEDULED_SHIPS_TIP },             // SVW_SHIPS
-{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   237,   248,    98,   109, 0x0,                             STR_RESIZE_BUTTON},
+{ WWT_PUSHTXTBTN,    RESIZE_RTB,  COLOUR_GREY,   121,   180,    98,   109, STR_BUTTON_RENAME,                STR_STATION_VIEW_RENAME_TOOLTIP},      // SVW_RENAME
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   181,   194,    98,   109, STR_TRAIN,                       STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP },            // SVW_TRAINS
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   195,   208,    98,   109, STR_LORRY,                       STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP },     // SVW_ROADVEHS
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   209,   222,    98,   109, STR_PLANE,                       STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP },          // SVW_PLANES
+{ WWT_PUSHTXTBTN,   RESIZE_LRTB,  COLOUR_GREY,   223,   236,    98,   109, STR_SHIP,                        STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP },             // SVW_SHIPS
+{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   237,   248,    98,   109, 0x0,                             STR_TOOLTIP_RESIZE},
 {   WIDGETS_END},
 };
 
@@ -710,11 +710,11 @@ static const NWidgetPart _nested_station_view_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_LOCATION), SetMinimalSize(60, 12), SetDataTip(STR_BUTTON_LOCATION, STR_STATION_VIEW_CENTER_TOOLTIP),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_ACCEPTS), SetMinimalSize(61, 12), SetDataTip(STR_STATION_VIEW_RATINGS_BUTTON, STR_STATION_VIEW_RATINGS_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_RENAME), SetMinimalSize(60, 12), SetResize(1, 0), SetDataTip(STR_QUERY_RENAME, STR_STATION_VIEW_RENAME_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_TRAINS), SetMinimalSize(14, 12), SetDataTip(STR_TRAIN, STR_SCHEDULED_TRAINS_TIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_ROADVEHS), SetMinimalSize(14, 12), SetDataTip(STR_LORRY, STR_SCHEDULED_ROAD_VEHICLES_TIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_PLANES),  SetMinimalSize(14, 12), SetDataTip(STR_PLANE, STR_SCHEDULED_AIRCRAFT_TIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_SHIPS), SetMinimalSize(14, 12), SetDataTip(STR_SHIP, STR_SCHEDULED_SHIPS_TIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_RENAME), SetMinimalSize(60, 12), SetResize(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_STATION_VIEW_RENAME_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_TRAINS), SetMinimalSize(14, 12), SetDataTip(STR_TRAIN, STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_ROADVEHS), SetMinimalSize(14, 12), SetDataTip(STR_LORRY, STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_PLANES),  SetMinimalSize(14, 12), SetDataTip(STR_PLANE, STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, SVW_SHIPS), SetMinimalSize(14, 12), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP),
 		NWidget(WWT_RESIZEBOX, COLOUR_GREY, SVW_RESIZE),
 	EndContainer(),
 };
@@ -1003,7 +1003,7 @@ struct StationViewWindow : public Window {
 
 			case SVW_RENAME:
 				SetDParam(0, this->window_number);
-				ShowQueryString(STR_STATION_NAME, STR_QUERY_RENAME_STATION_CAPTION, MAX_LENGTH_STATION_NAME_BYTES, MAX_LENGTH_STATION_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
+				ShowQueryString(STR_STATION_NAME, STR_STATION_VIEW_RENAME_STATION_CAPTION, MAX_LENGTH_STATION_NAME_BYTES, MAX_LENGTH_STATION_NAME_PIXELS, this, CS_ALPHANUMERAL, QSF_ENABLE_DEFAULT);
 				break;
 
 			case SVW_TRAINS: { // Show a list of scheduled trains to this station
@@ -1182,17 +1182,17 @@ enum JoinStationWidgets {
 
 static const Widget _select_station_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE, COLOUR_DARK_GREEN,     0,    10,     0,    13, STR_BLACK_CROSS,                 STR_TOOLTIP_CLOSE_WINDOW},
-{    WWT_CAPTION,  RESIZE_RIGHT, COLOUR_DARK_GREEN,    11,   199,     0,    13, STR_SELECT_STATION_TO_JOIN,      STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
+{    WWT_CAPTION,  RESIZE_RIGHT, COLOUR_DARK_GREEN,    11,   199,     0,    13, STR_JOIN_STATION_CAPTION,      STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     RESIZE_RB, COLOUR_DARK_GREEN,     0,   187,    14,    79, 0x0,                             STR_NULL},
 {  WWT_SCROLLBAR,    RESIZE_LRB, COLOUR_DARK_GREEN,   188,   199,    14,    67, 0x0,                             STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},
-{  WWT_RESIZEBOX,   RESIZE_LRTB, COLOUR_DARK_GREEN,   188,   199,    68,    79, 0x0,                             STR_RESIZE_BUTTON},
+{  WWT_RESIZEBOX,   RESIZE_LRTB, COLOUR_DARK_GREEN,   188,   199,    68,    79, 0x0,                             STR_TOOLTIP_RESIZE},
 {   WIDGETS_END},
 };
 
 static const NWidgetPart _nested_select_station_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN, JSW_WIDGET_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, JSW_WIDGET_CAPTION), SetDataTip(STR_SELECT_STATION_TO_JOIN, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, JSW_WIDGET_CAPTION), SetDataTip(STR_JOIN_STATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, JSW_PANEL), SetMinimalSize(188, 66), SetResize(1, 10), EndContainer(),
@@ -1222,7 +1222,7 @@ struct SelectStationWindow : Window {
 
 		FindStationsNearby<T>(this->area, true);
 
-		this->widget[JSW_WIDGET_CAPTION].data = T::EXPECTED_FACIL == FACIL_WAYPOINT ? STR_SELECT_WAYPOINT_TO_JOIN : STR_SELECT_STATION_TO_JOIN;
+		this->widget[JSW_WIDGET_CAPTION].data = T::EXPECTED_FACIL == FACIL_WAYPOINT ? STR_JOIN_WAYPOINT_CAPTION : STR_JOIN_STATION_CAPTION;
 		this->FindWindowPlacementAndResize(desc);
 	}
 
@@ -1234,7 +1234,7 @@ struct SelectStationWindow : Window {
 
 		uint y = 17;
 		if (this->vscroll.pos == 0) {
-			DrawString(3, this->widget[JSW_PANEL].right - 2, y, T::EXPECTED_FACIL == FACIL_WAYPOINT ? STR_CREATE_SPLITTED_WAYPOINT : STR_CREATE_SPLITTED_STATION);
+			DrawString(3, this->widget[JSW_PANEL].right - 2, y, T::EXPECTED_FACIL == FACIL_WAYPOINT ? STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT : STR_JOIN_STATION_CREATE_SPLITTED_STATION);
 			y += 10;
 		}
 
diff --git a/src/strings.cpp b/src/strings.cpp
index c4b4a7cc2..25c992e44 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -751,7 +751,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
 				 *   8bit   - cargo type
 				 *   16-bit - cargo count */
 				CargoID cargo = GetInt32(&argv);
-				StringID cargo_str = (cargo == CT_INVALID) ? STR_CARGO_N_A : CargoSpec::Get(cargo)->quantifier;
+				StringID cargo_str = (cargo == CT_INVALID) ? STR_QUANTITY_N_A : CargoSpec::Get(cargo)->quantifier;
 				buff = GetStringWithArgs(buff, cargo_str, argv++, last);
 				break;
 			}
@@ -864,7 +864,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
 					int64 temp[2];
 					temp[0] = wp->town->index;
 					temp[1] = wp->town_cn + 1;
-					StringID str = ((wp->string_id == STR_SV_STNAME_BUOY) ? STR_BUOYNAME_CITY : STR_WAYPOINTNAME_CITY);
+					StringID str = ((wp->string_id == STR_SV_STNAME_BUOY) ? STR_FORMAT_BUOY_NAME : STR_FORMAT_WAYPOINT_NAME);
 					if (wp->town_cn != 0) str++;
 					buff = GetStringWithArgs(buff, str, temp, last);
 				}
@@ -995,7 +995,7 @@ static char *FormatString(char *buff, const char *str, int64 *argv, uint casei,
 				if (si->name != NULL) {
 					buff = strecpy(buff, si->name, last);
 				} else {
-					buff = GetStringWithArgs(buff, STR_SIGN_DEFAULT, NULL, last);
+					buff = GetStringWithArgs(buff, STR_DEFAULT_SIGN_NAME, NULL, last);
 				}
 				break;
 			}
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index 3b24625b9..2c4baf5e2 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -173,10 +173,10 @@ struct SubsidyListWindow : Window {
 static const Widget _subsidies_list_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE,   COLOUR_BROWN,   0,  10,   0,  13, STR_BLACK_CROSS,       STR_TOOLTIP_CLOSE_WINDOW},                       // SLW_CLOSEBOX
 {    WWT_CAPTION, RESIZE_RIGHT,  COLOUR_BROWN,  11, 307,   0,  13, STR_SUBSIDIES_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},             // SLW_CAPTION
-{  WWT_STICKYBOX, RESIZE_LR,     COLOUR_BROWN, 308, 319,   0,  13, STR_NULL,              STR_STICKY_BUTTON},                              // SLW_STICKYBOX
-{      WWT_PANEL, RESIZE_RB,     COLOUR_BROWN,   0, 307,  14, 126, 0x0,                   STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER}, // SLW_PANEL
+{  WWT_STICKYBOX, RESIZE_LR,     COLOUR_BROWN, 308, 319,   0,  13, STR_NULL,              STR_TOOLTIP_STICKY},                              // SLW_STICKYBOX
+{      WWT_PANEL, RESIZE_RB,     COLOUR_BROWN,   0, 307,  14, 126, 0x0,                   STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER}, // SLW_PANEL
 {  WWT_SCROLLBAR, RESIZE_LRB,    COLOUR_BROWN, 308, 319,  14, 114, 0x0,                   STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},           // SLW_SCROLLBAR
-{  WWT_RESIZEBOX, RESIZE_LRTB,   COLOUR_BROWN, 308, 319, 115, 126, 0x0,                   STR_RESIZE_BUTTON},                              // SLW_RESIZEBOX
+{  WWT_RESIZEBOX, RESIZE_LRTB,   COLOUR_BROWN, 308, 319, 115, 126, 0x0,                   STR_TOOLTIP_RESIZE},                              // SLW_RESIZEBOX
 
 {   WIDGETS_END},
 };
@@ -188,7 +188,7 @@ static const NWidgetPart _nested_subsidies_list_widgets[] = {
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN, SLW_STICKYBOX),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PANEL, COLOUR_BROWN, SLW_PANEL), SetMinimalSize(308, 113), SetDataTip(0x0, STR_SUBSIDY_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER), SetResize(1, 1), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_BROWN, SLW_PANEL), SetMinimalSize(308, 113), SetDataTip(0x0, STR_SUBSIDIES_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER), SetResize(1, 1), EndContainer(),
 		NWidget(NWID_VERTICAL),
 			NWidget(WWT_SCROLLBAR, COLOUR_BROWN, SLW_SCROLLBAR),
 			NWidget(WWT_RESIZEBOX, COLOUR_BROWN, SLW_RESIZEBOX),
diff --git a/src/table/bridge_land.h b/src/table/bridge_land.h
index f665fc5b5..ffd3c0c69 100644
--- a/src/table/bridge_land.h
+++ b/src/table/bridge_land.h
@@ -746,43 +746,43 @@ const BridgeSpec _orig_bridge[] = {
 	   string with description               name on rail                                     name on road
 	   |                              |      |                                                | */
 	MBR(   0, 0, 16,  80,  32, 0xA24, PAL_NONE,
-	   STR_BRIDGE_NAME_WOODEN,               STR_BRIDGE_DESCRIPTION_RAIL_WOODEN,              STR_BRIDGE_DESCRIPTION_ROAD_WOODEN),
+	   STR_BRIDGE_NAME_WOODEN,               STR_LAI_BRIDGE_DESCRIPTION_RAIL_WOODEN,              STR_LAI_BRIDGE_DESCRIPTION_ROAD_WOODEN),
 
 	MBR(   0, 0,  2, 112,  48, 0xA26, PALETTE_TO_STRUCT_RED,
-	   STR_BRIDGE_NAME_CONCRETE,             STR_BRIDGE_DESCRIPTION_RAIL_CONCRETE,            STR_BRIDGE_DESCRIPTION_ROAD_CONCRETE),
+	   STR_BRIDGE_NAME_CONCRETE,             STR_LAI_BRIDGE_DESCRIPTION_RAIL_CONCRETE,            STR_LAI_BRIDGE_DESCRIPTION_ROAD_CONCRETE),
 
 	MBR(1930, 0,  5, 144,  64, 0xA25, PAL_NONE,
-	   STR_BRIDGE_NAME_GIRDER_STEEL,         STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE,       STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL),
+	   STR_BRIDGE_NAME_GIRDER_STEEL,         STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE,       STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL),
 
 	MBR(   0, 2, 10, 168,  80, 0xA22, PALETTE_TO_STRUCT_CONCRETE,
-	   STR_BRIDGE_NAME_SUSPENSION_CONCRETE,  STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE, STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE),
+	   STR_BRIDGE_NAME_SUSPENSION_CONCRETE,  STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_CONCRETE, STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_CONCRETE),
 
 	MBR(1930, 3, 16, 185,  96, 0xA22, PAL_NONE,
-	   STR_BRIDGE_NAME_SUSPENSION_STEEL,     STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL,    STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL),
+	   STR_BRIDGE_NAME_SUSPENSION_STEEL,     STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL,    STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL),
 
 	MBR(1930, 3, 16, 192, 112, 0xA22, PALETTE_TO_STRUCT_YELLOW,
-	   STR_BRIDGE_NAME_SUSPENSION_STEEL,     STR_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL,    STR_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL),
+	   STR_BRIDGE_NAME_SUSPENSION_STEEL,     STR_LAI_BRIDGE_DESCRIPTION_RAIL_SUSPENSION_STEEL,    STR_LAI_BRIDGE_DESCRIPTION_ROAD_SUSPENSION_STEEL),
 
 	MBR(1930, 3,  7, 224, 160, 0xA23, PAL_NONE,
-	   STR_BRIDGE_NAME_CANTILEVER_STEEL,     STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL,    STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL),
+	   STR_BRIDGE_NAME_CANTILEVER_STEEL,     STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL,    STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL),
 
 	MBR(1930, 3,  8, 232, 208, 0xA23, PALETTE_TO_STRUCT_BROWN,
-	   STR_BRIDGE_NAME_CANTILEVER_STEEL,     STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL,    STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL),
+	   STR_BRIDGE_NAME_CANTILEVER_STEEL,     STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL,    STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL),
 
 	MBR(1930, 3,  9, 248, 240, 0xA23, PALETTE_TO_STRUCT_RED,
-	   STR_BRIDGE_NAME_CANTILEVER_STEEL,     STR_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL,    STR_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL),
+	   STR_BRIDGE_NAME_CANTILEVER_STEEL,     STR_LAI_BRIDGE_DESCRIPTION_RAIL_CANTILEVER_STEEL,    STR_LAI_BRIDGE_DESCRIPTION_ROAD_CANTILEVER_STEEL),
 
 	MBR(1930, 0,  2, 240, 256, 0xA27, PAL_NONE,
-	   STR_BRIDGE_NAME_GIRDER_STEEL,         STR_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE,       STR_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL),
+	   STR_BRIDGE_NAME_GIRDER_STEEL,         STR_LAI_BRIDGE_DESCRIPTION_RAIL_GIRDER_STEELE,       STR_LAI_BRIDGE_DESCRIPTION_ROAD_GIRDER_STEEL),
 
 	MBR(1995, 2, 16, 255, 320, 0xA28, PAL_NONE,
-	   STR_BRIDGE_NAME_TUBULAR_STEEL,        STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL,       STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL),
+	   STR_BRIDGE_NAME_TUBULAR_STEEL,        STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL,       STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL),
 
 	MBR(2005, 2, 32, 380, 512, 0xA28, PALETTE_TO_STRUCT_YELLOW,
-	   STR_BRIDGE_NAME_TUBULAR_STEEL,        STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL,       STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL),
+	   STR_BRIDGE_NAME_TUBULAR_STEEL,        STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL,       STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL),
 
 	MBR(2010, 2, 32, 510, 608, 0xA28, PALETTE_TO_STRUCT_GREY,
-	   STR_BRIDGE_TUBULAR_SILICON,           STR_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL,       STR_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL)
+	   STR_BRIDGE_TUBULAR_SILICON,           STR_LAI_BRIDGE_DESCRIPTION_RAIL_TUBULAR_STEEL,       STR_LAI_BRIDGE_DESCRIPTION_ROAD_TUBULAR_STEEL)
 };
 
 #undef MBR
diff --git a/src/table/railtypes.h b/src/table/railtypes.h
index ff7f8dd8d..9f0f266aa 100644
--- a/src/table/railtypes.h
+++ b/src/table/railtypes.h
@@ -43,7 +43,7 @@ static const RailtypeInfo _original_railtypes[] = {
 			STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION,
 			STR_RAIL_MENU_RAILROAD_CONSTRUCTION,
 			STR_BUILD_VEHICLE_TRAIN_RAIL_CAPTION,
-			STR_RAIL_VEHICLES,
+			STR_REPLACE_RAIL_VEHICLES,
 			STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE,
 		},
 
@@ -115,7 +115,7 @@ static const RailtypeInfo _original_railtypes[] = {
 			STR_RAIL_TOOLBAR_ELRAIL_CONSTRUCTION_CAPTION,
 			STR_RAIL_MENU_ELRAIL_CONSTRUCTION,
 			STR_BUILD_VEHICLE_TRAIN_ELRAIL_CAPTION,
-			STR_ELRAIL_VEHICLES,
+			STR_REPLACE_ELRAIL_VEHICLES,
 			STR_ENGINE_PREVIEW_RAILROAD_LOCOMOTIVE,
 		},
 
@@ -183,7 +183,7 @@ static const RailtypeInfo _original_railtypes[] = {
 			STR_RAIL_TOOLBAR_MONORAIL_CONSTRUCTION_CAPTION,
 			STR_RAIL_MENU_MONORAIL_CONSTRUCTION,
 			STR_BUILD_VEHICLE_TRAIN_MONORAIL_CAPTION,
-			STR_MONORAIL_VEHICLES,
+			STR_REPLACE_MONORAIL_VEHICLES,
 			STR_ENGINE_PREVIEW_MONORAIL_LOCOMOTIVE,
 		},
 
@@ -251,7 +251,7 @@ static const RailtypeInfo _original_railtypes[] = {
 			STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION,
 			STR_RAIL_MENU_MAGLEV_CONSTRUCTION,
 			STR_BUILD_VEHICLE_TRAIN_MAGLEV_CAPTION,
-			STR_MAGLEV_VEHICLES,
+			STR_REPLACE_MAGLEV_VEHICLES,
 			STR_ENGINE_PREVIEW_MAGLEV_LOCOMOTIVE,
 		},
 
diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h
index 32a28e926..573891cd2 100644
--- a/src/table/unmovable_land.h
+++ b/src/table/unmovable_land.h
@@ -94,9 +94,9 @@ static const DrawTileSprites _unmovable_display_datas[] = {
 #undef TILE_SPRITE_LINE
 
 const UnmovableSpec _original_unmovable[] = {
-	{STR_UNMOVABLE_DESCRIPTION_TRANSMITTER,          1,   1},
-	{STR_UNMOVABLE_DESCRIPTION_LIGHTHOUSE,           1,   1},
+	{STR_LAI_UNMOVABLE_DESCRIPTION_TRANSMITTER,          1,   1},
+	{STR_LAI_UNMOVABLE_DESCRIPTION_LIGHTHOUSE,           1,   1},
 	{STR_TOWN_BUILDING_NAME_STATUE_1,                1,   1},
-	{STR_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND,   10,  2},
-	{STR_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS, 1,   1},
+	{STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_OWNED_LAND,   10,  2},
+	{STR_LAI_UNMOVABLE_DESCRIPTION_COMPANY_HEADQUARTERS, 1,   1},
 };
diff --git a/src/terraform_cmd.cpp b/src/terraform_cmd.cpp
index 34b7e19fa..64a0ea649 100644
--- a/src/terraform_cmd.cpp
+++ b/src/terraform_cmd.cpp
@@ -368,7 +368,7 @@ CommandCost CmdLevelLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 
 	/* Check range of destination height */
 	if (h > MAX_TILE_HEIGHT) return_cmd_error((oldh == 0) ? STR_ERROR_ALREADY_AT_SEA_LEVEL : STR_ERROR_TOO_HIGH);
-	if (p2 == 0) _error_message = STR_ALREADY_LEVELLED;
+	if (p2 == 0) _error_message = STR_ERROR_ALREADY_LEVELLED;
 
 	/* make sure sx,sy are smaller than ex,ey */
 	int ex = TileX(tile);
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index cc05cd1d0..e3a337669 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -315,18 +315,18 @@ static const NWidgetPart _nested_terraform_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_LOWER_LAND), SetMinimalSize(22,22),
-								SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_DOWN, STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND),
+								SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_DOWN, STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_RAISE_LAND), SetMinimalSize(22,22),
-								SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_UP, STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND),
+								SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_UP, STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_LEVEL_LAND), SetMinimalSize(22,22),
-								SetFill(0, 1), SetDataTip(SPR_IMG_LEVEL_LAND, STR_LEVEL_LAND_TOOLTIP),
+								SetFill(0, 1), SetDataTip(SPR_IMG_LEVEL_LAND, STR_LANDSCAPING_LEVEL_LAND_TOOLTIP),
 
 		NWidget(WWT_PANEL, COLOUR_DARK_GREEN, TTW_SEPERATOR), SetMinimalSize(4, 22), EndContainer(),
 
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_DEMOLISH), SetMinimalSize(22,22),
 								SetFill(0, 1), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_BUY_LAND), SetMinimalSize(22,22),
-								SetFill(0, 1), SetDataTip(SPR_IMG_BUY_LAND, STR_TERRAFORM_TOOLTIP_PURCHASE_LAND),
+								SetFill(0, 1), SetDataTip(SPR_IMG_BUY_LAND, STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_PLANT_TREES), SetMinimalSize(22,22),
 								SetFill(0, 1), SetDataTip(SPR_IMG_PLANTTREES, STR_SCENEDIT_TOOLBAR_PLANT_TREES),
 		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_PLACE_SIGN), SetMinimalSize(22,22),
@@ -519,11 +519,11 @@ static const NWidgetPart _nested_scen_edit_land_gen_widgets[] = {
 			NWidget(WWT_IMGBTN, COLOUR_GREY, ETTW_DEMOLISH), SetMinimalSize(22, 22),
 										SetFill(0, 1), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, ETTW_LOWER_LAND), SetMinimalSize(22, 22),
-										SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_DOWN, STR_TERRAFORM_TOOLTIP_LOWER_A_CORNER_OF_LAND),
+										SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_DOWN, STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, ETTW_RAISE_LAND), SetMinimalSize(22, 22),
-										SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_UP, STR_TERRAFORM_TOOLTIP_RAISE_A_CORNER_OF_LAND),
+										SetFill(0, 1), SetDataTip(SPR_IMG_TERRAFORM_UP, STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, ETTW_LEVEL_LAND), SetMinimalSize(22, 22),
-										SetFill(0, 1), SetDataTip(SPR_IMG_LEVEL_LAND, STR_LEVEL_LAND_TOOLTIP),
+										SetFill(0, 1), SetDataTip(SPR_IMG_LEVEL_LAND, STR_LANDSCAPING_LEVEL_LAND_TOOLTIP),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, ETTW_PLACE_ROCKS), SetMinimalSize(22, 22),
 										SetFill(0, 1), SetDataTip(SPR_IMG_ROCKS, STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE),
 			NWidget(WWT_IMGBTN, COLOUR_GREY, ETTW_PLACE_DESERT_LIGHTHOUSE), SetMinimalSize(22, 22),
@@ -547,9 +547,9 @@ static const NWidgetPart _nested_scen_edit_land_gen_widgets[] = {
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 6),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, ETTW_NEW_SCENARIO), SetMinimalSize(160, 12),
-								SetFill(1, 0), SetDataTip(STR_SE_NEW_WORLD, STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND), SetPadding(0, 2, 0, 2),
+								SetFill(1, 0), SetDataTip(STR_TERRAFORM_SE_NEW_WORLD, STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND), SetPadding(0, 2, 0, 2),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, ETTW_RESET_LANDSCAPE), SetMinimalSize(160, 12),
-								SetFill(1, 0), SetDataTip(STR_TERRAFORM_RESET_LANDSCAPE, STR_RESET_LANDSCAPE_TOOLTIP), SetPadding(1, 2, 2, 2),
+								SetFill(1, 0), SetDataTip(STR_TERRAFORM_RESET_LANDSCAPE, STR_TERRAFORM_RESET_LANDSCAPE_TOOLTIP), SetPadding(1, 2, 2, 2),
 	EndContainer(),
 };
 
diff --git a/src/timetable_cmd.cpp b/src/timetable_cmd.cpp
index 4e12743b4..2a50156b6 100644
--- a/src/timetable_cmd.cpp
+++ b/src/timetable_cmd.cpp
@@ -82,13 +82,13 @@ CommandCost CmdChangeTimetable(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 	if (wait_time != order->wait_time) {
 		switch (order->GetType()) {
 			case OT_GOTO_STATION:
-				if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_TIMETABLE_NOT_STOPPING_HERE);
+				if (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) return_cmd_error(STR_ERROR_TIMETABLE_NOT_STOPPING_HERE);
 				break;
 
 			case OT_CONDITIONAL:
 				break;
 
-			default: return_cmd_error(STR_TIMETABLE_ONLY_WAIT_AT_STATIONS);
+			default: return_cmd_error(STR_ERROR_TIMETABLE_ONLY_WAIT_AT_STATIONS);
 		}
 	}
 
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index f2a9d4965..9f6ad279e 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -291,18 +291,18 @@ struct TimetableWindow : Window {
 
 			case TTV_CLEAR_TIME: { // Clear waiting time button.
 				uint32 p1 = PackTimetableArgs(v, this->sel_index);
-				DoCommandP(0, p1, 0, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE));
+				DoCommandP(0, p1, 0, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 			} break;
 
 			case TTV_RESET_LATENESS: // Reset the vehicle's late counter.
-				DoCommandP(0, v->index, 0, CMD_SET_VEHICLE_ON_TIME | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE));
+				DoCommandP(0, v->index, 0, CMD_SET_VEHICLE_ON_TIME | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 				break;
 
 			case TTV_AUTOFILL: { // Autofill the timetable.
 				uint32 p2 = 0;
 				if (!HasBit(v->vehicle_flags, VF_AUTOFILL_TIMETABLE)) SetBit(p2, 0);
 				if (_ctrl_pressed) SetBit(p2, 1);
-				DoCommandP(0, v->index, p2, CMD_AUTOFILL_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE));
+				DoCommandP(0, v->index, p2, CMD_AUTOFILL_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 			} break;
 		}
 
@@ -322,7 +322,7 @@ struct TimetableWindow : Window {
 
 		uint32 p2 = minu(time, UINT16_MAX);
 
-		DoCommandP(0, p1, p2, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_CAN_T_TIMETABLE_VEHICLE));
+		DoCommandP(0, p1, p2, CMD_CHANGE_TIMETABLE | CMD_MSG(STR_ERROR_CAN_T_TIMETABLE_VEHICLE));
 	}
 
 	virtual void OnResize(Point delta)
@@ -335,8 +335,8 @@ struct TimetableWindow : Window {
 static const Widget _timetable_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,   COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,            STR_TOOLTIP_CLOSE_WINDOW},             // TTV_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,   RESIZE_RIGHT,  COLOUR_GREY,    11,   326,     0,    13, STR_TIMETABLE_TITLE,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},   // TTV_CAPTION
-	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   327,   387,     0,    13, STR_ORDER_VIEW,             STR_ORDER_VIEW_TOOLTIP},               // TTV_ORDER_VIEW
-	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   388,   399,     0,    13, STR_NULL,                   STR_STICKY_BUTTON},                    // TTV_STICKY
+	{ WWT_PUSHTXTBTN,   RESIZE_LR,     COLOUR_GREY,   327,   387,     0,    13, STR_TIMETABLE_ORDER_VIEW,             STR_TIMETABLE_ORDER_VIEW_TOOLTIP},               // TTV_ORDER_VIEW
+	{  WWT_STICKYBOX,   RESIZE_LR,     COLOUR_GREY,   388,   399,     0,    13, STR_NULL,                   STR_TOOLTIP_STICKY},                    // TTV_STICKY
 
 	{      WWT_PANEL,   RESIZE_RB,     COLOUR_GREY,     0,   387,    14,    95, STR_NULL,                   STR_TIMETABLE_TOOLTIP},                // TTV_TIMETABLE_PANEL
 	{  WWT_SCROLLBAR,   RESIZE_LRB,    COLOUR_GREY,   388,   399,    14,    95, STR_NULL,                   STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // TTV_SCROLLBAR
@@ -344,12 +344,12 @@ static const Widget _timetable_widgets[] = {
 	{      WWT_PANEL,   RESIZE_RTB,    COLOUR_GREY,     0,   399,    96,   117, STR_NULL,                   STR_NULL},                             // TTV_SUMMARY_PANEL
 
 	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,     0,   109,   118,   129, STR_TIMETABLE_CHANGE_TIME,  STR_TIMETABLE_WAIT_TIME_TOOLTIP},      // TTV_CHANGE_TIME
-	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   110,   219,   118,   129, STR_CLEAR_TIME,             STR_TIMETABLE_CLEAR_TIME_TOOLTIP},     // TTV_CLEAR_TIME
-	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   220,   337,   118,   129, STR_RESET_LATENESS,         STR_TIMETABLE_RESET_LATENESS_TOOLTIP}, // TTV_RESET_LATENESS
+	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   110,   219,   118,   129, STR_TIMETABLE_CLEAR_TIME,             STR_TIMETABLE_CLEAR_TIME_TOOLTIP},     // TTV_CLEAR_TIME
+	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   220,   337,   118,   129, STR_TIMETABLE_RESET_LATENESS,         STR_TIMETABLE_RESET_LATENESS_TOOLTIP}, // TTV_RESET_LATENESS
 	{ WWT_PUSHTXTBTN,   RESIZE_TB,     COLOUR_GREY,   338,   387,   118,   129, STR_TIMETABLE_AUTOFILL,     STR_TIMETABLE_AUTOFILL_TOOLTIP},       // TTV_AUTOFILL
 
 	{      WWT_PANEL,   RESIZE_RTB,    COLOUR_GREY,   388,   387,   118,   129, STR_NULL,                   STR_NULL},                             // TTV_EMPTY
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   388,   399,   118,   129, STR_NULL,                   STR_RESIZE_BUTTON},                    // TTV_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,   COLOUR_GREY,   388,   399,   118,   129, STR_NULL,                   STR_TOOLTIP_RESIZE},                    // TTV_RESIZE
 
 	{    WIDGETS_END }
 };
@@ -358,7 +358,7 @@ static const NWidgetPart _nested_timetable_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, TTV_WIDGET_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_GREY, TTV_CAPTION), SetDataTip(STR_TIMETABLE_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_ORDER_VIEW), SetMinimalSize(61, 14), SetDataTip( STR_ORDER_VIEW, STR_ORDER_VIEW_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_ORDER_VIEW), SetMinimalSize(61, 14), SetDataTip( STR_TIMETABLE_ORDER_VIEW, STR_TIMETABLE_ORDER_VIEW_TOOLTIP),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, TTV_STICKY),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
@@ -368,8 +368,8 @@ static const NWidgetPart _nested_timetable_widgets[] = {
 	NWidget(WWT_PANEL, COLOUR_GREY, TTV_SUMMARY_PANEL), SetMinimalSize(400, 22), SetResize(1, 0), EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_CHANGE_TIME), SetMinimalSize(110, 12), SetDataTip(STR_TIMETABLE_CHANGE_TIME, STR_TIMETABLE_WAIT_TIME_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_CLEAR_TIME), SetMinimalSize(110, 12), SetDataTip(STR_CLEAR_TIME, STR_TIMETABLE_CLEAR_TIME_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_RESET_LATENESS), SetMinimalSize(118, 12), SetDataTip(STR_RESET_LATENESS, STR_TIMETABLE_RESET_LATENESS_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_CLEAR_TIME), SetMinimalSize(110, 12), SetDataTip(STR_TIMETABLE_CLEAR_TIME, STR_TIMETABLE_CLEAR_TIME_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_RESET_LATENESS), SetMinimalSize(118, 12), SetDataTip(STR_TIMETABLE_RESET_LATENESS, STR_TIMETABLE_RESET_LATENESS_TOOLTIP),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, TTV_AUTOFILL), SetMinimalSize(50, 12), SetDataTip(STR_TIMETABLE_AUTOFILL, STR_TIMETABLE_AUTOFILL_TOOLTIP),
 		NWidget(WWT_PANEL, COLOUR_GREY, TTV_EMPTY), SetMinimalSize(0, 12), SetResize(1, 0), EndContainer(),
 		NWidget(WWT_RESIZEBOX,COLOUR_GREY, TTV_RESIZE),
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 45ef1d1c7..771370b97 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -215,7 +215,7 @@ static void PopupMainCompanyToolbMenu(Window *w, int widget, int grey = 0)
 #ifdef ENABLE_NETWORK
 	if (widget == TBN_COMPANIES && _networking) {
 		/* Add the client list button for the companies menu */
-		list->push_back(new DropDownListStringItem(STR_NETWORK_CLIENT_LIST, CTMN_CLIENT_LIST, false));
+		list->push_back(new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_CLIENT_LIST, CTMN_CLIENT_LIST, false));
 
 		if (_local_company == COMPANY_SPECTATOR) {
 			list->push_back(new DropDownListStringItem(STR_NETWORK_COMPANY_LIST_NEW_COMPANY, CTMN_NEW_COMPANY, NetworkMaxCompaniesReached()));
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index 88222fe72..743a07b88 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -330,7 +330,7 @@ void Town::UpdateVirtCoord()
 	SetDParam(0, this->index);
 	SetDParam(1, this->population);
 	this->sign.UpdatePosition(pt.x, pt.y - 24,
-		_settings_client.gui.population_in_label ? STR_TOWN_LABEL_POP : STR_TOWN_LABEL);
+		_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_VIEWPORT_TOWN);
 }
 
 /** Update the virtual coords needed to draw the town sign for all towns. */
@@ -631,7 +631,7 @@ static void GetTileDesc_Town(TileIndex tile, TileDesc *td)
 
 	if (!house_completed) {
 		SetDParamX(td->dparam, 0, td->str);
-		td->str = STR_TOWN_DESCRIPTION_UNDER_CONSTRUCTION;
+		td->str = STR_LAI_TOWN_INDUSTRY_DESCRIPTION_UNDER_CONSTRUCTION;
 	}
 
 	if (hs->grffile != NULL) {
@@ -1576,7 +1576,7 @@ CommandCost CmdBuildTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 	if (size > TS_RANDOM) return CMD_ERROR;
 	if (layout > TL_RANDOM) return CMD_ERROR;
 
-	if (!VerifyTownName(townnameparts, &par)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+	if (!VerifyTownName(townnameparts, &par)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 
 	CommandCost cost = TownCanBePlacedHere(tile);
 	if (CmdFailed(cost)) return cost;
@@ -1777,7 +1777,7 @@ bool GenerateTowns(TownLayout layout)
 		if (Town::GetNumItems() == 0) {
 			if (_game_mode != GM_EDITOR) {
 				extern StringID _switch_mode_errorstr;
-				_switch_mode_errorstr = STR_COULD_NOT_CREATE_TOWN;
+				_switch_mode_errorstr = STR_ERROR_COULD_NOT_CREATE_TOWN;
 			}
 		}
 		return false;  // we are still without a town? we failed, simply
@@ -2283,7 +2283,7 @@ CommandCost CmdRenameTown(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_TOWN_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniqueTownName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniqueTownName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
@@ -2304,7 +2304,7 @@ void ExpandTown(Town *t)
 	 * but do this only onces per openttd run. */
 	static bool warned_no_roads = false;
 	if (!_settings_game.economy.allow_town_roads && !warned_no_roads) {
-		ShowErrorMessage(INVALID_STRING_ID, STR_TOWN_EXPAND_WARN_NO_ROADS, 0, 0);
+		ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS, 0, 0);
 		warned_no_roads = true;
 	}
 
@@ -2445,7 +2445,7 @@ static void TownActionBribe(Town *t)
 
 		/* only show errormessage to the executing player. All errors are handled command.c
 		 * but this is special, because it can only 'fail' on a DC_EXEC */
-		if (IsLocalCompany()) ShowErrorMessage(STR_BRIBE_FAILED_2, STR_BRIBE_FAILED, 0, 0);
+		if (IsLocalCompany()) ShowErrorMessage(STR_ERROR_BRIBE_FAILED_2, STR_ERROR_BRIBE_FAILED, 0, 0);
 
 		/* decrease by a lot!
 		 * ChangeTownRating is only for stuff in demolishing. Bribe failure should
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index b589f24d7..a0e2d245c 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -326,7 +326,7 @@ public:
 		}
 
 		if (cargo_needed_for_growth > 0) {
-			DrawString(2, this->width - 2, y += 10, STR_CARGO_FOR_TOWNGROWTH);
+			DrawString(2, this->width - 2, y += 10, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH);
 
 			CargoID first_food_cargo = CT_INVALID;
 			StringID food_name = STR_CARGO_PLURAL_FOOD;
@@ -347,20 +347,20 @@ public:
 			if (first_food_cargo != CT_INVALID && this->town->act_food > 0) {
 				SetDParam(0, first_food_cargo);
 				SetDParam(1, this->town->act_food);
-				DrawString(2, this->width - 2, y += 10, STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH);
+				DrawString(2, this->width - 2, y += 10, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH);
 			} else {
 				SetDParam(0, food_name);
-				DrawString(2, this->width - 2, y += 10, STR_CARGO_FOR_TOWNGROWTH_REQUIRED);
+				DrawString(2, this->width - 2, y += 10, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED);
 			}
 
 			if (cargo_needed_for_growth > 1) {
 				if (first_water_cargo != CT_INVALID && this->town->act_water > 0) {
 					SetDParam(0, first_water_cargo);
 					SetDParam(1, this->town->act_water);
-					DrawString(2, this->width - 2, y += 10, STR_CARGO_FOR_TOWNGROWTH_LAST_MONTH);
+					DrawString(2, this->width - 2, y += 10, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_LAST_MONTH);
 				} else {
 					SetDParam(0, water_name);
-					DrawString(2, this->width - 2, y += 10, STR_CARGO_FOR_TOWNGROWTH_REQUIRED);
+					DrawString(2, this->width - 2, y += 10, STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED);
 				}
 			}
 		}
@@ -371,7 +371,7 @@ public:
 		if (_settings_game.economy.station_noise_level) {
 			SetDParam(0, this->town->noise_reached);
 			SetDParam(1, this->town->MaxTownNoise());
-			DrawString(2, this->width - 2, y += 10, STR_NOISE_IN_TOWN);
+			DrawString(2, this->width - 2, y += 10, STR_TOWN_VIEW_NOISE_IN_TOWN);
 		}
 	}
 
@@ -445,13 +445,13 @@ public:
 static const Widget _town_view_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_BROWN,     0,    10,     0,    13, STR_BLACK_CROSS,                      STR_TOOLTIP_CLOSE_WINDOW},              // TVW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,  COLOUR_BROWN,    11,   171,     0,    13, STR_TOWN_VIEW_TOWN_CAPTION,           STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},    // TVW_CAPTION
-{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_BROWN,   248,   259,     0,    13, 0x0,                                  STR_STICKY_BUTTON},                     // TVW_STICKY
+{  WWT_STICKYBOX,   RESIZE_NONE,  COLOUR_BROWN,   248,   259,     0,    13, 0x0,                                  STR_TOOLTIP_STICKY},                     // TVW_STICKY
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_BROWN,     0,   259,    14,   105, 0x0,                                  STR_NULL},                              // TVW_VIEWPORTPANEL
 {      WWT_INSET,   RESIZE_NONE,  COLOUR_BROWN,     2,   257,    16,   103, 0x0,                                  STR_NULL},                              // TVW_VIEWPORTINSET
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_BROWN,     0,   259,   106,   137, 0x0,                                  STR_NULL},                              // TVW_INFOPANEL
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_BROWN,     0,    85,   138,   149, STR_BUTTON_LOCATION,                  STR_TOWN_VIEW_CENTER_TOOLTIP},          // TVW_CENTERVIEW
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_BROWN,    86,   127,   138,   149, STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON, STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP}, // TVW_SHOWAUTHORITY
-{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_BROWN,   172,   247,     0,    13, STR_QUERY_RENAME,                     STR_TOWN_VIEW_RENAME_TOOLTIP},          // TVW_CHANGENAME
+{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_BROWN,   172,   247,     0,    13, STR_BUTTON_RENAME,                    STR_TOWN_VIEW_RENAME_TOOLTIP},          // TVW_CHANGENAME
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_BROWN,   128,   171,   138,   149, STR_TOWN_VIEW_EXPAND_BUTTON,          STR_TOWN_VIEW_EXPAND_TOOLTIP},          // TVW_EXPAND
 { WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_BROWN,   172,   259,   138,   149, STR_TOWN_VIEW_DELETE_BUTTON,          STR_TOWN_VIEW_DELETE_TOOLTIP},          // TVW_DELETE
 {   WIDGETS_END},
@@ -461,7 +461,7 @@ static const NWidgetPart _nested_town_view_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_BROWN, TVW_CLOSEBOX),
 		NWidget(WWT_CAPTION, COLOUR_BROWN, TVW_CAPTION), SetDataTip(STR_TOWN_VIEW_TOWN_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, TVW_CHANGENAME), SetMinimalSize(76, 14), SetDataTip(STR_QUERY_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, TVW_CHANGENAME), SetMinimalSize(76, 14), SetDataTip(STR_BUTTON_RENAME, STR_TOWN_VIEW_RENAME_TOOLTIP),
 		NWidget(WWT_STICKYBOX, COLOUR_BROWN, TVW_STICKY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_BROWN, TVW_VIEWPORTPANEL),
@@ -511,8 +511,8 @@ static const NWidgetPart _nested_town_directory_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(NWID_VERTICAL),
 			NWidget(NWID_HORIZONTAL),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, TDW_SORTNAME), SetMinimalSize(99, 12), SetDataTip(STR_SORT_BY_NAME, STR_SORT_ORDER_TIP), SetFill(1, 0),
-				NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, TDW_SORTPOPULATION), SetMinimalSize(97, 12), SetDataTip(STR_SORT_BY_POPULATION, STR_SORT_ORDER_TIP), SetFill(1, 0),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, TDW_SORTNAME), SetMinimalSize(99, 12), SetDataTip(STR_SORT_BY_NAME, STR_TOOLTIP_SORT_ORDER), SetFill(1, 0),
+				NWidget(WWT_PUSHTXTBTN, COLOUR_BROWN, TDW_SORTPOPULATION), SetMinimalSize(97, 12), SetDataTip(STR_SORT_BY_POPULATION, STR_TOOLTIP_SORT_ORDER), SetFill(1, 0),
 			EndContainer(),
 			NWidget(WWT_PANEL, COLOUR_BROWN, TDW_CENTERTOWN), SetMinimalSize(196, 164), SetDataTip(0x0, STR_TOWN_DIRECTORY_LIST_TOOLTIP),
 							SetFill(1, 0), SetResize(0, 10), EndContainer(),
@@ -818,7 +818,7 @@ static const NWidgetPart _nested_found_town_widgets[] = {
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_RANDOMTOWN), SetMinimalSize(156, 12), SetFill(1, 0),
 										SetDataTip(STR_FOUND_TOWN_RANDOM_TOWN_BUTTON, STR_FOUND_TOWN_RANDOM_TOWN_TOOLTIP), SetPadding(0, 2, 1, 2),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_MANYRANDOMTOWNS), SetMinimalSize(156, 12), SetFill(1, 0),
-										SetDataTip(STR_MANY_RANDOM_TOWNS, STR_RANDOM_TOWNS_TIP), SetPadding(0, 2, 0, 2),
+										SetDataTip(STR_FOUND_TOWN_MANY_RANDOM_TOWNS, STR_FOUND_TOWN_RANDOM_TOWNS_TOOLTIP), SetPadding(0, 2, 0, 2),
 		/* Town size selection. */
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetFill(1, 0),
@@ -836,7 +836,7 @@ static const NWidgetPart _nested_found_town_widgets[] = {
 			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_SIZE_LARGE), SetMinimalSize(78, 12), SetFill(1, 0),
 										SetDataTip(STR_FOUND_TOWN_INITIAL_SIZE_LARGE_BUTTON, STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP),
 			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_SIZE_RANDOM), SetMinimalSize(78, 12), SetFill(1, 0),
-										SetDataTip(STR_SELECT_TOWN_SIZE_RANDOM, STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP),
+										SetDataTip(STR_FOUND_TOWN_SIZE_RANDOM, STR_FOUND_TOWN_INITIAL_SIZE_TOOLTIP),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 3),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_CITY), SetPadding(0, 2, 0, 2), SetMinimalSize(156, 12), SetFill(1, 0),
@@ -844,21 +844,21 @@ static const NWidgetPart _nested_found_town_widgets[] = {
 		/* Town roads selection. */
 		NWidget(NWID_HORIZONTAL),
 			NWidget(NWID_SPACER), SetFill(1, 0),
-			NWidget(WWT_LABEL, COLOUR_DARK_GREEN, TSEW_TOWNLAYOUT), SetMinimalSize(148, 14), SetDataTip(STR_TOWN_ROAD_LAYOUT, STR_NULL),
+			NWidget(WWT_LABEL, COLOUR_DARK_GREEN, TSEW_TOWNLAYOUT), SetMinimalSize(148, 14), SetDataTip(STR_FOUND_TOWN_ROAD_LAYOUT, STR_NULL),
 			NWidget(NWID_SPACER), SetFill(1, 0),
 		EndContainer(),
 		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(2, 0, 2),
-			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_ORIGINAL), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_SELECT_LAYOUT_ORIGINAL, STR_SELECT_TOWN_ROAD_LAYOUT),
-			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_BETTER), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_SELECT_LAYOUT_BETTER_ROADS, STR_SELECT_TOWN_ROAD_LAYOUT),
+			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_ORIGINAL), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_FOUND_TOWN_SELECT_LAYOUT_ORIGINAL, STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT),
+			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_BETTER), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_FOUND_TOWN_SELECT_LAYOUT_BETTER_ROADS, STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 		NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(2, 0, 2),
-			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_GRID2), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_SELECT_LAYOUT_2X2_GRID, STR_SELECT_TOWN_ROAD_LAYOUT),
-			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_GRID3), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_SELECT_LAYOUT_3X3_GRID, STR_SELECT_TOWN_ROAD_LAYOUT),
+			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_GRID2), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_FOUND_TOWN_SELECT_LAYOUT_2X2_GRID, STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT),
+			NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_GRID3), SetMinimalSize(78, 12), SetFill(1, 0), SetDataTip(STR_FOUND_TOWN_SELECT_LAYOUT_3X3_GRID, STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT),
 		EndContainer(),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 		NWidget(WWT_TEXTBTN, COLOUR_GREY, TSEW_LAYOUT_RANDOM), SetPadding(0, 2, 0, 2), SetMinimalSize(0, 12), SetFill(1, 0),
-										SetDataTip(STR_SELECT_LAYOUT_RANDOM, STR_SELECT_TOWN_ROAD_LAYOUT), SetFill(1, 0),
+										SetDataTip(STR_FOUND_TOWN_SELECT_LAYOUT_RANDOM, STR_FOUND_TOWN_SELECT_TOWN_ROAD_LAYOUT), SetFill(1, 0),
 		NWidget(NWID_SPACER), SetMinimalSize(0, 2),
 	EndContainer(),
 };
@@ -916,7 +916,7 @@ public:
 				_generating_world = false;
 
 				if (t == NULL) {
-					ShowErrorMessage(STR_NO_SPACE_FOR_TOWN, STR_CANNOT_GENERATE_TOWN, 0, 0);
+					ShowErrorMessage(STR_ERROR_NO_SPACE_FOR_TOWN, STR_ERROR_CAN_T_GENERATE_TOWN, 0, 0);
 				} else {
 					ScrollMainWindowToTile(t->xy);
 				}
@@ -928,7 +928,7 @@ public:
 				_generating_world = true;
 				UpdateNearestTownForRoadTiles(true);
 				if (!GenerateTowns(town_layout)) {
-					ShowErrorMessage(STR_NO_SPACE_FOR_TOWN, STR_CANNOT_GENERATE_TOWN, 0, 0);
+					ShowErrorMessage(STR_ERROR_NO_SPACE_FOR_TOWN, STR_ERROR_CAN_T_GENERATE_TOWN, 0, 0);
 				}
 				UpdateNearestTownForRoadTiles(false);
 				_generating_world = false;
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index 00c08ca7b..59850b0c3 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -829,7 +829,7 @@ static void AddRearEngineToMultiheadedTrain(Train *v)
 CommandCost CmdBuildRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
 {
 	/* Check if the engine-type is valid (for the company) */
-	if (!IsEngineBuildable(p1, VEH_TRAIN, _current_company)) return_cmd_error(STR_RAIL_VEHICLE_NOT_AVAILABLE);
+	if (!IsEngineBuildable(p1, VEH_TRAIN, _current_company)) return_cmd_error(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE);
 
 	const Engine *e = Engine::Get(p1);
 	CommandCost value(EXPENSES_NEW_VEHICLES, e->GetCost());
@@ -1241,7 +1241,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, u
 				if (callback != CALLBACK_FAILED) {
 					StringID error = STR_NULL;
 
-					if (callback == 0xFD) error = STR_INCOMPATIBLE_RAIL_TYPES;
+					if (callback == 0xFD) error = STR_ERROR_INCOMPATIBLE_RAIL_TYPES;
 					if (callback < 0xFD) error = GetGRFStringID(GetEngineGRFID(dst_head->engine_type), 0xD000 + callback);
 
 					if (error != STR_NULL) {
@@ -1443,7 +1443,7 @@ CommandCost CmdSellRailWagon(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 	if (p2 > 1) return CMD_ERROR;
 
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_SELL_DESTROYED_VEHICLE);
 
 	v = v->GetFirstEnginePart();
 	Train *first = v->First();
@@ -2086,7 +2086,7 @@ CommandCost CmdRefitRailVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1,
 	if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR;
 
 	if (CheckTrainStoppedInDepot(v) < 0) return_cmd_error(STR_TRAIN_MUST_BE_STOPPED);
-	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE);
+	if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_ERROR_CAN_T_REFIT_DESTROYED_VEHICLE);
 
 	/* Check cargo */
 	if (new_cid >= NUM_CARGO) return CMD_ERROR;
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index c2c6a8afd..1a8209119 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -282,7 +282,7 @@ void DrawTrainDetails(const Train *v, int left, int right, int y, int vscroll_po
 		}
 
 		/* draw total cargo tab */
-		DrawString(left, right, y + 2, STR_TOTAL_CAPACITY_TEXT);
+		DrawString(left, right, y + 2, STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_TEXT);
 		for (CargoID i = 0; i < NUM_CARGO; i++) {
 			if (max_cargo[i] > 0 && --vscroll_pos < 0 && vscroll_pos > -vscroll_cap) {
 				y += 14;
@@ -291,10 +291,10 @@ void DrawTrainDetails(const Train *v, int left, int right, int y, int vscroll_po
 				SetDParam(2, i);            // {SHORTCARGO} #1
 				SetDParam(3, max_cargo[i]); // {SHORTCARGO} #2
 				SetDParam(4, _settings_game.vehicle.freight_trains);
-				DrawString(left, right, y + 2, FreightWagonMult(i) > 1 ? STR_TOTAL_CAPACITY_MULT : STR_TOTAL_CAPACITY);
+				DrawString(left, right, y + 2, FreightWagonMult(i) > 1 ? STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY_MULT : STR_VEHICLE_DETAILS_TRAIN_TOTAL_CAPACITY);
 			}
 		}
 		SetDParam(0, feeder_share);
-		DrawString(left, right, y + 15, STR_FEEDER_CARGO_VALUE);
+		DrawString(left, right, y + 15, STR_VEHICLE_INFO_FEEDER_CARGO_VALUE);
 	}
 }
diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp
index 30908dfd2..5078c33fd 100644
--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@@ -126,22 +126,22 @@ public:
 static const NWidgetPart _nested_transparency_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN, TTW_WIDGET_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, TTW_WIDGET_CAPTION), SetDataTip(STR_TRANSPARENCY_TOOLB, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, TTW_WIDGET_CAPTION), SetDataTip(STR_TRANSPARENCY_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN, TTW_WIDGET_STICKYBOX),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_SIGNS), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_SIGN, STR_TRANSPARENT_SIGNS_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_TREES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_PLANTTREES, STR_TRANSPARENT_TREES_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_HOUSES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_TOWN, STR_TRANSPARENT_HOUSES_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_INDUSTRIES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_INDUSTRY, STR_TRANSPARENT_INDUSTRIES_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_BUILDINGS), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_BRIDGES), SetMinimalSize(43, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BRIDGE, STR_TRANSPARENT_BRIDGES_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_STRUCTURES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_TRANSMITTER, STR_TRANSPARENT_STRUCTURES_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_CATENARY), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_BUILD_X_ELRAIL, STR_TRANSPARENT_CATENARY_DESC),
-		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_LOADING), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_TRAINLIST, STR_TRANSPARENT_LOADING_DESC),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_SIGNS), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_SIGN, STR_TRANSPARENT_SIGNS_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_TREES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_PLANTTREES, STR_TRANSPARENT_TREES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_HOUSES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_TOWN, STR_TRANSPARENT_HOUSES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_INDUSTRIES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_INDUSTRY, STR_TRANSPARENT_INDUSTRIES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_BUILDINGS), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_COMPANY_LIST, STR_TRANSPARENT_BUILDINGS_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_BRIDGES), SetMinimalSize(43, 22), SetFill(0, 1), SetDataTip(SPR_IMG_BRIDGE, STR_TRANSPARENT_BRIDGES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_STRUCTURES), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_TRANSMITTER, STR_TRANSPARENT_STRUCTURES_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_CATENARY), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_BUILD_X_ELRAIL, STR_TRANSPARENT_CATENARY_TOOLTIP),
+		NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, TTW_WIDGET_LOADING), SetMinimalSize(22, 22), SetFill(0, 1), SetDataTip(SPR_IMG_TRAINLIST, STR_TRANSPARENT_LOADING_TOOLTIP),
 	EndContainer(),
 	/* Panel with 'inivisibility' buttons. */
-	NWidget(WWT_PANEL, COLOUR_DARK_GREEN, TTW_WIDGET_END), SetMinimalSize(219, 13), SetDataTip(0x0, STR_TRANSPARENT_INVISIBLE_DESC),
+	NWidget(WWT_PANEL, COLOUR_DARK_GREEN, TTW_WIDGET_END), SetMinimalSize(219, 13), SetDataTip(0x0, STR_TRANSPARENT_INVISIBLE_TOOLTIP),
 	EndContainer(),
 };
 
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index 653ba8bd5..522772442 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -549,9 +549,9 @@ static void GetTileDesc_Trees(TileIndex tile, TileDesc *td)
 	TreeType tt = GetTreeType(tile);
 
 	if (IsInsideMM(tt, TREE_RAINFOREST, TREE_CACTUS)) {
-		td->str = STR_TREE_NAME_RAINFOREST;
+		td->str = STR_LAI_TREE_NAME_RAINFOREST;
 	} else {
-		td->str = tt == TREE_CACTUS ? STR_TREE_NAME_CACTUS_PLANTS : STR_TREE_NAME_TREES;
+		td->str = tt == TREE_CACTUS ? STR_LAI_TREE_NAME_CACTUS_PLANTS : STR_LAI_TREE_NAME_TREES;
 	}
 
 	td->owner[0] = GetTileOwner(tile);
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index 3bdc0a838..c46351034 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -170,7 +170,7 @@ static const Widget _build_trees_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,        37,    70,   110,   155, 0x0,                           STR_PLANT_TREE_TOOLTIP},             // BTW_TYPE_32
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,        72,   105,   110,   155, 0x0,                           STR_PLANT_TREE_TOOLTIP},             // BTW_TYPE_33
 {      WWT_PANEL,   RESIZE_NONE,  COLOUR_GREY,       107,   140,   110,   155, 0x0,                           STR_PLANT_TREE_TOOLTIP},             // BTW_TYPE_34
-{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,         2,   140,   157,   168, STR_TREES_RANDOM_TYPE,         STR_TREES_RANDOM_TYPE_TIP},          // BTW_TYPE_RANDOM
+{    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,         2,   140,   157,   168, STR_TREES_RANDOM_TYPE,         STR_TREES_RANDOM_TYPE_TOOLTIP},          // BTW_TYPE_RANDOM
 {    WWT_TEXTBTN,   RESIZE_NONE,  COLOUR_GREY,         2,   140,   170,   181, STR_TREES_RANDOM_TREES_BUTTON, STR_TREES_RANDOM_TREES_TOOLTIP},     // BTW_MANY_RANDOM
 {    WIDGETS_END},
 };
@@ -227,7 +227,7 @@ static const NWidgetPart _nested_build_trees_widgets[] = {
 					EndContainer(),
 				EndContainer(),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
-				NWidget(WWT_TEXTBTN, COLOUR_GREY, BTW_TYPE_RANDOM), SetMinimalSize(139, 12), SetDataTip(STR_TREES_RANDOM_TYPE, STR_TREES_RANDOM_TYPE_TIP),
+				NWidget(WWT_TEXTBTN, COLOUR_GREY, BTW_TYPE_RANDOM), SetMinimalSize(139, 12), SetDataTip(STR_TREES_RANDOM_TYPE, STR_TREES_RANDOM_TYPE_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 1),
 				NWidget(WWT_TEXTBTN, COLOUR_GREY, BTW_MANY_RANDOM), SetMinimalSize(139, 12), SetDataTip(STR_TREES_RANDOM_TREES_BUTTON, STR_TREES_RANDOM_TREES_TOOLTIP),
 				NWidget(NWID_SPACER), SetMinimalSize(0, 2),
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp
index b57095768..3858c3603 100644
--- a/src/tunnelbridge_cmd.cpp
+++ b/src/tunnelbridge_cmd.cpp
@@ -214,7 +214,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, DoCommandFlag flags, uint32 p1, u
 	TileIndex tile_end = end_tile;
 
 	if (tile_start == tile_end) {
-		return_cmd_error(STR_ERROR_CANNOT_START_AND_END_ON);
+		return_cmd_error(STR_ERROR_CAN_T_START_AND_END_ON);
 	}
 
 	Axis direction;
@@ -247,7 +247,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, DoCommandFlag flags, uint32 p1, u
 	CommandCost terraform_cost_north = CheckBridgeSlopeNorth(direction, &tileh_start, &z_start);
 	CommandCost terraform_cost_south = CheckBridgeSlopeSouth(direction, &tileh_end,   &z_end);
 
-	if (z_start != z_end) return_cmd_error(STR_BRIDGEHEADS_NOT_SAME_HEIGHT);
+	if (z_start != z_end) return_cmd_error(STR_ERROR_BRIDGEHEADS_NOT_SAME_HEIGHT);
 
 	if (IsBridgeTile(tile_start) && IsBridgeTile(tile_end) &&
 			GetOtherBridgeEnd(tile_start) == tile_end &&
@@ -330,7 +330,7 @@ CommandCost CmdBuildBridge(TileIndex end_tile, DoCommandFlag flags, uint32 p1, u
 
 		TileIndexDiff delta = (direction == AXIS_X ? TileDiffXY(1, 0) : TileDiffXY(0, 1));
 		for (TileIndex tile = tile_start + delta; tile != tile_end; tile += delta) {
-			if (GetTileMaxZ(tile) > z_start) return_cmd_error(STR_BRIDGE_TOO_LOW_FOR_TERRAIN);
+			if (GetTileMaxZ(tile) > z_start) return_cmd_error(STR_ERROR_BRIDGE_TOO_LOW_FOR_TERRAIN);
 
 			if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) {
 				/* Disallow crossing bridges for the time being */
@@ -495,7 +495,7 @@ CommandCost CmdBuildTunnel(TileIndex start_tile, DoCommandFlag flags, uint32 p1,
 	Slope end_tileh;
 	for (;;) {
 		end_tile += delta;
-		if (!IsValidTile(end_tile)) return_cmd_error(STR_TUNNEL_THROUGH_MAP_BORDER);
+		if (!IsValidTile(end_tile)) return_cmd_error(STR_ERROR_TUNNEL_THROUGH_MAP_BORDER);
 		end_tileh = GetTileSlope(end_tile, &end_z);
 
 		if (start_z == end_z) break;
@@ -1229,9 +1229,9 @@ static void GetTileDesc_TunnelBridge(TileIndex tile, TileDesc *td)
 	TransportType tt = GetTunnelBridgeTransportType(tile);
 
 	if (IsTunnel(tile)) {
-		td->str = (tt == TRANSPORT_RAIL) ? STR_TUNNEL_DESCRIPTION_RAILROAD : STR_TUNNEL_DESCRIPTION_ROAD;
+		td->str = (tt == TRANSPORT_RAIL) ? STR_LAI_TUNNEL_DESCRIPTION_RAILROAD : STR_LAI_TUNNEL_DESCRIPTION_ROAD;
 	} else { // IsBridge(tile)
-		td->str = (tt == TRANSPORT_WATER) ? STR_BRIDGE_DESCRIPTION_AQUEDUCT : GetBridgeSpec(GetBridgeType(tile))->transport_name[tt];
+		td->str = (tt == TRANSPORT_WATER) ? STR_LAI_BRIDGE_DESCRIPTION_AQUEDUCT : GetBridgeSpec(GetBridgeType(tile))->transport_name[tt];
 	}
 	td->owner[0] = GetTileOwner(tile);
 
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp
index 8c76b010e..6c99cad7a 100644
--- a/src/vehicle_cmd.cpp
+++ b/src/vehicle_cmd.cpp
@@ -70,7 +70,7 @@ CommandCost CmdStartStopVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1,
 
 	switch (v->type) {
 		case VEH_TRAIN:
-			if ((v->vehstatus & VS_STOPPED) && Train::From(v)->tcache.cached_power == 0) return_cmd_error(STR_TRAIN_START_NO_CATENARY);
+			if ((v->vehstatus & VS_STOPPED) && Train::From(v)->tcache.cached_power == 0) return_cmd_error(STR_ERROR_TRAIN_START_NO_CATENARY);
 			break;
 
 		case VEH_SHIP:
@@ -517,7 +517,7 @@ CommandCost CmdRenameVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_VEHICLE_NAME_BYTES) return CMD_ERROR;
-		if (!(flags & DC_AUTOREPLACE) && !IsUniqueVehicleName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!(flags & DC_AUTOREPLACE) && !IsUniqueVehicleName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 3d9724a9c..335094a43 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -390,7 +390,7 @@ static const Widget _vehicle_refit_widgets[] = {
 	{  WWT_SCROLLBAR, RESIZE_BOTTOM,  COLOUR_GREY,   228,   239,    28,   139, 0x0,               STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST}, // VRW_SCROLLBAR
 	{      WWT_PANEL,     RESIZE_TB,  COLOUR_GREY,     0,   239,   140,   161, 0x0,               STR_NULL},                             // VRW_INFOPANEL
 	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   227,   162,   173, 0x0,               STR_NULL},                             // VRW_REFITBUTTON
-	{  WWT_RESIZEBOX,     RESIZE_TB,  COLOUR_GREY,   228,   239,   162,   173, 0x0,               STR_RESIZE_BUTTON},                    // VRW_RESIZEBOX
+	{  WWT_RESIZEBOX,     RESIZE_TB,  COLOUR_GREY,   228,   239,   162,   173, 0x0,               STR_TOOLTIP_RESIZE},                    // VRW_RESIZEBOX
 	{   WIDGETS_END},
 };
 
@@ -682,22 +682,22 @@ enum VehicleListWindowWidgets {
 static const Widget _vehicle_list_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,     0,    10,     0,    13, STR_BLACK_CROSS,      STR_TOOLTIP_CLOSE_WINDOW},
 	{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,    11,   247,     0,    13, 0x0,                  STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},
-	{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   248,   259,     0,    13, 0x0,                  STR_STICKY_BUTTON},
-	{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    80,    14,    25, STR_SORT_BY,          STR_SORT_ORDER_TIP},
-	{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_GREY,    81,   247,    14,    25, 0x0,                  STR_SORT_CRITERIA_TIP},
+	{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY,   248,   259,     0,    13, 0x0,                  STR_TOOLTIP_STICKY},
+	{ WWT_PUSHTXTBTN,   RESIZE_NONE,  COLOUR_GREY,     0,    80,    14,    25, STR_BUTTON_SORT_BY,          STR_TOOLTIP_SORT_ORDER},
+	{   WWT_DROPDOWN,   RESIZE_NONE,  COLOUR_GREY,    81,   247,    14,    25, 0x0,                  STR_TOOLTIP_SORT_CRITERIAP},
 	{      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,   248,   259,    14,    25, 0x0,                  STR_NULL},
 	{     WWT_MATRIX,     RESIZE_RB,  COLOUR_GREY,     0,   247,    26,   181, 0x0,                  STR_NULL},
 	{  WWT_SCROLLBAR,    RESIZE_LRB,  COLOUR_GREY,   248,   259,    26,   181, 0x0,                  STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST},
 	/* Widget to be shown for other companies hiding the following 6 widgets */
 	{      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,     0,   247,   182,   193, 0x0,                  STR_NULL},
 
-	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   105,   182,   193, 0x0,                  STR_AVAILABLE_ENGINES_TIP},
-	{   WWT_DROPDOWN,     RESIZE_TB,  COLOUR_GREY,   106,   223,   182,   193, STR_MANAGE_LIST,      STR_MANAGE_LIST_TIP},
+	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,     0,   105,   182,   193, 0x0,                  STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP},
+	{   WWT_DROPDOWN,     RESIZE_TB,  COLOUR_GREY,   106,   223,   182,   193, STR_VEHICLE_LIST_MANAGE_LIST,      STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP},
 
-	{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   224,   235,   182,   193, SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP},
-	{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   236,   247,   182,   193, SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP},
+	{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   224,   235,   182,   193, SPR_FLAG_VEH_STOPPED, STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP},
+	{ WWT_PUSHIMGBTN,     RESIZE_TB,  COLOUR_GREY,   236,   247,   182,   193, SPR_FLAG_VEH_RUNNING, STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP},
 	{      WWT_PANEL,    RESIZE_RTB,  COLOUR_GREY,   248,   247,   182,   193, 0x0,                  STR_NULL},
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   248,   259,   182,   193, 0x0,                  STR_RESIZE_BUTTON},
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY,   248,   259,   182,   193, 0x0,                  STR_TOOLTIP_RESIZE},
 	{   WIDGETS_END},
 };
 
@@ -709,8 +709,8 @@ static const NWidgetPart _nested_vehicle_list[] = {
 	EndContainer(),
 
 	NWidget(NWID_HORIZONTAL),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLW_WIDGET_SORT_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_SORT_BY, STR_SORT_ORDER_TIP),
-		NWidget(WWT_DROPDOWN, COLOUR_GREY, VLW_WIDGET_SORT_BY_PULLDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_SORT_CRITERIA_TIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLW_WIDGET_SORT_ORDER), SetMinimalSize(81, 12), SetDataTip(STR_BUTTON_SORT_BY, STR_TOOLTIP_SORT_ORDER),
+		NWidget(WWT_DROPDOWN, COLOUR_GREY, VLW_WIDGET_SORT_BY_PULLDOWN), SetMinimalSize(167, 12), SetDataTip(0x0, STR_TOOLTIP_SORT_CRITERIAP),
 		NWidget(WWT_PANEL, COLOUR_GREY, VLW_WIDGET_EMPTY_TOP_RIGHT), SetMinimalSize(12, 12), SetResize(1, 0),
 		EndContainer(),
 	EndContainer(),
@@ -725,13 +725,13 @@ static const NWidgetPart _nested_vehicle_list[] = {
 		NWidget(WWT_PANEL, COLOUR_GREY, VLW_WIDGET_OTHER_COMPANY_FILLER),
 			NWidget(NWID_HORIZONTAL),
 				NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, VLW_WIDGET_AVAILABLE_VEHICLES), SetMinimalSize(106, 12),
-								SetDataTip(0x0, STR_AVAILABLE_ENGINES_TIP),
+								SetDataTip(0x0, STR_VEHICLE_LIST_AVAILABLE_ENGINES_TOOLTIP),
 				NWidget(WWT_DROPDOWN, COLOUR_GREY, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN), SetMinimalSize(118, 12),
-								SetDataTip(STR_MANAGE_LIST, STR_MANAGE_LIST_TIP),
+								SetDataTip(STR_VEHICLE_LIST_MANAGE_LIST, STR_VEHICLE_LIST_MANAGE_LIST_TOOLTIP),
 				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, VLW_WIDGET_STOP_ALL), SetMinimalSize(12, 12),
-								SetDataTip(SPR_FLAG_VEH_STOPPED, STR_MASS_STOP_LIST_TIP),
+								SetDataTip(SPR_FLAG_VEH_STOPPED, STR_VEHICLE_LIST_MASS_STOP_LIST_TOOLTIP),
 				NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, VLW_WIDGET_START_ALL), SetMinimalSize(12, 12),
-								SetDataTip(SPR_FLAG_VEH_RUNNING, STR_MASS_START_LIST_TIP),
+								SetDataTip(SPR_FLAG_VEH_RUNNING, STR_VEHICLE_LIST_MASS_START_LIST_TOOLTIP),
 				NWidget(WWT_PANEL, COLOUR_GREY, VLW_WIDGET_EMPTY_BOTTOM_RIGHT), SetMinimalSize(0, 12), SetResize(1, 0),
 				EndContainer(),
 			EndContainer(),
@@ -753,7 +753,7 @@ static void DrawSmallOrderList(const Vehicle *v, int left, int right, int y)
 
 		if (order->IsType(OT_GOTO_STATION)) {
 			SetDParam(0, order->GetDestination());
-			DrawString(left, right, y, STR_ORDER_STATION_SMALL);
+			DrawString(left, right, y, STR_TINY_BLACK_STATIONL);
 
 			y += 6;
 			if (++i == 4) break;
@@ -803,11 +803,11 @@ void BaseVehicleListWindow::DrawVehicleListItems(int x, VehicleID selected_vehic
 		if (v->name != NULL) {
 			/* The vehicle got a name so we will print it */
 			SetDParam(0, v->index);
-			DrawString(x + 19, this->widget[VLW_WIDGET_LIST].right, y, STR_VEHICLE_NAME_SMALL);
+			DrawString(x + 19, this->widget[VLW_WIDGET_LIST].right, y, STR_TINY_BLACK_VEHICLE);
 		} else if (v->group_id != DEFAULT_GROUP) {
 			/* The vehicle has no name, but is member of a group, so print group name */
 			SetDParam(0, v->group_id);
-			DrawString(x + 19, this->widget[VLW_WIDGET_LIST].right, y, STR_GROUP_TINY_NAME, TC_BLACK);
+			DrawString(x + 19, this->widget[VLW_WIDGET_LIST].right, y, STR_TINT_GROUP, TC_BLACK);
 		}
 
 		if (this->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, this->widget[VLW_WIDGET_LIST].right, y);
@@ -848,10 +848,10 @@ struct VehicleListWindow : public BaseVehicleListWindow {
 
 		/* Set up the window widgets */
 		this->widget[VLW_WIDGET_LIST].tooltips           = STR_VEHICLE_LIST_TRAIN_LIST_TOOLTIP + this->vehicle_type;
-		this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS + this->vehicle_type;
+		this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_VEHICLE_LIST_AVAILABLE_TRAINS + this->vehicle_type;
 
 		if (window_type == VLW_SHARED_ORDERS) {
-			this->widget[VLW_WIDGET_CAPTION].data = STR_VEH_WITH_SHARED_ORDERS_LIST;
+			this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHARED_ORDERS_LIST_CAPTION;
 		} else {
 			this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vehicle_type;
 		}
@@ -1015,17 +1015,17 @@ struct VehicleListWindow : public BaseVehicleListWindow {
 
 			case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
 				static StringID action_str[] = {
-					STR_REPLACE_VEHICLES,
-					STR_SEND_FOR_SERVICING,
+					STR_VEHICLE_LIST_REPLACE_VEHICLES,
+					STR_VEHICLE_LIST_SEND_FOR_SERVICING,
 					STR_NULL,
 					INVALID_STRING_ID
 				};
 
 				static const StringID depot_name[] = {
-					STR_SEND_TRAIN_TO_DEPOT,
-					STR_SEND_ROAD_VEHICLE_TO_DEPOT,
-					STR_SEND_SHIP_TO_DEPOT,
-					STR_SEND_AIRCRAFT_TO_HANGAR
+					STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT,
+					STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT,
+					STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT,
+					STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR
 				};
 
 				/* XXX - Substite string since the dropdown cannot handle dynamic strings */
@@ -1199,7 +1199,7 @@ static const Widget _vehicle_details_widgets[] = {
 	{   WWT_CLOSEBOX,   RESIZE_NONE,  COLOUR_GREY,   0,  10,   0,  13, STR_BLACK_CROSS,                    STR_TOOLTIP_CLOSE_WINDOW},                      // VLD_WIDGET_CLOSEBOX
 	{    WWT_CAPTION,  RESIZE_RIGHT,  COLOUR_GREY,  11, 352,   0,  13, STR_VEHICLE_DETAILS_CAPTION,        STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS},            // VLD_WIDGET_CAPTION
 	{ WWT_PUSHTXTBTN,     RESIZE_LR,  COLOUR_GREY, 353, 392,   0,  13, STR_VEHICLE_NAME_BUTTON,            STR_NULL /* filled in later */},                // VLD_WIDGET_RENAME_VEHICLE
-	{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY, 393, 404,   0,  13, STR_NULL,                           STR_STICKY_BUTTON},                             // VLD_WIDGET_STICKY
+	{  WWT_STICKYBOX,     RESIZE_LR,  COLOUR_GREY, 393, 404,   0,  13, STR_NULL,                           STR_TOOLTIP_STICKY},                             // VLD_WIDGET_STICKY
 	{      WWT_PANEL,  RESIZE_RIGHT,  COLOUR_GREY,   0, 404,  14,  55, 0x0,                                STR_NULL},                                      // VLD_WIDGET_TOP_DETAILS
 	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,   0,  10, 101, 106, STR_BLACK_SMALL_ARROW_UP,           STR_VEHICLE_DETAILS_INCREASE_SERVICING_INTERVAL_TOOLTIP},   // VLD_WIDGET_INCREASE_SERVICING_INTERVAL
 	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,   0,  10, 107, 112, STR_BLACK_SMALL_ARROW_DOWN,         STR_VEHICLE_DETAILS_DECREASE_SERVICING_INTERVAL_TOOLTIP},   // VLD_WIDGET_DECREASE_SERVICING_INTERVAL
@@ -1210,7 +1210,7 @@ static const Widget _vehicle_details_widgets[] = {
 	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY,  96, 194, 113, 124, STR_VEHICLE_DETAIL_TAB_INFORMATION, STR_VEHICLE_DETAILS_TRAIN_INFORMATION_TOOLTIP}, // VLD_WIDGET_DETAILS_TRAIN_VEHICLES
 	{ WWT_PUSHTXTBTN,     RESIZE_TB,  COLOUR_GREY, 195, 293, 113, 124, STR_VEHICLE_DETAIL_TAB_CAPACITIES,  STR_VEHICLE_DETAILS_TRAIN_CAPACITIES_TOOLTIP},  // VLD_WIDGET_DETAILS_CAPACITY_OF_EACH
 	{ WWT_PUSHTXTBTN,    RESIZE_RTB,  COLOUR_GREY, 294, 392, 113, 124, STR_VEHICLE_DETAIL_TAB_TOTAL_CARGO, STR_VEHICLE_DETAILS_TRAIN_TOTAL_CARGO_TOOLTIP}, // VLD_WIDGET_DETAILS_TOTAL_CARGO
-	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY, 393, 404, 113, 124, 0x0,                                STR_RESIZE_BUTTON},                             // VLD_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,   RESIZE_LRTB,  COLOUR_GREY, 393, 404, 113, 124, 0x0,                                STR_TOOLTIP_RESIZE},                             // VLD_WIDGET_RESIZE
 	{   WIDGETS_END},
 };
 
@@ -1374,7 +1374,7 @@ struct VehicleDetailsWindow : Window {
 
 		/* Draw running cost */
 		SetDParam(1, v->age / DAYS_IN_LEAP_YEAR);
-		SetDParam(0, (v->age + DAYS_IN_YEAR < v->max_age) ? STR_AGE : STR_AGE_RED);
+		SetDParam(0, (v->age + DAYS_IN_YEAR < v->max_age) ? STR_VEHICLE_INFO_AGE : STR_VEHICLE_INFO_AGE_RED);
 		SetDParam(2, v->max_age / DAYS_IN_LEAP_YEAR);
 		SetDParam(3, v->GetDisplayRunningCost());
 		DrawString(2, this->width - 2, 15, STR_VEHICLE_INFO_AGE_RUNNING_COST_YR);
@@ -1512,7 +1512,7 @@ static void ShowVehicleDetailsWindow(const Vehicle *v)
 static const Widget _vehicle_view_widgets[] = {
 	{   WWT_CLOSEBOX,  RESIZE_NONE,  COLOUR_GREY,   0,  10,   0,  13, STR_BLACK_CROSS,          STR_TOOLTIP_CLOSE_WINDOW },           // VVW_WIDGET_CLOSEBOX
 	{    WWT_CAPTION, RESIZE_RIGHT,  COLOUR_GREY,  11, 237,   0,  13, STR_VEHICLE_VIEW_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS }, // VVW_WIDGET_CAPTION
-	{  WWT_STICKYBOX,    RESIZE_LR,  COLOUR_GREY, 238, 249,   0,  13, 0x0,                      STR_STICKY_BUTTON },                  // VVW_WIDGET_STICKY
+	{  WWT_STICKYBOX,    RESIZE_LR,  COLOUR_GREY, 238, 249,   0,  13, 0x0,                      STR_TOOLTIP_STICKY },                  // VVW_WIDGET_STICKY
 	{      WWT_PANEL,    RESIZE_RB,  COLOUR_GREY,   0, 231,  14, 103, 0x0,                      STR_NULL },                           // VVW_WIDGET_PANEL
 	{      WWT_INSET,    RESIZE_RB,  COLOUR_GREY,   2, 229,  16, 101, 0x0,                      STR_NULL },                           // VVW_WIDGET_VIEWPORT
 	{    WWT_PUSHBTN,   RESIZE_RTB,  COLOUR_GREY,   0, 237, 104, 115, 0x0,                      0x0 /* filled later */ },             // VVW_WIDGET_START_STOP_VEH
@@ -1523,7 +1523,7 @@ static const Widget _vehicle_view_widgets[] = {
 	{ WWT_PUSHIMGBTN,    RESIZE_LR,  COLOUR_GREY, 232, 249,  86, 103, SPR_SHOW_VEHICLE_DETAILS, 0x0 /* filled later */ },             // VVW_WIDGET_SHOW_DETAILS
 	{ WWT_PUSHIMGBTN,    RESIZE_LR,  COLOUR_GREY, 232, 249,  32,  49, 0x0 /* filled later */,   0x0 /* filled later */ },             // VVW_WIDGET_CLONE_VEH
 	{      WWT_PANEL,   RESIZE_LRB,  COLOUR_GREY, 232, 249, 104, 103, 0x0,                      STR_NULL },                           // VVW_WIDGET_EMPTY_BOTTOM_RIGHT
-	{  WWT_RESIZEBOX,  RESIZE_LRTB,  COLOUR_GREY, 238, 249, 104, 115, 0x0,                      STR_RESIZE_BUTTON },                  // VVW_WIDGET_RESIZE
+	{  WWT_RESIZEBOX,  RESIZE_LRTB,  COLOUR_GREY, 238, 249, 104, 115, 0x0,                      STR_TOOLTIP_RESIZE },                  // VVW_WIDGET_RESIZE
 	{ WWT_PUSHIMGBTN,    RESIZE_LR,  COLOUR_GREY, 232, 249,  50,  67, SPR_FORCE_VEHICLE_TURN,   STR_VEHICLE_VIEW_ROAD_VEHICLE_REVERSE_TOOLTIP }, // VVW_WIDGET_TURN_AROUND
 	{ WWT_PUSHIMGBTN,    RESIZE_LR,  COLOUR_GREY, 232, 249,  50,  67, SPR_IGNORE_SIGNALS,       STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP }, // VVW_WIDGET_FORCE_PROCEED
 {   WIDGETS_END},
@@ -1662,7 +1662,7 @@ struct VehicleViewWindow : Window {
 		this->widget[VVW_WIDGET_GOTO_DEPOT].tooltips       = STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP + v->type;
 		this->widget[VVW_WIDGET_SHOW_ORDERS].tooltips      = STR_VEHICLE_VIEW_TRAIN_ORDERS_TOOLTIP + v->type;
 		this->widget[VVW_WIDGET_SHOW_DETAILS].tooltips     = STR_VEHICLE_VIEW_TRAIN_SHOW_DETAILS_TOOLTIP + v->type;
-		this->widget[VVW_WIDGET_CLONE_VEH].tooltips        = STR_CLONE_TRAIN_INFO + v->type;
+		this->widget[VVW_WIDGET_CLONE_VEH].tooltips        = STR_VEHICLE_VIEW_CLONE_TRAIN_INFO + v->type;
 
 		/*
 		 * fill in data and tooltip codes for the widgets and
@@ -1771,25 +1771,25 @@ struct VehicleViewWindow : Window {
 			if (v->type == VEH_TRAIN) {
 				if (v->cur_speed == 0) {
 					if (Train::From(v)->tcache.cached_power == 0) {
-						str = STR_TRAIN_NO_POWER;
+						str = STR_VEHICLE_STATUS_TRAIN_NO_POWER;
 					} else {
 						str = STR_VEHICLE_STATUS_STOPPED;
 					}
 				} else {
 					SetDParam(0, v->GetDisplaySpeed());
-					str = STR_TRAIN_STOPPING + _settings_client.gui.vehicle_speed;
+					str = STR_VEHICLE_STATUS_TRAIN_STOPPING + _settings_client.gui.vehicle_speed;
 				}
 			} else { // no train
 				str = STR_VEHICLE_STATUS_STOPPED;
 			}
 		} else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK) && !v->current_order.IsType(OT_LOADING)) {
-			str = STR_TRAIN_STUCK;
+			str = STR_VEHICLE_STATUS_TRAIN_STUCK;
 		} else { // vehicle is in a "normal" state, show current order
 			switch (v->current_order.GetType()) {
 				case OT_GOTO_STATION: {
 					SetDParam(0, v->current_order.GetDestination());
 					SetDParam(1, v->GetDisplaySpeed());
-					str = STR_HEADING_FOR_STATION + _settings_client.gui.vehicle_speed;
+					str = STR_VEHICLE_STATUS_HEADING_FOR_STATION + _settings_client.gui.vehicle_speed;
 				} break;
 
 				case OT_GOTO_DEPOT: {
@@ -1803,9 +1803,9 @@ struct VehicleViewWindow : Window {
 						SetDParam(1, v->GetDisplaySpeed());
 					}
 					if (v->current_order.GetDepotActionType() & ODATFB_HALT) {
-						str = STR_HEADING_FOR_TRAIN_DEPOT + 2 * v->type + _settings_client.gui.vehicle_speed;
+						str = STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT + 2 * v->type + _settings_client.gui.vehicle_speed;
 					} else {
-						str = STR_HEADING_FOR_TRAIN_DEPOT_SERVICE + 2 * v->type + _settings_client.gui.vehicle_speed;
+						str = STR_VEHICLE_STATUS_HEADING_FOR_TRAIN_DEPOT_SERVICE + 2 * v->type + _settings_client.gui.vehicle_speed;
 					}
 				} break;
 
@@ -1816,7 +1816,7 @@ struct VehicleViewWindow : Window {
 				case OT_GOTO_WAYPOINT: {
 					assert(v->type == VEH_TRAIN || v->type == VEH_SHIP);
 					SetDParam(0, v->current_order.GetDestination());
-					str = STR_HEADING_FOR_WAYPOINT + _settings_client.gui.vehicle_speed;
+					str = STR_VEHICLE_STATUS_HEADING_FOR_WAYPOINT + _settings_client.gui.vehicle_speed;
 					SetDParam(1, v->GetDisplaySpeed());
 					break;
 				}
@@ -1830,7 +1830,7 @@ struct VehicleViewWindow : Window {
 
 				default:
 					if (v->GetNumOrders() == 0) {
-						str = STR_NO_ORDERS + _settings_client.gui.vehicle_speed;
+						str = STR_VEHICLE_STATUS_NO_ORDERS + _settings_client.gui.vehicle_speed;
 						SetDParam(0, v->GetDisplaySpeed());
 					} else {
 						str = STR_EMPTY;
diff --git a/src/viewport.cpp b/src/viewport.cpp
index f26e7086e..a7966a522 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1080,7 +1080,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
 						right  > t->sign.left &&
 						left   < t->sign.left + t->sign.width_normal) {
 					AddStringToDraw(t->sign.left + 1, t->sign.top + 1,
-						_settings_client.gui.population_in_label ? STR_TOWN_LABEL_POP : STR_TOWN_LABEL,
+						_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_VIEWPORT_TOWN,
 						t->index, t->population);
 				}
 			}
@@ -1096,7 +1096,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
 						right  > t->sign.left &&
 						left   < t->sign.left + t->sign.width_normal * 2) {
 					AddStringToDraw(t->sign.left + 1, t->sign.top + 1,
-						_settings_client.gui.population_in_label ? STR_TOWN_LABEL_POP : STR_TOWN_LABEL,
+						_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_VIEWPORT_TOWN,
 						t->index, t->population);
 				}
 			}
@@ -1112,8 +1112,8 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
 						top    < t->sign.top + ScaleByZoom(12, dpi->zoom) &&
 						right  > t->sign.left &&
 						left   < t->sign.left + ScaleByZoom(t->sign.width_small, dpi->zoom)) {
-					AddStringToDraw(t->sign.left + 5, t->sign.top + 1, STR_TOWN_LABEL_TINY_BLACK, t->index, 0);
-					AddStringToDraw(t->sign.left + 1, t->sign.top - 3, STR_TOWN_LABEL_TINY_WHITE, t->index, 0);
+					AddStringToDraw(t->sign.left + 5, t->sign.top + 1, STR_VIEWPORT_TOWN_TINY_BLACK, t->index, 0);
+					AddStringToDraw(t->sign.left + 1, t->sign.top - 3, STR_VIEWPORT_TOWN_TINY_WHITE, t->index, 0);
 				}
 			}
 			break;
@@ -1131,7 +1131,7 @@ static void AddStation(const BaseStation *st, bool tiny, uint16 width)
 	/* Don't draw if the display options are disabled */
 	if (!HasBit(_display_opt, is_station ? DO_SHOW_STATION_NAMES : DO_SHOW_WAYPOINT_NAMES)) return;
 
-	StringID str = (is_station ? STR_STATION_SIGN : STR_WAYPOINT_VIEWPORT) + tiny;
+	StringID str = (is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT) + tiny;
 
 	AddStringToDraw(st->sign.left + 1, st->sign.top + 1, str, st->index, st->facilities, (st->owner == OWNER_NONE || !st->IsInUse()) ? 0xE : _company_colours[st->owner], width);
 }
@@ -1220,7 +1220,7 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
 						top    < si->sign.top + 12 &&
 						right  > si->sign.left &&
 						left   < si->sign.left + si->sign.width_normal) {
-					AddSign(si, STR_SIGN_WHITE, si->sign.width_normal);
+					AddSign(si, STR_WHITE_SIGN, si->sign.width_normal);
 				}
 			}
 			break;
@@ -1233,7 +1233,7 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
 						top    < si->sign.top + 24 &&
 						right  > si->sign.left &&
 						left   < si->sign.left + si->sign.width_normal * 2) {
-					AddSign(si, STR_SIGN_WHITE, si->sign.width_normal);
+					AddSign(si, STR_WHITE_SIGN, si->sign.width_normal);
 				}
 			}
 			break;
@@ -1248,7 +1248,7 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
 						top    < si->sign.top + ScaleByZoom(12, dpi->zoom) &&
 						right  > si->sign.left &&
 						left   < si->sign.left + ScaleByZoom(si->sign.width_small, dpi->zoom)) {
-					AddSign(si, IsTransparencySet(TO_SIGNS) ? STR_SIGN_SMALL_WHITE : STR_SIGN_SMALL_BLACK, si->sign.width_small | 0x8000);
+					AddSign(si, IsTransparencySet(TO_SIGNS) ? STR_VIEWPORT_SIGN_SMALL_WHITE : STR_VIEWPORT_SIGN_SMALL_BLACK, si->sign.width_small | 0x8000);
 				}
 			}
 			break;
@@ -1425,7 +1425,7 @@ static void ViewportDrawStrings(DrawPixelInfo *dpi, const StringSpriteToDrawVect
 
 		if (ss->width != 0) {
 			/* Do not draw signs nor station names if they are set invisible */
-			if (IsInvisibilitySet(TO_SIGNS) && ss->string != STR_SIGN_WHITE) continue;
+			if (IsInvisibilitySet(TO_SIGNS) && ss->string != STR_WHITE_SIGN) continue;
 
 			int x = UnScaleByZoom(ss->x, zoom) - 1;
 			int y = UnScaleByZoom(ss->y, zoom) - 1;
@@ -1440,8 +1440,8 @@ static void ViewportDrawStrings(DrawPixelInfo *dpi, const StringSpriteToDrawVect
 			}
 
 		/* Draw the rectangle if 'tranparent station signs' is off,
-		 * or if we are drawing a general text sign (STR_SIGN_WHITE) */
-			if (!IsTransparencySet(TO_SIGNS) || ss->string == STR_SIGN_WHITE) {
+		 * or if we are drawing a general text sign (STR_WHITE_SIGN) */
+			if (!IsTransparencySet(TO_SIGNS) || ss->string == STR_WHITE_SIGN) {
 				DrawFrameRect(
 					x, y, x + w, bottom, (Colours)ss->colour,
 					IsTransparencySet(TO_SIGNS) ? FR_TRANSPARENT : FR_NONE
@@ -1453,7 +1453,7 @@ static void ViewportDrawStrings(DrawPixelInfo *dpi, const StringSpriteToDrawVect
 		SetDParam(1, ss->params[1]);
 		/* if we didn't draw a rectangle, or if transparant building is on,
 		 * draw the text in the colour the rectangle would have */
-		if (IsTransparencySet(TO_SIGNS) && ss->string != STR_SIGN_WHITE && ss->width != 0) {
+		if (IsTransparencySet(TO_SIGNS) && ss->string != STR_WHITE_SIGN && ss->width != 0) {
 			/* Real colours need the IS_PALETTE_COLOUR flag
 			 * otherwise colours from _string_colourmap are assumed. */
 			colour = (TextColour)_colour_gradient[ss->colour][6] | IS_PALETTE_COLOUR;
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp
index 52247e8c0..d168f2df4 100644
--- a/src/water_cmd.cpp
+++ b/src/water_cmd.cpp
@@ -687,15 +687,15 @@ static void GetTileDesc_Water(TileIndex tile, TileDesc *td)
 	switch (GetWaterTileType(tile)) {
 		case WATER_TILE_CLEAR:
 			switch (GetWaterClass(tile)) {
-				case WATER_CLASS_SEA:   td->str = STR_WATER_DESCRIPTION_WATER;     break;
-				case WATER_CLASS_CANAL: td->str = STR_LANDINFO_CANAL; break;
-				case WATER_CLASS_RIVER: td->str = STR_LANDINFO_RIVER; break;
+				case WATER_CLASS_SEA:   td->str = STR_LAI_WATER_DESCRIPTION_WATER; break;
+				case WATER_CLASS_CANAL: td->str = STR_LAI_WATER_DESCRIPTION_CANAL; break;
+				case WATER_CLASS_RIVER: td->str = STR_LAI_WATER_DESCRIPTION_RIVER; break;
 				default: NOT_REACHED(); break;
 			}
 			break;
-		case WATER_TILE_COAST: td->str = STR_WATER_DESCRIPTION_COAST_OR_RIVERBANK; break;
-		case WATER_TILE_LOCK : td->str = STR_LANDINFO_LOCK;           break;
-		case WATER_TILE_DEPOT: td->str = STR_WATER_DESCRIPTION_SHIP_DEPOT;         break;
+		case WATER_TILE_COAST: td->str = STR_LAI_WATER_DESCRIPTION_COAST_OR_RIVERBANK; break;
+		case WATER_TILE_LOCK : td->str = STR_LAI_WATER_DESCRIPTION_LOCK;               break;
+		case WATER_TILE_DEPOT: td->str = STR_LAI_WATER_DESCRIPTION_SHIP_DEPOT;         break;
 		default: NOT_REACHED(); break;
 	}
 
@@ -1143,7 +1143,7 @@ static VehicleEnterTileStatus VehicleEnter_Water(Vehicle *v, TileIndex tile, int
 static CommandCost TerraformTile_Water(TileIndex tile, DoCommandFlag flags, uint z_new, Slope tileh_new)
 {
 	/* Canals can't be terraformed */
-	if (IsWaterTile(tile) && IsCanal(tile)) return_cmd_error(STR_MUST_DEMOLISH_CANAL_FIRST);
+	if (IsWaterTile(tile) && IsCanal(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_CANAL_FIRST);
 
 	return DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 }
diff --git a/src/waypoint_cmd.cpp b/src/waypoint_cmd.cpp
index 94a959e78..b31ff65ad 100644
--- a/src/waypoint_cmd.cpp
+++ b/src/waypoint_cmd.cpp
@@ -33,7 +33,7 @@ void Waypoint::UpdateVirtCoord()
 {
 	Point pt = RemapCoords2(TileX(this->xy) * TILE_SIZE, TileY(this->xy) * TILE_SIZE);
 	SetDParam(0, this->index);
-	this->sign.UpdatePosition(pt.x, pt.y - 0x20, STR_WAYPOINT_VIEWPORT);
+	this->sign.UpdatePosition(pt.x, pt.y - 0x20, STR_VIEWPORT_WAYPOINT);
 	/* Recenter viewport */
 	InvalidateWindowData(WC_WAYPOINT_VIEW, this->index);
 }
@@ -378,7 +378,7 @@ CommandCost RemoveBuoy(TileIndex tile, DoCommandFlag flags)
 
 	Waypoint *wp = Waypoint::GetByTile(tile);
 
-	if (HasStationInUse(wp->index, INVALID_COMPANY)) return_cmd_error(STR_BUOY_IS_IN_USE);
+	if (HasStationInUse(wp->index, INVALID_COMPANY)) return_cmd_error(STR_ERROR_BUOY_IS_IN_USE);
 	/* remove the buoy if there is a ship on tile when company goes bankrupt... */
 	if (!(flags & DC_BANKRUPT) && !EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
 
@@ -432,7 +432,7 @@ CommandCost CmdRenameWaypoint(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
 
 	if (!reset) {
 		if (strlen(text) >= MAX_LENGTH_STATION_NAME_BYTES) return CMD_ERROR;
-		if (!IsUniqueWaypointName(text)) return_cmd_error(STR_NAME_MUST_BE_UNIQUE);
+		if (!IsUniqueWaypointName(text)) return_cmd_error(STR_ERROR_NAME_MUST_BE_UNIQUE);
 	}
 
 	if (flags & DC_EXEC) {
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index 70aafeb07..4f515769d 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -45,9 +45,9 @@ public:
 
 		this->CreateNestedTree(desc);
 		if (this->vt == VEH_TRAIN) {
-			this->nested_array[WAYPVW_SHOW_VEHICLES]->SetDataTip(STR_TRAIN, STR_SCHEDULED_TRAINS_TIP);
+			this->nested_array[WAYPVW_SHOW_VEHICLES]->SetDataTip(STR_TRAIN, STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP);
 			this->nested_array[WAYPVW_CENTERVIEW]->tool_tip = STR_WAYPOINT_VIEW_CENTER_TOOLTIP;
-			this->nested_array[WAYPVW_RENAME]->tool_tip = STR_CHANGE_WAYPOINT_NAME;
+			this->nested_array[WAYPVW_RENAME]->tool_tip = STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME;
 		}
 		this->FinishInitNested(desc, window_number);
 
@@ -111,7 +111,7 @@ public:
 	{
 		if (str == NULL) return;
 
-		DoCommandP(0, this->window_number, 0, CMD_RENAME_WAYPOINT | CMD_MSG(STR_CANT_CHANGE_WAYPOINT_NAME), NULL, str);
+		DoCommandP(0, this->window_number, 0, CMD_RENAME_WAYPOINT | CMD_MSG(STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME), NULL, str);
 	}
 
 };
@@ -119,7 +119,7 @@ public:
 static const NWidgetPart _nested_waypoint_view_widgets[] = {
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_CLOSEBOX, COLOUR_GREY, WAYPVW_CLOSEBOX),
-		NWidget(WWT_CAPTION, COLOUR_GREY, WAYPVW_CAPTION), SetDataTip(STR_WAYPOINT_VIEWPORT, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
+		NWidget(WWT_CAPTION, COLOUR_GREY, WAYPVW_CAPTION), SetDataTip(STR_VIEWPORT_WAYPOINT, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
 		NWidget(WWT_STICKYBOX, COLOUR_GREY, WAYPVW_STICKY),
 	EndContainer(),
 	NWidget(WWT_PANEL, COLOUR_GREY, WAYPVW_VIEWPORTPANEL),
@@ -129,8 +129,8 @@ static const NWidgetPart _nested_waypoint_view_widgets[] = {
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WAYPVW_CENTERVIEW), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_BUTTON_LOCATION, STR_BUOY_VIEW_CENTER_TOOLTIP),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WAYPVW_RENAME), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_QUERY_RENAME, STR_CHANGE_BUOY_NAME),
-		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WAYPVW_SHOW_VEHICLES), SetMinimalSize(15, 12), SetDataTip(STR_SHIP, STR_SCHEDULED_SHIPS_TIP),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WAYPVW_RENAME), SetMinimalSize(100, 12), SetFill(1, 0), SetDataTip(STR_BUTTON_RENAME, STR_BUOY_VIEW_CHANGE_BUOY_NAME),
+		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WAYPVW_SHOW_VEHICLES), SetMinimalSize(15, 12), SetDataTip(STR_SHIP, STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP),
 	EndContainer(),
 };
 
diff --git a/src/widget.cpp b/src/widget.cpp
index 0e675e9cf..54ac5db72 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -1963,13 +1963,13 @@ NWidgetLeaf::NWidgetLeaf(WidgetType tp, Colours colour, int index, uint16 data,
 		case WWT_STICKYBOX:
 			this->SetFill(false, false);
 			this->SetMinimalSize(WD_STICKYBOX_WIDTH, 14);
-			this->SetDataTip(STR_NULL, STR_STICKY_BUTTON);
+			this->SetDataTip(STR_NULL, STR_TOOLTIP_STICKY);
 			break;
 
 		case WWT_RESIZEBOX:
 			this->SetFill(false, false);
 			this->SetMinimalSize(WD_RESIZEBOX_WIDTH, 12);
-			this->SetDataTip(STR_NULL, STR_RESIZE_BUTTON);
+			this->SetDataTip(STR_NULL, STR_TOOLTIP_RESIZE);
 			break;
 
 		case WWT_CLOSEBOX: